connect-sdk-ruby 1.36.0 → 2.0.0

data/lib/ingenico/connect/sdk/domain/payment/mobile_payment_method_specific_output.rb

@@ -11,57 +11,52 @@ module Ingenico::Connect::SDK
   module Domain
     module Payment
 
+      # @attr [String] authorisation_code
+      # @attr [Ingenico::Connect::SDK::Domain::Definitions::CardFraudResults] fraud_results
+      # @attr [String] network
+      # @attr [Ingenico::Connect::SDK::Domain::Payment::MobilePaymentData] payment_data
+      # @attr [Ingenico::Connect::SDK::Domain::Payment::ThreeDSecureResults] three_d_secure_results
       class MobilePaymentMethodSpecificOutput < Ingenico::Connect::SDK::Domain::Payment::AbstractPaymentMethodSpecificOutput
 
-        # String
         attr_accessor :authorisation_code
 
-        # {Ingenico::Connect::SDK::Domain::Definitions::CardFraudResults}
         attr_accessor :fraud_results
 
-        # String
         attr_accessor :network
 
-        # {Ingenico::Connect::SDK::Domain::Payment::MobilePaymentData}
         attr_accessor :payment_data
 
-        # {Ingenico::Connect::SDK::Domain::Payment::ThreeDSecureResults}
         attr_accessor :three_d_secure_results
 
+        # @return (Hash)
         def to_h
           hash = super
-          add_to_hash(hash, 'authorisationCode', @authorisation_code)
-          add_to_hash(hash, 'fraudResults', @fraud_results)
-          add_to_hash(hash, 'network', @network)
-          add_to_hash(hash, 'paymentData', @payment_data)
-          add_to_hash(hash, 'threeDSecureResults', @three_d_secure_results)
+          hash['authorisationCode'] = @authorisation_code unless @authorisation_code.nil?
+          hash['fraudResults'] = @fraud_results.to_h unless @fraud_results.nil?
+          hash['network'] = @network unless @network.nil?
+          hash['paymentData'] = @payment_data.to_h unless @payment_data.nil?
+          hash['threeDSecureResults'] = @three_d_secure_results.to_h unless @three_d_secure_results.nil?
           hash
         end
 
         def from_hash(hash)
           super
-          if hash.has_key?('authorisationCode')
+          if hash.has_key? 'authorisationCode'
             @authorisation_code = hash['authorisationCode']
           end
-          if hash.has_key?('fraudResults')
-            if !(hash['fraudResults'].is_a? Hash)
-              raise TypeError, "value '%s' is not a Hash" % [hash['fraudResults']]
-            end
+          if hash.has_key? 'fraudResults'
+            raise TypeError, "value '%s' is not a Hash" % [hash['fraudResults']] unless hash['fraudResults'].is_a? Hash
             @fraud_results = Ingenico::Connect::SDK::Domain::Definitions::CardFraudResults.new_from_hash(hash['fraudResults'])
           end
-          if hash.has_key?('network')
+          if hash.has_key? 'network'
             @network = hash['network']
           end
-          if hash.has_key?('paymentData')
-            if !(hash['paymentData'].is_a? Hash)
-              raise TypeError, "value '%s' is not a Hash" % [hash['paymentData']]
-            end
+          if hash.has_key? 'paymentData'
+            raise TypeError, "value '%s' is not a Hash" % [hash['paymentData']] unless hash['paymentData'].is_a? Hash
             @payment_data = Ingenico::Connect::SDK::Domain::Payment::MobilePaymentData.new_from_hash(hash['paymentData'])
           end
-          if hash.has_key?('threeDSecureResults')
-            if !(hash['threeDSecureResults'].is_a? Hash)
-              raise TypeError, "value '%s' is not a Hash" % [hash['threeDSecureResults']]
-            end
+          if hash.has_key? 'threeDSecureResults'
+            raise TypeError, "value '%s' is not a Hash" % [hash['threeDSecureResults']] unless hash['threeDSecureResults'].is_a? Hash
             @three_d_secure_results = Ingenico::Connect::SDK::Domain::Payment::ThreeDSecureResults.new_from_hash(hash['threeDSecureResults'])
           end
         end

