cloud_payments 1.0.2 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 04fb941f12526716bc4134db20ccbde6b973f1f0cbd4cbdedb16f61a0a832907
-  data.tar.gz: 195b80061bb94786f2520491a72d7ae3e01310309fcc2ff23ef656d82de494ee
+  metadata.gz: 3c4990b4c0e90d444b09179475ce9c3e2ff4c50d8a2af87bd25d676f18ed399e
+  data.tar.gz: 8702f0a17b461fb582d79cf79382fb72af93ac86429bcc9ef26f1979cb4ab619
 SHA512:
-  metadata.gz: 84362d280a6c6f40e2929f88a2b2d0a30b24f1e544538fb9de349bc57fc4a9dde44fc3228d937063e3a991e0bd73f378eecb1da1dccfe18013f0d8b01cd6217b
-  data.tar.gz: ebe23ab42b51850c0eb6836dc8edd52f79c94fa63da8396f91cf440e05c1a6941b79145946609294f2f92519761e11f43dcd7f68727600f0eee0137e234ff3fa
+  metadata.gz: e860f4b88400e9f8eeb97c380448a7fa45f37bf7cee3304dbb44b3f09204e32c503a98f31fe629f891f7777c036df23f41de7b532e3078c77f6562be2267540e
+  data.tar.gz: 3b70dedae8ce944c98a68cdfa80fd4aaa3ef3c8e766a30237b138ff4af73ce9a146a363f6eabbcfb86c66f4786650388dc342ae2edc70b338b14b278517e183e

data/bin/release

@@ -0,0 +1,17 @@
+#!/usr/bin/env bash
+
+VERSION=$1
+
+if [ -z $1 ] ; then
+  echo "Please provide version number: bin/release 1.0.0" && exit 1;
+fi
+
+printf "module CloudPayments\n  VERSION = \"$VERSION\"\nend\n" > ./lib/cloud_payments/version.rb
+bundle
+git add Gemfile.lock lib/cloud_payments/version.rb
+git commit -m "Bump version for $VERSION"
+git push
+git tag v$VERSION
+git push --tags
+gem build cloud_payments.gemspec
+gem push "cloud_payments-$VERSION.gem"

data/cloud_payments.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'faraday'
+  spec.add_dependency 'faraday', '< 3.0'
   spec.add_dependency 'multi_json', '~> 1.11'
   spec.add_dependency 'hashie', '~> 3.4'
 

data/lib/cloud_payments/client.rb

@@ -16,7 +16,6 @@ module CloudPayments
     end
 
     def perform_request(path, params = nil)
-      connection.basic_auth(config.public_key, config.secret_key)
       response = connection.post(path, (params ? convert_to_json(params) : nil), headers)
 
       Response.new(response.status, response.body, response.headers).tap do |response|
@@ -45,7 +44,18 @@ module CloudPayments
     end
 
     def build_connection
-      Faraday::Connection.new(config.host, config.connection_options, &config.connection_block)
+      Faraday::Connection.new(config.host, config.connection_options) do |conn|
+
+        # https://github.com/lostisland/faraday/blob/main/UPGRADING.md#authentication-helper-methods-in-connection-have-been-removed
+        # https://lostisland.github.io/faraday/#/middleware/included/authentication?id=faraday-1x-usage
+        if Faraday::VERSION.start_with?("1.")
+          conn.request :basic_auth, config.public_key, config.secret_key
+        else
+          conn.request :authorization, :basic, config.public_key, config.secret_key
+        end
+
+        config.connection_block.call(conn) if config.connection_block
+      end
     end
   end
 end

data/lib/cloud_payments/models/transaction.rb

@@ -47,6 +47,7 @@ module CloudPayments
     property :token
     property :apple_pay
     property :android_pay
+    property :escrow_accumulation_id
 
     def required_secure3d?
       false

data/lib/cloud_payments/version.rb

@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 module CloudPayments
-  VERSION = '1.0.2'
+  VERSION = "1.2.0"
 end

data/spec/cloud_payments/models/transaction_spec.rb

@@ -43,7 +43,8 @@ describe CloudPayments::Transaction do
       refunded: false,
       card_holder_message: 'Payment successful',
       name: 'CARDHOLDER NAME',
