cardconnect 2.3.0 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1319ba15f85f510f12fc111ca22d27ac342d91688e0728c11a21b946af2e1f02
-  data.tar.gz: a39c7ab4f3b114407a8c5172ade8dd7d27fecca2e40457a2e029e5c592b0775a
+  metadata.gz: 392819d44d5b57e895e919ff4d8f09be8b2a03301100f944fd79b3b5cb321a52
+  data.tar.gz: 5d972cde73c7482d8de49279a68fc00429058244f1a6b960e823a130c1b437db
 SHA512:
-  metadata.gz: d32dca6f0801050dec6a2645e4104f57347e1d4e26ec84f32410aadf3e07de9a92081c574a2023360972da3d69c6ec0c44f9e7ca3924e5564eab6870c57ad98d
-  data.tar.gz: 87948c7f5600544bff1801804bb5989e0a8d7e0bcb3bfa0f2120dd0f1a36eef03f8f0037e5418de32d3809b999e0d2f513738940ebcad856dc0d4d252b801047
+  metadata.gz: 48c09c70ca14beffd6bc7e4d8b6999b4ad9b20bc4b04c9137908c514af52950f717e9cd02021187bd79831594a449b01ea734db7b2f37e67e124e4f9a76eb6b7
+  data.tar.gz: 0c5ce20dccadabad622ade2c9b46911672187b0734292e9470fffd4ae427138bc4561521d9bfb41656581307164c6b34057b6232a77dc62ac0299841d3b8fd0d

data/.github/workflows/ruby.yml

@@ -0,0 +1,35 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+# This workflow will download a prebuilt Ruby version, install dependencies and run tests with Rake
+# For more information see: https://github.com/marketplace/actions/setup-ruby-jruby-and-truffleruby
+
+name: Ruby
+
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    branches: [ "master" ]
+
+permissions:
+  contents: read
+
+jobs:
+  test:
+
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby-version: ['3.0', '3.1', '3.2']
+
+    steps:
+    - uses: actions/checkout@v3
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby-version }}
+        bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+    - name: Run tests
+      run: bundle exec rake

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## v2.4.0
+
+* Upgrades `faraday` and `faraday_middleware` dependency versions to use ones that works with ruby 3.0.
+
 ## v2.3.0
 
 * Added the following fields to response objects (@shivashankar-ror):

data/README.md

