six_saferpay 2.8.0 → 2.8.4

data/lib/six_saferpay/client.rb

@@ -18,9 +18,9 @@ module SixSaferpay
       hash = JSON.parse(hash, symbolize_names: true)
       hash = transform_response_hash(hash)
       if @response.code == '200'
-        @object.response_class.new(hash)
+        @object.response_class.new(**hash)
       else
-        raise SixSaferpay::Error.new(hash)
+        raise SixSaferpay::Error.new(**hash)
       end
     end
 

data/lib/six_saferpay/errors/error.rb

@@ -22,7 +22,7 @@ module SixSaferpay
                    processor_result: nil,
                    processor_message: nil
                   )
-      @response_header = SixSaferpay::ResponseHeader.new(response_header.to_h) if response_header
+      @response_header = SixSaferpay::ResponseHeader.new(**response_header.to_h) if response_header
       @behavior = behavior
       @error_name = error_name
       @error_message = error_message

data/lib/six_saferpay/models/chosen_plan.rb

@@ -25,14 +25,14 @@ module SixSaferpay
       @interest_rate = interest_rate
       if installment_fee
         @installment_fee = SixSaferpay::InstallmentFee
-          .new(installment_fee.to_h)
+          .new(**installment_fee.to_h)
       end
       if annual_percentage_rate
         @annual_percentage_rate = annual_percentage_rate
       end
       if total_amount_due
         @total_amount_due = SixSaferpay::TotalAmountDue
-          .new(total_amount_due.to_h)
+          .new(**total_amount_due.to_h)
       end
     end
 

data/lib/six_saferpay/models/dcc.rb

@@ -4,7 +4,7 @@ module SixSaferpay
     attr_accessor(:payer_amount)
 
     def initialize(payer_amount:)
-      @payer_amount = SixSaferpay::PayerAmount.new(payer_amount.to_h)
+      @payer_amount = SixSaferpay::PayerAmount.new(**payer_amount.to_h)
     end
 
     def to_hash

data/lib/six_saferpay/models/installment_plans.rb

@@ -24,22 +24,22 @@ module SixSaferpay
       @interest_rate = interest_rate
       if installment_fee
         @installment_fee = SixSaferpay::InstallmentFee
-          .new(installment_fee.to_h)
+          .new(**installment_fee.to_h)
       end
       if annual_percentage_rate
         @annual_percentage_rate = annual_percentage_rate
       end
       if first_installment_amount
         @first_installment_amount = SixSaferpay::FirstInstallmentAmount
-          .new(first_installment_amount.to_h)
+          .new(**first_installment_amount.to_h)
       end
       if subsequent_installment_amount
         @subsequent_installment_amount = SixSaferpay::SubsequentInstallmentAmount
-          .new(subsequent_installment_amount.to_h)
+          .new(**subsequent_installment_amount.to_h)
       end
       if total_amount_due
         @total_amount_due = SixSaferpay::TotalAmountDue
-          .new(total_amount_due.to_h)
+          .new(**total_amount_due.to_h)
       end
     end
 

data/lib/six_saferpay/models/invoice.rb

@@ -4,7 +4,7 @@ module SixSaferpay
     attr_accessor(:payee, :reason_for_transfer, :due_date)
 
     def initialize(payee: nil, reason_for_transfer: nil, due_date: nil)
-      @payee = SixSaferpay::Payee.new(payee.to_h) if payee
+      @payee = SixSaferpay::Payee.new(**payee.to_h) if payee
       @reason_for_transfer = reason_for_transfer
       @due_date = due_date
     end

data/lib/six_saferpay/models/{items.rb → item.rb}

@@ -1,5 +1,5 @@
 module SixSaferpay
-  class Items
+  class Item
 
     attr_accessor(
       :type,
@@ -11,6 +11,7 @@ module SixSaferpay
       :quantity,
       :unit_price,
       :is_pre_order,
+      :tax_rate,
       :tax_amount,
       :discount_amount,
     )
