six_saferpay 0.1.10 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 25905e96758e61391e8ee95dfc6795ca1e84fb753fa8ce46a9948cdde7d6df4e
-  data.tar.gz: 686f52677a0abe0b4ca8d9ea03111985403840eab2d35e4ed3a554dacb48bff8
+  metadata.gz: ceaa6770af2ef4601171a3712aa2eb140392c1b44ce467e27ba2854a0b8fcca3
+  data.tar.gz: 836723987b8b80de63418413e5a7e32c446f27f0fbb1fc1c5f13e2301605bcf4
 SHA512:
-  metadata.gz: f77747f41a4f5c1727a9ccab460ce8934ca23a2504846d39bb261810ac92eeb7ba66d3f42ad2ec220b01d8b59dd91003b957413f7c25fbfc05f6c8141389bfd4
-  data.tar.gz: 1f35d0a4af9a38fd6ed22eec212db2a9277728119121de034df51b6471bb724dcb21fde9b7de3f93e7ade5c995ffb48f1c2903371841e6316450f129e0f87f42
+  metadata.gz: 5c54b4d3b7e6f4572dd3a783ac8de905e5abf915198c7a8a5a4b28f8d92340882a90efacad5cbc5b9c827296cb71395cfa8bf2cd9587a0da11f63ef202260380
+  data.tar.gz: 409044750e116e69a0c4be1d417a6272c5f189d36933fe2d5203f08857614c6909c8cf5e82ab6436c5b35f654d8023eb90ec9d40cf9f9f4fa82a9489e683e47f

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    six_saferpay (0.1.9)
-      activesupport (>= 5.0.0.0)
+    six_saferpay (0.1.10)
+      activesupport (~> 5.0, >= 5.0.0.0)
 
 GEM
   remote: https://rubygems.org/
@@ -62,6 +62,8 @@ GEM
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.2)
+    spinning_wheel (0.2.0)
+      activesupport (~> 5.0, >= 5.0.0.0)
     spoon (0.0.6)
       ffi
     thread_safe (0.3.6)
@@ -95,15 +97,16 @@ PLATFORMS
 
 DEPENDENCIES
   bundler (~> 2.0)
-  dotenv (~> 2.7.0)
+  dotenv (~> 2.7, >= 2.7)
   pry (~> 0.12.0)
   rake (~> 10.0)
   rspec (~> 3.0)
   simplecov (~> 0.16)
   six_saferpay!
+  spinning_wheel (~> 0.1)
   tty-prompt (~> 0.18)
-  vcr (~> 4.0.0)
-  webmock (~> 3.5.1)
+  vcr (~> 4.0, >= 4.0.0)
+  webmock (~> 3.5, >= 3.5.1)
 
 BUNDLED WITH
    2.0.1

data/lib/six_saferpay/api/six_payment_page/requests/initialize.rb

@@ -19,7 +19,6 @@ module SixSaferpay
         :delivery_address_form,
         :card_form,
         :condition
-
       )
 
       def initialize(request_header: nil,
@@ -40,7 +39,7 @@ module SixSaferpay
                      condition: nil
                     )
         @request_header = request_header || SixSaferpay::RequestHeader.new()
-        @config_set = @config_set
+        @config_set = config_set
         @terminal_id = terminal_id || SixSaferpay.config.terminal_id
         @payment = SixSaferpay::Payment.new(payment.to_h) if payment
         @payment_methods = payment_methods
@@ -64,7 +63,7 @@ module SixSaferpay
         hash.merge!(terminal_id: @terminal_id)
         hash.merge!(payment: @payment.to_h)
         hash.merge!(payment_methods: @payment_methods) if @payment_methods
-        hash.merge!(payment_methods_options: @payment_methods_options) if @payment_methods_options
+        hash.merge!(payment_methods_options: @payment_methods_options.to_h) if @payment_methods_options
         hash.merge!(wallets: @wallets) if @wallets
         hash.merge!(payer: @payer.to_h) if @payer
         hash.merge!(register_alias: @register_alias.to_h) if @register_alias