@@ -4,7 +4,6 @@ CardConnect API Ruby Client
 
 [![Gem Version](https://badge.fury.io/rb/cardconnect.svg)](http://badge.fury.io/rb/cardconnect)
 [![Code Climate](https://codeclimate.com/github/mobilecause/cardconnect/badges/gpa.svg)](https://codeclimate.com/github/mobilecause/cardconnect)
-[![Build Status](https://travis-ci.org/mobilecause/cardconnect.svg?branch=master)](https://travis-ci.org/mobilecause/cardconnect)
 
 ## Installation
 
@@ -149,6 +148,23 @@ response = service.submit
 
 http://developer.cardconnect.com/cardconnect-api/#response-codes
 
+## Run-time logins
+Typically, you want to use `config/initializers/cardconnect.rb` to set your API username and password details in a secure way, as detailed above. If you need to connect to multiple CardConnect accounts, you can specify the username/password immediately before processing a transaction.
+
+Example:
+```
+config = CardConnect::Configuration.new
+config.api_username = "username"
+config.api_password = "password123"
+config.endpoint = "https://url.com"
+
+connection = CardConnect::Connection.new(config).connection
+service = CardConnect::Service::Authorize.new(connection)
+service.build_request(params)
+response = service.submit
+```
+Username, password, and/or endpoint can be defined either in the CardConnect initializer or overridden at runtime.
+
 ## To Do:
 
 #### Authorization Service

data/cardconnect.gemspec

@@ -18,8 +18,5 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_development_dependency 'bundler', '~> 1.0'
-
-  spec.add_dependency 'faraday', '~> 0.12.1'
-  spec.add_dependency 'faraday_middleware', '~> 0.11.0.1'
+  spec.add_dependency 'faraday', '~> 2.7.4'
 end

data/lib/cardconnect/connection.rb

@@ -1,5 +1,4 @@
 require 'faraday'
-require 'faraday_middleware'
 
 module CardConnect
   class Connection
@@ -7,9 +6,10 @@ module CardConnect
       @config = config
     end
 
-    def connection
+    def connection(config = nil)
+      config ||= @config
       @connection ||= Faraday.new(faraday_options) do |f|
-        f.request :basic_auth, @config.api_username, @config.api_password
+        f.request :authorization, :basic, config.api_username, config.api_password
         f.request :json
 
         f.response :json, content_type: /\bjson$/

data/lib/cardconnect/services/authorization/authorization_response.rb

@@ -3,7 +3,7 @@ module CardConnect
     class AuthorizationResponse
       include Utils
 
-      FIELDS = [:respstat, :retref, :account, :token, :amount, :merchid, :respcode,
+      FIELDS = [:respstat, :retref, :account, :expiry, :token, :amount, :merchid, :respcode,
                 :resptext, :respproc, :avsresp, :cvvresp, :authcode, :commcard, :profileid, :acctid].freeze
 
       attr_accessor(*FIELDS)

data/lib/cardconnect/services/inquire/inquire_response.rb

@@ -6,7 +6,7 @@ module CardConnect
       FIELDS = [
         :merchid, :account, :amount, :currency, :retref, :respcode,
         :respproc, :respstat, :resptext, :setlstat, :capturedate, :batchid,
-        :token, :authdate, :lastfour, :name, :settledate
+        :token, :authdate, :lastfour, :name, :settledate, :expiry
       ].freeze
 
       # Settlement Status

data/lib/cardconnect/version.rb

@@ -1,3 +1,3 @@
 module CardConnect
-  VERSION = '2.3.0'.freeze
+  VERSION = '2.4.0'.freeze
 end

data/test/api_response_stubs.rb

@@ -13,6 +13,7 @@ def valid_auth_response # rubocop:disable Metrics/MethodLength
     'authcode' => '046221',
     'respproc' => 'FNOR',
     'commcard' => 'N',
+    'expiry' => '04/32',
     'profileid' => '12345678',
     'acctid' => nil
   }
@@ -47,6 +48,7 @@ def valid_inquire_response # rubocop:disable Metrics/MethodLength
     'respstat' => 'A',
     'currency' => 'USD',
     'token' => '9418594164541111',
+    'expiry' => '04/32',
     'authdate' => '20180410',
     'lastfour' => '1111',
     'name' => 'TOM JONES',

data/test/cardconnect/configuration_test.rb

@@ -10,22 +10,22 @@ describe CardConnect::Configuration do
   end
 
   it 'must respond to merchant id' do
-    @config.must_respond_to :merchant_id
+    _(@config).must_respond_to :merchant_id
   end
 
   it 'must respond to api username' do
-    @config.must_respond_to :api_username
+    _(@config).must_respond_to :api_username
   end
 
   it 'must respond to api password' do
-    @config.must_respond_to :api_password
+    _(@config).must_respond_to :api_password
   end
 
   it 'must respond to endpoint' do
-    @config.must_respond_to :endpoint
+    _(@config).must_respond_to :endpoint
   end
 
   it 'must respond to connection_options' do
-    @config.must_respond_to :connection_options
+    _(@config).must_respond_to :connection_options
   end
 end

data/test/cardconnect/connection_test.rb

@@ -11,25 +11,25 @@ describe CardConnect::Connection do
 
   describe '#connection' do
     it 'must have user agent in the headers' do
-      @connection.headers['User-Agent'].must_equal "CardConnectRubyGem/#{CardConnect::VERSION}"
+        _(@connection.headers['User-Agent']).must_equal "CardConnectRubyGem/#{CardConnect::VERSION}"
     end
 
     it 'must have a URL that matches the configured endpoint' do
-      @connection.url_prefix.host.must_equal URI.parse(CardConnect.configuration.endpoint).host
-      @connection.url_prefix.scheme.must_equal 'https'
+      _(@connection.url_prefix.host).must_equal URI.parse(CardConnect.configuration.endpoint).host
+      _(@connection.url_prefix.scheme).must_equal 'https'
     end
 
     describe 'Faraday handlers' do
       it 'must have a handler for basic authentication first' do
-        @connection.builder.handlers.first.must_be :===, Faraday::Request::BasicAuthentication
+        _(@connection.builder.handlers.first).must_be :===, Faraday::Request::Authorization
       end
 
       it 'must have a handler for encoding the request as json second' do
-        @connection.builder.handlers[1].must_be :===, FaradayMiddleware::EncodeJson
+        _(@connection.builder.handlers[1]).must_be :===, Faraday::Request::Json
       end
 
       it 'must have a handler for parsing the json response third' do
-        @connection.builder.handlers[2].must_be :===, FaradayMiddleware::ParseJson
+        _(@connection.builder.handlers[2]).must_be :===, Faraday::Response::Json
       end
 
       it 'has ssl verification on by default' do

data/test/cardconnect/services/authorization/authorization_request_test.rb

@@ -11,133 +11,133 @@ describe CardConnect::Service::AuthorizationRequest do
 
   describe 'FIELDS' do
     it 'should have merchant id' do
-      @request.merchid.must_equal '000000927996'
+      _(@request.merchid).must_equal '000000927996'
     end
 
     it 'should have account' do
-      @request.account.must_equal '4111111111111111'
+      _(@request.account).must_equal '4111111111111111'
     end
 
     it 'should have expiry' do
-      @request.expiry.must_equal '1212'
+      _(@request.expiry).must_equal '1212'
     end
 
     it 'should have amount' do
-      @request.amount.must_equal '0'
+      _(@request.amount).must_equal '0'
     end
 
     it 'should have currency' do
-      @request.currency.must_equal 'USD'
+      _(@request.currency).must_equal 'USD'
     end
 
     it 'should have account type' do
-      @request.accttype.must_equal 'VISA'
+      _(@request.accttype).must_equal 'VISA'
     end
 
     it 'should have name' do
-      @request.name.must_equal 'TOM JONES'
+      _(@request.name).must_equal 'TOM JONES'
     end
 
     it 'should have address' do
-      @request.address.must_equal '123 MAIN STREET'
+      _(@request.address).must_equal '123 MAIN STREET'
     end
 
     it 'should have city' do
-      @request.city.must_equal 'anytown'
+      _(@request.city).must_equal 'anytown'
     end
 
     it 'should have country' do
-      @request.country.must_equal 'US'
+      _(@request.country).must_equal 'US'
     end
 
     it 'should have phone' do
-      @request.phone.must_equal '3334445555'
+      _(@request.phone).must_equal '3334445555'
     end
 
     it 'should have postal' do
-      @request.postal.must_equal '55555'
+      _(@request.postal).must_equal '55555'
     end
 
     it 'should have email' do
-      @request.email.must_equal 'tom@jones.com'
+      _(@request.email).must_equal 'tom@jones.com'
     end
 
     it 'should have ecomind' do
-      @request.ecomind.must_equal 'E'
+      _(@request.ecomind).must_equal 'E'
     end
 
     it 'should have cvv2' do
-      @request.cvv2.must_equal '123'
+      _(@request.cvv2).must_equal '123'
     end
 
     it 'should have order id' do
-      @request.orderid.must_equal 'AB-11-9876'
+      _(@request.orderid).must_equal 'AB-11-9876'
     end
 
     it 'should have track' do
-      @request.track.must_equal 'Y'
+      _(@request.track).must_equal 'Y'
     end
 
     it 'should have bankaba' do
-      @request.bankaba.must_equal '1010101'
+      _(@request.bankaba).must_equal '1010101'
     end
 
     it 'should have tokenize' do
-      @request.tokenize.must_equal 'Y'
+      _(@request.tokenize).must_equal 'Y'
     end
 
     it 'should have termid' do
-      @request.termid.must_equal '12345'
+      _(@request.termid).must_equal '12345'
     end
 
     it 'should have capture' do
-      @request.capture.must_equal 'Y'
+      _(@request.capture).must_equal 'Y'
     end
 
     it 'should have ssnl4 field' do
-      @request.ssnl4.must_equal '1234'
+      _(@request.ssnl4).must_equal '1234'
     end
 
     it 'should have license field' do
-      @request.license.must_equal 'CO:1231231234'
+      _(@request.license).must_equal 'CO:1231231234'
     end
 
     it 'should have profile field' do
-      @request.profile.must_equal 'Y'
+      _(@request.profile).must_equal 'Y'
     end
 
     it 'should have ponumber field' do
-      @request.ponumber.must_equal '1234'
+      _(@request.ponumber).must_equal '1234'
     end
 
     it 'should have authcode field' do
-      @request.authcode.must_equal '123456'
+      _(@request.authcode).must_equal '123456'
     end
 
     it 'should have invoiceid field' do
-      @request.invoiceid.must_equal '000000000001'
+      _(@request.invoiceid).must_equal '000000000001'
     end
 
     it 'should have taxamnt field' do
-      @request.taxamnt.must_equal '0'
+      _(@request.taxamnt).must_equal '0'
     end
 
     describe 'userfields' do
       it 'should be an array of name-value pairs' do
-        @request.userfields.must_be_kind_of Array
-        @request.userfields.first.must_be_kind_of Hash
-        @request.userfields.first['name0'].must_equal 'value0'
+        _(@request.userfields).must_be_kind_of Array
+        _(@request.userfields.first).must_be_kind_of Hash
+        _(@request.userfields.first['name0']).must_equal 'value0'
       end
     end
   end
 
   describe '#valid?' do
     it 'should not be valid if no attributes are passed in' do
-      CardConnect::Service::AuthorizationRequest.new.valid?.must_equal false
+      _(CardConnect::Service::AuthorizationRequest.new.valid?).must_equal false
     end
 
     it 'should be valid if valid attributes are passed in' do
-      CardConnect::Service::AuthorizationRequest.new(valid_auth_request).valid?.must_equal true
+      _(CardConnect::Service::AuthorizationRequest.new(valid_auth_request).valid?).must_equal true
     end
   end
 
@@ -145,14 +145,14 @@ describe CardConnect::Service::AuthorizationRequest do
     CardConnect::Service::AuthorizationRequest::REQUIRED_FIELDS.each do |field|
       field_name = field.to_s.capitalize
       it "should have an error message if #{field_name} is missing" do
-        CardConnect::Service::AuthorizationRequest.new.errors.must_include "#{field_name} is missing"
+        _(CardConnect::Service::AuthorizationRequest.new.errors).must_include "#{field_name} is missing"
       end
     end
   end
 
   describe '#payload' do
     it 'should generate hash with all the right values' do
-      @request.payload.must_equal symbolize_keys(valid_auth_request)
+      _(@request.payload).must_equal symbolize_keys(valid_auth_request)
     end
   end
 end

data/test/cardconnect/services/authorization/authorization_response_test.rb

@@ -11,89 +11,89 @@ describe CardConnect::Service::AuthorizationResponse do
 
   describe 'FIELDS' do
     it 'should have the merchant id' do
-      @response.merchid.must_equal '020594000000'
+      _(@response.merchid).must_equal '020594000000'
     end
 
     it 'should have the status' do
-      @response.respstat.must_equal 'A'
+      _(@response.respstat).must_equal 'A'
     end
 
     it 'should have the Retrieval Reference Number' do
-      @response.retref.must_equal '343005123105'
+      _(@response.retref).must_equal '343005123105'
     end
 
     it 'should have the Account Number' do
-      @response.account.must_equal '41XXXXXXXXXX1111'
+      _(@response.account).must_equal '41XXXXXXXXXX1111'
     end
 
     it 'should have the Token' do
-      @response.token.must_equal '9419786452781111'
+      _(@response.token).must_equal '9419786452781111'
     end
 
     it 'should have the Amount' do
-      @response.amount.must_equal '111'
+      _(@response.amount).must_equal '111'
     end
 
     it 'should have the Response Code' do
-      @response.respcode.must_equal '00'
+      _(@response.respcode).must_equal '00'
     end
 
     it 'should have the Response text' do
-      @response.resptext.must_equal 'Approved'
+      _(@response.resptext).must_equal 'Approved'
     end
 
     it 'should have the Response Processor' do
-      @response.respproc.must_equal 'FNOR'
+      _(@response.respproc).must_equal 'FNOR'
     end
 
     it 'should have the AVS response code' do
-      @response.avsresp.must_equal '9'
+      _(@response.avsresp).must_equal '9'
     end
 
     it 'should have the CVV response code' do
-      @response.cvvresp.must_equal 'M'
+      _(@response.cvvresp).must_equal 'M'
     end
 
     it 'should have the Authorization code' do
-      @response.authcode.must_equal '046221'
+      _(@response.authcode).must_equal '046221'
     end
 
     it 'should have the Commercial Card Flag' do
-      @response.commcard.must_equal 'N'
+      _(@response.commcard).must_equal 'N'
     end
 
     it 'should have the profile id' do
-      @response.profileid.must_equal '12345678'
+      _(@response.profileid).must_equal '12345678'
     end
   end
 
   describe '#success?' do
     it 'should be true when there are no errors' do
-      @response.success?.must_equal true
+      _(@response.success?).must_equal true
     end
 
     it 'should be false when there are errors' do
       auth_response = valid_auth_response.merge!('respstat' => 'B', 'resptext' => 'this is an error')
       response = CardConnect::Service::AuthorizationResponse.new(auth_response)
-      response.success?.must_equal false
+      _(response.success?).must_equal false
     end
   end
 
   describe '#errors' do
     it 'should be empty when there are no errors' do
-      @response.errors.must_be_empty
+      _(@response.errors).must_be_empty
     end
 
     it 'should be an array of error messages when there are errors' do
       auth_response = valid_auth_response.merge!('respstat' => 'B', 'resptext' => 'this is an error')
       response = CardConnect::Service::AuthorizationResponse.new(auth_response)
-      response.errors.must_equal ['this is an error']
+      _(response.errors).must_equal ['this is an error']
     end
   end
 
   describe '#body' do
     it 'should generate hash with all the right values' do
-      @response.body.must_equal symbolize_keys(valid_auth_response)
+      _(@response.body).must_equal symbolize_keys(valid_auth_response)
     end
   end
 end

data/test/cardconnect/services/authorization/authorization_test.rb

@@ -13,7 +13,7 @@ describe CardConnect::Service::Authorization do
   end
 
   it 'must have the right path' do
-    @service.path.must_equal '/cardconnect/rest/auth'
+    _(@service.path).must_equal '/cardconnect/rest/auth'
   end
 
   describe '#build_request' do
@@ -27,30 +27,30 @@ describe CardConnect::Service::Authorization do
 
     it 'uses the default merchant id if it is not passed in' do
       @service.build_request(@valid_params.reject! { |k, _| k == 'merchid' })
-      @service.request.merchid.must_equal 'merchant123'
+      _(@service.request.merchid).must_equal 'merchant123'
     end
 
     it 'creates an Authorization request object with the right params' do
       @service.build_request(@valid_params)
-      @service.request.must_be_kind_of CardConnect::Service::AuthorizationRequest
-      @service.request.merchid.must_equal '000000927996'
-      @service.request.account.must_equal '4111111111111111'
-      @service.request.expiry.must_equal '1212'
-      @service.request.amount.must_equal '0'
-      @service.request.currency.must_equal 'USD'
+      _(@service.request).must_be_kind_of CardConnect::Service::AuthorizationRequest
+      _(@service.request.merchid).must_equal '000000927996'
+      _(@service.request.account).must_equal '4111111111111111'
+      _(@service.request.expiry).must_equal '1212'
+      _(@service.request.amount).must_equal '0'
+      _(@service.request.currency).must_equal 'USD'
     end
   end
 
   describe '#submit' do
     it 'raises an error when there is no request' do
-      @service.request.nil?.must_equal true
-      proc { @service.submit }.must_raise CardConnect::Error
+      _(@service.request.nil?).must_equal true
+      _(-> { @service.submit }).must_raise CardConnect::Error
     end
 
     it 'creates a response when a valid request is processed' do
       @service.build_request(valid_auth_request)
       @service.submit
-      @service.response.must_be_kind_of CardConnect::Service::AuthorizationResponse
+      _(@service.response).must_be_kind_of CardConnect::Service::AuthorizationResponse
     end
   end
 end

data/test/cardconnect/services/bin/bin_request_test.rb

@@ -11,35 +11,35 @@ describe CardConnect::Service::BinRequest do
 
   describe 'FIELDS' do
     it 'should have merchant id' do
-      @request.merchid.must_equal '000000927996'
+      _(@request.merchid).must_equal '000000927996'
     end
 
     it 'should have token' do
-      @request.token.must_equal '9477709629051443'
+      _(@request.token).must_equal '9477709629051443'
     end
   end
 
   describe '#valid?' do
     it 'should not be valid if no attributes are passed in' do
-      CardConnect::Service::BinRequest.new.valid?.must_equal false
+      _(CardConnect::Service::BinRequest.new.valid?).must_equal false
     end
 
     it 'should be valid if valid attributes are passed in' do
-      CardConnect::Service::BinRequest.new(valid_bin_request).valid?.must_equal true
+      _(CardConnect::Service::BinRequest.new(valid_bin_request).valid?).must_equal true
     end
   end
 
   describe '#errors' do
     CardConnect::Service::BinRequest::REQUIRED_FIELDS.each do |field|
       it "should have an error message if #{field} is missing" do
-        CardConnect::Service::BinRequest.new.errors.must_include "#{field.to_s.capitalize} is missing"
+        _(CardConnect::Service::BinRequest.new.errors).must_include "#{field.to_s.capitalize} is missing"
       end
     end
   end
 
   describe '#payload' do
     it 'should generate the correct path params' do
-      @request.payload.must_equal '/000000927996/9477709629051443'
+      _(@request.payload).must_equal '/000000927996/9477709629051443'
     end
   end
 end