@@ -25,6 +26,7 @@ module SixSaferpay
       quantity: nil,
       unit_price: nil,
       is_pre_order: nil,
+      tax_rate: nil,
       tax_amount: nil,
       discount_amount: nil
       )
@@ -37,45 +39,26 @@ module SixSaferpay
       @quantity = quantity
       @unit_price = unit_price
       @is_pre_order = is_pre_order
+      @tax_rate = tax_rate
       @tax_amount = tax_amount
       @discount_amount = discount_amount
     end
 
     def to_hash
       hash = Hash.new
-      if @type
-        hash.merge!(type: @type)
-      end
-      if @id
-        hash.merge!(id: @id)
-      end
-      if @variant_id
-        hash.merge!(variant_id: @variant_id)
-      end
-      if @name
-        hash.merge!(name: @name)
-      end
-      if @category_name
-        hash.merge!(category_name: @category_name)
-      end
-      if @description
-        hash.merge!(description: @description)
-      end
-      if @quantity
-        hash.merge!(quantity: @quantity)
-      end
-      if @unit_price
-        hash.merge!(unit_price: @unit_price)
-      end
-      if !@is_pre_order.nil?
-        hash.merge!(is_pre_order: @is_pre_order)
-      end
-      if @tax_amount
-        hash.merge!(tax_amount: @tax_amount)
-      end
-      if @discount_amount
-        hash.merge!(discount_amount: @discount_amount)
-      end
+      hash.merge!(type: @type) if @type
+      hash.merge!(id: @id) if @id
+      hash.merge!(variant_id: @variant_id) if @variant_id
+      hash.merge!(name: @name) if @name
+      hash.merge!(category_name: @category_name) if @category_name
+      hash.merge!(description: @description) if @description
+      hash.merge!(quantity: @quantity) if @quantity
+      hash.merge!(unit_price: @unit_price) if @unit_price
+      hash.merge!(is_pre_order: @is_pre_order) if !@is_pre_order.nil?
+      hash.merge!(tax_rate: @tax_rate) if @tax_rate
+      hash.merge!(tax_amount: @tax_amount) if @tax_amount
+      hash.merge!(discount_amount: @discount_amount) if @discount_amount
+
       hash
     end
     alias_method :to_h, :to_hash

data/lib/six_saferpay/models/liability.rb

@@ -14,8 +14,8 @@ module SixSaferpay
                   )
       @liability_shift = liability_shift
       @liable_entity = liable_entity
-      @three_ds = SixSaferpay::ThreeDs.new(three_ds.to_h) if three_ds
-      @fraud_free = SixSaferpay::FraudFree.new(fraud_free.to_h) if fraud_free
+      @three_ds = SixSaferpay::ThreeDs.new(**three_ds.to_h) if three_ds
+      @fraud_free = SixSaferpay::FraudFree.new(**fraud_free.to_h) if fraud_free
     end
 
     def to_hash

data/lib/six_saferpay/models/marketplace.rb

@@ -5,8 +5,8 @@ module SixSaferpay
 
     def initialize(submerchant_id: , fee: , fee_refund: )
       @submerchant_id = submerchant_id
-      @fee = SixSaferpay::Fee.new(fee.to_h) if fee
-      @fee_refund = SixSaferpay::FeeRefund.new(fee_refund.to_h) if fee_refund
+      @fee = SixSaferpay::Fee.new(**fee.to_h) if fee
+      @fee_refund = SixSaferpay::FeeRefund.new(**fee_refund.to_h) if fee_refund
     end
 
     def to_hash

data/lib/six_saferpay/models/mastercard_issuer_installments.rb

@@ -16,15 +16,15 @@ module SixSaferpay
       )
       if installment_plans
         @installment_plans = SixSaferpay::InstallmentPlans
-          .new(installment_plans.to_h)
+          .new(**installment_plans.to_h)
       end
       if custom_plan
         @custom_plan = SixSaferpay::CustomPlan