@@ -74,7 +73,7 @@ module SixSaferpay
         hash.merge!(billing_address_form: @billing_address_form.to_h) if @billing_address_form
         hash.merge!(delivery_address_form: @delivery_address_form.to_h) if @delivery_address_form
         hash.merge!(card_form: @card_form.to_h) if @card_form
-        hash.merge!(condition: @codition) if @condition
+        hash.merge!(condition: @condition) if @condition
         hash
       end
       alias_method :to_h, :to_hash

data/lib/six_saferpay/api/six_payment_page/responses/assert_response.rb

@@ -21,7 +21,7 @@ module SixSaferpay
                     )
         @response_header = SixSaferpay::ResponseHeader.new(response_header.to_h)
         @transaction = SixSaferpay::Transaction.new(transaction.to_h)
-        @payment_means = SixSaferpay::PaymentMeans.new(payment_means.to_h)
+        @payment_means = SixSaferpay::ResponsePaymentMeans.new(payment_means.to_h)
         @payer = SixSaferpay::Payer.new(payer.to_h) if payer
         @registration_result = SixSaferpay::RegistrationResult.new(registration_result.to_h) if registration_result
         @liability = SixSaferpay::Liability.new(liability.to_h) if liability

data/lib/six_saferpay/api/six_payment_page/responses/initalize_response.rb

@@ -28,17 +28,6 @@ module SixSaferpay
       end
       alias_method :to_h, :to_hash
 
-      def token
-        @token
-      end
-
-      def expiration
-        @expiration
-      end
-
-      def redirect_url
-        @redirect_url
-      end
     end
   end
 end

data/lib/six_saferpay/api/six_transaction/requests/authorize.rb

@@ -0,0 +1,45 @@
+module SixSaferpay
+  module SixTransaction
+    class Authorize
+
+      attr_accessor :request_header,
+                    :token,
+                    :condition,
+                    :verification_code,
+                    :register_alias
+
+
+      def initialize(request_header: nil,
+                     token:,
+                     condition: nil,
+                     verification_code: nil,
+                     register_alias: nil
+                    )
+        @request_header = request_header || SixSaferpay::RequestHeader.new()
+        @token = token
+        @condition = condition
+        @verification_code = verification_code
+        @register_alias = SixSaferpay::RegisterAlias.new(register_alias.to_h) if register_alias
+      end
+
+      def to_hash
+        hash = Hash.new
+        hash.merge!(request_header: @request_header.to_h) if @register_alias
+        hash.merge!(token: @token) if @token
+        hash.merge!(condition: @condition) if @condition
+        hash.merge!(verification_code: @verification_code) if @verification_code
+        hash.merge!(register_alias: @register_alias.to_h) if @register_alias
+        hash
+      end
+      alias_method :to_h, :to_hash
+
+      def to_json
+        to_hash.to_json
+      end
+
+      def url
+        '/Payment/v1/Transaction/Authorize'
+      end
+    end
+  end
+end

data/lib/six_saferpay/api/six_transaction/requests/cancel.rb

@@ -1,32 +1,30 @@
 module SixSaferpay
-  module API
-    module SixTransaction
-      class Cancel
+  module SixTransaction
+    class Cancel
 
-        attr_accessor :request_header, :transaction_reference
+      attr_accessor :request_header,
+                    :transaction_reference
 
-        def initialize(transaction_id)
-          @request_header = SixSaferpay::RequestHeader.new
-          @transaction_reference = SixSaferpay::TransactionReference
-            .new(transaction_id)
-        end
 
-        def to_hash
-          hash = Hash.new
-          hash.merge!(@request_header.to_h)
-          hash.merge!(@transaction_reference.to_h)
-          hash
-        end
-        alias_method :to_h, :to_hash
+      def initialize(request_header: nil, transaction_reference:)
+        @request_header = request_header || SixSaferpay::RequestHeader.new()
+        @transaction_reference = SixSaferpay::TransactionReference.new(transaction_reference.to_h) if transaction_reference
+      end
 
