connect-sdk-ruby 1.36.0 → 2.0.0

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

@@ -12,55 +12,48 @@ module Ingenico::Connect::SDK
   module Domain
     module Payment
 
+      # @attr [Ingenico::Connect::SDK::Domain::Definitions::AmountOfMoney] amount_of_money
+      # @attr [Ingenico::Connect::SDK::Domain::Payment::LineItemInvoiceData] invoice_data
+      # @attr [Ingenico::Connect::SDK::Domain::Payment::LineItemLevel3InterchangeInformation] level3_interchange_information
+      # @attr [Ingenico::Connect::SDK::Domain::Payment::OrderLineDetails] order_line_details
       class LineItem < Ingenico::Connect::SDK::DataObject
 
-        # {Ingenico::Connect::SDK::Domain::Definitions::AmountOfMoney}
         attr_accessor :amount_of_money
 
-        # {Ingenico::Connect::SDK::Domain::Payment::LineItemInvoiceData}
         attr_accessor :invoice_data
 
-        # {Ingenico::Connect::SDK::Domain::Payment::LineItemLevel3InterchangeInformation}
         #
-        # Deprecated; Use orderLineDetails instead
+        # @deprecated Use orderLineDetails instead
         attr_accessor :level3_interchange_information
 
-        # {Ingenico::Connect::SDK::Domain::Payment::OrderLineDetails}
         attr_accessor :order_line_details
 
+        # @return (Hash)
         def to_h
           hash = super
-          add_to_hash(hash, 'amountOfMoney', @amount_of_money)
-          add_to_hash(hash, 'invoiceData', @invoice_data)
-          add_to_hash(hash, 'level3InterchangeInformation', @level3_interchange_information)
-          add_to_hash(hash, 'orderLineDetails', @order_line_details)
+          hash['amountOfMoney'] = @amount_of_money.to_h unless @amount_of_money.nil?
+          hash['invoiceData'] = @invoice_data.to_h unless @invoice_data.nil?
+          hash['level3InterchangeInformation'] = @level3_interchange_information.to_h unless @level3_interchange_information.nil?
+          hash['orderLineDetails'] = @order_line_details.to_h unless @order_line_details.nil?
           hash
         end
 
         def from_hash(hash)
           super
-          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?('invoiceData')
-            if !(hash['invoiceData'].is_a? Hash)
-              raise TypeError, "value '%s' is not a Hash" % [hash['invoiceData']]
-            end
+          if hash.has_key? 'invoiceData'
+            raise TypeError, "value '%s' is not a Hash" % [hash['invoiceData']] unless hash['invoiceData'].is_a? Hash
             @invoice_data = Ingenico::Connect::SDK::Domain::Payment::LineItemInvoiceData.new_from_hash(hash['invoiceData'])
           end
-          if hash.has_key?('level3InterchangeInformation')
-            if !(hash['level3InterchangeInformation'].is_a? Hash)
-              raise TypeError, "value '%s' is not a Hash" % [hash['level3InterchangeInformation']]
-            end
+          if hash.has_key? 'level3InterchangeInformation'
+            raise TypeError, "value '%s' is not a Hash" % [hash['level3InterchangeInformation']] unless hash['level3InterchangeInformation'].is_a? Hash
             @level3_interchange_information = Ingenico::Connect::SDK::Domain::Payment::LineItemLevel3InterchangeInformation.new_from_hash(hash['level3InterchangeInformation'])
           end
-          if hash.has_key?('orderLineDetails')
-            if !(hash['orderLineDetails'].is_a? Hash)
-              raise TypeError, "value '%s' is not a Hash" % [hash['orderLineDetails']]
-            end
+          if hash.has_key? 'orderLineDetails'
+            raise TypeError, "value '%s' is not a Hash" % [hash['orderLineDetails']] unless hash['orderLineDetails'].is_a? Hash
             @order_line_details = Ingenico::Connect::SDK::Domain::Payment::OrderLineDetails.new_from_hash(hash['orderLineDetails'])
           end
         end

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

@@ -8,48 +8,49 @@ module Ingenico::Connect::SDK
   module Domain
     module Payment
 
+      # @attr [String] description
+      # @attr [String] merchant_linenumber
+      # @attr [String] merchant_pagenumber
+      # @attr [String] nr_of_items
+      # @attr [Integer] price_per_item
       class LineItemInvoiceData < Ingenico::Connect::SDK::DataObject
 
