connect-sdk-ruby 1.5.0 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1fbce0636a60191953016983f15d8e0a3f02347e
-  data.tar.gz: 5676833dcc4cd193c438d52cf3ba4dd3b867db89
+  metadata.gz: b5f2472449a29e66bef937d3be0c4346af2c7ca9
+  data.tar.gz: 2cbb453a1ff614fbddabb4d88e5a6535901f9db8
 SHA512:
-  metadata.gz: 25c09dbb1b0906082d3523e86710d36356272864b1a6d53d336ff1c15451025afa6d2773ffd77401dcc74970780e610f4047030cecd2ff315e86010cf40263cd
-  data.tar.gz: 7ad7c5a3edfff7dc69feb9ff095dd977f17cdff43c11269a21cf389ae8b9960c580faf78035d7586492f1410555a3e70f52b962b949c38407ed0aecd06341971
+  metadata.gz: 22ffcac8ecb66987b285b7c1b9fe38d729688d8a1abb9815396663611f7667b98279e511ec6e9e6f0c2375cb81f37692d6ecf54b9774c167d36d99157c14e5a0
+  data.tar.gz: 0b72832ff357bed4bce56938e3ee2e57b5b48cd686381b6cd31033bab13ab80b8ad03a88dbfe5efe16afafd145ca8ad683c856f09a71645db91dfedf15bc19fe

data/connect-sdk-ruby.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name           = 'connect-sdk-ruby'
-  spec.version        = '1.5.0'
+  spec.version        = '1.5.1'
   spec.authors        = ['Ingenico ePayments']
   spec.email          = ['github@epay.ingenico.com']
   spec.summary        = %q{SDK to communicate with the GlobalCollect platform using the Ingenico Connect Server API}

data/examples/merchant/payments/approve_payment_example.rb

@@ -3,8 +3,8 @@
 # https://developer.globalcollect.com/documentation/api/server/
 #
 require 'ingenico/connect/sdk/factory'
-require 'ingenico/connect/sdk/domain/payment/approve_payment_request'
 require 'ingenico/connect/sdk/domain/payment/approve_payment_non_sepa_direct_debit_payment_method_specific_input'
+require 'ingenico/connect/sdk/domain/payment/approve_payment_request'
 require 'ingenico/connect/sdk/domain/payment/order_approve_payment'
 require 'ingenico/connect/sdk/domain/payment/order_references_approve_payment'
 

data/examples/merchant/payments/create_payment_example.rb

@@ -9,10 +9,10 @@ require 'ingenico/connect/sdk/domain/definitions/address'
 require 'ingenico/connect/sdk/domain/definitions/amount_of_money'
 require 'ingenico/connect/sdk/domain/definitions/card'
 require 'ingenico/connect/sdk/domain/definitions/company_information'
-require 'ingenico/connect/sdk/domain/payment/create_payment_request'
 require 'ingenico/connect/sdk/domain/payment/address_personal'
 require 'ingenico/connect/sdk/domain/payment/card_payment_method_specific_input'
 require 'ingenico/connect/sdk/domain/payment/contact_details'
+require 'ingenico/connect/sdk/domain/payment/create_payment_request'
 require 'ingenico/connect/sdk/domain/payment/customer'
 require 'ingenico/connect/sdk/domain/payment/line_item'
 require 'ingenico/connect/sdk/domain/payment/line_item_invoice_data'

data/examples/merchant/payments/refund_payment_example.rb

@@ -10,14 +10,14 @@ require 'ingenico/connect/sdk/domain/definitions/bank_account_iban'
 require 'ingenico/connect/sdk/domain/definitions/contact_details_base'
 require 'ingenico/connect/sdk/domain/payment/address_personal'
 require 'ingenico/connect/sdk/domain/payment/personal_name'
-require 'ingenico/connect/sdk/domain/refund/refund_request'
 require 'ingenico/connect/sdk/domain/refund/bank_refund_method_specific_input'
 require 'ingenico/connect/sdk/domain/refund/refund_customer'
 require 'ingenico/connect/sdk/domain/refund/refund_references'
+require 'ingenico/connect/sdk/domain/refund/refund_request'
 
 Definitions = Ingenico::Connect::SDK::Domain::Definitions
-Refund = Ingenico::Connect::SDK::Domain::Refund
 Payment = Ingenico::Connect::SDK::Domain::Payment
+Refund = Ingenico::Connect::SDK::Domain::Refund
 
 def example
   get_client do |client|

data/examples/merchant/payouts/create_payout_example.rb

@@ -16,8 +16,8 @@ require 'ingenico/connect/sdk/domain/payout/payout_customer'
 require 'ingenico/connect/sdk/domain/payout/payout_references'
 
 Definitions = Ingenico::Connect::SDK::Domain::Definitions
-Payout = Ingenico::Connect::SDK::Domain::Payout
 Payment = Ingenico::Connect::SDK::Domain::Payment
+Payout = Ingenico::Connect::SDK::Domain::Payout
 
 def example
   get_client do |client|

data/examples/merchant/productgroups/get_payment_product_group_example.rb

@@ -10,11 +10,11 @@ Productgroups = Ingenico::Connect::SDK::Merchant::Productgroups
 def example
   get_client do |client|
     query = Productgroups::GetProductgroupParams.new
-    query.amount = 1000
-    query.is_recurring = true
     query.country_code = 'NL'
-    query.locale = 'en_US'
     query.currency_code = 'EUR'
+    query.locale = 'en_US'
+    query.amount = 1000
+    query.is_recurring = true
     query.add_hide('fields')
 
     response = client.merchant('merchantId').productgroups().get('cards', query)

data/examples/merchant/productgroups/get_payment_product_groups_example.rb

@@ -10,11 +10,11 @@ Productgroups = Ingenico::Connect::SDK::Merchant::Productgroups
 def example
   get_client do |client|
     query = Productgroups::FindProductgroupsParams.new
-    query.amount = 1000
-    query.is_recurring = true
     query.country_code = 'NL'