data/lib/ingenico/connect/sdk/domain/payment/mobile_three_d_secure_challenge_parameters.rb

@@ -8,41 +8,42 @@ module Ingenico::Connect::SDK
   module Domain
     module Payment
 
+      # @attr [String] acs_reference_number
+      # @attr [String] acs_signed_content
+      # @attr [String] acs_transaction_id
+      # @attr [String] three_d_server_transaction_id
       class MobileThreeDSecureChallengeParameters < Ingenico::Connect::SDK::DataObject
 
-        # String
         attr_accessor :acs_reference_number
 
-        # String
         attr_accessor :acs_signed_content
 
-        # String
         attr_accessor :acs_transaction_id
 
-        # String
         attr_accessor :three_d_server_transaction_id
 
+        # @return (Hash)
         def to_h
           hash = super
-          add_to_hash(hash, 'acsReferenceNumber', @acs_reference_number)
-          add_to_hash(hash, 'acsSignedContent', @acs_signed_content)
-          add_to_hash(hash, 'acsTransactionId', @acs_transaction_id)
-          add_to_hash(hash, 'threeDServerTransactionId', @three_d_server_transaction_id)
+          hash['acsReferenceNumber'] = @acs_reference_number unless @acs_reference_number.nil?
+          hash['acsSignedContent'] = @acs_signed_content unless @acs_signed_content.nil?
+          hash['acsTransactionId'] = @acs_transaction_id unless @acs_transaction_id.nil?
+          hash['threeDServerTransactionId'] = @three_d_server_transaction_id unless @three_d_server_transaction_id.nil?
           hash
         end
 
         def from_hash(hash)
           super
-          if hash.has_key?('acsReferenceNumber')
+          if hash.has_key? 'acsReferenceNumber'
             @acs_reference_number = hash['acsReferenceNumber']
           end
-          if hash.has_key?('acsSignedContent')
+          if hash.has_key? 'acsSignedContent'
             @acs_signed_content = hash['acsSignedContent']
           end
-          if hash.has_key?('acsTransactionId')
+          if hash.has_key? 'acsTransactionId'
             @acs_transaction_id = hash['acsTransactionId']
           end
-          if hash.has_key?('threeDServerTransactionId')
+          if hash.has_key? 'threeDServerTransactionId'
             @three_d_server_transaction_id = hash['threeDServerTransactionId']
           end
         end

data/lib/ingenico/connect/sdk/domain/payment/non_sepa_direct_debit_payment_method_specific_input.rb

@@ -10,75 +10,72 @@ module Ingenico::Connect::SDK
   module Domain
     module Payment
 
+      # @attr [String] date_collect
+      # @attr [String] direct_debit_text
+      # @attr [true/false] is_recurring
+      # @attr [Ingenico::Connect::SDK::Domain::Payment::NonSepaDirectDebitPaymentProduct705SpecificInput] payment_product705_specific_input
+      # @attr [Ingenico::Connect::SDK::Domain::Payment::NonSepaDirectDebitPaymentProduct730SpecificInput] payment_product730_specific_input
+      # @attr [String] recurring_payment_sequence_indicator
+      # @attr [String] token
+      # @attr [true/false] tokenize
       class NonSepaDirectDebitPaymentMethodSpecificInput < Ingenico::Connect::SDK::Domain::Definitions::AbstractPaymentMethodSpecificInput
 
-        # String
         attr_accessor :date_collect
 
-        # String
         attr_accessor :direct_debit_text
 
-        # true/false
         attr_accessor :is_recurring
 
-        # {Ingenico::Connect::SDK::Domain::Payment::NonSepaDirectDebitPaymentProduct705SpecificInput}
         attr_accessor :payment_product705_specific_input
 
-        # {Ingenico::Connect::SDK::Domain::Payment::NonSepaDirectDebitPaymentProduct730SpecificInput}
         attr_accessor :payment_product730_specific_input
 
-        # String
         attr_accessor :recurring_payment_sequence_indicator
 
-        # String
         attr_accessor :token
 
-        # true/false
         attr_accessor :tokenize
 
+        # @return (Hash)
         def to_h
           hash = super
