bambora-client 0.4.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cfbb5f16d08f5d325effaf6e1f63c6b685f994d24205a8dccf7bcc53da3d2cbd
-  data.tar.gz: 8c29fc34d18356b8f0890a65976e0351ba2686d64181464729753087d85bd892
+  metadata.gz: 8f352f6b69779ed40aec8656bac2ef2ab59e3f9f2c449ded71fd2b927521f33b
+  data.tar.gz: d156be5c5a47ea734231bde86e1664b21f2f1ee9abdb5334b0c416d3f2139259
 SHA512:
-  metadata.gz: 7fd38771757b08b4c5effbbf9c43b3dbdc894478b76f3c8f896d2e4b6152a28045eb32d9641218d33add77ba29d4be81c38bf381c64d088c33cd69c96c9f990b
-  data.tar.gz: cd04925aa02ec74f09ac4e50b13ba718b8a5ad1d746914b96c8a18d276985233e8ab791361927eeb4e9eeac9fe89ed9bb624b5a7ca0bfcced090392c072dfaef
+  metadata.gz: f683ea503ba51055b1526f97f893d83a87f75f336b4deedd09b779a6b739194a31cc8d280c66cf0be4576a356ddf9e48263bc42fdae52ee684452015a931f7ef
+  data.tar.gz: 3700fddc9d722bbbe240f3df94d2aab8ffd7f6a800fa62245993e04c45207d48f32370224cd3d9c7ebd664ed5c0da8d5b57af4d76a06cef992e2767c49018c01

data/.editorconfig

@@ -0,0 +1,10 @@
+# top-most EditorConfig file
+root = true
+
+# Unix-style newlines with a newline ending every file
+# Indent with 2 spaces
+[*]
+end_of_line = lf
+insert_final_newline = true
+indent_style = space
+indent_size = 2

data/.github/workflows/gempush.yml

@@ -12,10 +12,10 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - name: Set up Ruby 2.6
+    - name: Set up Ruby 3.0
       uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 2.6
+        ruby-version: 3.0
 
     - name: Publish to RubyGems
       run: |

data/.github/workflows/linter.yml

@@ -18,9 +18,7 @@ jobs:
           ${{ runner.os }}-gem-
     - name: Setup ruby
       uses: ruby/setup-ruby@v1
-    - run: |
-        gem install bundler
-        bundle config path vendor/bundle
-        bundle install --jobs 4 --retry 3
+    - name: Install dependencies
+      run: bundle install
     - name: Rubocop checks
       run: bundle exec rubocop

data/.github/workflows/ruby.yml

@@ -8,7 +8,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby: ['2.4', '2.5', '2.6']
+        ruby: ['3.0', '3.1', '3.2', '3.3']
     name: Ruby ${{ matrix.ruby }} Test
     steps:
       - uses: actions/checkout@master
@@ -25,10 +25,8 @@ jobs:
         uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
-      - run: |
-          gem install bundler
-          bundle config path vendor/bundle
-          bundle install --jobs 4 --retry 3
+      - name: Install dependencies
+        run: bundle install
       - name: Run Tests
         run: |
           bundle exec rake spec

data/.rubocop.yml

@@ -1,5 +1,5 @@
 AllCops:
-  TargetRubyVersion: 2.4
+  TargetRubyVersion: 3.0
 
 Metrics/ClassLength:
   Enabled: false
@@ -103,3 +103,6 @@ Security/YAMLLoad:
 
 Style/RegexpLiteral:
   Enabled: false
+
+Naming/VariableNumber:
+  Enabled: false

data/.ruby-version

@@ -1 +1 @@
-2.5.7
+3.0.5

data/CHANGELOG.md

@@ -1,3 +1,22 @@
+## 0.7.0 (2024-02-06)
+
+- Drop support for Ruby 2
+- Updating minimum Ruby version to Ruby 3.0.5
+- Add test support for Ruby 3.1, 3.2, 3.3
+- Updated Rubocop to enforce 3.0.x conventions
+- Linting fixes
+- Update `BatchReportResource#batch_report_body` to allow `sub merchant id` to be received from `Bambora::Client` or `elements`
+
+## 0.6.0 (2023-05-02)
+
+- Updating minimum Ruby version to Ruby 2.7.7
+- Add test support for Ruby 3.0
+- Update Faraday to 2.0.1
+
+## 0.5.0 (2023-01-04)
+
+- Updating minimum Ruby version to Ruby 2.6.6
+
 ## 0.4.0 (2021-05-31)
 
 - Add `Bambora::V1::PaymentResource#get` method

