Merge pull request #25 from Adyen/develop

Update versions, add msg to AdyenError, fix console

Author: Colin Rood

README.md

@@ -64,6 +64,11 @@ response = adyen.checkout.payments({
 })
 ```
 
+### Change API Version
+```ruby
+adyen.checkout.version = 49
+```
+
 ## List of supported methods
 
 **checkout:**

bin/console

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require_relative "../lib/adyen.rb"
+require_relative "../lib/adyen-ruby-api-library.rb"
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.

docs/payout.html

@@ -88,7 +88,7 @@ <h3 id="storepayoutdetails">Store payout details</h3>
     "shopperReference" : "&lt;ShopperReference&gt;",
     "dateOfBirth" : "1990-01-01",
     "entityType" : "Company",
-    "nationality" : "NL",
+    "nationality" : "NL"
 }')</code></pre>
 
         <h3 id="submitapayout">Submit a payout</h3>

lib/adyen/errors.rb

@@ -1,8 +1,16 @@
 module Adyen
   class AdyenError < StandardError
-    attr_reader :code, :response, :request
+    attr_reader :code, :response, :request, :msg
 
     def initialize(request = nil, response = nil, msg = nil, code = nil)
+      attributes = {
+        code: code,
+        request: request,
+        response: response,
+        msg: msg
+      }.select { |_k, v| v }.map { |k, v| "#{k}:#{v}" }.join(', ')
+      message = "#{self.class.name} #{attributes}"
+      super(message)
       @code = code
       @response = response
       @request = request
@@ -12,65 +20,44 @@ def initialize(request = nil, response = nil, msg = nil, code = nil)
 
   class AuthenticationError < AdyenError
     def initialize(msg, request)
-      @code = 401
-      @response = nil
-      @request = request
-      @msg = msg
+      super(request, nil, msg, 401)
     end
   end
 
   class PermissionError < AdyenError
     def initialize(msg, request)
-      @code = 403
-      @response = nil
-      @request = request
-      @msg = msg
+      super(request, nil, msg, 403)
     end
   end
 
   class FormatError < AdyenError
     def initialize(msg, request, response)
-      @code = 422
-      @response = response
-      @request = request
-      @msg = msg
+      super(request, response, msg, 422)
     end
   end
 
   class ServerError < AdyenError
     def initialize(msg, request, response)
-      @code = 500
-      @response = response
-      @request = request
-      @msg = msg
+      super(request, response, msg, 500)
     end
   end
 
   class ConfigurationError < AdyenError
     def initialize(msg, request)
-      @code = 905
-      @response = nil
-      @request = request
-      @msg = msg
+      super(request, nil, msg, 905)
     end
   end
 
   class ValidationError < AdyenError
     def initialize(msg, request)
-      @code = nil
-      @response = nil
-      @request = request
-      @msg = msg
+      super(request, nil, msg, nil)
     end
   end
 
   # catchall for errors which don't have more specific classes
   class APIError < AdyenError
     def initialize(msg, request, response, code)
-      @code = code
-      @response = response
-      @request = request
-      @msg = msg
+      super(request, response, msg, code)
     end
   end
 end

lib/adyen/services/checkout.rb

@@ -2,7 +2,7 @@
 
 module Adyen
   class Checkout < Service
-    DEFAULT_VERSION = 41
+    DEFAULT_VERSION = 49
 
     def initialize(client, version = DEFAULT_VERSION)
       service = 'Checkout'

lib/adyen/services/marketpay.rb

@@ -72,7 +72,7 @@ def initialize(client, version = DEFAULT_VERSION)
 
     class Notification < Service
       attr_accessor :version
-      DEFAULT_VERSION = 1
+      DEFAULT_VERSION = 5
 
       def initialize(client, version = DEFAULT_VERSION)
         service = 'Notification'

lib/adyen/services/payments.rb

@@ -3,7 +3,7 @@
 module Adyen
   class Payments < Service
     attr_accessor :version
-    DEFAULT_VERSION = 40
+    DEFAULT_VERSION = 49
 
     def initialize(client, version = DEFAULT_VERSION)
       service = 'Payment'

lib/adyen/services/recurring.rb

@@ -3,7 +3,7 @@
 module Adyen
   class Recurring < Service
     attr_accessor :version
-    DEFAULT_VERSION = 25
+    DEFAULT_VERSION = 30
 
     def initialize(client, version = DEFAULT_VERSION)
       service = 'Recurring'

lib/adyen/version.rb

@@ -1,4 +1,4 @@
 module Adyen
   NAME = "adyen-ruby-api-library"
-  VERSION = "2.0.0".freeze
+  VERSION = "3.0.0".freeze
 end

spec/errors_spec.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Adyen::AdyenError do
+  describe '#to_s' do
+    it 'describes using the error properties' do
+      expect(Adyen::AdyenError.new('request', 'response', 'message', 'code').to_s).to eq('Adyen::AdyenError code:code, request:request, response:response, msg:message')
+    end
+    it 'skips the null properties' do
+      expect(Adyen::AdyenError.new('request', nil, nil, 'code').to_s).to eq('Adyen::AdyenError code:code, request:request')
+    end
+    it 'uses the proper error class name' do
+      expect(Adyen::PermissionError.new('a message', 'a request').to_s).to eq('Adyen::PermissionError code:403, request:a request, msg:a message')
+    end
+  end
+end