-        def to_json
-          to_hash.to_json
-        end
+      def to_hash
+        hash = Hash.new
+        hash.merge!(request_header: @request_header.to_h) if @request_header
+        hash.merge!(transaction_reference: @transaction_reference.to_h) if @transaction_reference
+        hash
+      end
+      alias_method :to_h, :to_hash
 
-        def url
-          '/Payment/v1/Transaction/Cancel'
-        end
+      def to_json
+        to_hash.to_json
+      end
 
+      def url
+        '/Payment/v1/Transaction/Cancel'
       end
     end
   end

data/lib/six_saferpay/api/six_transaction/requests/capture.rb

@@ -30,6 +30,7 @@ module SixSaferpay
         hash = Hash.new
         hash.merge!(request_header: @request_header.to_h) if @request_header
         hash.merge!(transaction_reference: @transaction_reference.to_h) if @transaction_reference
+        hash.merge!(amount: @amount.to_h) if @amount
         hash.merge!(billpay: @billpay.to_h) if @billpay
         hash.merge!(pending_notifiction: @pending_notifiction.to_h) if @pending_notifiction
         hash.merge!(marketplace: @marketplace.to_h) if @marketplace

data/lib/six_saferpay/api/six_transaction/requests/initialize.rb

@@ -1,73 +1,72 @@
 module SixSaferpay
-  module API
-    module SixTransactions
-      class Initialize
+  module SixTransaction
+    class Initialize
 
-        attr_accessor(
-          :request_header,
-          :config_set,
-          :terminal_id,
-          :payment,
-          :payment_means,
-          :payer,
-          :return_urls,
-          :styling,
-          :wallet,
-          :payment_methods,
-          :card_form
-          )
+      attr_accessor(
+        :request_header,
+        :config_set,
+        :terminal_id,
+        :payment,
+        :payment_means,
+        :payer,
+        :return_urls,
+        :styling,
+        :wallet,
+        :payment_methods,
+        :card_form
+        )
 
 
-        def initialize(request_header: nil,
-                       config_set: nil,
-                       terminal_id: nil,
-                       payment:,
-                       payment_means: nil,
-                       payer: nil,
-                       return_urls: nil,
-                       styling: nil,
-                       wallet: nil,
-                       payment_methods: nil,
-                       card_form: nil
-                      )
-          @request_header = request_header || SixSaferpay::RequestHeader.new()
-          @config_set = config_set
-          @terminal_id = terminal_id || SixSaferpay.config.terminal_id
-          @payment = payment
-          @payment_means = payment_means
-          @return_urls = return_urls || SixSaferpay::ReturnUrls.new()
-          @styling = styling
-          @wallet = wallet
-          @payment_methods = payment_methods
-          @card_form = card_form
-        end
-
-        def to_hash
-          hash = Hash.new
-          hash.merge!(RequestHeader: @request_header.to_h)
-          hash.merge!(ConfigSet: @config_set) if @config_set
-          hash.merge!(TerminalID: @terminal_id)
-          hash.merge!(Payment: @payment.to_h)
-          hash.merge!(PaymentMeans: @payment_means.to_h) if @payment_means
-          hash.merge!(Payer: @payer.to_h) if @payer
-          hash.merge!(ReturnUrls: @return_urls.to_h ) if @return_urls
-          hash.merge!(Styling: @styling.to_h) if @styling
-          hash.merge!(Wallet: @wallet.to_h) if @wallet
-          hash.merge!(PaymentMethods: @payment_methods) if @payment_methods
-          hash.merge!(CardForm: @card_form.to_h) if @card_form
-          hash
-        end
-        alias_method :to_h, :to_hash
+      def initialize(request_header: nil,
+                     config_set: nil,
+                     terminal_id: nil,
+                     payment:,
+                     payment_means: nil,
+                     payer: nil,
+                     return_urls: nil,
+                     styling: nil,
+                     wallet: nil,
+                     payment_methods: nil,
+                     card_form: nil
+                    )
+        @request_header = request_header || SixSaferpay::RequestHeader.new()
+        @config_set = config_set
+        @terminal_id = terminal_id || SixSaferpay.config.terminal_id
+        @payment = SixSaferpay::Payment.new(payment.to_h) if payment
+        @payment_means = SixSaferpay::RequestPaymentMeans.new(payment_means.to_h) if payment_means
+        @payer = SixSaferpay::Payer.new(payer.to_h) if payer
+        @return_urls = return_urls || SixSaferpay::ReturnUrls.new()
+        @styling = SixSaferpay::Styling.new(styling.to_h) if styling
+        @wallet = SixSaferpay::Wallet.new(wallet.to_h) if wallet
+        @payment_methods = payment_methods
+        @card_form = SixSaferpay::CardForm.new(card_form.to_h) if card_form
+      end
 
-        def to_json
-          to_hash.to_json
-        end
+      def to_hash
+        hash = Hash.new
+        hash.merge!(request_header: @request_header.to_h) if @request_header
+        hash.merge!(config_set: @config_set) if @config_set
+        hash.merge!(terminal_id: @terminal_id) if @terminal_id
+        hash.merge!(payment: @payment.to_h) if @payment
+        hash.merge!(payment_means: @payment_means.to_h) if @payment_means
+        hash.merge!(payer: @payer.to_h) if @payer
+        hash.merge!(return_urls: @return_urls.to_h ) if @return_urls
+        hash.merge!(styling: @styling.to_h) if @styling
+        hash.merge!(wallet: @wallet.to_h) if @wallet
+        hash.merge!(payment_methods: @payment_methods) if @payment_methods
+        hash.merge!(card_form: @card_form.to_h) if @card_form
+        hash
+      end
+      alias_method :to_h, :to_hash
 
-        def url
-          '/Payment/v1/Transaction/Initialize'
-        end
+      def to_json
+        to_hash.to_json
+      end
 
+      def url
+        '/Payment/v1/Transaction/Initialize'
       end
+
     end
   end
 end

data/lib/six_saferpay/api/six_transaction/responses/authorize_response.rb

@@ -0,0 +1,47 @@
+module SixSaferpay
+  module SixTransaction
+    class AuthorizeResponse
+
+      attr_accessor :response_header,
+                    :transaction,
+                    :payment_means,
+                    :payer,
+                    :registration_result,
+                    :liability,
+                    :dcc
+
+
+      def initialize(response_header:,
+                     transaction:,
+                     payment_means:,
+                     payer: nil,
+                     registration_result: nil,
+                     liability: nil,
+                     dcc: nil
+
+                    )
+        @response_header = SixSaferpay::ResponseHeader.new(response_header.to_h) if response_header
+        @transaction = SixSaferpay::Transaction.new(transaction.to_h) if transaction
+        @payment_means = SixSaferpay::ResponsePaymentMeans.new(payment_means.to_h) if payment_means
+        @payer = SixSaferpay::Payer.new(payer.to_h) if payer
+        @registration_result = SixSaferpay::RegistrationResult.new(registration_result.to_h) if registration_result
+        @liability = SixSaferpay::Liability.new(liability.to_h) if liability
+        @dcc = SixSaferpay::Dcc.new(dcc.to_h) if dcc
+      end
+
+      def to_hash
+        hash = Hash.new
+        hash.merge!(response_header: @response_header.to_h) if @response_header
+        hash.merge!(transaction: @transaction.to_h) if @transaction
+        hash.merge!(payment_means: @payment_means.to_h) if @payment_means
+        hash.merge!(payer: @payer.to_h) if @payer
+        hash.merge!(registration_result: @registration_result.to_h) if @registration_result
+        hash.merge!(liability: @liability.to_h) if @liability
+        hash.merge!(dcc: @dcc.to_h) if @dcc
+        hash
+      end
+      alias_method :to_h, :to_hash
+
+    end
+  end
+end