-    query.locale = 'en_US'
     query.currency_code = 'EUR'
+    query.locale = 'en_US'
+    query.amount = 1000
+    query.is_recurring = true
     query.add_hide('fields')
 
     response = client.merchant('merchantId').productgroups().find(query)

data/examples/merchant/products/get_directory_example.rb

@@ -10,8 +10,8 @@ Products = Ingenico::Connect::SDK::Merchant::Products
 def example
   get_client do |client|
     query = Products::DirectoryParams.new
-    query.currency_code = 'EUR'
     query.country_code = 'NL'
+    query.currency_code = 'EUR'
 
     response = client.merchant('merchantId').products().directory(809, query)
   end

data/examples/merchant/products/get_payment_product_example.rb

@@ -10,11 +10,11 @@ Products = Ingenico::Connect::SDK::Merchant::Products
 def example
   get_client do |client|
     query = Products::GetProductParams.new
-    query.amount = 1000
-    query.is_recurring = true
     query.country_code = 'US'
-    query.locale = 'en_US'
     query.currency_code = 'USD'
+    query.locale = 'en_US'
+    query.amount = 1000
+    query.is_recurring = true
     query.add_hide('fields')
 
     response = client.merchant('merchantId').products().get(1, query)

data/examples/merchant/products/get_payment_products_example.rb

@@ -10,11 +10,11 @@ Products = Ingenico::Connect::SDK::Merchant::Products
 def example
   get_client do |client|
     query = Products::FindProductsParams.new
-    query.amount = 1000
-    query.is_recurring = true
     query.country_code = 'US'
-    query.locale = 'en_US'
     query.currency_code = 'USD'
+    query.locale = 'en_US'
+    query.amount = 1000
+    query.is_recurring = true
     query.add_hide('fields')
 
     response = client.merchant('merchantId').products().find(query)

data/examples/merchant/riskassessments/risk_assessment_bank_account_example.rb

@@ -6,9 +6,9 @@ require 'ingenico/connect/sdk/factory'
 require 'ingenico/connect/sdk/domain/definitions/address'
 require 'ingenico/connect/sdk/domain/definitions/amount_of_money'
 require 'ingenico/connect/sdk/domain/definitions/bank_account_bban'
-require 'ingenico/connect/sdk/domain/riskassessments/risk_assessment_bank_account'
 require 'ingenico/connect/sdk/domain/riskassessments/customer_risk_assessment'
 require 'ingenico/connect/sdk/domain/riskassessments/order_risk_assessment'
+require 'ingenico/connect/sdk/domain/riskassessments/risk_assessment_bank_account'
 
 Definitions = Ingenico::Connect::SDK::Domain::Definitions
 Riskassessments = Ingenico::Connect::SDK::Domain::Riskassessments

data/examples/merchant/riskassessments/risk_assessment_cards_example.rb

@@ -9,9 +9,9 @@ require 'ingenico/connect/sdk/domain/definitions/airline_data'
 require 'ingenico/connect/sdk/domain/definitions/airline_flight_leg'
 require 'ingenico/connect/sdk/domain/definitions/amount_of_money'
 require 'ingenico/connect/sdk/domain/definitions/card'
-require 'ingenico/connect/sdk/domain/riskassessments/risk_assessment_card'
 require 'ingenico/connect/sdk/domain/riskassessments/customer_risk_assessment'
 require 'ingenico/connect/sdk/domain/riskassessments/order_risk_assessment'
+require 'ingenico/connect/sdk/domain/riskassessments/risk_assessment_card'
 
 Definitions = Ingenico::Connect::SDK::Domain::Definitions
 Riskassessments = Ingenico::Connect::SDK::Domain::Riskassessments

data/examples/merchant/services/convert_amount_example.rb

@@ -11,8 +11,8 @@ def example
   get_client do |client|
     query = Services::ConvertAmountParams.new
     query.source = 'EUR'
-    query.amount = 100
     query.target = 'USD'
+    query.amount = 100
 
     response = client.merchant('merchantId').services().convert_amount(query)
   end

data/examples/merchant/tokens/update_token_example.rb

@@ -6,12 +6,12 @@ require 'ingenico/connect/sdk/factory'
 require 'ingenico/connect/sdk/domain/definitions/address'
 require 'ingenico/connect/sdk/domain/definitions/card_without_cvv'
 require 'ingenico/connect/sdk/domain/definitions/company_information'
-require 'ingenico/connect/sdk/domain/token/update_token_request'
 require 'ingenico/connect/sdk/domain/token/customer_token'
 require 'ingenico/connect/sdk/domain/token/personal_information_token'
 require 'ingenico/connect/sdk/domain/token/personal_name_token'
 require 'ingenico/connect/sdk/domain/token/token_card'
 require 'ingenico/connect/sdk/domain/token/token_card_data'
+require 'ingenico/connect/sdk/domain/token/update_token_request'
 
 Definitions = Ingenico::Connect::SDK::Domain::Definitions
 Token = Ingenico::Connect::SDK::Domain::Token

data/lib/ingenico/connect/sdk/merchant/merchant_client.rb

@@ -26,14 +26,6 @@ module Ingenico::Connect::SDK
         super(parent, path_context)
       end
 
-      # Resource /{{merchantId}}/hostedcheckouts
-      #
-      # Create new hosted checkout
-      # Returns:: {Ingenico::Connect::SDK::Merchant::Hostedcheckouts::HostedcheckoutsClient}
-      def hostedcheckouts
-        Ingenico::Connect::SDK::Merchant::Hostedcheckouts::HostedcheckoutsClient.new(self, nil)
-      end
-
       # Resource /{{merchantId}}/payments
       #
       # Create, cancel and approve payments
@@ -50,14 +42,6 @@ module Ingenico::Connect::SDK
         Ingenico::Connect::SDK::Merchant::Payouts::PayoutsClient.new(self, nil)
       end
 