-        # String
         attr_accessor :description
 
-        # String
         attr_accessor :merchant_linenumber
 
-        # String
         attr_accessor :merchant_pagenumber
 
-        # String
         attr_accessor :nr_of_items
 
-        # Integer
         attr_accessor :price_per_item
 
+        # @return (Hash)
         def to_h
           hash = super
-          add_to_hash(hash, 'description', @description)
-          add_to_hash(hash, 'merchantLinenumber', @merchant_linenumber)
-          add_to_hash(hash, 'merchantPagenumber', @merchant_pagenumber)
-          add_to_hash(hash, 'nrOfItems', @nr_of_items)
-          add_to_hash(hash, 'pricePerItem', @price_per_item)
+          hash['description'] = @description unless @description.nil?
+          hash['merchantLinenumber'] = @merchant_linenumber unless @merchant_linenumber.nil?
+          hash['merchantPagenumber'] = @merchant_pagenumber unless @merchant_pagenumber.nil?
+          hash['nrOfItems'] = @nr_of_items unless @nr_of_items.nil?
+          hash['pricePerItem'] = @price_per_item unless @price_per_item.nil?
           hash
         end
 
         def from_hash(hash)
           super
-          if hash.has_key?('description')
+          if hash.has_key? 'description'
             @description = hash['description']
           end
-          if hash.has_key?('merchantLinenumber')
+          if hash.has_key? 'merchantLinenumber'
             @merchant_linenumber = hash['merchantLinenumber']
           end
-          if hash.has_key?('merchantPagenumber')
+          if hash.has_key? 'merchantPagenumber'
             @merchant_pagenumber = hash['merchantPagenumber']
           end
-          if hash.has_key?('nrOfItems')
+          if hash.has_key? 'nrOfItems'
             @nr_of_items = hash['nrOfItems']
           end
-          if hash.has_key?('pricePerItem')
+          if hash.has_key? 'pricePerItem'
             @price_per_item = hash['pricePerItem']
           end
         end

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

@@ -8,69 +8,70 @@ module Ingenico::Connect::SDK
   module Domain
     module Payment
 
+      # @attr [Integer] discount_amount
+      # @attr [Integer] line_amount_total
+      # @attr [String] product_code
+      # @attr [Integer] product_price
+      # @attr [String] product_type
+      # @attr [Integer] quantity
+      # @attr [Integer] tax_amount
+      # @attr [String] unit
       class LineItemLevel3InterchangeInformation < Ingenico::Connect::SDK::DataObject
 
-        # Integer
         attr_accessor :discount_amount
 
-        # Integer
         attr_accessor :line_amount_total
 
-        # String
         attr_accessor :product_code
 
-        # Integer
         attr_accessor :product_price
 
-        # String
         attr_accessor :product_type
 
-        # Integer
         attr_accessor :quantity
 
-        # Integer
         attr_accessor :tax_amount
 
-        # String
         attr_accessor :unit
 
+        # @return (Hash)
         def to_h
           hash = super
-          add_to_hash(hash, 'discountAmount', @discount_amount)
-          add_to_hash(hash, 'lineAmountTotal', @line_amount_total)
-          add_to_hash(hash, 'productCode', @product_code)
-          add_to_hash(hash, 'productPrice', @product_price)
-          add_to_hash(hash, 'productType', @product_type)
-          add_to_hash(hash, 'quantity', @quantity)
-          add_to_hash(hash, 'taxAmount', @tax_amount)
-          add_to_hash(hash, 'unit', @unit)
+          hash['discountAmount'] = @discount_amount unless @discount_amount.nil?
+          hash['lineAmountTotal'] = @line_amount_total unless @line_amount_total.nil?
+          hash['productCode'] = @product_code unless @product_code.nil?
+          hash['productPrice'] = @product_price unless @product_price.nil?
+          hash['productType'] = @product_type unless @product_type.nil?
+          hash['quantity'] = @quantity unless @quantity.nil?
+          hash['taxAmount'] = @tax_amount unless @tax_amount.nil?
+          hash['unit'] = @unit unless @unit.nil?
           hash
         end
 
         def from_hash(hash)
           super
-          if hash.has_key?('discountAmount')
+          if hash.has_key? 'discountAmount'
             @discount_amount = hash['discountAmount']
           end
-          if hash.has_key?('lineAmountTotal')
+          if hash.has_key? 'lineAmountTotal'
             @line_amount_total = hash['lineAmountTotal']
           end
-          if hash.has_key?('productCode')
+          if hash.has_key? 'productCode'
             @product_code = hash['productCode']
           end
-          if hash.has_key?('productPrice')
+          if hash.has_key? 'productPrice'
             @product_price = hash['productPrice']
           end
-          if hash.has_key?('productType')
+          if hash.has_key? 'productType'
             @product_type = hash['productType']
           end
-          if hash.has_key?('quantity')
+          if hash.has_key? 'quantity'
             @quantity = hash['quantity']
           end
-          if hash.has_key?('taxAmount')
+          if hash.has_key? 'taxAmount'
             @tax_amount = hash['taxAmount']
           end
-          if hash.has_key?('unit')
+          if hash.has_key? 'unit'
             @unit = hash['unit']
           end
         end

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

@@ -9,37 +9,36 @@ module Ingenico::Connect::SDK
   module Domain
     module Payment
 
+      # @attr [String] contact_website_url
+      # @attr [Ingenico::Connect::SDK::Domain::Payment::Seller] seller
+      # @attr [String] website_url
       class Merchant < Ingenico::Connect::SDK::DataObject
 
-        # String
         attr_accessor :contact_website_url
 
-        # {Ingenico::Connect::SDK::Domain::Payment::Seller}
         attr_accessor :seller
 
-        # String
         attr_accessor :website_url
 
+        # @return (Hash)
         def to_h
           hash = super
-          add_to_hash(hash, 'contactWebsiteUrl', @contact_website_url)
-          add_to_hash(hash, 'seller', @seller)
-          add_to_hash(hash, 'websiteUrl', @website_url)
+          hash['contactWebsiteUrl'] = @contact_website_url unless @contact_website_url.nil?
+          hash['seller'] = @seller.to_h unless @seller.nil?
+          hash['websiteUrl'] = @website_url unless @website_url.nil?
           hash
         end
 
         def from_hash(hash)
           super
-          if hash.has_key?('contactWebsiteUrl')
+          if hash.has_key? 'contactWebsiteUrl'
             @contact_website_url = hash['contactWebsiteUrl']
           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?('websiteUrl')
+          if hash.has_key? 'websiteUrl'
             @website_url = hash['websiteUrl']
           end
         end

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

@@ -13,83 +13,74 @@ module Ingenico::Connect::SDK
   module Domain
     module Payment
 
+      # @attr [String] action_type
+      # @attr [Array<Ingenico::Connect::SDK::Domain::Product::PaymentProductField>] form_fields
+      # @attr [Ingenico::Connect::SDK::Domain::Payment::MobileThreeDSecureChallengeParameters] mobile_three_d_secure_challenge_parameters
+      # @attr [Ingenico::Connect::SDK::Domain::Payment::RedirectData] redirect_data
+      # @attr [String] rendering_data
+      # @attr [Array<Ingenico::Connect::SDK::Domain::Definitions::KeyValuePair>] show_data
+      # @attr [Ingenico::Connect::SDK::Domain::Payment::ThirdPartyData] third_party_data
       class MerchantAction < Ingenico::Connect::SDK::DataObject
 
-        # String
         attr_accessor :action_type
 
-        # Array of {Ingenico::Connect::SDK::Domain::Product::PaymentProductField}
         attr_accessor :form_fields
 
-        # {Ingenico::Connect::SDK::Domain::Payment::MobileThreeDSecureChallengeParameters}
         attr_accessor :mobile_three_d_secure_challenge_parameters
 
-        # {Ingenico::Connect::SDK::Domain::Payment::RedirectData}
         attr_accessor :redirect_data
 
-        # String
         attr_accessor :rendering_data
 
-        # Array of {Ingenico::Connect::SDK::Domain::Definitions::KeyValuePair}
         attr_accessor :show_data
 
-        # {Ingenico::Connect::SDK::Domain::Payment::ThirdPartyData}
         attr_accessor :third_party_data
 
+        # @return (Hash)
         def to_h
           hash = super