-          add_to_hash(hash, 'dateCollect', @date_collect)
-          add_to_hash(hash, 'directDebitText', @direct_debit_text)
-          add_to_hash(hash, 'isRecurring', @is_recurring)
-          add_to_hash(hash, 'paymentProduct705SpecificInput', @payment_product705_specific_input)
-          add_to_hash(hash, 'paymentProduct730SpecificInput', @payment_product730_specific_input)
-          add_to_hash(hash, 'recurringPaymentSequenceIndicator', @recurring_payment_sequence_indicator)
-          add_to_hash(hash, 'token', @token)
-          add_to_hash(hash, 'tokenize', @tokenize)
+          hash['dateCollect'] = @date_collect unless @date_collect.nil?
+          hash['directDebitText'] = @direct_debit_text unless @direct_debit_text.nil?
+          hash['isRecurring'] = @is_recurring unless @is_recurring.nil?
+          hash['paymentProduct705SpecificInput'] = @payment_product705_specific_input.to_h unless @payment_product705_specific_input.nil?
+          hash['paymentProduct730SpecificInput'] = @payment_product730_specific_input.to_h unless @payment_product730_specific_input.nil?
+          hash['recurringPaymentSequenceIndicator'] = @recurring_payment_sequence_indicator unless @recurring_payment_sequence_indicator.nil?
+          hash['token'] = @token unless @token.nil?
+          hash['tokenize'] = @tokenize unless @tokenize.nil?
           hash
         end
 
         def from_hash(hash)
           super
-          if hash.has_key?('dateCollect')
+          if hash.has_key? 'dateCollect'
             @date_collect = hash['dateCollect']
           end
-          if hash.has_key?('directDebitText')
+          if hash.has_key? 'directDebitText'
             @direct_debit_text = hash['directDebitText']
           end
-          if hash.has_key?('isRecurring')
+          if hash.has_key? 'isRecurring'
             @is_recurring = hash['isRecurring']
           end
-          if hash.has_key?('paymentProduct705SpecificInput')
-            if !(hash['paymentProduct705SpecificInput'].is_a? Hash)
-              raise TypeError, "value '%s' is not a Hash" % [hash['paymentProduct705SpecificInput']]
-            end
+          if hash.has_key? 'paymentProduct705SpecificInput'
+            raise TypeError, "value '%s' is not a Hash" % [hash['paymentProduct705SpecificInput']] unless hash['paymentProduct705SpecificInput'].is_a? Hash
             @payment_product705_specific_input = Ingenico::Connect::SDK::Domain::Payment::NonSepaDirectDebitPaymentProduct705SpecificInput.new_from_hash(hash['paymentProduct705SpecificInput'])
           end
-          if hash.has_key?('paymentProduct730SpecificInput')
-            if !(hash['paymentProduct730SpecificInput'].is_a? Hash)
-              raise TypeError, "value '%s' is not a Hash" % [hash['paymentProduct730SpecificInput']]
-            end
+          if hash.has_key? 'paymentProduct730SpecificInput'
+            raise TypeError, "value '%s' is not a Hash" % [hash['paymentProduct730SpecificInput']] unless hash['paymentProduct730SpecificInput'].is_a? Hash
             @payment_product730_specific_input = Ingenico::Connect::SDK::Domain::Payment::NonSepaDirectDebitPaymentProduct730SpecificInput.new_from_hash(hash['paymentProduct730SpecificInput'])
           end
-          if hash.has_key?('recurringPaymentSequenceIndicator')
+          if hash.has_key? 'recurringPaymentSequenceIndicator'
             @recurring_payment_sequence_indicator = hash['recurringPaymentSequenceIndicator']
           end
-          if hash.has_key?('token')
+          if hash.has_key? 'token'
             @token = hash['token']
           end
-          if hash.has_key?('tokenize')
+          if hash.has_key? 'tokenize'
             @tokenize = hash['tokenize']
           end
         end

data/lib/ingenico/connect/sdk/domain/payment/non_sepa_direct_debit_payment_method_specific_output.rb

@@ -9,23 +9,22 @@ module Ingenico::Connect::SDK
   module Domain
     module Payment
 