-          .new(custom_plan)
+          .new(**custom_plan.to_h)
       end
       if chosen_plan
         @chosen_plan = SixSaferpay::ChosenPlan
-          .new(chosen_plan.to_h)
+          .new(**chosen_plan.to_h)
       end
       @receipt_free_text = receipt_free_text
     end

data/lib/six_saferpay/models/order.rb

@@ -6,18 +6,18 @@ module SixSaferpay
     )
 
     def initialize(
-      items: nil
+      items: []
       )
 
       if items
-        @items = SixSaferpay::Items.new(items.to_h)
+        @items = items.map {|item_attr| SixSaferpay::Item.new(item_attr) }
       end
     end
 
     def to_hash
       hash = Hash.new
       if @items
-        hash.merge!(items: @items.to_h)
+        hash.merge!(items: items.map(&:to_hash))
       end
       hash
     end

data/lib/six_saferpay/models/payer.rb

@@ -23,8 +23,8 @@ module SixSaferpay
       @ip_address = ip_address
       @ip_location = ip_location
       @language_code = language_code
-      @delivery_address = SixSaferpay::DeliveryAddress.new(delivery_address.to_h) if delivery_address
-      @billing_address = SixSaferpay::BillingAddress.new(billing_address.to_h) if billing_address
+      @delivery_address = SixSaferpay::DeliveryAddress.new(**delivery_address.to_h) if delivery_address
+      @billing_address = SixSaferpay::BillingAddress.new(**billing_address.to_h) if billing_address
     end
 
     def to_hash

data/lib/six_saferpay/models/payer_profile.rb

@@ -49,7 +49,7 @@ module SixSaferpay
       @secondary_email = secondary_email
 
       if phone
-        @phone = SixSaferpay::Phone.new(phone.to_h)
+        @phone = SixSaferpay::Phone.new(**phone.to_h)
       end
     end
 

data/lib/six_saferpay/models/payment.rb

@@ -18,14 +18,14 @@ module SixSaferpay
                    options: nil,
                    recurring: nil,
                    installment: nil)
-      @amount = SixSaferpay::Amount.new(amount.to_h) if amount
+      @amount = SixSaferpay::Amount.new(**amount.to_h) if amount
       @order_id = order_id
       @description = description
       @payer_note = payer_note
       @mandate_id = mandate_id
-      @options = SixSaferpay::Options.new(options.to_h) if options
-      @recurring = SixSaferpay::Recurring.new(recurring.to_h) if recurring
-      @installment = SixSaferpay::Installment.new(installment.to_h) if installment
+      @options = SixSaferpay::Options.new(**options.to_h) if options
+      @recurring = SixSaferpay::Recurring.new(**recurring.to_h) if recurring
+      @installment = SixSaferpay::Installment.new(**installment.to_h) if installment
     end
 
     def to_hash

data/lib/six_saferpay/models/payment_method_options.rb

@@ -4,7 +4,7 @@ module SixSaferpay
     attr_accessor(:bankcontact)
 
     def initialize(bankcontact: nil)
-      @bankcontact = SixSaferpay::Bankcontact.new(bankcontact.to_h) if bankcontact
+      @bankcontact = SixSaferpay::Bankcontact.new(**bankcontact.to_h) if bankcontact
     end
 
     def to_hash

data/lib/six_saferpay/models/payment_methods_options.rb

@@ -4,8 +4,8 @@ module SixSaferpay
     attr_accessor(:alipay, :ideal)
 
     def initialize(alipay: nil, ideal: nil)
-      @alipay = SixSaferpay::Alipay.new(alipay.to_h) if alipay
-      @ideal = SixSaferpay::Ideal.new(ideal.to_h) if ideal
+      @alipay = SixSaferpay::Alipay.new(**alipay.to_h) if alipay
+      @ideal = SixSaferpay::Ideal.new(**ideal.to_h) if ideal
     end
 
     def to_hash

data/lib/six_saferpay/models/processing_data.rb