-      # Resource /{{merchantId}}/productgroups
-      #
-      # Get information about payment product groups
-      # Returns:: {Ingenico::Connect::SDK::Merchant::Productgroups::ProductgroupsClient}
-      def productgroups
-        Ingenico::Connect::SDK::Merchant::Productgroups::ProductgroupsClient.new(self, nil)
-      end
-
       # Resource /{{merchantId}}/products
       #
       # Get information about payment products
@@ -66,6 +50,14 @@ module Ingenico::Connect::SDK
         Ingenico::Connect::SDK::Merchant::Products::ProductsClient.new(self, nil)
       end
 
+      # Resource /{{merchantId}}/productgroups
+      #
+      # Get information about payment product groups
+      # Returns:: {Ingenico::Connect::SDK::Merchant::Productgroups::ProductgroupsClient}
+      def productgroups
+        Ingenico::Connect::SDK::Merchant::Productgroups::ProductgroupsClient.new(self, nil)
+      end
+
       # Resource /{{merchantId}}/refunds
       #
       # Create, cancel and approve refunds
@@ -105,6 +97,14 @@ module Ingenico::Connect::SDK
       def tokens
         Ingenico::Connect::SDK::Merchant::Tokens::TokensClient.new(self, nil)
       end
+
+      # Resource /{{merchantId}}/hostedcheckouts
+      #
+      # Create new hosted checkout
+      # Returns:: {Ingenico::Connect::SDK::Merchant::Hostedcheckouts::HostedcheckoutsClient}
+      def hostedcheckouts
+        Ingenico::Connect::SDK::Merchant::Hostedcheckouts::HostedcheckoutsClient.new(self, nil)
+      end
     end
   end
 end

data/lib/ingenico/connect/sdk/merchant/payments/payments_client.rb

@@ -126,10 +126,7 @@ module Ingenico::Connect::SDK
             Ingenico::Connect::SDK::Domain::Payment::PaymentApprovalResponse,
             context)
         rescue ResponseException => e
-          error_type = {
-            402 => Ingenico::Connect::SDK::Domain::Errors::ErrorResponse,
-            404 => Ingenico::Connect::SDK::Domain::Errors::ErrorResponse,
-          }.fetch(e.status_code, Ingenico::Connect::SDK::Domain::Errors::ErrorResponse)
+          error_type = Ingenico::Connect::SDK::Domain::Errors::ErrorResponse
           error_object = @communicator.marshaller.unmarshal(e.body, error_type)
           raise create_exception(e.status_code, e.body, error_object, context)
         end
@@ -162,9 +159,7 @@ module Ingenico::Connect::SDK
             Ingenico::Connect::SDK::Domain::Payment::CancelPaymentResponse,
             context)
         rescue ResponseException => e
-          error_type = {
-            402 => Ingenico::Connect::SDK::Domain::Errors::ErrorResponse,
-          }.fetch(e.status_code, Ingenico::Connect::SDK::Domain::Errors::ErrorResponse)
+          error_type = Ingenico::Connect::SDK::Domain::Errors::ErrorResponse
           error_object = @communicator.marshaller.unmarshal(e.body, error_type)
           raise create_exception(e.status_code, e.body, error_object, context)
         end
@@ -197,9 +192,7 @@ module Ingenico::Connect::SDK
             Ingenico::Connect::SDK::Domain::Payment::CancelApprovalPaymentResponse,
             context)
         rescue ResponseException => e
-          error_type = {
-            404 => Ingenico::Connect::SDK::Domain::Errors::ErrorResponse,
-          }.fetch(e.status_code, Ingenico::Connect::SDK::Domain::Errors::ErrorResponse)
+          error_type = Ingenico::Connect::SDK::Domain::Errors::ErrorResponse
           error_object = @communicator.marshaller.unmarshal(e.body, error_type)
           raise create_exception(e.status_code, e.body, error_object, context)
         end
@@ -232,10 +225,7 @@ module Ingenico::Connect::SDK
             Ingenico::Connect::SDK::Domain::Payment::PaymentResponse,
             context)
         rescue ResponseException => e
-          error_type = {
-            404 => Ingenico::Connect::SDK::Domain::Errors::ErrorResponse,
-            405 => Ingenico::Connect::SDK::Domain::Errors::ErrorResponse,
-          }.fetch(e.status_code, Ingenico::Connect::SDK::Domain::Errors::ErrorResponse)
+          error_type = Ingenico::Connect::SDK::Domain::Errors::ErrorResponse
           error_object = @communicator.marshaller.unmarshal(e.body, error_type)
           raise create_exception(e.status_code, e.body, error_object, context)
         end
@@ -307,9 +297,7 @@ module Ingenico::Connect::SDK
             Ingenico::Connect::SDK::Domain::Token::CreateTokenResponse,
             context)
         rescue ResponseException => e
-          error_type = {
-            404 => Ingenico::Connect::SDK::Domain::Errors::ErrorResponse,
-          }.fetch(e.status_code, Ingenico::Connect::SDK::Domain::Errors::ErrorResponse)
+          error_type = Ingenico::Connect::SDK::Domain::Errors::ErrorResponse
           error_object = @communicator.marshaller.unmarshal(e.body, error_type)
           raise create_exception(e.status_code, e.body, error_object, context)
         end

data/lib/ingenico/connect/sdk/merchant/payouts/payouts_client.rb

@@ -81,9 +81,7 @@ module Ingenico::Connect::SDK
             Ingenico::Connect::SDK::Domain::Payout::PayoutResponse,
             context)
         rescue ResponseException => e
-          error_type = {
-            404 => Ingenico::Connect::SDK::Domain::Errors::ErrorResponse,
-          }.fetch(e.status_code, Ingenico::Connect::SDK::Domain::Errors::ErrorResponse)
+          error_type = Ingenico::Connect::SDK::Domain::Errors::ErrorResponse
           error_object = @communicator.marshaller.unmarshal(e.body, error_type)
           raise create_exception(e.status_code, e.body, error_object, context)
         end
@@ -117,9 +115,7 @@ module Ingenico::Connect::SDK
             Ingenico::Connect::SDK::Domain::Payout::PayoutResponse,
             context)
         rescue ResponseException => e
-          error_type = {
-            402 => Ingenico::Connect::SDK::Domain::Errors::ErrorResponse,
-          }.fetch(e.status_code, Ingenico::Connect::SDK::Domain::Errors::ErrorResponse)
+          error_type = Ingenico::Connect::SDK::Domain::Errors::ErrorResponse
           error_object = @communicator.marshaller.unmarshal(e.body, error_type)
           raise create_exception(e.status_code, e.body, error_object, context)
         end
@@ -151,9 +147,7 @@ module Ingenico::Connect::SDK
             nil,
             context)
         rescue ResponseException => e
-          error_type = {
-            402 => Ingenico::Connect::SDK::Domain::Errors::ErrorResponse,
-          }.fetch(e.status_code, Ingenico::Connect::SDK::Domain::Errors::ErrorResponse)
+          error_type = Ingenico::Connect::SDK::Domain::Errors::ErrorResponse
           error_object = @communicator.marshaller.unmarshal(e.body, error_type)
           raise create_exception(e.status_code, e.body, error_object, context)
         end
@@ -185,9 +179,7 @@ module Ingenico::Connect::SDK
             nil,
             context)
         rescue ResponseException => e
-          error_type = {
-            405 => Ingenico::Connect::SDK::Domain::Errors::ErrorResponse,
-          }.fetch(e.status_code, Ingenico::Connect::SDK::Domain::Errors::ErrorResponse)
+          error_type = Ingenico::Connect::SDK::Domain::Errors::ErrorResponse
           error_object = @communicator.marshaller.unmarshal(e.body, error_type)
           raise create_exception(e.status_code, e.body, error_object, context)
         end

data/lib/ingenico/connect/sdk/merchant/productgroups/find_productgroups_params.rb

@@ -11,24 +11,23 @@ module Ingenico::Connect::SDK
       # Query parameters for {https://developer.globalcollect.com/documentation/api/server/#__merchantId__productgroups_get Get payment product groups}
       class FindProductgroupsParams < Ingenico::Connect::SDK::ParamRequest
 
-        # Integer
-        attr_accessor :amount
-
-        # Array of String
-        attr_accessor :hide
-
-        # true/false
-        attr_accessor :is_recurring
-
         # String
         attr_accessor :country_code
 
         # String
-        attr_accessor :locale
+        attr_accessor :currency_code
 
         # String
-        attr_accessor :currency_code
-        attr_accessor :amount, :hide, :is_recurring, :country_code, :locale, :currency_code
+        attr_accessor :locale
+
+        # Integer
+        attr_accessor :amount
+
+        # true/false
+        attr_accessor :is_recurring
+
+        # Array of String
+        attr_accessor :hide
 
         # Adds the parameter _value_ to the _hide_ Array
         def add_hide(value)
@@ -41,12 +40,12 @@ module Ingenico::Connect::SDK
         # Returns an Array of {Ingenico::Connect::SDK::RequestParam} objects representing the attributes of this class
         def to_request_parameters
           result = []
-          add_parameter(result, 'amount', @amount)
-          add_parameter(result, 'hide', @hide)
-          add_parameter(result, 'isRecurring', @is_recurring)
           add_parameter(result, 'countryCode', @country_code)
-          add_parameter(result, 'locale', @locale)
           add_parameter(result, 'currencyCode', @currency_code)
+          add_parameter(result, 'locale', @locale)
+          add_parameter(result, 'amount', @amount)
+          add_parameter(result, 'isRecurring', @is_recurring)
+          add_parameter(result, 'hide', @hide)
           result
         end
       end

data/lib/ingenico/connect/sdk/merchant/productgroups/get_productgroup_params.rb

@@ -11,24 +11,23 @@ module Ingenico::Connect::SDK
       # Query parameters for {https://developer.globalcollect.com/documentation/api/server/#__merchantId__productgroups__paymentProductGroupId__get Get payment product group}
       class GetProductgroupParams < Ingenico::Connect::SDK::ParamRequest
 
-        # Integer
-        attr_accessor :amount
-
-        # Array of String
-        attr_accessor :hide
-
-        # true/false
-        attr_accessor :is_recurring
-
         # String
         attr_accessor :country_code
 
         # String
-        attr_accessor :locale
+        attr_accessor :currency_code
 
         # String
-        attr_accessor :currency_code
-        attr_accessor :amount, :hide, :is_recurring, :country_code, :locale, :currency_code
+        attr_accessor :locale
+
+        # Integer
+        attr_accessor :amount
+
+        # true/false
+        attr_accessor :is_recurring
+
+        # Array of String
+        attr_accessor :hide
 
         # Adds the parameter _value_ to the _hide_ Array
         def add_hide(value)
@@ -41,12 +40,12 @@ module Ingenico::Connect::SDK
         # Returns an Array of {Ingenico::Connect::SDK::RequestParam} objects representing the attributes of this class
         def to_request_parameters
           result = []
-          add_parameter(result, 'amount', @amount)
-          add_parameter(result, 'hide', @hide)
-          add_parameter(result, 'isRecurring', @is_recurring)
           add_parameter(result, 'countryCode', @country_code)
-          add_parameter(result, 'locale', @locale)
           add_parameter(result, 'currencyCode', @currency_code)
+          add_parameter(result, 'locale', @locale)
+          add_parameter(result, 'amount', @amount)
+          add_parameter(result, 'isRecurring', @is_recurring)
+          add_parameter(result, 'hide', @hide)
           result
         end
       end

data/lib/ingenico/connect/sdk/merchant/productgroups/productgroups_client.rb

@@ -24,7 +24,7 @@ module Ingenico::Connect::SDK
         # Resource /{{merchantId}}/productgroups
         #
         # {https://developer.globalcollect.com/documentation/api/server/#__merchantId__productgroups_get Get payment product groups}
-        # query::   {Ingenico::Connect::SDK::Merchant::Productgroups::FindParams}
+        # query::   {Ingenico::Connect::SDK::Merchant::Productgroups::FindProductgroupsParams}
         # context:: {Ingenico::Connect::SDK::CallContext}
         # Returns:: {Ingenico::Connect::SDK::Domain::Product::PaymentProductGroups}
         # Raises:: {Ingenico::Connect::SDK::ValidationException} if the request was not correct and couldn't be processed (HTTP status code 400)
@@ -54,7 +54,7 @@ module Ingenico::Connect::SDK
         #
         # {https://developer.globalcollect.com/documentation/api/server/#__merchantId__productgroups__paymentProductGroupId__get Get payment product group}
         # payment_product_group_id:: String
-        # query::                    {Ingenico::Connect::SDK::Merchant::Productgroups::GetParams}
+        # query::                    {Ingenico::Connect::SDK::Merchant::Productgroups::GetProductgroupParams}
         # context::                  {Ingenico::Connect::SDK::CallContext}
         # Returns:: {Ingenico::Connect::SDK::Domain::Product::PaymentProductGroupResponse}
         # Raises:: {Ingenico::Connect::SDK::ValidationException} if the request was not correct and couldn't be processed (HTTP status code 400)
@@ -78,9 +78,7 @@ module Ingenico::Connect::SDK
             Ingenico::Connect::SDK::Domain::Product::PaymentProductGroupResponse,
             context)
         rescue ResponseException => e
-          error_type = {
-            404 => Ingenico::Connect::SDK::Domain::Errors::ErrorResponse,
-          }.fetch(e.status_code, Ingenico::Connect::SDK::Domain::Errors::ErrorResponse)
+          error_type = Ingenico::Connect::SDK::Domain::Errors::ErrorResponse
           error_object = @communicator.marshaller.unmarshal(e.body, error_type)
           raise create_exception(e.status_code, e.body, error_object, context)
         end

data/lib/ingenico/connect/sdk/merchant/products/directory_params.rb

@@ -12,17 +12,16 @@ module Ingenico::Connect::SDK
       class DirectoryParams < Ingenico::Connect::SDK::ParamRequest
 
         # String
-        attr_accessor :currency_code
+        attr_accessor :country_code
 
         # String
-        attr_accessor :country_code
-        attr_accessor :currency_code, :country_code
+        attr_accessor :currency_code
 
         # Returns an Array of {Ingenico::Connect::SDK::RequestParam} objects representing the attributes of this class
         def to_request_parameters
           result = []
-          add_parameter(result, 'currencyCode', @currency_code)
           add_parameter(result, 'countryCode', @country_code)
+          add_parameter(result, 'currencyCode', @currency_code)
           result
         end
       end

data/lib/ingenico/connect/sdk/merchant/products/find_products_params.rb

@@ -11,24 +11,23 @@ module Ingenico::Connect::SDK
       # Query parameters for {https://developer.globalcollect.com/documentation/api/server/#__merchantId__products_get Get payment products}
       class FindProductsParams < Ingenico::Connect::SDK::ParamRequest
 
-        # Integer
-        attr_accessor :amount
-
-        # Array of String
-        attr_accessor :hide
-
-        # true/false
-        attr_accessor :is_recurring
-
         # String
         attr_accessor :country_code
 
         # String
-        attr_accessor :locale
+        attr_accessor :currency_code
 
         # String
-        attr_accessor :currency_code
-        attr_accessor :amount, :hide, :is_recurring, :country_code, :locale, :currency_code
+        attr_accessor :locale
+
+        # Integer
+        attr_accessor :amount
+
+        # true/false
+        attr_accessor :is_recurring
+
+        # Array of String
+        attr_accessor :hide
 
         # Adds the parameter _value_ to the _hide_ Array
         def add_hide(value)
@@ -41,12 +40,12 @@ module Ingenico::Connect::SDK
         # Returns an Array of {Ingenico::Connect::SDK::RequestParam} objects representing the attributes of this class
         def to_request_parameters
           result = []
-          add_parameter(result, 'amount', @amount)
-          add_parameter(result, 'hide', @hide)
-          add_parameter(result, 'isRecurring', @is_recurring)
           add_parameter(result, 'countryCode', @country_code)
-          add_parameter(result, 'locale', @locale)
           add_parameter(result, 'currencyCode', @currency_code)
+          add_parameter(result, 'locale', @locale)
+          add_parameter(result, 'amount', @amount)
+          add_parameter(result, 'isRecurring', @is_recurring)
+          add_parameter(result, 'hide', @hide)
           result
         end
       end

data/lib/ingenico/connect/sdk/merchant/products/get_product_params.rb

@@ -11,24 +11,23 @@ module Ingenico::Connect::SDK
       # Query parameters for {https://developer.globalcollect.com/documentation/api/server/#__merchantId__products__paymentProductId__get Get payment product}
       class GetProductParams < Ingenico::Connect::SDK::ParamRequest
 
-        # Integer
-        attr_accessor :amount
-
-        # Array of String
-        attr_accessor :hide
-
-        # true/false
-        attr_accessor :is_recurring
-
         # String
         attr_accessor :country_code
 
         # String
-        attr_accessor :locale
+        attr_accessor :currency_code
 
         # String
-        attr_accessor :currency_code
-        attr_accessor :amount, :hide, :is_recurring, :country_code, :locale, :currency_code
+        attr_accessor :locale
+
+        # Integer
+        attr_accessor :amount
+
+        # true/false
+        attr_accessor :is_recurring
+
+        # Array of String
+        attr_accessor :hide
 
         # Adds the parameter _value_ to the _hide_ Array
         def add_hide(value)
@@ -41,12 +40,12 @@ module Ingenico::Connect::SDK
         # Returns an Array of {Ingenico::Connect::SDK::RequestParam} objects representing the attributes of this class
         def to_request_parameters
           result = []
-          add_parameter(result, 'amount', @amount)
-          add_parameter(result, 'hide', @hide)
-          add_parameter(result, 'isRecurring', @is_recurring)
           add_parameter(result, 'countryCode', @country_code)
-          add_parameter(result, 'locale', @locale)
           add_parameter(result, 'currencyCode', @currency_code)
+          add_parameter(result, 'locale', @locale)
+          add_parameter(result, 'amount', @amount)
+          add_parameter(result, 'isRecurring', @is_recurring)
+          add_parameter(result, 'hide', @hide)
           result
         end
       end

data/lib/ingenico/connect/sdk/merchant/products/networks_params.rb

@@ -22,7 +22,6 @@ module Ingenico::Connect::SDK
 
         # true/false
         attr_accessor :is_recurring
-        attr_accessor :country_code, :currency_code, :amount, :is_recurring
 
         # Returns an Array of {Ingenico::Connect::SDK::RequestParam} objects representing the attributes of this class
         def to_request_parameters

data/lib/ingenico/connect/sdk/merchant/products/products_client.rb

@@ -27,7 +27,7 @@ module Ingenico::Connect::SDK
         # Resource /{{merchantId}}/products
         #
         # {https://developer.globalcollect.com/documentation/api/server/#__merchantId__products_get Get payment products}
-        # query::   {Ingenico::Connect::SDK::Merchant::Products::FindParams}
+        # query::   {Ingenico::Connect::SDK::Merchant::Products::FindProductsParams}
         # context:: {Ingenico::Connect::SDK::CallContext}
         # Returns:: {Ingenico::Connect::SDK::Domain::Product::PaymentProducts}
         # Raises:: {Ingenico::Connect::SDK::ValidationException} if the request was not correct and couldn't be processed (HTTP status code 400)
@@ -57,7 +57,7 @@ module Ingenico::Connect::SDK
         #
         # {https://developer.globalcollect.com/documentation/api/server/#__merchantId__products__paymentProductId__get Get payment product}
         # payment_product_id:: Integer
-        # query::              {Ingenico::Connect::SDK::Merchant::Products::GetParams}
+        # query::              {Ingenico::Connect::SDK::Merchant::Products::GetProductParams}
         # context::            {Ingenico::Connect::SDK::CallContext}
         # Returns:: {Ingenico::Connect::SDK::Domain::Product::PaymentProductResponse}
         # Raises:: {Ingenico::Connect::SDK::ValidationException} if the request was not correct and couldn't be processed (HTTP status code 400)
@@ -114,9 +114,7 @@ module Ingenico::Connect::SDK
             Ingenico::Connect::SDK::Domain::Product::Directory,
             context)
         rescue ResponseException => e
-          error_type = {
-            404 => Ingenico::Connect::SDK::Domain::Errors::ErrorResponse,
-          }.fetch(e.status_code, Ingenico::Connect::SDK::Domain::Errors::ErrorResponse)
+          error_type = Ingenico::Connect::SDK::Domain::Errors::ErrorResponse
           error_object = @communicator.marshaller.unmarshal(e.body, error_type)
           raise create_exception(e.status_code, e.body, error_object, context)
         end
@@ -149,9 +147,7 @@ module Ingenico::Connect::SDK
             Ingenico::Connect::SDK::Domain::Product::PaymentProductNetworksResponse,
             context)
         rescue ResponseException => e
-          error_type = {
-            404 => Ingenico::Connect::SDK::Domain::Errors::ErrorResponse,
-          }.fetch(e.status_code, Ingenico::Connect::SDK::Domain::Errors::ErrorResponse)
+          error_type = Ingenico::Connect::SDK::Domain::Errors::ErrorResponse
           error_object = @communicator.marshaller.unmarshal(e.body, error_type)
           raise create_exception(e.status_code, e.body, error_object, context)
         end
@@ -183,9 +179,7 @@ module Ingenico::Connect::SDK
             Ingenico::Connect::SDK::Domain::Publickey::PublicKey,
             context)
         rescue ResponseException => e
-          error_type = {
-            404 => Ingenico::Connect::SDK::Domain::Errors::ErrorResponse,
-          }.fetch(e.status_code, Ingenico::Connect::SDK::Domain::Errors::ErrorResponse)
+          error_type = Ingenico::Connect::SDK::Domain::Errors::ErrorResponse
           error_object = @communicator.marshaller.unmarshal(e.body, error_type)
           raise create_exception(e.status_code, e.body, error_object, context)
         end

data/lib/ingenico/connect/sdk/merchant/services/convert_amount_params.rb

@@ -14,19 +14,18 @@ module Ingenico::Connect::SDK
         # String
         attr_accessor :source
 
-        # Integer
-        attr_accessor :amount
-
         # String
         attr_accessor :target
-        attr_accessor :source, :amount, :target
+
+        # Integer
+        attr_accessor :amount
 
         # Returns an Array of {Ingenico::Connect::SDK::RequestParam} objects representing the attributes of this class
         def to_request_parameters
           result = []
           add_parameter(result, 'source', @source)
-          add_parameter(result, 'amount', @amount)
           add_parameter(result, 'target', @target)
+          add_parameter(result, 'amount', @amount)
           result
         end
       end

data/lib/ingenico/connect/sdk/merchant/services/services_client.rb

@@ -107,9 +107,7 @@ module Ingenico::Connect::SDK
             Ingenico::Connect::SDK::Domain::Services::GetIINDetailsResponse,
             context)
         rescue ResponseException => e
-          error_type = {
-            404 => Ingenico::Connect::SDK::Domain::Errors::ErrorResponse,
-          }.fetch(e.status_code, Ingenico::Connect::SDK::Domain::Errors::ErrorResponse)
+          error_type = Ingenico::Connect::SDK::Domain::Errors::ErrorResponse
           error_object = @communicator.marshaller.unmarshal(e.body, error_type)
           raise create_exception(e.status_code, e.body, error_object, context)
         end
@@ -137,9 +135,7 @@ module Ingenico::Connect::SDK
             Ingenico::Connect::SDK::Domain::Services::TestConnection,
             context)
         rescue ResponseException => e