+      # @attr [Ingenico::Connect::SDK::Domain::Definitions::FraudResults] fraud_results
       class NonSepaDirectDebitPaymentMethodSpecificOutput < Ingenico::Connect::SDK::Domain::Payment::AbstractPaymentMethodSpecificOutput
 
-        # {Ingenico::Connect::SDK::Domain::Definitions::FraudResults}
         attr_accessor :fraud_results
 
+        # @return (Hash)
         def to_h
           hash = super
-          add_to_hash(hash, 'fraudResults', @fraud_results)
+          hash['fraudResults'] = @fraud_results.to_h unless @fraud_results.nil?
           hash
         end
 
         def from_hash(hash)
           super
-          if hash.has_key?('fraudResults')
-            if !(hash['fraudResults'].is_a? Hash)
-              raise TypeError, "value '%s' is not a Hash" % [hash['fraudResults']]
-            end
+          if hash.has_key? 'fraudResults'
+            raise TypeError, "value '%s' is not a Hash" % [hash['fraudResults']] unless hash['fraudResults'].is_a? Hash
             @fraud_results = Ingenico::Connect::SDK::Domain::Definitions::FraudResults.new_from_hash(hash['fraudResults'])
           end
         end

data/lib/ingenico/connect/sdk/domain/payment/non_sepa_direct_debit_payment_product705_specific_input.rb

@@ -9,37 +9,36 @@ module Ingenico::Connect::SDK
   module Domain
     module Payment
 
+      # @attr [String] authorisation_id
+      # @attr [Ingenico::Connect::SDK::Domain::Definitions::BankAccountBban] bank_account_bban
+      # @attr [String] transaction_type
       class NonSepaDirectDebitPaymentProduct705SpecificInput < Ingenico::Connect::SDK::DataObject
 
-        # String
         attr_accessor :authorisation_id
 
-        # {Ingenico::Connect::SDK::Domain::Definitions::BankAccountBban}
         attr_accessor :bank_account_bban
 
-        # String
         attr_accessor :transaction_type
 
+        # @return (Hash)
         def to_h
           hash = super
-          add_to_hash(hash, 'authorisationId', @authorisation_id)
-          add_to_hash(hash, 'bankAccountBban', @bank_account_bban)
-          add_to_hash(hash, 'transactionType', @transaction_type)
+          hash['authorisationId'] = @authorisation_id unless @authorisation_id.nil?
+          hash['bankAccountBban'] = @bank_account_bban.to_h unless @bank_account_bban.nil?
+          hash['transactionType'] = @transaction_type unless @transaction_type.nil?
           hash
         end
 
         def from_hash(hash)
           super
-          if hash.has_key?('authorisationId')
+          if hash.has_key? 'authorisationId'
             @authorisation_id = hash['authorisationId']
           end
-          if hash.has_key?('bankAccountBban')
-            if !(hash['bankAccountBban'].is_a? Hash)
-              raise TypeError, "value '%s' is not a Hash" % [hash['bankAccountBban']]
-            end
+          if hash.has_key? 'bankAccountBban'
+            raise TypeError, "value '%s' is not a Hash" % [hash['bankAccountBban']] unless hash['bankAccountBban'].is_a? Hash
             @bank_account_bban = Ingenico::Connect::SDK::Domain::Definitions::BankAccountBban.new_from_hash(hash['bankAccountBban'])
           end
-          if hash.has_key?('transactionType')
+          if hash.has_key? 'transactionType'
             @transaction_type = hash['transactionType']
           end
         end

data/lib/ingenico/connect/sdk/domain/payment/non_sepa_direct_debit_payment_product730_specific_input.rb

@@ -9,23 +9,22 @@ module Ingenico::Connect::SDK
   module Domain
     module Payment
 
+      # @attr [Ingenico::Connect::SDK::Domain::Definitions::BankAccountBban] bank_account_bban
       class NonSepaDirectDebitPaymentProduct730SpecificInput < Ingenico::Connect::SDK::DataObject
 
-        # {Ingenico::Connect::SDK::Domain::Definitions::BankAccountBban}
         attr_accessor :bank_account_bban
 
+        # @return (Hash)
         def to_h
           hash = super