data/bambora-client.gemspec

@@ -6,8 +6,8 @@ require 'bambora/client/version'
 Gem::Specification.new do |spec|
   spec.name          = 'bambora-client'
   spec.version       = Bambora::Client::VERSION
-  spec.authors       = ['Cassidy K']
-  spec.email         = ['hello@cassidy.codes', 'tech@himama.com']
+  spec.authors       = ['HiMama']
+  spec.email         = ['tech@himama.com']
 
   spec.summary       = 'A thread-safe client for the Bambora/Beanstream API.'
   spec.description   = 'The official beanstream-ruby gem is not thread-safe. This thread-safe client works in '\
@@ -37,19 +37,20 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.required_ruby_version = '>= 2.4.6'
+  spec.required_ruby_version = '>= 3.0.5'
 
-  spec.add_dependency 'excon', '< 1.0'
-  spec.add_dependency 'faraday', '< 1.0'
+  spec.add_dependency 'faraday', '~> 2.0.1'
+  spec.add_dependency 'faraday-excon', '~> 2.1.0'
+  spec.add_dependency 'faraday-multipart', '~> 1.0.0'
   spec.add_dependency 'gyoku', '~> 1.0'
   spec.add_dependency 'multiparty', '~> 0'
 
   spec.add_development_dependency 'bundler', '~> 2'
-  spec.add_development_dependency 'pry', '~> 0.12.0'
-  spec.add_development_dependency 'pry-byebug', '~> 3.7'
+  spec.add_development_dependency 'pry', '~> 0.14.0'
+  spec.add_development_dependency 'pry-byebug', '~> 3.8.0'
   spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'rspec_junit_formatter', '~> 0.4.1'
-  spec.add_development_dependency 'rubocop', '~> 0.74.0'
+  spec.add_development_dependency 'rubocop', '~> 1.12.0'
   spec.add_development_dependency 'webmock', '~> 3.7'
 end

data/lib/bambora/adapters/query_string_response.rb

@@ -8,7 +8,7 @@ module Bambora
       parsed_response = super
       return error_response if parsed_response.values.flatten.empty? # We didn't get a query string back.
 
-      parsed_response.each_with_object({}) { |(key, val), obj| obj[key] = val.length == 1 ? val.first : val }
+      parsed_response.transform_values { |val| val.length == 1 ? val.first : val }
     end
 
     private

data/lib/bambora/adapters/response.rb

@@ -13,7 +13,7 @@ module Bambora
     end
 
     def to_h
-      deep_transform_keys_in_object(parser.parse(response.body), &:to_sym)
+      deep_transform_keys_in_object(parser.parse(response.body.to_s), &:to_sym)
     rescue JSON::ParserError
       error_response
     end
@@ -33,8 +33,14 @@ module Bambora
       end
     end
 
+    # Faraday 1.0 fixed a bug where request/response bodies were indistinguishable.
+    # Our tests rely on this behaviour, and perhaps upstream clients do too.
+    # @SEE https://github.com/lostisland/faraday/pull/847
     def error_response
-      { status: response.status, body: response.body }
+      {
+        status: response.status,
+        body: response.body || response.env.request_body,
+      }
     end
 
     def parser

data/lib/bambora/bank/adapters/payment_profile_response.rb

@@ -13,8 +13,8 @@ module Bambora
         end
 
         def to_h
-          parsed_query_string.each_with_object({}) do |(key, val), obj|
-            obj[transform(key)] = val
+          parsed_query_string.transform_keys do |key|
+            transform(key)
           end
         end
 

data/lib/bambora/bank/batch_report_resource.rb

@@ -56,16 +56,14 @@ module Bambora
         response = client.post(path: sub_path, body: batch_report_body(report_data))
 
         response = ensure_record_key_exists(response)
-        response = add_messages_to_response(response)
-
-        response
+        add_messages_to_response(response)
       end
 
       private
 
       def ensure_record_key_exists(response)
         # bambora can return null or empty record results, fill it in for consistency