-      token: 'a4e67841-abb0-42de-a364-d1d8f9f4b3c0'
+      token: 'a4e67841-abb0-42de-a364-d1d8f9f4b3c0',
+      escrow_accumulation_id: '119d1f05-4fa8-4f35-85b6-09216a5a4fb6'
     } }
 
     specify{ expect(subject.id).to eq(504) }
@@ -82,6 +83,7 @@ describe CloudPayments::Transaction do
     specify{ expect(subject.name).to eq('CARDHOLDER NAME') }
     specify{ expect(subject.token).to eq('a4e67841-abb0-42de-a364-d1d8f9f4b3c0') }
     specify{ expect(subject.refunded).to eq(false) }
+    specify{ expect(subject.escrow_accumulation_id).to eq('119d1f05-4fa8-4f35-85b6-09216a5a4fb6') }
 
     context 'without any attributes' do
       let(:attributes){ {} }

data/spec/cloud_payments_spec.rb

@@ -3,9 +3,6 @@ require 'spec_helper'
 
 describe CloudPayments do
   describe '#config=' do
-    before { @old_config = CloudPayments.config }
-    after { CloudPayments.config = @old_config }
-
     specify{ expect{ CloudPayments.config = 'config' }.to change{ CloudPayments.config }.to('config') }
   end
 

data/spec/fixtures/apis/tokens/auth/successful.yml

@@ -41,7 +41,8 @@
         "ReasonCode":0,
         "CardHolderMessage":"Payment successful",
         "Name":"CARDHOLDER NAME",
-        "Token":"a4e67841-abb0-42de-a364-d1d8f9f4b3c0"
+        "Token":"a4e67841-abb0-42de-a364-d1d8f9f4b3c0",
+        "EscrowAccumulationId": "119d1f05-4fa8-4f35-85b6-09216a5a4fb6"
       },
       "Success":true,
       "Message": null

data/spec/fixtures/apis/tokens/charge/successful.yml

@@ -41,7 +41,8 @@
         "ReasonCode":0,
         "CardHolderMessage":"Payment successful",
         "Name":"CARDHOLDER NAME",
-        "Token":"a4e67841-abb0-42de-a364-d1d8f9f4b3c0"
+        "Token":"a4e67841-abb0-42de-a364-d1d8f9f4b3c0",
+        "EscrowAccumulationId": "119d1f05-4fa8-4f35-85b6-09216a5a4fb6"
       },
       "Success":true,
       "Message": null

data/spec/spec_helper.rb

@@ -15,8 +15,10 @@ RSpec.configure do |config|
   config.mock_with :rspec
   config.include CloudPayments::RSpec::Helpers
 
-  config.before :each do
-    CloudPayments.configure do |c|
+  # these params are used in stubs, in basic auth
+  # see webmock_stub in spec/support/helpers.rb
+  def default_config
+    CloudPayments::Config.new do |c|
       c.public_key = 'user'
       c.secret_key = 'pass'
       c.host = 'http://localhost:9292'
@@ -24,4 +26,11 @@ RSpec.configure do |config|
       # c.raise_banking_errors = true
     end
   end
+
+  CloudPayments.config = default_config
+
+  config.after :each do
+    CloudPayments.config = default_config
+    CloudPayments.client = CloudPayments::Client.new
+  end
 end

data/spec/support/helpers.rb

@@ -73,7 +73,7 @@ module CloudPayments
         def fixture
           @fixture ||= begin
             file = fixture_path.join("#{name}.yml").to_s
-            YAML.load(File.read(file)) if File.exists?(file)
+            YAML.load(File.read(file)) if File.exist?(file)
           end
         end
 

metadata

@@ -1,30 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: cloud_payments
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.2.0
 platform: ruby
 authors:
 - undr
 - kirillplatonov
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-11 00:00:00.000000000 Z
+date: 2025-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
@@ -85,7 +84,8 @@ description: CloudPayments ruby client
 email:
 - undr@yandex.ru
 - mail@kirillplatonov.com
-executables: []
+executables:
+- release
 extensions: []
 extra_rdoc_files: []
 files:
@@ -96,6 +96,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- bin/release
 - cloud_payments.gemspec
 - config.ru
 - lib/cloud_payments.rb
@@ -193,7 +194,6 @@ homepage: https://github.com/platmart/cloud_payments
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -208,8 +208,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.6.2
 specification_version: 4
 summary: CloudPayments ruby client
 test_files: