buckaruby 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ca0648f0a6575163b3684b909a613114b6f7634d
-  data.tar.gz: 58d4b4baf6dbf494a39839352c24c522a415ea87
+  metadata.gz: 4bf463fefe2e48b81e3802d81e8141a535a4f586
+  data.tar.gz: b2192a33d06fd0c4c9cba9e9eb7969cd12fdc061
 SHA512:
-  metadata.gz: dfc7886aaa82c537c786ed16543abd0934d28529e1c40a76709699c6f4d9f3ee49b7caca09aac5c79de733b88397cfac1a29209a3f2df6960df2fb1227c5519f
-  data.tar.gz: dacded44324296a0af0c05063047d87f6764bd613ab438091995caf7abcb6d80b25a1d06235b6283da0a1701940c7f061a11ce7cd4d3395be72d10c5302ff418
+  metadata.gz: 636784a521333470080bfaf8603bb5049e6129d94f2cd01cf20cae672c6ff84827f8a9ddb6221e3eb5b0a7bc2f484fe5788e21d5580c8303a7df5bcaa0ffcd1c
+  data.tar.gz: 88a2da8cf30a4791535456fe99b3b06a845d42cbfcf52799558b09e0b41fa3186667f954a05633a4de401f130894a1b5c56fdcd449030c052a7cea66464df827

data/.rubocop.yml

@@ -42,8 +42,5 @@ Style/IfUnlessModifier:
 Style/MutableConstant:
   Enabled: false
 
-Style/RedundantReturn:
-  Enabled: false
-
 Style/StringLiterals:
   Enabled: false

data/.travis.yml

@@ -2,5 +2,6 @@ language: ruby
 sudo: false
 cache: bundler
 rvm:
-  - 2.2.5
-  - 2.3.1
+  - 2.2.6
+  - 2.3.3
+  - 2.4.0

data/CHANGELOG.md

@@ -0,0 +1,10 @@
+# Buckaruby changelog
+
+## 1.0.1 (2017-01-05)
+
+- Recognize status codes 792 & 793 as a pending transaction.
+- For SEPA Direct Debit, make the collect date configurable and let Buckaroo determine the default.
+
+## 1.0.0 (2016-11-24)
+
+- First public release.

data/README.md

@@ -1,6 +1,8 @@
 # Buckaruby
 