-        response.dig(:response)[:record] = [] if response.dig(:response, :record).nil?
+        response[:response][:record] = [] if response.dig(:response, :record).nil?
 
         response
       end
@@ -83,7 +81,7 @@ module Bambora
           merchant_id: client.merchant_id,
           pass_code: api_key,
           sub_merchant_id: client.sub_merchant_id,
-        )
+        ).compact
       end
     end
   end

data/lib/bambora/bank/builders/payment_profile_params.rb

@@ -16,8 +16,8 @@ module Bambora
           #
           # @params params [Hash]
           def build(params)
-            params.each_with_object({}) do |(key, value), obj|
-              obj[transform_key(key)] = value
+            params.transform_keys do |key|
+              transform_key(key)
             end
           end
 

data/lib/bambora/client/version.rb

@@ -2,6 +2,6 @@
 
 module Bambora
   class Client
-    VERSION = '0.4.0'
+    VERSION = '0.7.0'
   end
 end

data/lib/bambora/client.rb

@@ -12,6 +12,7 @@ require 'gyoku' # XML Builder
 require 'multiparty' # Multipart/mixed requests
 
 require 'bambora/client/version'
+require 'bambora/credentials'
 
 # Adapters
 require 'bambora/adapters/response'
@@ -163,7 +164,7 @@ module Bambora
     #
     # @param api_key [String] API key for the bank profiles endpoint.
     #
-    # @return [Bambora::Bank::PaymentProfileResource]
+    # @return [Bambora::Bank::BatchReportResource]
     def batch_reports(api_key:)
       @batch_reports = Bambora::Bank::BatchReportResource.new(
         client: xml_client,

data/lib/bambora/credentials.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module Bambora
+  class Credentials
+    attr_reader :merchant_id, :reporting_passcode
+
+    def initialize(options = {})
+      @merchant_id = options[:merchant_id]
+      @reporting_passcode = options[:reporting_passcode]
+    end
+  end
+end

data/lib/bambora/rest/client.rb

@@ -1,5 +1,8 @@
 # frozen_string_literal: true
 
+require 'faraday/multipart'
+require 'faraday/excon'
+
 module Bambora
   module Rest
     ##

data/lib/bambora/rest/json_client.rb

@@ -30,7 +30,7 @@ module Bambora
       # @param api_key [String] Indicating the API Key to be used with the request.
       #
       # @return [Hash] Indicating success or failure of the operation.
-      def get(path:, params: nil, api_key:)
+      def get(path:, api_key:, params: nil)
         parse_response_body(
           super(path: path, params: params, headers: build_headers(api_key: api_key)),
         ).to_h

metadata

@@ -1,43 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: bambora-client
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.7.0
 platform: ruby
 authors:
-- Cassidy K
+- HiMama
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-05-31 00:00:00.000000000 Z
+date: 2024-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: excon
+  name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 2.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 2.0.1
 - !ruby/object:Gem::Dependency
-  name: faraday
+  name: faraday-excon
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 2.1.0
+- !ruby/object:Gem::Dependency
+  name: faraday-multipart
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: gyoku
   requirement: !ruby/object:Gem::Requirement
@@ -86,28 +100,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: 0.14.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: 0.14.0
 - !ruby/object:Gem::Dependency
   name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: 3.8.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: 3.8.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -156,14 +170,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.74.0
+        version: 1.12.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.74.0
+        version: 1.12.0
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -181,12 +195,12 @@ dependencies:
 description: The official beanstream-ruby gem is not thread-safe. This thread-safe
   client works in environments like Sidekiq and Puma.
 email:
-- hello@cassidy.codes
 - tech@himama.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".editorconfig"
 - ".github/workflows/gempush.yml"
 - ".github/workflows/linter.yml"
 - ".github/workflows/ruby.yml"
@@ -218,6 +232,7 @@ files:
 - lib/bambora/builders/xml_request_body.rb
 - lib/bambora/client.rb
 - lib/bambora/client/version.rb
+- lib/bambora/credentials.rb
 - lib/bambora/factories/response_adapter_factory.rb
 - lib/bambora/rest/batch_payment_file_upload_client.rb
 - lib/bambora/rest/client.rb
@@ -243,14 +258,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.6
+      version: 3.0.5
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3.1
+rubygems_version: 3.5.3
 signing_key: 
 specification_version: 4
 summary: A thread-safe client for the Bambora/Beanstream API.