@@ -4,7 +4,7 @@ module SixSaferpay
     attr_accessor(:bancontact)
 
     def initialize(bancontact: nil)
-      @bancontact = SixSaferpay::Bancontact.new(bancontact.to_h) if bancontact
+      @bancontact = SixSaferpay::Bancontact.new(**bancontact.to_h) if bancontact
     end
 
     def to_hash

data/lib/six_saferpay/models/refund.rb

@@ -1,5 +1,5 @@
 module SixSaferpay
-  class Refund 
+  class Refund
 
     attr_accessor(:amount,
                   :order_id,
@@ -9,7 +9,7 @@ module SixSaferpay
     def initialize(amount:,
                    order_id: nil,
                    description: nil)
-      @amount = SixSaferpay::Amount.new(amount.to_h) if amount
+      @amount = SixSaferpay::Amount.new(**amount.to_h) if amount
       @order_id = order_id
       @description = description
     end

data/lib/six_saferpay/models/registration_result.rb

@@ -14,11 +14,11 @@ module SixSaferpay
                    authentication_result: nil)
 
       @success = success
-      @fd_alias = SixSaferpay::RegistrationAlias.new(fd_alias.to_h) if fd_alias
-      @error = SixSaferpay::RegistrationError.new(error.to_h) if error
+      @fd_alias = SixSaferpay::RegistrationAlias.new(**fd_alias.to_h) if fd_alias
+      @error = SixSaferpay::RegistrationError.new(**error.to_h) if error
       if authentication_result
         @authentication_result = SixSaferpay::AuthenticationResult
-          .new(authentication_result.to_h)
+          .new(**authentication_result.to_h)
       end
     end
 

data/lib/six_saferpay/models/request_header.rb

@@ -16,7 +16,7 @@ module SixSaferpay
       @customer_id = customer_id || SixSaferpay.config.customer_id
       @request_id = request_id || SecureRandom.uuid
       @retry_indicator = retry_indicator || 0
-      @client_info = SixSaferpay::ClientInfo.new(client_info.to_h) if client_info
+      @client_info = SixSaferpay::ClientInfo.new(**client_info.to_h) if client_info
     end
 
     def to_hash

data/lib/six_saferpay/models/request_payment_means.rb

@@ -12,10 +12,10 @@ module SixSaferpay
                    fd_alias: nil,
                    saferpay_fields: nil
                   )
-      @card = SixSaferpay::RequestCard.new(card.to_h) if card
-      @bank_account = SixSaferpay::BankAccount.new(bank_account.to_h) if bank_account
-      @fd_alias = SixSaferpay::PaymentMeansAlias.new(fd_alias.to_h) if fd_alias
-      @saferpay_fields = SixSaferpay::SaferpayFields.new(saferpay_fields.to_h) if saferpay_fields
+      @card = SixSaferpay::RequestCard.new(**card.to_h) if card
+      @bank_account = SixSaferpay::BankAccount.new(**bank_account.to_h) if bank_account
+      @fd_alias = SixSaferpay::PaymentMeansAlias.new(**fd_alias.to_h) if fd_alias
+      @saferpay_fields = SixSaferpay::SaferpayFields.new(**saferpay_fields.to_h) if saferpay_fields
     end
 
     def to_hash

data/lib/six_saferpay/models/response_payment_means.rb

@@ -16,12 +16,12 @@ module SixSaferpay
                    bank_account: nil,
                    twint: nil
                   )
-      @brand = SixSaferpay::Brand.new(brand.to_h) if brand
+      @brand = SixSaferpay::Brand.new(**brand.to_h) if brand
       @display_text = display_text
       @wallet = wallet
-      @card = SixSaferpay::ResponseCard.new(card.to_h) if card
-      @bank_account = SixSaferpay::BankAccount.new(bank_account.to_h) if bank_account
-      @twint = SixSaferpay::Twint.new(twint.to_h) if twint
+      @card = SixSaferpay::ResponseCard.new(**card.to_h) if card
+      @bank_account = SixSaferpay::BankAccount.new(**bank_account.to_h) if bank_account
+      @twint = SixSaferpay::Twint.new(**twint.to_h) if twint
     end
 
     def to_hash