-          add_to_hash(hash, 'bankAccountBban', @bank_account_bban)
+          hash['bankAccountBban'] = @bank_account_bban.to_h unless @bank_account_bban.nil?
           hash
         end
 
         def from_hash(hash)
           super
-          if hash.has_key?('bankAccountBban')
-            if !(hash['bankAccountBban'].is_a? Hash)
-              raise TypeError, "value '%s' is not a Hash" % [hash['bankAccountBban']]
-            end
+          if hash.has_key? 'bankAccountBban'
+            raise TypeError, "value '%s' is not a Hash" % [hash['bankAccountBban']] unless hash['bankAccountBban'].is_a? Hash
             @bank_account_bban = Ingenico::Connect::SDK::Domain::Definitions::BankAccountBban.new_from_hash(hash['bankAccountBban'])
           end
         end

data/lib/ingenico/connect/sdk/domain/payment/order.rb

@@ -16,100 +16,85 @@ module Ingenico::Connect::SDK
   module Domain
     module Payment
 
+      # @attr [Ingenico::Connect::SDK::Domain::Payment::AdditionalOrderInput] additional_input
+      # @attr [Ingenico::Connect::SDK::Domain::Definitions::AmountOfMoney] amount_of_money
+      # @attr [Ingenico::Connect::SDK::Domain::Payment::Customer] customer
+      # @attr [Array<Ingenico::Connect::SDK::Domain::Payment::LineItem>] items
+      # @attr [Ingenico::Connect::SDK::Domain::Payment::OrderReferences] references
+      # @attr [Ingenico::Connect::SDK::Domain::Payment::Seller] seller
+      # @attr [Ingenico::Connect::SDK::Domain::Payment::Shipping] shipping
+      # @attr [Ingenico::Connect::SDK::Domain::Payment::ShoppingCart] shopping_cart
       class Order < Ingenico::Connect::SDK::DataObject
 
-        # {Ingenico::Connect::SDK::Domain::Payment::AdditionalOrderInput}
         attr_accessor :additional_input
 
-        # {Ingenico::Connect::SDK::Domain::Definitions::AmountOfMoney}
         attr_accessor :amount_of_money
 
-        # {Ingenico::Connect::SDK::Domain::Payment::Customer}
         attr_accessor :customer
 
-        # Array of {Ingenico::Connect::SDK::Domain::Payment::LineItem}
         #
-        # Deprecated; Use shoppingCart.items instead
+        # @deprecated Use shoppingCart.items instead
         attr_accessor :items
 
-        # {Ingenico::Connect::SDK::Domain::Payment::OrderReferences}
         attr_accessor :references
 
-        # {Ingenico::Connect::SDK::Domain::Payment::Seller}
         #
-        # Deprecated; Use Merchant.seller instead
+        # @deprecated Use Merchant.seller instead
         attr_accessor :seller
 
-        # {Ingenico::Connect::SDK::Domain::Payment::Shipping}
         attr_accessor :shipping
 
-        # {Ingenico::Connect::SDK::Domain::Payment::ShoppingCart}
         attr_accessor :shopping_cart
 
+        # @return (Hash)
         def to_h
           hash = super
-          add_to_hash(hash, 'additionalInput', @additional_input)
-          add_to_hash(hash, 'amountOfMoney', @amount_of_money)
-          add_to_hash(hash, 'customer', @customer)
-          add_to_hash(hash, 'items', @items)
-          add_to_hash(hash, 'references', @references)
-          add_to_hash(hash, 'seller', @seller)
-          add_to_hash(hash, 'shipping', @shipping)
-          add_to_hash(hash, 'shoppingCart', @shopping_cart)
+          hash['additionalInput'] = @additional_input.to_h unless @additional_input.nil?
+          hash['amountOfMoney'] = @amount_of_money.to_h unless @amount_of_money.nil?
+          hash['customer'] = @customer.to_h unless @customer.nil?
+          hash['items'] = @items.collect{|val| val.to_h} unless @items.nil?
+          hash['references'] = @references.to_h unless @references.nil?
+          hash['seller'] = @seller.to_h unless @seller.nil?
+          hash['shipping'] = @shipping.to_h unless @shipping.nil?
+          hash['shoppingCart'] = @shopping_cart.to_h unless @shopping_cart.nil?
           hash
         end
 
         def from_hash(hash)
           super