data/lib/six_saferpay/api/six_transaction/responses/cancel_response.rb

@@ -0,0 +1,34 @@
+module SixSaferpay
+  module SixTransaction
+    class CancelResponse
+
+      attr_accessor :response_header,
+                    :transaction_id,
+                    :order_id,
+                    :date
+
+
+      def initialize(response_header:,
+                     transaction_id:,
+                     order_id: nil,
+                     date: nile
+                    )
+        @response_header = SixSaferpay::ResponseHeader.new(response_header.to_h) if response_header
+        @transaction_id = transaction_id
+        @order_id = order_id
+        @date = date
+      end
+
+      def to_hash
+        hash = Hash.new
+        hash.merge!(response_header: @response_header.to_h) if @response_header
+        hash.merge!(transaction_id: @transaction_id) if @transaction_id
+        hash.merge!(order_id: @order_id) if @order_id
+        hash.merge!(date: @date) if @date
+        hash
+      end
+      alias_method :to_h, :to_hash
+
+    end
+  end
+end

data/lib/six_saferpay/api/six_transaction/responses/capture_response.rb

@@ -8,12 +8,13 @@ module SixSaferpay
                     :date,
                     :invoice
                    )
+
       def initialize(response_header: ,
                     capture_id: nil,
                     status: ,
                     date: ,
                     invoice: nil)
-        @response_header = SixSaferpay::ResponseHeader.new(response_header) if response_header
+        @response_header = SixSaferpay::ResponseHeader.new(response_header.to_h) if response_header
         @capture_id = capture_id
         @status = status
         @date = date

data/lib/six_saferpay/api/six_transaction/responses/initialize_response.rb

@@ -1,12 +1,41 @@
 module SixSaferpay
-  module API
-    module SixTransaction
-      class InitializeResponse
+  module SixTransaction
+    class InitializeResponse
 
-        def initialize(hash)
-        end
+      attr_accessor(:response_header,
+                    :token,
+                    :expiration,
+                    :liability_shift,
+                    :redirect_required,
+                    :redirect
+                   )
 
+      def initialize(response_header:,
+                     token:,
+                     expiration:,
+                     liability_shift: nil,
+                     redirect_required:,
+                     redirect: )
+        @response_header = SixSaferpay::ResponseHeader.new(response_header.to_h) if response_header
+        @token = token
+        @expiration = expiration
+        @liability_shift = liability_shift
+        @redirect_required = redirect_required
+        @redirect = SixSaferpay::Redirect.new(redirect.to_h) if redirect
       end
+
+      def to_hash
+        hash = Hash.new
+        hash.merge!(response_header: @response_header.to_h) if @response_header
+        hash.merge!(token: @token) if @token
+        hash.merge!(expiration: @expiration) if @expiration
+        hash.merge!(liability_shift: @liability_shift) if !@liability_shift.nil?
+        hash.merge!(redirect_required: @redirect_required) if !@redirect_required.nil?
+        hash.merge!(redirect: @redirect.to_h) if @redirect
+        hash
+      end
+      alias_method :to_h, :to_hash
+
     end
   end
 end

data/lib/six_saferpay/client.rb

@@ -14,10 +14,13 @@ module SixSaferpay
       https = Net::HTTP.new(uri.host, uri.port)
       https.use_ssl = true
       @response = https.request(request)
-      body = @response.body
-      hash = JSON.parse(body, symbolize_names: true)
+      hash = @response.body
+      hash = JSON.parse(hash, symbolize_names: true)
       hash = hash.deep_transform_keys do |key|
         key = key.to_s.underscore
+        key.gsub!(/^alias/,'fd_alias')
+        key.gsub!(/^abort/,'fd_abort')
+        key.gsub!(/^fail/,'fd_fail')
         key.to_sym
       end
       if @response.code == "200"
@@ -34,10 +37,11 @@ module SixSaferpay
       hash = @object.to_h
       hash = hash.deep_transform_keys do |key|
         key = key.to_s.camelize
+        key.gsub!('fd_','')
         key.to_sym
       end
-      body = hash.to_json
-      request.body = body
+      hash = hash.to_json
+      request.body = hash
       request.basic_auth(username, password)
       @request = request
     end

data/lib/six_saferpay/models/address_form.rb

@@ -1,16 +1,18 @@
 module SixSaferpay
   class AddressForm
 
-    attr_accessor(:display, :mandatory_fields)
+    attr_accessor(:display,
+                  :mandatory_fields)
 
-    def initialize(display:, mandatory_fields: nil)
+    def initialize(display:,
+                   mandatory_fields: nil)
       @display = display
       @mandatory_fields = mandatory_fields
     end
 
     def to_hash
       hash = Hash.new
-      hash.merge!(display: @display)
+      hash.merge!(display: @display) if !@display.nil?
       hash.merge!(mandatory_fields: @mandatory_fields) if @mandatory_fields
       hash
     end
@@ -18,4 +20,3 @@ module SixSaferpay
 
   end
 end
-

data/lib/six_saferpay/models/amount.rb

@@ -9,9 +9,10 @@ module SixSaferpay
     end
 
     def to_hash
-      body = Hash.new
-      body.merge!(value: @value)
-      body.merge!(currency_code: @currency_code)
+      hash = Hash.new
+      hash.merge!(value: @value)
+      hash.merge!(currency_code: @currency_code)
+      hash
     end
     alias_method :to_h, :to_hash
 

data/lib/six_saferpay/models/bank_account.rb

@@ -22,12 +22,13 @@ module SixSaferpay
     end
 
     def to_hash
-      body = Hash.new
-      body.merge!(IBAN: @iban)
-      body.merge!(HolderName: @holder_name)
-      body.merge!(BankName: @bank_name)
-      body.merge!(CountryCode: @country_code)
-      body
+      hash = Hash.new
+      hash.merge!(iban: @iban) if @iban
+      hash.merge!(holder_name: @holder_name) if @holder_name
+      hash.merge!(bic: @bic) if @bic
+      hash.merge!(bank_name: @bank_name)
+      hash.merge!(country_code: @country_code)
+      hash
     end
     alias_method :to_h, :to_hash
 

data/lib/six_saferpay/models/brand.rb

@@ -9,10 +9,10 @@ module SixSaferpay
     end
 
     def to_hash
-      body = Hash.new
-      body.merge!(payment_method: @payment_method) if @payment_method
-      body.merge!(name: @name)
-      body
+      hash = Hash.new
+      hash.merge!(payment_method: @payment_method) if @payment_method
+      hash.merge!(name: @name) if @name
+      hash
     end
     alias_method :to_h, :to_hash
 

data/lib/six_saferpay/models/client_info.rb

@@ -1,5 +1,5 @@
 module SixSaferpay
-  class ClientInfo < Model
+  class ClientInfo 
 
     attr_accessor :shop_info, :os_info
 
@@ -10,8 +10,8 @@ module SixSaferpay
 
     def to_hash
       hash = Hash.new
-      hash.merge!(shop_info: @shop_info)
-      hash.merge!(os_info: @os_info)
+      hash.merge!(shop_info: @shop_info) if @shop_info
+      hash.merge!(os_info: @os_info) if @os_info
       hash
     end
     alias_method :to_h, :to_hash

data/lib/six_saferpay/models/direct_debit.rb

@@ -0,0 +1,20 @@
+module SixSaferpay
+  class DirectDebit
+
+    attr_accessor(:mandate_id, :creditor_id)
+
+    def initialize(mandate_id:, creditor_id:)
+      @mandate_id = mandate_id
+      @creditor_id = creditor_id
+    end
+
+    def to_hash
+      hash = Hash.new
+      hash.merge!(mandate_id: @mandate_id) if @mandate_id
+      hash.merge!(creditor_id: @creditor_id) if @creditor_id
+      hash
+    end
+    alias_method :to_h, :to_hash
+
+  end
+end