data/lib/six_saferpay/models/risk_factors.rb

@@ -15,7 +15,7 @@ module SixSaferpay
       @delivery_type = delivery_type
 
       if payer_profile
-        @payer_profile = SixSaferpay::PayerProfile.new(payer_profile.to_h)
+        @payer_profile = SixSaferpay::PayerProfile.new(**payer_profile.to_h)
       end
       @is_b2b = is_b2b
     end

data/lib/six_saferpay/models/transaction.rb

@@ -36,14 +36,14 @@ module SixSaferpay
       @id = id
       @capture_id = capture_id
       @date = date
-      @amount = SixSaferpay::Amount.new(amount)
+      @amount = SixSaferpay::Amount.new(**amount.to_h)
       @order_id = order_id
       @acquirer_name = acquirer_name
       @acquirer_reference = acquirer_reference
       @six_transaction_reference = six_transaction_reference
       @approval_code = approval_code
-      @direct_debit = SixSaferpay::DirectDebit.new(direct_debit) if direct_debit 
-      @invoice = SixSaferpay::Invoice.new(invoice) if invoice
+      @direct_debit = SixSaferpay::DirectDebit.new(**direct_debit.to_h) if direct_debit
+      @invoice = SixSaferpay::Invoice.new(**invoice.to_h) if invoice
     end
 
     def to_hash

data/lib/six_saferpay/models/update_payment_means.rb

@@ -4,7 +4,7 @@ module SixSaferpay
     attr_accessor(:card)
 
     def initialize(card: nil)
-      @card = SixSaferpay::AliasCard.new(card.to_h) if card
+      @card = SixSaferpay::AliasCard.new(**card.to_h) if card
     end
 
     def to_hash

data/lib/six_saferpay/version.rb

@@ -1,3 +1,3 @@
 module SixSaferpay
-  VERSION = "2.8.0"
+  VERSION = "2.8.4"
 end

data/six_saferpay.gemspec

@@ -14,6 +14,8 @@ Gem::Specification.new do |spec|
   spec.homepage      = "https://github.com/fadendaten/six_saferpay"
   spec.license       = "MIT"
 
+  spec.required_ruby_version = Gem::Requirement.new('~> 2.5')
+
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
   spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
@@ -23,17 +25,17 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency 'activesupport', '~> 6.1', '>= 6.1.3'
+  spec.add_runtime_dependency 'activesupport', '>= 6.0.0'
 
-  spec.add_development_dependency 'bundler', '~> 2.1'
+  spec.add_development_dependency 'bundler', '~> 2.2'
   spec.add_development_dependency 'rake', '~> 13.0'
-  spec.add_development_dependency 'rspec', '~> 3.0'
-  spec.add_development_dependency 'vcr', '~> 4.0', '>= 4.0.0'
-  spec.add_development_dependency 'webmock', '~> 3.10', '>= 3.10'
-  spec.add_development_dependency 'dotenv', '~> 2.7', '>= 2.7'
+  spec.add_development_dependency 'rspec', '~> 3.1'
+  spec.add_development_dependency 'vcr', '~> 6.0'
+  spec.add_development_dependency 'webmock', '~> 3.13'
+  spec.add_development_dependency 'dotenv', '~> 2.7'
   spec.add_development_dependency 'pry', '~> 0.14'
-  spec.add_development_dependency 'tty-prompt', '~> 0.22'
-  spec.add_development_dependency 'simplecov', '~> 0.19'
-  spec.add_development_dependency 'spinning_wheel', '~> 0.2.2'
+  spec.add_development_dependency 'tty-prompt', '~> 0.23'
+  spec.add_development_dependency 'simplecov', '~> 0.21'
+  spec.add_development_dependency 'spinning_wheel', '~> 1.0'
   spec.add_development_dependency 'thor', '~> 1.1.0'
 end