-          add_to_hash(hash, 'actionType', @action_type)
-          add_to_hash(hash, 'formFields', @form_fields)
-          add_to_hash(hash, 'mobileThreeDSecureChallengeParameters', @mobile_three_d_secure_challenge_parameters)
-          add_to_hash(hash, 'redirectData', @redirect_data)
-          add_to_hash(hash, 'renderingData', @rendering_data)
-          add_to_hash(hash, 'showData', @show_data)
-          add_to_hash(hash, 'thirdPartyData', @third_party_data)
+          hash['actionType'] = @action_type unless @action_type.nil?
+          hash['formFields'] = @form_fields.collect{|val| val.to_h} unless @form_fields.nil?
+          hash['mobileThreeDSecureChallengeParameters'] = @mobile_three_d_secure_challenge_parameters.to_h unless @mobile_three_d_secure_challenge_parameters.nil?
+          hash['redirectData'] = @redirect_data.to_h unless @redirect_data.nil?
+          hash['renderingData'] = @rendering_data unless @rendering_data.nil?
+          hash['showData'] = @show_data.collect{|val| val.to_h} unless @show_data.nil?
+          hash['thirdPartyData'] = @third_party_data.to_h unless @third_party_data.nil?
           hash
         end
 
         def from_hash(hash)
           super
-          if hash.has_key?('actionType')
+          if hash.has_key? 'actionType'
             @action_type = hash['actionType']
           end
-          if hash.has_key?('formFields')
-            if !(hash['formFields'].is_a? Array)
-              raise TypeError, "value '%s' is not an Array" % [hash['formFields']]
-            end
+          if hash.has_key? 'formFields'
+            raise TypeError, "value '%s' is not an Array" % [hash['formFields']] unless hash['formFields'].is_a? Array
             @form_fields = []
             hash['formFields'].each do |e|
               @form_fields << Ingenico::Connect::SDK::Domain::Product::PaymentProductField.new_from_hash(e)
             end
           end
-          if hash.has_key?('mobileThreeDSecureChallengeParameters')
-            if !(hash['mobileThreeDSecureChallengeParameters'].is_a? Hash)
-              raise TypeError, "value '%s' is not a Hash" % [hash['mobileThreeDSecureChallengeParameters']]
-            end
+          if hash.has_key? 'mobileThreeDSecureChallengeParameters'
+            raise TypeError, "value '%s' is not a Hash" % [hash['mobileThreeDSecureChallengeParameters']] unless hash['mobileThreeDSecureChallengeParameters'].is_a? Hash
             @mobile_three_d_secure_challenge_parameters = Ingenico::Connect::SDK::Domain::Payment::MobileThreeDSecureChallengeParameters.new_from_hash(hash['mobileThreeDSecureChallengeParameters'])
           end
-          if hash.has_key?('redirectData')
-            if !(hash['redirectData'].is_a? Hash)
-              raise TypeError, "value '%s' is not a Hash" % [hash['redirectData']]
-            end
+          if hash.has_key? 'redirectData'
+            raise TypeError, "value '%s' is not a Hash" % [hash['redirectData']] unless hash['redirectData'].is_a? Hash
             @redirect_data = Ingenico::Connect::SDK::Domain::Payment::RedirectData.new_from_hash(hash['redirectData'])
           end
-          if hash.has_key?('renderingData')
+          if hash.has_key? 'renderingData'
             @rendering_data = hash['renderingData']
           end
-          if hash.has_key?('showData')
-            if !(hash['showData'].is_a? Array)
-              raise TypeError, "value '%s' is not an Array" % [hash['showData']]
-            end
+          if hash.has_key? 'showData'
+            raise TypeError, "value '%s' is not an Array" % [hash['showData']] unless hash['showData'].is_a? Array
             @show_data = []
             hash['showData'].each do |e|
               @show_data << Ingenico::Connect::SDK::Domain::Definitions::KeyValuePair.new_from_hash(e)
             end
           end
-          if hash.has_key?('thirdPartyData')
-            if !(hash['thirdPartyData'].is_a? Hash)
-              raise TypeError, "value '%s' is not a Hash" % [hash['thirdPartyData']]
-            end
+          if hash.has_key? 'thirdPartyData'
+            raise TypeError, "value '%s' is not a Hash" % [hash['thirdPartyData']] unless hash['thirdPartyData'].is_a? Hash
             @third_party_data = Ingenico::Connect::SDK::Domain::Payment::ThirdPartyData.new_from_hash(hash['thirdPartyData'])
           end
         end

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