-          error_type = {
-            403 => Ingenico::Connect::SDK::Domain::Errors::ErrorResponse,
-          }.fetch(e.status_code, Ingenico::Connect::SDK::Domain::Errors::ErrorResponse)
+          error_type = Ingenico::Connect::SDK::Domain::Errors::ErrorResponse
           error_object = @communicator.marshaller.unmarshal(e.body, error_type)
           raise create_exception(e.status_code, e.body, error_object, context)
         end

data/lib/ingenico/connect/sdk/merchant/tokens/delete_token_params.rb

@@ -13,7 +13,6 @@ module Ingenico::Connect::SDK
 
         # String
         attr_accessor :mandate_cancel_date
-        attr_accessor :mandate_cancel_date
 
         # Returns an Array of {Ingenico::Connect::SDK::RequestParam} objects representing the attributes of this class
         def to_request_parameters

data/lib/ingenico/connect/sdk/merchant/tokens/tokens_client.rb

@@ -46,19 +46,17 @@ module Ingenico::Connect::SDK
             Ingenico::Connect::SDK::Domain::Token::CreateTokenResponse,
             context)
         rescue ResponseException => e
-          error_type = {
-            403 => Ingenico::Connect::SDK::Domain::Errors::ErrorResponse,
-          }.fetch(e.status_code, Ingenico::Connect::SDK::Domain::Errors::ErrorResponse)
+          error_type = Ingenico::Connect::SDK::Domain::Errors::ErrorResponse
           error_object = @communicator.marshaller.unmarshal(e.body, error_type)
           raise create_exception(e.status_code, e.body, error_object, context)
         end
 
         # Resource /{{merchantId}}/tokens/{{tokenId}}
         #
-        # {https://developer.globalcollect.com/documentation/api/server/#__merchantId__tokens__tokenId__delete Delete token}
+        # {https://developer.globalcollect.com/documentation/api/server/#__merchantId__tokens__tokenId__get Get token}
         # token_id:: String
-        # query::    {Ingenico::Connect::SDK::Merchant::Tokens::DeleteParams}
         # context::  {Ingenico::Connect::SDK::CallContext}
+        # Returns:: {Ingenico::Connect::SDK::Domain::Token::TokenResponse}
         # Raises:: {Ingenico::Connect::SDK::ValidationException} if the request was not correct and couldn't be processed (HTTP status code 400)
         # Raises:: {Ingenico::Connect::SDK::AuthorizationException} if the request was not allowed (HTTP status code 403)
         # Raises:: {Ingenico::Connect::SDK::IdempotenceException} if an idempotent request caused a conflict (HTTP status code 409)
@@ -68,31 +66,29 @@ module Ingenico::Connect::SDK
         #          the GlobalCollect platform was unable to process a message from a downstream partner/acquirer,  
         #          or the service that you're trying to reach is temporary unavailable (HTTP status code 500, 502 or 503)
         # Raises:: {Ingenico::Connect::SDK::ApiException} if the GlobalCollect platform returned any other error
-        def delete(token_id, query, context=nil)
+        def get(token_id, context=nil)
           path_context = {
             'tokenId' => token_id,
           }
           uri = instantiate_uri('/{apiVersion}/{merchantId}/tokens/{tokenId}', path_context)