-          if hash.has_key?('additionalInput')
-            if !(hash['additionalInput'].is_a? Hash)
-              raise TypeError, "value '%s' is not a Hash" % [hash['additionalInput']]
-            end
+          if hash.has_key? 'additionalInput'
+            raise TypeError, "value '%s' is not a Hash" % [hash['additionalInput']] unless hash['additionalInput'].is_a? Hash
             @additional_input = Ingenico::Connect::SDK::Domain::Payment::AdditionalOrderInput.new_from_hash(hash['additionalInput'])
           end
-          if hash.has_key?('amountOfMoney')
-            if !(hash['amountOfMoney'].is_a? Hash)
-              raise TypeError, "value '%s' is not a Hash" % [hash['amountOfMoney']]
-            end
+          if hash.has_key? 'amountOfMoney'
+            raise TypeError, "value '%s' is not a Hash" % [hash['amountOfMoney']] unless hash['amountOfMoney'].is_a? Hash
             @amount_of_money = Ingenico::Connect::SDK::Domain::Definitions::AmountOfMoney.new_from_hash(hash['amountOfMoney'])
           end
-          if hash.has_key?('customer')
-            if !(hash['customer'].is_a? Hash)
-              raise TypeError, "value '%s' is not a Hash" % [hash['customer']]
-            end
+          if hash.has_key? 'customer'
+            raise TypeError, "value '%s' is not a Hash" % [hash['customer']] unless hash['customer'].is_a? Hash
             @customer = Ingenico::Connect::SDK::Domain::Payment::Customer.new_from_hash(hash['customer'])
           end
-          if hash.has_key?('items')
-            if !(hash['items'].is_a? Array)
-              raise TypeError, "value '%s' is not an Array" % [hash['items']]
-            end
+          if hash.has_key? 'items'
+            raise TypeError, "value '%s' is not an Array" % [hash['items']] unless hash['items'].is_a? Array
             @items = []
             hash['items'].each do |e|
               @items << Ingenico::Connect::SDK::Domain::Payment::LineItem.new_from_hash(e)
             end
           end
-          if hash.has_key?('references')
-            if !(hash['references'].is_a? Hash)
-              raise TypeError, "value '%s' is not a Hash" % [hash['references']]
-            end
+          if hash.has_key? 'references'
+            raise TypeError, "value '%s' is not a Hash" % [hash['references']] unless hash['references'].is_a? Hash
             @references = Ingenico::Connect::SDK::Domain::Payment::OrderReferences.new_from_hash(hash['references'])
           end
-          if hash.has_key?('seller')
-            if !(hash['seller'].is_a? Hash)
-              raise TypeError, "value '%s' is not a Hash" % [hash['seller']]
-            end
+          if hash.has_key? 'seller'
+            raise TypeError, "value '%s' is not a Hash" % [hash['seller']] unless hash['seller'].is_a? Hash
             @seller = Ingenico::Connect::SDK::Domain::Payment::Seller.new_from_hash(hash['seller'])
           end
-          if hash.has_key?('shipping')
-            if !(hash['shipping'].is_a? Hash)
-              raise TypeError, "value '%s' is not a Hash" % [hash['shipping']]
-            end
+          if hash.has_key? 'shipping'
+            raise TypeError, "value '%s' is not a Hash" % [hash['shipping']] unless hash['shipping'].is_a? Hash
             @shipping = Ingenico::Connect::SDK::Domain::Payment::Shipping.new_from_hash(hash['shipping'])
           end
-          if hash.has_key?('shoppingCart')
-            if !(hash['shoppingCart'].is_a? Hash)
-              raise TypeError, "value '%s' is not a Hash" % [hash['shoppingCart']]
-            end
+          if hash.has_key? 'shoppingCart'
+            raise TypeError, "value '%s' is not a Hash" % [hash['shoppingCart']] unless hash['shoppingCart'].is_a? Hash
             @shopping_cart = Ingenico::Connect::SDK::Domain::Payment::ShoppingCart.new_from_hash(hash['shoppingCart'])
           end
         end