@@ -8,27 +8,28 @@ module Ingenico::Connect::SDK
   module Domain
     module Payment
 
+      # @attr [String] dpan
+      # @attr [String] expiry_date
       class MobilePaymentData < Ingenico::Connect::SDK::DataObject
 
-        # String
         attr_accessor :dpan
 
-        # String
         attr_accessor :expiry_date
 
+        # @return (Hash)
         def to_h
           hash = super
-          add_to_hash(hash, 'dpan', @dpan)
-          add_to_hash(hash, 'expiryDate', @expiry_date)
+          hash['dpan'] = @dpan unless @dpan.nil?
+          hash['expiryDate'] = @expiry_date unless @expiry_date.nil?
           hash
         end
 
         def from_hash(hash)
           super
-          if hash.has_key?('dpan')
+          if hash.has_key? 'dpan'
             @dpan = hash['dpan']
           end
-          if hash.has_key?('expiryDate')
+          if hash.has_key? 'expiryDate'
             @expiry_date = hash['expiryDate']
           end
         end

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

@@ -9,51 +9,50 @@ module Ingenico::Connect::SDK
   module Domain
     module Payment
 
+      # @attr [String] authorization_mode
+      # @attr [Ingenico::Connect::SDK::Domain::Payment::DecryptedPaymentData] decrypted_payment_data
+      # @attr [String] encrypted_payment_data
+      # @attr [true/false] requires_approval
+      # @attr [true/false] skip_fraud_service
       class MobilePaymentMethodSpecificInput < Ingenico::Connect::SDK::Domain::Definitions::AbstractPaymentMethodSpecificInput
 
-        # String
         attr_accessor :authorization_mode
 
-        # {Ingenico::Connect::SDK::Domain::Payment::DecryptedPaymentData}
         attr_accessor :decrypted_payment_data
 
-        # String
         attr_accessor :encrypted_payment_data
 
-        # true/false
         attr_accessor :requires_approval
 
-        # true/false
         attr_accessor :skip_fraud_service
 
+        # @return (Hash)
         def to_h
           hash = super
-          add_to_hash(hash, 'authorizationMode', @authorization_mode)
-          add_to_hash(hash, 'decryptedPaymentData', @decrypted_payment_data)
-          add_to_hash(hash, 'encryptedPaymentData', @encrypted_payment_data)
-          add_to_hash(hash, 'requiresApproval', @requires_approval)
-          add_to_hash(hash, 'skipFraudService', @skip_fraud_service)
+          hash['authorizationMode'] = @authorization_mode unless @authorization_mode.nil?
+          hash['decryptedPaymentData'] = @decrypted_payment_data.to_h unless @decrypted_payment_data.nil?
+          hash['encryptedPaymentData'] = @encrypted_payment_data unless @encrypted_payment_data.nil?
+          hash['requiresApproval'] = @requires_approval unless @requires_approval.nil?
+          hash['skipFraudService'] = @skip_fraud_service unless @skip_fraud_service.nil?
           hash
         end
 
         def from_hash(hash)
           super
-          if hash.has_key?('authorizationMode')
+          if hash.has_key? 'authorizationMode'
             @authorization_mode = hash['authorizationMode']
           end
-          if hash.has_key?('decryptedPaymentData')
-            if !(hash['decryptedPaymentData'].is_a? Hash)
-              raise TypeError, "value '%s' is not a Hash" % [hash['decryptedPaymentData']]
-            end
+          if hash.has_key? 'decryptedPaymentData'
+            raise TypeError, "value '%s' is not a Hash" % [hash['decryptedPaymentData']] unless hash['decryptedPaymentData'].is_a? Hash
             @decrypted_payment_data = Ingenico::Connect::SDK::Domain::Payment::DecryptedPaymentData.new_from_hash(hash['decryptedPaymentData'])
           end
-          if hash.has_key?('encryptedPaymentData')
+          if hash.has_key? 'encryptedPaymentData'
             @encrypted_payment_data = hash['encryptedPaymentData']
           end
-          if hash.has_key?('requiresApproval')
+          if hash.has_key? 'requiresApproval'
             @requires_approval = hash['requiresApproval']
           end
-          if hash.has_key?('skipFraudService')
+          if hash.has_key? 'skipFraudService'
             @skip_fraud_service = hash['skipFraudService']
           end
         end