-          return @communicator.delete(
+          return @communicator.get(
             uri,
             client_headers,
-            query,
             nil,
+            Ingenico::Connect::SDK::Domain::Token::TokenResponse,
             context)
         rescue ResponseException => e
-          error_type = {
-            404 => Ingenico::Connect::SDK::Domain::Errors::ErrorResponse,
-          }.fetch(e.status_code, Ingenico::Connect::SDK::Domain::Errors::ErrorResponse)
+          error_type = Ingenico::Connect::SDK::Domain::Errors::ErrorResponse
           error_object = @communicator.marshaller.unmarshal(e.body, error_type)
           raise create_exception(e.status_code, e.body, error_object, context)
         end
 
         # Resource /{{merchantId}}/tokens/{{tokenId}}
         #
-        # {https://developer.globalcollect.com/documentation/api/server/#__merchantId__tokens__tokenId__get Get token}
+        # {https://developer.globalcollect.com/documentation/api/server/#__merchantId__tokens__tokenId__put Update token}
         # token_id:: String
+        # body::     {Ingenico::Connect::SDK::Domain::Token::UpdateTokenRequest}
         # context::  {Ingenico::Connect::SDK::CallContext}
-        # Returns:: {Ingenico::Connect::SDK::Domain::Token::TokenResponse}
         # Raises:: {Ingenico::Connect::SDK::ValidationException} if the request was not correct and couldn't be processed (HTTP status code 400)
         # Raises:: {Ingenico::Connect::SDK::AuthorizationException} if the request was not allowed (HTTP status code 403)
         # Raises:: {Ingenico::Connect::SDK::IdempotenceException} if an idempotent request caused a conflict (HTTP status code 409)
@@ -102,30 +98,29 @@ module Ingenico::Connect::SDK
         #          the GlobalCollect platform was unable to process a message from a downstream partner/acquirer,  
         #          or the service that you're trying to reach is temporary unavailable (HTTP status code 500, 502 or 503)
         # Raises:: {Ingenico::Connect::SDK::ApiException} if the GlobalCollect platform returned any other error
-        def get(token_id, context=nil)
+        def update(token_id, body, context=nil)
           path_context = {
             'tokenId' => token_id,
           }
           uri = instantiate_uri('/{apiVersion}/{merchantId}/tokens/{tokenId}', path_context)
-          return @communicator.get(
+          return @communicator.put(
             uri,
             client_headers,
             nil,
-            Ingenico::Connect::SDK::Domain::Token::TokenResponse,
+            body,
+            nil,
             context)
         rescue ResponseException => e
-          error_type = {
-            404 => Ingenico::Connect::SDK::Domain::Errors::ErrorResponse,
-          }.fetch(e.status_code, Ingenico::Connect::SDK::Domain::Errors::ErrorResponse)
+          error_type = Ingenico::Connect::SDK::Domain::Errors::ErrorResponse
           error_object = @communicator.marshaller.unmarshal(e.body, error_type)
           raise create_exception(e.status_code, e.body, error_object, context)
         end
 
         # Resource /{{merchantId}}/tokens/{{tokenId}}
         #
-        # {https://developer.globalcollect.com/documentation/api/server/#__merchantId__tokens__tokenId__put Update token}
+        # {https://developer.globalcollect.com/documentation/api/server/#__merchantId__tokens__tokenId__delete Delete token}
         # token_id:: String
-        # body::     {Ingenico::Connect::SDK::Domain::Token::UpdateTokenRequest}
+        # query::    {Ingenico::Connect::SDK::Merchant::Tokens::DeleteTokenParams}
         # context::  {Ingenico::Connect::SDK::CallContext}
         # Raises:: {Ingenico::Connect::SDK::ValidationException} if the request was not correct and couldn't be processed (HTTP status code 400)
         # Raises:: {Ingenico::Connect::SDK::AuthorizationException} if the request was not allowed (HTTP status code 403)
@@ -136,16 +131,15 @@ module Ingenico::Connect::SDK
         #          the GlobalCollect platform was unable to process a message from a downstream partner/acquirer,  
         #          or the service that you're trying to reach is temporary unavailable (HTTP status code 500, 502 or 503)
         # Raises:: {Ingenico::Connect::SDK::ApiException} if the GlobalCollect platform returned any other error
-        def update(token_id, body, context=nil)
+        def delete(token_id, query, context=nil)
           path_context = {
             'tokenId' => token_id,
           }
           uri = instantiate_uri('/{apiVersion}/{merchantId}/tokens/{tokenId}', path_context)
-          return @communicator.put(
+          return @communicator.delete(
             uri,
             client_headers,
-            nil,
-            body,
+            query,
             nil,
             context)
         rescue ResponseException => e

data/lib/ingenico/connect/sdk/meta_data_provider.rb

@@ -5,7 +5,7 @@ module Ingenico::Connect::SDK
 
   # Manages metadata about the server using the SDK
   class MetaDataProvider
-    @@SDK_VERSION = '1.5.0'
+    @@SDK_VERSION = '1.5.1'
     @@SERVER_META_INFO_HEADER = 'X-GCS-ServerMetaInfo'
     @@PROHIBITED_HEADERS = [@@SERVER_META_INFO_HEADER, 'X-GCS-Idempotence-Key',
                             'Date', 'Content-Type', 'Authorization'].sort!.freeze

data/lib/ingenico/connect/sdk/request_header.rb

@@ -10,7 +10,7 @@ module Ingenico::Connect::SDK
         raise ArgumentError.new('name is required')
       end
       @name = name
-      @value = value
+      @value = normalize_value(value)
     end
 
     # HTTP header name
@@ -21,5 +21,18 @@ module Ingenico::Connect::SDK
     def to_s
       "#{name}:#{value}"
     end
+
+    private
+
+    def normalize_value(value)
+      if value.nil? || value.empty?
+        return value
+      end
+      # Replace all sequences of whitespace*-linebreak-whitespace* into a single linebreak-space
+      # This will ensure that:
+      # - no line ends with whitespace, because this causes authentication failures
+      # - each line starts with a single whitespace, so it is a valid header value
+      value.gsub(/[\s&&[^\r\n]]*(\r?\n)[\s&&[^\r\n]]*/, '\1 ');
+    end
   end
 end

data/spec/integration/multiline_header_spec.rb

@@ -16,15 +16,21 @@ describe 'multiline headers' do
     configuration = Integration.init_communicator_configuration
     meta_data_provider = Ingenico::Connect::SDK::MetaDataProvider.new('Ingenico', additional_request_headers:
                                                        [Ingenico::Connect::SDK::RequestHeader.new('X-GCS-MultiLineHeader', multi_line_header)])
-    session = Ingenico::Connect::SDK::Factory.create_session_from_configuration(configuration)
+    session = Ingenico::Connect::SDK::Factory.create_session_from_configuration(configuration, meta_data_provider:
+                                                       meta_data_provider)
 
     params = Ingenico::Connect::SDK::Merchant::Products::DirectoryParams.new
     params.country_code = 'NL'
     params.currency_code = 'EUR'
 
-    Integration.init_client(false) do |client|
+    init_client_from_session(session) do |client|
       response = client.merchant(Integration::MERCHANT_ID).products.directory(809, params)
       expect(response.entries.length).to be > 0
     end
   end
 end
+
+def init_client_from_session(session)
+    yield client = Ingenico::Connect::SDK::Factory.create_client_from_session(session).with_client_meta_info('{"test":"test"}')
+    client.close
+end

data/spec/lib/defaultimpl/default_connection_logger_spec.rb

@@ -41,7 +41,7 @@ module ValidationDict
     message =~ REQUEST_START
     id = $1  # capture id from the regular expression above
     expect(message).to match(GET_METHOD)
-    expect(message).to match(%r(uri:          '/v1/1234/services/convert/amount\?source=EUR&amount=1000&target=USD'))
+    expect(message).to match(%r(uri:          '/v1/1234/services/convert/amount\?source=EUR&target=USD&amount=1000'))
     validate_request_headers(message)
     return id
   end
@@ -248,7 +248,7 @@ describe 'DefaultConnectionLogging' do
   it 'can log a GET request with parameters' do
     response_body = IO.read(resource_prefix + 'convertAmount.json')
 
-    stub_request(:get, 'https://api-sandbox.globalcollect.com/v1/1234/services/convert/amount?amount=1000&source=EUR&target=USD')
+    stub_request(:get, 'https://api-sandbox.globalcollect.com/v1/1234/services/convert/amount?source=EUR&target=USD&amount=1000')
         .to_return(status: 200, body: response_body,
                    headers: base_headers.merge({'Content-Type' => 'application/json'}))
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: connect-sdk-ruby
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.1
 platform: ruby
 authors:
 - Ingenico ePayments
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-18 00:00:00.000000000 Z
+date: 2017-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httpclient