+[![Gem Version](https://badge.fury.io/rb/buckaruby.svg)](https://badge.fury.io/rb/buckaruby)
 [![Build Status](https://travis-ci.org/KentaaNL/buckaruby.svg?branch=master)](https://travis-ci.org/KentaaNL/buckaruby)
+[![Code Climate](https://codeclimate.com/github/KentaaNL/buckaruby/badges/gpa.svg)](https://codeclimate.com/github/KentaaNL/buckaruby)
 
 The Buckaruby gem provides a Ruby library for communicating with the Buckaroo Payment Engine 3.0.
 

data/buckaruby.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email         = ["support@kentaa.nl"]
   spec.summary       = "Ruby library for communicating with the Buckaroo Payment Engine 3.0."
   spec.description   = "The Buckaruby gem provides a Ruby library for communicating with the Buckaroo Payment Engine 3.0."
-  spec.homepage      = "http://www.buckaroo.nl/"
+  spec.homepage      = "https://github.com/KentaaNL/buckaruby"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files -z`.split("\x0")

data/lib/buckaruby/gateway.rb

@@ -27,7 +27,7 @@ module Buckaruby
         raise ArgumentError, "Invalid payment method, only #{PaymentMethod::IDEAL} is supported."
       end
 
-      return Ideal::ISSUERS
+      Ideal::ISSUERS
     end
 
     # Setup a new transaction.
@@ -38,10 +38,7 @@ module Buckaruby
 
       normalize_account_iban!(options) if options[:payment_method] == PaymentMethod::SEPA_DIRECT_DEBIT
 
-      request = build_request(:setup_transaction)
-      response = request.execute(options)
-
-      return SetupTransactionResponse.new(response, @options)
+      execute_request(:setup_transaction, options)
     end
 
     # Setup a recurrent transaction.
@@ -50,10 +47,7 @@ module Buckaruby
 
       validate_recurrent_transaction_params!(options)
 
-      request = build_request(:recurrent_transaction)
-      response = request.execute(options)
-
-      return RecurrentTransactionResponse.new(response, @options)
+      execute_request(:recurrent_transaction, options)
     end
 
     # Get transaction status.
@@ -62,10 +56,7 @@ module Buckaruby
 
       validate_status_params!(options)
 
-      request = build_request(:status)
-      response = request.execute(options)
-
-      return StatusResponse.new(response, @options)
+      execute_request(:status, options)
     end
 
     # Verify the response / callback.
@@ -74,7 +65,7 @@ module Buckaruby
         raise ArgumentError, "No callback parameters found"
       end
 
-      return CallbackResponse.new(response, @options)
+      CallbackResponse.new(response, @options)
     end
 
     private
@@ -189,6 +180,21 @@ module Buckaruby
       options[:hash_method] = hash_method
     end
 
+    # Build and execute a request.
+    def execute_request(request_type, options)
+      request = build_request(request_type)
+      response = request.execute(options)
+
+      case request_type
+      when :setup_transaction
+        SetupTransactionResponse.new(response, @options)
+      when :recurrent_transaction
+        RecurrentTransactionResponse.new(response, @options)
+      when :status
+        StatusResponse.new(response, @options)
+      end
+    end
+
     # Factory method for constructing a request.
     def build_request(request_type)
       case request_type

data/lib/buckaruby/iban.rb

@@ -19,7 +19,7 @@ module Buckaruby
       all_numbers = country_code_added.gsub(/[A-Z]/) { |p| (p.respond_to?(:ord) ? p.ord : p[0]) - 55 } + '00'
       verification_number = (98 - (all_numbers.to_i % 97)).to_s.rjust(2, '0')
 
-      return country_code + verification_number + account_identification
+      country_code + verification_number + account_identification
     end
   end
 end

data/lib/buckaruby/request.rb

@@ -24,7 +24,7 @@ module Buckaruby
 
       @logger.debug("[execute] response: #{response.inspect}")
 
-      return response
+      response
     end
 
     def build_request_params(_options)
@@ -59,25 +59,25 @@ module Buckaruby
       # Sign the data with our secret key.
       params[:brq_signature] = Signature.generate_signature(params, @options)
 
-      return params
+      params
     end
 
     def post_data(params)
-      return params.map { |key, value| "#{key}=#{CGI.escape(value.to_s)}" }.join("&")
+      params.map { |key, value| "#{key}=#{CGI.escape(value.to_s)}" }.join("&")
     end
 
     def parse_response(body)
       query = CGI.parse(body)
       query.each { |key, value| query[key] = value.first }
-      return query
+      query
     end
 
     def test?
-      return @options[:mode] == :test
+      @options[:mode] == :test
     end
 
     def api_url
-      return test? ? Urls::TEST_URL : Urls::PRODUCTION_URL
+      test? ? Urls::TEST_URL : Urls::PRODUCTION_URL
     end
   end
 
@@ -102,7 +102,7 @@ module Buckaruby
       params[:brq_description] = options[:description] if options[:description]
       params[:brq_return] = options[:return_url] if options[:return_url]
 
-      return params
+      params
     end
 
     def build_transaction_request_params(_options)
@@ -112,10 +112,6 @@ module Buckaruby
 
   # Request for a creating a new transaction.
   class SetupTransactionRequest < TransactionRequest
-    def execute(options)
-      super(options.merge(action: Action::PAY))
-    end
-
     def build_transaction_request_params(options)
       params = {}
 
@@ -130,14 +126,17 @@ module Buckaruby
         params.merge!(
           brq_service_sepadirectdebit_action: Action::PAY,
           brq_service_sepadirectdebit_customeriban: options[:account_iban],
-          brq_service_sepadirectdebit_customeraccountname: options[:account_name],
-          brq_service_sepadirectdebit_collectdate: (Date.today + 5).strftime("%Y-%m-%d")
+          brq_service_sepadirectdebit_customeraccountname: options[:account_name]
         )
 
         if options[:account_bic]
           params[:brq_service_sepadirectdebit_customerbic] = options[:account_bic]
         end
 
+        if options[:collect_date]
+          params[:brq_service_sepadirectdebit_collectdate] = options[:collect_date].strftime("%Y-%m-%d")
+        end
+
         if options[:mandate_reference]
           params.merge!(
             brq_service_sepadirectdebit_action: [Action::PAY, Action::EXTRA_INFO].join(","),
@@ -149,16 +148,12 @@ module Buckaruby
 
       params[:brq_startrecurrent] = options[:recurring] if options[:recurring]
 
-      return params
+      params
     end
   end
 
   # Request for a creating a recurrent transaction.
   class RecurrentTransactionRequest < TransactionRequest
-    def execute(options)
-      super(options.merge(action: Action::PAY_RECURRENT))
-    end
-
     def build_transaction_request_params(options)
       params = {}
 
@@ -171,7 +166,7 @@ module Buckaruby
 
       params[:brq_originaltransaction] = options[:transaction_id]
 
-      return params
+      params
     end
   end
 
@@ -187,7 +182,7 @@ module Buckaruby
       params[:brq_transaction] = options[:transaction_id] if options[:transaction_id]
       params[:brq_payment] = options[:payment_id] if options[:payment_id]
 
-      return params
+      params
     end
   end
 end

data/lib/buckaruby/response.rb

@@ -30,72 +30,72 @@ module Buckaruby
     def account_bic
       case payment_method
       when PaymentMethod::IDEAL
-        return params[:brq_service_ideal_consumerbic]
+        params[:brq_service_ideal_consumerbic]
       when PaymentMethod::SEPA_DIRECT_DEBIT
-        return params[:brq_service_sepadirectdebit_customerbic]
+        params[:brq_service_sepadirectdebit_customerbic]
       end
     end
 
     def account_iban
       case payment_method
       when PaymentMethod::IDEAL
-        return params[:brq_service_ideal_consumeriban]
+        params[:brq_service_ideal_consumeriban]
       when PaymentMethod::SEPA_DIRECT_DEBIT
-        return params[:brq_service_sepadirectdebit_customeriban]
+        params[:brq_service_sepadirectdebit_customeriban]
       end
     end
 
     def account_name
       case payment_method
       when PaymentMethod::IDEAL
-        return params[:brq_service_ideal_consumername] || params[:brq_customer_name]
+        params[:brq_service_ideal_consumername] || params[:brq_customer_name]
       when PaymentMethod::SEPA_DIRECT_DEBIT
-        return params[:brq_service_sepadirectdebit_customername] || params[:brq_customer_name]
+        params[:brq_service_sepadirectdebit_customername] || params[:brq_customer_name]
       end
     end
 
     def collect_date
       if payment_method == PaymentMethod::SEPA_DIRECT_DEBIT
-        return parse_date(params[:brq_service_sepadirectdebit_collectdate])
+        parse_date(params[:brq_service_sepadirectdebit_collectdate])
       end
     end
 
     def invoicenumber
-      return params[:brq_invoicenumber]
+      params[:brq_invoicenumber]
     end
 
     def mandate_reference
       if payment_method == PaymentMethod::SEPA_DIRECT_DEBIT
-        return params[:brq_service_sepadirectdebit_mandatereference]
+        params[:brq_service_sepadirectdebit_mandatereference]
       end
     end
 
     def payment_id
-      return params[:brq_payment]
+      params[:brq_payment]
     end
 
     def payment_method
-      return parse_payment_method(params[:brq_payment_method] || params[:brq_transaction_method])
+      parse_payment_method(params[:brq_payment_method] || params[:brq_transaction_method])
     end
 
     def redirect_url
-      return params[:brq_redirecturl]
+      params[:brq_redirecturl]
     end
 
     def refund_transaction_id
-      return params[:brq_relatedtransaction_refund]
+      params[:brq_relatedtransaction_refund]
     end
 
     def reversal_transaction_id
-      return params[:brq_relatedtransaction_reversal]
+      params[:brq_relatedtransaction_reversal]
     end
 
     def timestamp
-      return parse_time(params[:brq_timestamp])
+      parse_time(params[:brq_timestamp])
     end
 
     def transaction_id
-      return params[:brq_transactions]
+      params[:brq_transactions]
     end
 
     def transaction_type
@@ -103,17 +103,17 @@ module Buckaruby
         # See http://support.buckaroo.nl/index.php/Transactietypes
         case params[:brq_transaction_type]
         when 'C001', 'C002', 'C004', 'C021', 'C043', 'C044', 'C046', 'C090', 'V001', 'V002', 'V010', 'V021', 'V090'
-          return TransactionType::PAYMENT
+          TransactionType::PAYMENT
         when 'C005', 'V014', 'V031', 'V032', 'V034', 'V043', 'V044', 'V046', 'V094'
-          return TransactionType::PAYMENT_RECURRENT
+          TransactionType::PAYMENT_RECURRENT
         when 'C079', 'C080', 'C082', 'C092', 'C101', 'C102', 'C121', 'C500', 'V067', 'V068', 'V070', 'V079', 'V080', 'V082', 'V092', 'V101', 'V102', 'V110'
-          return TransactionType::REFUND
+          TransactionType::REFUND
         when 'C501', 'C502', 'C562', 'V111', 'V131', 'V132', 'V134', 'V143', 'V144', 'V146'
-          return TransactionType::REVERSAL
+          TransactionType::REVERSAL
         end
       else
         # Fallback when transaction type is not known (cancelling credit card)
-        return TransactionType::PAYMENT
+        TransactionType::PAYMENT
       end
     end
 
@@ -121,15 +121,15 @@ module Buckaruby
       # See http://support.buckaroo.nl/index.php/Statuscodes
       case params[:brq_statuscode]
       when '190'
-        return TransactionStatus::SUCCESS
+        TransactionStatus::SUCCESS
       when '490', '491', '492'
-        return TransactionStatus::FAILED
+        TransactionStatus::FAILED
       when '690'
-        return TransactionStatus::REJECTED
-      when '790', '791'
-        return TransactionStatus::PENDING
+        TransactionStatus::REJECTED
+      when '790', '791', '792', '793'
+        TransactionStatus::PENDING
       when '890', '891'
-        return TransactionStatus::CANCELLED
+        TransactionStatus::CANCELLED
       end
     end
 
@@ -151,21 +151,21 @@ module Buckaruby
         transaction_status: transaction_status
       }.reject { |_key, value| value.nil? }
 
-      return hash
+      hash
     end
 
     private
 
     def parse_date(date)
-      return date ? Date.strptime(date, '%Y-%m-%d') : nil
+      date ? Date.strptime(date, '%Y-%m-%d') : nil
     end
 
     def parse_time(time)
-      return time ? Time.strptime(time, '%Y-%m-%d %H:%M:%S') : nil
+      time ? Time.strptime(time, '%Y-%m-%d %H:%M:%S') : nil
     end
 
     def parse_payment_method(method)
-      return method ? method.downcase : nil
+      method ? method.downcase : nil
     end
   end
 

data/lib/buckaruby/signature.rb

@@ -10,11 +10,11 @@ module Buckaruby
 
       case hash_method
       when :sha1
-        return Digest::SHA1.hexdigest(generate_signature_string(params, secret))
+        Digest::SHA1.hexdigest(generate_signature_string(params, secret))
       when :sha256
-        return Digest::SHA256.hexdigest(generate_signature_string(params, secret))
+        Digest::SHA256.hexdigest(generate_signature_string(params, secret))
       when :sha512
-        return Digest::SHA512.hexdigest(generate_signature_string(params, secret))
+        Digest::SHA512.hexdigest(generate_signature_string(params, secret))
       else
         raise ArgumentError, "Invalid hash method provided: #{hash_method}"
       end
@@ -24,7 +24,7 @@ module Buckaruby
       sign_params = params.select { |key, _value| key.to_s.upcase.start_with?("BRQ_", "ADD_", "CUST_") && key.to_s.casecmp("BRQ_SIGNATURE").nonzero? }
       string = sign_params.sort_by { |p| p.first.downcase }.map { |param| "#{param[0]}=#{param[1]}" }.join
       string << secret
-      return string
+      string
     end
   end
 end

data/lib/buckaruby/support/case_insensitive_hash.rb

@@ -28,7 +28,7 @@ module Buckaruby
 
       def convert_key(key)
         string = key.is_a?(Symbol) ? key.to_s : key
-        return string.downcase
+        string.downcase
       end
     end
   end

data/lib/buckaruby/version.rb

@@ -1,3 +1,3 @@
 module Buckaruby
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

data/spec/buckaruby/gateway_spec.rb

@@ -208,7 +208,7 @@ describe Buckaruby::Gateway do
     end
 
     it 'should initiate a transaction for payment method sepa direct debit' do
-      response = subject.setup_transaction(amount: 10, payment_method: Buckaruby::PaymentMethod::SEPA_DIRECT_DEBIT, invoicenumber: "12345", return_url: "http://www.return.url/", account_iban: "NL13TEST0123456789", account_name: "J. Tester", mandate_reference: "00P12345")
+      response = subject.setup_transaction(amount: 10, payment_method: Buckaruby::PaymentMethod::SEPA_DIRECT_DEBIT, invoicenumber: "12345", return_url: "http://www.return.url/", account_iban: "NL13TEST0123456789", account_name: "J. Tester", mandate_reference: "00P12345", collect_date: Date.new(2016, 1, 1))
       expect(response).to be_an_instance_of(Buckaruby::SetupTransactionResponse)
       expect(response.transaction_id).to eq("41C48B55FA9164E123CC73B1157459E840BE5D24")
       expect(response.transaction_status).to eq(Buckaruby::TransactionStatus::PENDING)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: buckaruby
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Kentaa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-24 00:00:00.000000000 Z
+date: 2017-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -69,6 +69,7 @@ files:
 - ".gitignore"
 - ".rubocop.yml"
 - ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -97,7 +98,7 @@ files:
 - spec/buckaruby/signature_spec.rb
 - spec/buckaruby/support/case_insensitive_hash_spec.rb
 - spec/spec_helper.rb
-homepage: http://www.buckaroo.nl/
+homepage: https://github.com/KentaaNL/buckaruby
 licenses:
 - MIT
 metadata: {}
@@ -117,7 +118,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Ruby library for communicating with the Buckaroo Payment Engine 3.0.