cloud_payments 0.0.6 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: ed4e88a861a6e0f61c9758ae8db253faf5479e74
-  data.tar.gz: 26b8c758021f249079c5b00d88e62cdf7bc80327
+SHA256:
+  metadata.gz: 18a3af691a696388ee8c524b24e8de18be07b14d45935ed2ddfe7ac66c2f5e04
+  data.tar.gz: 9640d2ef9dae3d7ec7048be44c80123ce4ff735059fa0209891d7482affe2131
 SHA512:
-  metadata.gz: 1556658db7e02a39c840876f9017218182a853b92fe590fb7ed0ca793a20784b81c917ca959e72b565d8df616ed1354cd91e21f921ac5a82b4cd32be64f76dc2
-  data.tar.gz: 4a1c1a70e208bc95d3c3bfaf07219309c8e0171912ca0267a18e47667112c8cadf67ae4809ab723348fb1351029d3fd9a8c9bca53e7271b3eb5eaa1cf862abe1
+  metadata.gz: 433286122b1d5dd9ed981ed9314f0dbdb21ccc4ccb7db1a3487201211543377ad4441e953125c810bf285a035c8cadac0d17143e141c381ed4a0589cd8b1d823
+  data.tar.gz: bd01fc125ddd8606b8570bffb804d72964f1442cb934140c75a39ac2e92861be925b5b997638ff433375af8ff7c71624c9fba1f6de33ffe0c379e6c8e7866956

data/.travis.yml

@@ -1,11 +1,14 @@
 language: ruby
+
+rvm:
+  - 2.3
+  - 2.4
+  - 2.5
+  - 2.6
+  - 2.7
+
 cache: bundler
-script: bundle exec rspec
+
 before_install: gem install bundler
-rvm:
-  - '2.2'
-  - '2.3'
-  - ruby-head
-matrix:
-  allow_failures:
-    - rvm: ruby-head
+
+script: bundle exec rspec

data/README.md

@@ -1,8 +1,8 @@
 # CloudPayments
 
-CloudPayments ruby client (http://cloudpayments.eu/Docs/Integration)
+CloudPayments ruby client (https://developers.cloudpayments.ru/en/)
 
-[![Build Status](https://travis-ci.org/undr/cloud_payments.svg)](https://travis-ci.org/undr/cloud_payments)
+[![Build Status](https://travis-ci.org/platmart/cloud_payments.svg)](https://travis-ci.org/platmart/cloud_payments)
 
 ## Installation
 
@@ -28,6 +28,8 @@ $ gem install cloud_payments
 
 ### Configuration
 
+#### Global configuration
+
 ```ruby
 CloudPayments.configure do |c|
   c.host = 'http://localhost:3000'    # By default, it is https://api.cloudpayments.ru
@@ -37,6 +39,28 @@ CloudPayments.configure do |c|
   c.logger = Logger.new('/dev/null')  # By default, it writes logs to stdout
   c.raise_banking_errors = true       # By default, it is not raising banking errors
 end
+
+# API client
+CloudPayments.client.payments.cards.charge(...)
+
+# Webhooks
+CloudPayments.webhooks.on_pay(...)
+```
+
+#### Local configuration
+
+```ruby
+config = CloudPayments::Config.new do |c|
+  # ...
+end
+
+# API client
+client = CloudPayments::Client.new(config)
+client.payments.cards.charge(...)
+
+# Webhooks
+webhooks = CloudPayments::Webhooks.new(config)
+webhooks.on_pay(...)
 ```
 
 ### Test method
@@ -81,6 +105,7 @@ transaction = CloudPayments.client.payments.cards.charge(
 # :card_last_four=>"1111",
 # :card_type=>"Visa",
 # :card_type_code=>0,
+# :issuer=>"Sberbank of Russia",
 # :issuer_bank_country=>"RU",
 # :status=>"Completed",
 # :status_code=>3,
@@ -95,6 +120,52 @@ transaction.token
 # => "a4e67841-abb0-42de-a364-d1d8f9f4b3c0"
 ```
 
+## Kassa Receipt
+
+CloudPayments Kassa API (https://cloudpayments.ru/docs/api/kassa)
+
+```ruby
+CloudPayments.client.kassa.receipt({
+  account_id: "user@example.com",
+  customer_receipt: {
+    items: [
+      {
+        amount: "13350.00",
+        ean13: nil,
+        label: "Good Description",
+        price: "13350.00",
+        quantity: 1.0,
+        vat: nil
+      }
+    ]
+  },
+  inn: "7708806666",
+  invoice_id: "231312312",
+  type: "Income"
+})
+```
+
+## Apple Pay Start Session
+[Start Apple Pay session](https://developers.cloudpayments.ru/#zapusk-sessii-dlya-oplaty-cherez-apple-pay)
+```ruby
+CloudPayments.client.apple_pay.start_session({validation_url: "https://apple-pay-gateway-pr-pod2.apple.com/paymentservices/startSession"})
+# => {
+#   :message => nil,
+#     :model => {
+#                    :display_name => "example.com,
+#                     :domain_name => "example.com",
+#                 :epoch_timestamp => 1594072416294,
+#                      :expires_at => 1594076016294,
+#             :merchant_identifier => "5DCCE3A52CFC3FAF9F4EA8421472E47BC503E03051B04D2ED67A3834386B52F2",
+#     :merchant_session_identifier => "SSHDA3C703BD69B45EDB8934E6BFCC159B2B83AAFC02DB625F1F1E3997CCC2FE2CFD11F636558",
+#                           :nonce => "51c77142",
+#                       :signature => "30800.....0"
+#   },
+#   :success => true
+# }
+
+```
+
 ## Webhooks
 
 ```ruby
@@ -132,7 +203,7 @@ end
 
 ## Contributing
 
-1. Fork it ( https://github.com/undr/cloud_payments/fork )
+1. Fork it ( https://github.com/platmart/cloud_payments/fork )
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)

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

@@ -7,11 +7,11 @@ require 'cloud_payments/version'
 Gem::Specification.new do |spec|
   spec.name          = 'cloud_payments'
   spec.version       = CloudPayments::VERSION
-  spec.authors       = ['undr']
-  spec.email         = ['undr@yandex.ru']
+  spec.authors       = ['undr', 'kirillplatonov']
+  spec.email         = ['undr@yandex.ru', 'mail@kirillplatonov.com']
   spec.summary       = %q{CloudPayments ruby client}
   spec.description   = %q{CloudPayments ruby client}
-  spec.homepage      = ''
+  spec.homepage      = 'https://github.com/platmart/cloud_payments'
   spec.license       = 'MIT'
 
   spec.files         = `git ls-files -z`.split("\x0")
@@ -19,10 +19,10 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'faraday', '~> 0.9.2'
+  spec.add_dependency 'faraday', '< 2.0'
   spec.add_dependency 'multi_json', '~> 1.11'
   spec.add_dependency 'hashie', '~> 3.4'
 
-  spec.add_development_dependency 'rake', '~> 10.0'
-  spec.add_development_dependency 'rspec', '~> 3.4'
+  spec.add_development_dependency 'rake', '~> 13.0'
+  spec.add_development_dependency 'rspec', '~> 3.9'
 end

data/lib/cloud_payments/client.rb

@@ -10,13 +10,12 @@ module CloudPayments
 
     attr_reader :config, :connection
 
-    def initialize
-      @config = CloudPayments.config
+    def initialize(config = nil)
+      @config = config || CloudPayments.config
       @connection = build_connection
     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,10 @@ 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|
+        conn.request :basic_auth, config.public_key, config.secret_key
+        config.connection_block.call(conn) if config.connection_block
+      end
     end
   end
 end

data/lib/cloud_payments/config.rb

@@ -18,6 +18,9 @@ module CloudPayments
       @connection_options = {}
       @connection_block = nil
       @host = 'https://api.cloudpayments.ru'
+      if block_given?
+        yield self
+      end
     end
 
     def logger

data/lib/cloud_payments/models/on_fail.rb

@@ -23,6 +23,7 @@ module CloudPayments
     property :ip_city
     property :ip_region
     property :ip_district
+    property :issuer
     property :issuer_bank_country
     property :description
     property :metadata, from: :data, default: {}

data/lib/cloud_payments/models/on_kassa_receipt.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+module CloudPayments
+  # @see https://cloudpayments.ru/Docs/Notifications#receipt CloudPayments API
+  class OnKassaReceipt < Model
+    property :id, required: true
+    property :document_number, required: true
+    property :session_number, required: true
+    property :fiscal_sign, required: true
+    property :device_number, required: true
+    property :reg_number, required: true
+    property :inn, required: true
+    property :type, required: true
+    property :ofd, required: true
+    property :url, required: true
+    property :qr_code_url, required: true
+    property :amount, transform_with: DecimalTransform, required: true
+    property :date_time, transform_with: DateTimeTransform
+    property :receipt
+    property :invoice_id
+    property :transaction_id
+    property :account_id
+  end
+end

data/lib/cloud_payments/models/on_pay.rb

@@ -26,6 +26,7 @@ module CloudPayments
     property :card_type_code
     property :card_exp_date
     property :name
+    property :issuer
     property :issuer_bank_country
     property :status, required: true
     property :status_code

data/lib/cloud_payments/models/subscription.rb

@@ -5,7 +5,7 @@ module CloudPayments
 
     property :id, required: true
     property :account_id, required: true
-    property :description, required: true
+    property :description
     property :email, required: true
     property :amount, transform_with: DecimalTransform, required: true
     property :currency, required: true

data/lib/cloud_payments/models/transaction.rb

@@ -36,13 +36,18 @@ module CloudPayments
     property :card_type_code
     property :card_exp_date
     property :name
+    property :issuer
     property :issuer_bank_country
     property :status, required: true
     property :status_code
     property :reason
     property :reason_code
+    property :refunded
     property :card_holder_message
     property :token
+    property :apple_pay
+    property :android_pay
+    property :escrow_accumulation_id
 
     def required_secure3d?
       false
@@ -79,5 +84,9 @@ module CloudPayments
     def declined?
       status == DECLINED
     end
+
+    def refunded?
+      refunded
+    end
   end
 end

data/lib/cloud_payments/models.rb

@@ -9,3 +9,4 @@ require 'cloud_payments/models/order'
 require 'cloud_payments/models/on_recurrent'
 require 'cloud_payments/models/on_pay'
 require 'cloud_payments/models/on_fail'
+require 'cloud_payments/models/on_kassa_receipt'

data/lib/cloud_payments/namespaces/apple_pay.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+module CloudPayments
+  module Namespaces
+    class ApplePay < Base
+      ValidationUrlMissing = Class.new(StandardError)
+
+      def self.resource_name
+        'applepay'
+      end
+
+      def start_session(attributes)
+        validation_url = attributes.fetch(:validation_url) { raise ValidationUrlMissing.new('validation_url is required') }
+
+        request(:startsession, { "ValidationUrl" => validation_url })
+      end
+    end
+  end
+end

data/lib/cloud_payments/namespaces/base.rb

@@ -24,7 +24,7 @@ module CloudPayments
       protected
 
       def api_exceptions
-        [::Faraday::Error::ConnectionFailed, ::Faraday::Error::TimeoutError, Client::ServerError, Client::GatewayError]
+        [::Faraday::ConnectionFailed, ::Faraday::TimeoutError, Client::ServerError, Client::GatewayError]
       end
 
       def resource_path(path = nil)

data/lib/cloud_payments/namespaces/cards.rb

@@ -12,6 +12,11 @@ module CloudPayments
         instantiate(response[:model])
       end
 
+      def post3ds(attributes)
+        response = request(:post3ds, attributes)
+        instantiate(response[:model])
+      end
+
       private
 
       def instantiate(model)

data/lib/cloud_payments/namespaces/kassa.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+module CloudPayments
+  module Namespaces
+    class Kassa < Base
+      InnNotProvided             = Class.new(StandardError)
+      TypeNotProvided            = Class.new(StandardError)
+      CustomerReceiptNotProvided = Class.new(StandardError)
+
+      def self.resource_name
+        'kkt'
+      end
+
+      def receipt(attributes)
+        attributes.fetch(:inn)  { raise InnNotProvided.new('inn attribute is required') }
+        attributes.fetch(:type) { raise TypeNotProvided.new('type attribute is required') }
+        attributes.fetch(:customer_receipt)  { raise CustomerReceiptNotProvided.new('customer_receipt is required') }
+
+        request(:receipt, attributes)
+      end
+    end
+  end
+end

data/lib/cloud_payments/namespaces/orders.rb

@@ -6,6 +6,10 @@ module CloudPayments
         response = request(:create, attributes)
         Order.new(response[:model])
       end
+
+      def cancel(order_id)
+        request(:cancel, id: order_id)[:success]
+      end
     end
   end
 end

data/lib/cloud_payments/namespaces.rb

@@ -5,6 +5,8 @@ require 'cloud_payments/namespaces/tokens'
 require 'cloud_payments/namespaces/payments'
 require 'cloud_payments/namespaces/subscriptions'
 require 'cloud_payments/namespaces/orders'
+require 'cloud_payments/namespaces/kassa'
+require 'cloud_payments/namespaces/apple_pay'
 
 module CloudPayments
   module Namespaces
@@ -12,6 +14,10 @@ module CloudPayments
       Payments.new(self)
     end
 
+    def kassa
+      Kassa.new(self)
+    end
+
     def subscriptions
       Subscriptions.new(self)
     end
@@ -20,9 +26,13 @@ module CloudPayments
       Orders.new(self)
     end
 
+    def apple_pay
+      ApplePay.new(self)
+    end
+
     def ping
       !!(perform_request('/test').body || {})[:success]
-    rescue ::Faraday::Error::ConnectionFailed, ::Faraday::Error::TimeoutError, CloudPayments::Client::ServerError => e
+    rescue ::Faraday::ConnectionFailed, ::Faraday::TimeoutError, CloudPayments::Client::ServerError => e
       false
     end
   end

data/lib/cloud_payments/version.rb

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

data/lib/cloud_payments/webhooks.rb

@@ -8,8 +8,8 @@ module CloudPayments
 
     attr_reader :config
 
-    def initialize
-      @config = CloudPayments.config
+    def initialize(config = nil)
+      @config = config || CloudPayments.config
       @digest = OpenSSL::Digest.new('sha256')
       @serializer = Client::Serializer::Base.new(config)
     end
@@ -23,6 +23,10 @@ module CloudPayments
       true
     end
 
+    def kassa_receipt(data)
+      OnKassaReceipt.new(@serializer.load(data))
+    end
+
     def on_recurrent(data)
       OnRecurrent.new(@serializer.load(data))
     end

data/lib/cloud_payments.rb

@@ -3,7 +3,6 @@ require 'date'
 require 'hashie'
 require 'faraday'
 require 'multi_json'
-require 'pp'
 require 'cloud_payments/version'
 require 'cloud_payments/config'
 require 'cloud_payments/namespaces'

data/spec/cloud_payments/models/subscription_spec.rb

@@ -54,7 +54,6 @@ describe CloudPayments::Subscription do
 
     it_behaves_like :raise_without_attribute, :id
     it_behaves_like :raise_without_attribute, :account_id
-    it_behaves_like :raise_without_attribute, :description
     it_behaves_like :raise_without_attribute, :email
     it_behaves_like :raise_without_attribute, :amount
     it_behaves_like :raise_without_attribute, :currency_code

data/spec/cloud_payments/models/transaction_spec.rb

@@ -34,14 +34,17 @@ describe CloudPayments::Transaction do
       card_type: 'Visa',
       card_type_code: 0,
       card_exp_date: '10/17',
+      issuer: 'Sberbank of Russia',
       issuer_bank_country: 'RU',
       status: 'Completed',
       status_code: 3,
       reason: 'Approved',
       reason_code: 0,
+      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) }
@@ -72,12 +75,15 @@ describe CloudPayments::Transaction do
     specify{ expect(subject.card_type).to eq('Visa') }
     specify{ expect(subject.card_type_code).to eq(0) }
     specify{ expect(subject.card_exp_date).to eq('10/17') }
+    specify{ expect(subject.issuer).to eq('Sberbank of Russia') }
     specify{ expect(subject.issuer_bank_country).to eq('RU') }
     specify{ expect(subject.reason).to eq('Approved') }
     specify{ expect(subject.reason_code).to eq(0) }
     specify{ expect(subject.card_holder_message).to eq('Payment successful') }
     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){ {} }
@@ -111,9 +117,11 @@ describe CloudPayments::Transaction do
     it_behaves_like :not_raise_without_attribute, :ip_longitude, :ip_lng
     it_behaves_like :not_raise_without_attribute, :card_type_code
     it_behaves_like :not_raise_without_attribute, :card_exp_date
+    it_behaves_like :not_raise_without_attribute, :issuer
     it_behaves_like :not_raise_without_attribute, :issuer_bank_country
     it_behaves_like :not_raise_without_attribute, :reason
     it_behaves_like :not_raise_without_attribute, :reason_code
+    it_behaves_like :not_raise_without_attribute, :refunded
     it_behaves_like :not_raise_without_attribute, :card_holder_message
     it_behaves_like :not_raise_without_attribute, :name
     it_behaves_like :not_raise_without_attribute, :token
@@ -251,5 +259,22 @@ describe CloudPayments::Transaction do
         specify{ expect(subject.ip_location).to be_nil }
       end
     end
+
+    describe '#refunded?' do
+      context do
+        let(:attributes) { { refunded: false } }
+        specify { expect(subject.refunded?).to be_falsey }
+      end
+
+      context do
+        let(:attributes) { { refunded: true } }
+        specify { expect(subject.refunded?).to be_truthy }
+      end
+
+      context do
+        let(:attributes) { { refunded: nil } }
+        specify { expect(subject.refunded?).to be_falsey }
+      end
+    end
   end
 end

data/spec/cloud_payments/namespaces/apple_pay_spec.rb

@@ -0,0 +1,21 @@
+#!/usr/bin/env ruby
+# encoding: utf-8
+# frozen_string_literal: true
+require 'spec_helper'
+
+describe CloudPayments::Namespaces::ApplePay do
+  subject{ described_class.new(CloudPayments.client) }
+
+  describe '#receipt' do
+    let(:attributes) do
+      {
+        validation_url: ''
+      }
+    end
+
+    context do
+      before{ attributes.delete(:validation_url) }
+      specify{ expect{subject.start_session(attributes)}.to raise_error(described_class::ValidationUrlMissing) }
+    end
+  end
+end

data/spec/cloud_payments/namespaces/cards_spec.rb

@@ -14,11 +14,11 @@ describe CloudPayments::Namespaces::Cards do
     card_cryptogram_packet: '01492500008719030128SM'
   } }
 
-  context do
+  describe '#charge' do
     context 'config.raise_banking_errors = false' do
       before { CloudPayments.config.raise_banking_errors = false }
 
-      describe '#charge' do
+      context do
         before{ stub_api_request('cards/charge/successful').perform }
         specify{ expect(subject.charge(attributes)).to be_instance_of(CloudPayments::Transaction) }
         specify{ expect(subject.charge(attributes)).not_to be_required_secure3d }
@@ -117,4 +117,43 @@ describe CloudPayments::Namespaces::Cards do
       end
     end
   end
+
+  describe '#post3ds' do
+    let(:attributes){ { transaction_id: 12345, pa_res: 'AQ==' } }
+
+    context 'config.raise_banking_errors = false' do
+      before { CloudPayments.config.raise_banking_errors = false }
+
+      context do
+        before{ stub_api_request('cards/post3ds/successful').perform }
+        specify{ expect(subject.post3ds(attributes)).to be_instance_of(CloudPayments::Transaction) }
+        specify{ expect(subject.post3ds(attributes)).not_to be_required_secure3d }
+        specify{ expect(subject.post3ds(attributes)).to be_completed }
+        specify{ expect(subject.post3ds(attributes).id).to eq(12345) }
+      end
+
+      context do
+        before{ stub_api_request('cards/post3ds/failed').perform }
+        specify{ expect(subject.post3ds(attributes)).to be_instance_of(CloudPayments::Transaction) }
+        specify{ expect(subject.post3ds(attributes)).not_to be_required_secure3d }
+        specify{ expect(subject.post3ds(attributes)).to be_declined }
+        specify{ expect(subject.post3ds(attributes).id).to eq(12345) }
+        specify{ expect(subject.post3ds(attributes).reason).to eq('InsufficientFunds') }
+      end
+    end
+
+    context 'config.raise_banking_errors = true' do
+      before { CloudPayments.config.raise_banking_errors = true }
+
+      context do
+        before{ stub_api_request('cards/post3ds/successful').perform }
+        specify{ expect{ subject.post3ds(attributes) }.not_to raise_error }
+      end
+
+      context do
+        before{ stub_api_request('cards/post3ds/failed').perform }
+        specify{ expect{ subject.post3ds(attributes) }.to raise_error(CloudPayments::Client::GatewayErrors::InsufficientFunds) }
+      end
+    end
+  end
 end

data/spec/cloud_payments/namespaces/kassa_spec.rb

@@ -0,0 +1,43 @@
+#!/usr/bin/env ruby
+# encoding: utf-8
+# frozen_string_literal: true
+require 'spec_helper'
+
+describe CloudPayments::Namespaces::Kassa do
+  subject{ described_class.new(CloudPayments.client) }
+
+  describe '#receipt' do
+    let(:attributes) do
+      {
+        inn: '7708806666',
+        type: 'Income',
+        customer_receipt:  {
+          items: [
+            {
+              amount: '13350.00',
+              label: 'Good Description',
+              price: '13350.00',
+              quantity: 1.0,
+              vat: 0
+            }
+          ]
+        }
+      }
+    end
+
+    context do
+      before{ attributes.delete(:inn) }
+      specify{ expect{subject.receipt(attributes)}.to raise_error(described_class::InnNotProvided) }
+    end
+
+    context do
+      before{ attributes.delete(:type) }
+      specify{ expect{subject.receipt(attributes)}.to raise_error(described_class::TypeNotProvided) }
+    end
+
+    context do
+      before{ attributes.delete(:customer_receipt) }
+      specify{ expect{subject.receipt(attributes)}.to raise_error(described_class::CustomerReceiptNotProvided) }
+    end
+  end
+end

data/spec/cloud_payments/namespaces/orders_spec.rb

@@ -42,4 +42,16 @@ describe CloudPayments::Namespaces::Orders do
       end
     end
   end
+
+  describe '#cancel' do
+    context do
+      before{ stub_api_request('orders/cancel/successful').perform }
+      specify{ expect(subject.cancel('12345')).to be_truthy }
+    end
+
+    context do
+      before{ stub_api_request('orders/cancel/failed').perform }
+      specify{ expect{ subject.cancel('12345') }.to raise_error(CloudPayments::Client::GatewayError, 'Error message') }
+    end
+  end
 end

data/spec/cloud_payments/namespaces/payments_spec.rb

@@ -123,6 +123,12 @@ describe CloudPayments::Namespaces::Payments do
         specify{ expect(subject.get(transaction_id).id).to eq(transaction_id) }
         specify{ expect(subject.get(transaction_id).reason).to eq('Approved') }
       end
+
+      context 'transaction is refunded' do
+        before{ stub_api_request('payments/get/refunded').perform }
+        specify{ expect(subject.get(transaction_id)).to be_completed }
+        specify{ expect(subject.get(transaction_id)).to be_refunded }
+      end
     end
 
     context 'config.raise_banking_errors = true' do

data/spec/cloud_payments/namespaces_spec.rb

@@ -34,7 +34,7 @@ describe CloudPayments::Namespaces do
     end
 
     context 'when exception occurs while request' do
-      before{ stub_api_request('ping/failed').to_raise(::Faraday::Error::ConnectionFailed) }
+      before{ stub_api_request('ping/failed').to_raise(::Faraday::ConnectionFailed) }
       specify{ expect(subject.ping).to be_falsy }
     end
 

data/spec/cloud_payments/webhooks_spec.rb

@@ -227,4 +227,46 @@ describe CloudPayments::Webhooks do
     specify { expect(subject.failed_transactions).to eq 22 }
     specify { expect(subject.next_transaction_at).to eq DateTime.parse('2015-11-18 20:29:05') }
   end
+
+  describe 'on_kassa_receipt' do
+    let(:raw_data) do
+      {"Id"=>"sc_a38ca02005d40db7d32b36a0097b0",
+       "DocumentNumber"=>"1234",
+       "SessionNumber"=>"12345",
+       "FiscalSign"=>"signsgin",
+       "DeviceNumber"=>"123465",
+       "RegNumber"=>"12345",
+       "Inn"=>"0",
+       "Type"=>"Type",
+       "Ofd"=>"Ofd",
+       "Url"=>"http://example.com/url/",
+       "QrCodeUrl"=>"http://example.com/url",
+       "Amount"=>"11.11",
+       "DateTime"=>"2015-11-18 20:29:05",
+       "Receipt"=>"{}",
+       "TransactionId" => "12321123",
+       "InvoiceId" => "123123",
+       "AccountId" => "3213213"}
+    end
+
+    subject { CloudPayments.webhooks.kassa_receipt(raw_data) }
+
+    specify { expect(subject.id).to eq "sc_a38ca02005d40db7d32b36a0097b0" }
+    specify { expect(subject.document_number).to eq '1234' }
+    specify { expect(subject.session_number).to eq '12345' }
+    specify { expect(subject.fiscal_sign).to eq 'signsgin' }
+    specify { expect(subject.device_number).to eq '123465' }
+    specify { expect(subject.reg_number).to eq '12345' }
+    specify { expect(subject.inn).to eq '0' }
+    specify { expect(subject.type).to eq 'Type' }
+    specify { expect(subject.ofd).to eq 'Ofd' }
+    specify { expect(subject.url).to eq 'http://example.com/url/' }
+    specify { expect(subject.qr_code_url).to eq 'http://example.com/url' }
+    specify { expect(subject.amount).to eq 11.11 }
+    specify { expect(subject.date_time).to eq DateTime.parse('2015-11-18 20:29:05') }
+    specify { expect(subject.receipt).to eq '{}' }
+    specify { expect(subject.transaction_id).to eq '12321123' }
+    specify { expect(subject.invoice_id).to eq '123123' }
+    specify { expect(subject.account_id).to eq '3213213' }
+  end
 end

data/spec/cloud_payments_spec.rb

@@ -3,13 +3,32 @@ 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
 
-  describe '#config' do
-    specify{ expect(CloudPayments.config).to be_instance_of(CloudPayments::Config) }
+  it 'supports global configuration' do
+    CloudPayments.config.secret_key = "OLD_KEY"
+
+    CloudPayments.configure do |c|
+      c.secret_key = "NEW_KEY"
+    end
+
+    expect(CloudPayments.config.secret_key).to eq "NEW_KEY"
+    expect(CloudPayments.client.config.secret_key).to eq "NEW_KEY"
+  end
+
+  it 'supports local configuration' do
+    CloudPayments.config.secret_key = "OLD_KEY"
+
+    config = CloudPayments::Config.new do |c|
+      c.secret_key = "NEW_KEY"
+    end
+    client = CloudPayments::Client.new(config)
+    webhooks = CloudPayments::Webhooks.new(config)
+
+    expect(CloudPayments.config.secret_key).to eq "OLD_KEY"
+    expect(config.secret_key).to eq "NEW_KEY"
+    expect(client.config.secret_key).to eq "NEW_KEY"
+    expect(webhooks.config.secret_key).to eq "NEW_KEY"
   end
 end

data/spec/fixtures/apis/cards/post3ds/failed.yml

@@ -0,0 +1,45 @@
+---
+:request:
+  :url: '/payments/cards/post3ds'
+  :body: '{"TransactionId":12345,"PaRes":"AQ=="}'
+:response:
+  :body: >
+    {
+      "Model": {
+        "TransactionId": 12345,
+        "Amount": 10.0,
+        "Currency": "RUB",
+        "CurrencyCode": 0,
+        "PaymentAmount": 10.0,
+        "PaymentCurrency": "RUB",
+        "PaymentCurrencyCode": 0,
+        "InvoiceId": "1234567",
+        "AccountId": "user_x",
+        "Email": null,
+        "Description": "Payment for goods on example.com",
+        "JsonData": null,
+        "CreatedDate": "\/Date(1401718880000)\/",
+        "CreatedDateIso":"2014-08-09T11:49:41",
+        "TestMode": true,
+        "IpAddress": "195.91.194.13",
+        "IpCountry": "RU",
+        "IpCity": "Ufa",
+        "IpRegion": "Bashkortostan Republic",
+        "IpDistrict": "Volga Federal District",
+        "IpLatitude": 54.7355,
+        "IpLongitude": 55.991982,
+        "CardFirstSix": "411111",
+        "CardLastFour": "1111",
+        "CardType": "Visa",
+        "CardTypeCode": 0,
+        "IssuerBankCountry": "RU",
+        "Status": "Declined",
+        "StatusCode": 5,
+        "Reason": "InsufficientFunds",
+        "ReasonCode": 5051,
+        "CardHolderMessage": "Insufficient funds on account",
+        "Name": "CARDHOLDER NAME"
+      },
+      "Success": false,
+      "Message": null
+    }

data/spec/fixtures/apis/cards/post3ds/successful.yml

@@ -0,0 +1,48 @@
+---
+:request:
+  :url: '/payments/cards/post3ds'
+  :body: '{"TransactionId":12345,"PaRes":"AQ=="}'
+:response:
+  :body: >
+    {
+      "Model":{
+        "TransactionId":12345,
+        "Amount":10.0,
+        "Currency":"RUB",
+        "CurrencyCode":0,
+        "InvoiceId":"1234567",
+        "AccountId":"user_x",
+        "Email":null,
+        "Description":"Payment for goods on example.com",
+        "JsonData":null,
+        "CreatedDate":"\/Date(1401718880000)\/",
+        "CreatedDateIso":"2014-08-09T11:49:41",
+        "AuthDate":"\/Date(1401733880523)\/",
+        "AuthDateIso":"2014-08-09T11:49:42",
+        "ConfirmDate":"\/Date(1401733880523)\/",
+        "ConfirmDateIso":"2014-08-09T11:49:42",
+        "AuthCode":"123456",
+        "TestMode":true,
+        "IpAddress":"195.91.194.13",
+        "IpCountry":"RU",
+        "IpCity":"Ufa",
+        "IpRegion":"Bashkortostan Republic",
+        "IpDistrict":"Volga Federal District",
+        "IpLatitude":54.7355,
+        "IpLongitude":55.991982,
+        "CardFirstSix":"411111",
+        "CardLastFour":"1111",
+        "CardType":"Visa",
+        "CardTypeCode":0,
+        "IssuerBankCountry":"RU",
+        "Status":"Completed",
+        "StatusCode":3,
+        "Reason":"Approved",
+        "ReasonCode":0,
+        "CardHolderMessage":"Payment successful",
+        "Name":"CARDHOLDER NAME",
+        "Token":"a4e67841-abb0-42de-a364-d1d8f9f4b3c0"
+      },
+      "Success":true,
+      "Message": null
+    }

data/spec/fixtures/apis/orders/cancel/failed.yml

@@ -0,0 +1,6 @@
+---
+:request:
+  :url: '/orders/cancel'
+  :body: '{"Id":"12345"}'
+:response:
+  :body: '{"Success":false,"Message":"Error message"}'

data/spec/fixtures/apis/orders/cancel/successful.yml

@@ -0,0 +1,6 @@
+---
+:request:
+  :url: '/orders/cancel'
+  :body: '{"Id":"12345"}'
+:response:
+  :body: '{"Success":true,"Message":null}'

data/spec/fixtures/apis/payments/get/failed.yml

@@ -37,6 +37,7 @@
         "StatusCode": 5,
         "Reason": "InsufficientFunds",
         "ReasonCode": 5051,
+        "Refunded": false,
         "CardHolderMessage": "Insufficient funds on account",
         "Name": "CARDHOLDER NAME"
       },

data/spec/fixtures/apis/payments/get/refunded.yml

@@ -0,0 +1,49 @@
+---
+:request:
+  :url: '/payments/get'
+  :body: '{"TransactionId":12345}'
+:response:
+  :body: >
+    {
+      "Model":{
+        "TransactionId":12345,
+        "Amount":10.0,
+        "Currency":"RUB",
+        "CurrencyCode":0,
+        "InvoiceId":"1234567",
+        "AccountId":"user_x",
+        "Email":null,
+        "Description":"Payment for goods on example.com",
+        "JsonData":null,
+        "CreatedDate":"\/Date(1401718880000)\/",
+        "CreatedDateIso":"2014-08-09T11:49:41",
+        "AuthDate":"\/Date(1401733880523)\/",
+        "AuthDateIso":"2014-08-09T11:49:42",
+        "ConfirmDate":"\/Date(1401733880523)\/",
+        "ConfirmDateIso":"2014-08-09T11:49:42",
+        "AuthCode":"123456",
+        "TestMode":true,
+        "IpAddress":"195.91.194.13",
+        "IpCountry":"RU",
+        "IpCity":"Ufa",
+        "IpRegion":"Bashkortostan Republic",
+        "IpDistrict":"Volga Federal District",
+        "IpLatitude":54.7355,
+        "IpLongitude":55.991982,
+        "CardFirstSix":"411111",
+        "CardLastFour":"1111",
+        "CardType":"Visa",
+        "CardTypeCode":0,
+        "IssuerBankCountry":"RU",
+        "Status":"Completed",
+        "StatusCode":3,
+        "Reason":"Approved",
+        "ReasonCode":0,
+        "Refunded": true,
+        "CardHolderMessage":"Payment successful",
+        "Name":"CARDHOLDER NAME",
+        "Token":"a4e67841-abb0-42de-a364-d1d8f9f4b3c0"
+      },
+      "Success":true,
+      "Message": null
+    }

data/spec/fixtures/apis/payments/get/successful.yml

@@ -39,6 +39,7 @@
         "StatusCode":3,
         "Reason":"Approved",
         "ReasonCode":0,
+        "Refunded": false,
         "CardHolderMessage":"Payment successful",
         "Name":"CARDHOLDER NAME",
         "Token":"a4e67841-abb0-42de-a364-d1d8f9f4b3c0"

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

@@ -11,15 +11,26 @@ WebMock.disable_net_connect!
 
 Dir["./spec/support/**/*.rb"].each { |f| require f }
 
-CloudPayments.configure do |c|
-  c.public_key = 'user'
-  c.secret_key = 'pass'
-  c.host = 'http://localhost:9292'
-  c.log = false
-  # c.raise_banking_errors = true
-end
-
 RSpec.configure do |config|
   config.mock_with :rspec
   config.include CloudPayments::RSpec::Helpers
+
+  # 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'
+      c.log = false
+      # 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

metadata

@@ -1,29 +1,30 @@
 --- !ruby/object:Gem::Specification
 name: cloud_payments
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 1.1.0
 platform: ruby
 authors:
 - undr
-autorequire: 
+- kirillplatonov
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-08-09 00:00:00.000000000 Z
+date: 2021-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
@@ -58,32 +59,34 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '3.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '3.9'
 description: CloudPayments ruby client
 email:
 - undr@yandex.ru
-executables: []
+- mail@kirillplatonov.com
+executables:
+- release
 extensions: []
 extra_rdoc_files: []
 files:
@@ -94,6 +97,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- bin/release
 - cloud_payments.gemspec
 - config.ru
 - lib/cloud_payments.rb
@@ -109,6 +113,7 @@ files:
 - lib/cloud_payments/models/like_subscription.rb
 - lib/cloud_payments/models/model.rb
 - lib/cloud_payments/models/on_fail.rb
+- lib/cloud_payments/models/on_kassa_receipt.rb
 - lib/cloud_payments/models/on_pay.rb
 - lib/cloud_payments/models/on_recurrent.rb
 - lib/cloud_payments/models/order.rb
@@ -116,8 +121,10 @@ files:
 - lib/cloud_payments/models/subscription.rb
 - lib/cloud_payments/models/transaction.rb
 - lib/cloud_payments/namespaces.rb
+- lib/cloud_payments/namespaces/apple_pay.rb
 - lib/cloud_payments/namespaces/base.rb
 - lib/cloud_payments/namespaces/cards.rb
+- lib/cloud_payments/namespaces/kassa.rb
 - lib/cloud_payments/namespaces/orders.rb
 - lib/cloud_payments/namespaces/payments.rb
 - lib/cloud_payments/namespaces/subscriptions.rb
@@ -126,13 +133,14 @@ files:
 - lib/cloud_payments/webhooks.rb
 - spec/cloud_payments/client/response_spec.rb
 - spec/cloud_payments/client/serializer/multi_json_spec.rb
-- spec/cloud_payments/client_spec.rb
 - spec/cloud_payments/models/order_spec.rb
 - spec/cloud_payments/models/secure3d_spec.rb
 - spec/cloud_payments/models/subscription_spec.rb
 - spec/cloud_payments/models/transaction_spec.rb
+- spec/cloud_payments/namespaces/apple_pay_spec.rb
 - spec/cloud_payments/namespaces/base_spec.rb
 - spec/cloud_payments/namespaces/cards_spec.rb
+- spec/cloud_payments/namespaces/kassa_spec.rb
 - spec/cloud_payments/namespaces/orders_spec.rb
 - spec/cloud_payments/namespaces/payments_spec.rb
 - spec/cloud_payments/namespaces/subscriptions_spec.rb
@@ -146,6 +154,10 @@ files:
 - spec/fixtures/apis/cards/charge/failed.yml
 - spec/fixtures/apis/cards/charge/secure3d.yml
 - spec/fixtures/apis/cards/charge/successful.yml
+- spec/fixtures/apis/cards/post3ds/failed.yml
+- spec/fixtures/apis/cards/post3ds/successful.yml
+- spec/fixtures/apis/orders/cancel/failed.yml
+- spec/fixtures/apis/orders/cancel/successful.yml
 - spec/fixtures/apis/orders/create/successful.yml
 - spec/fixtures/apis/payments/confirm/failed.yml
 - spec/fixtures/apis/payments/confirm/failed_with_message.yml
@@ -155,6 +167,7 @@ files:
 - spec/fixtures/apis/payments/find/successful.yml
 - spec/fixtures/apis/payments/get/failed.yml
 - spec/fixtures/apis/payments/get/failed_with_message.yml
+- spec/fixtures/apis/payments/get/refunded.yml
 - spec/fixtures/apis/payments/get/successful.yml
 - spec/fixtures/apis/payments/post3ds/failed.yml
 - spec/fixtures/apis/payments/post3ds/successful.yml
@@ -178,11 +191,11 @@ files:
 - spec/spec_helper.rb
 - spec/support/examples.rb
 - spec/support/helpers.rb
-homepage: ''
+homepage: https://github.com/platmart/cloud_payments
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -197,21 +210,21 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
-signing_key: 
+rubygems_version: 3.2.22
+signing_key:
 specification_version: 4
 summary: CloudPayments ruby client
 test_files:
 - spec/cloud_payments/client/response_spec.rb
 - spec/cloud_payments/client/serializer/multi_json_spec.rb
-- spec/cloud_payments/client_spec.rb
 - spec/cloud_payments/models/order_spec.rb
 - spec/cloud_payments/models/secure3d_spec.rb
 - spec/cloud_payments/models/subscription_spec.rb
 - spec/cloud_payments/models/transaction_spec.rb
+- spec/cloud_payments/namespaces/apple_pay_spec.rb
 - spec/cloud_payments/namespaces/base_spec.rb
 - spec/cloud_payments/namespaces/cards_spec.rb
+- spec/cloud_payments/namespaces/kassa_spec.rb
 - spec/cloud_payments/namespaces/orders_spec.rb
 - spec/cloud_payments/namespaces/payments_spec.rb
 - spec/cloud_payments/namespaces/subscriptions_spec.rb
@@ -225,6 +238,10 @@ test_files:
 - spec/fixtures/apis/cards/charge/failed.yml
 - spec/fixtures/apis/cards/charge/secure3d.yml
 - spec/fixtures/apis/cards/charge/successful.yml
+- spec/fixtures/apis/cards/post3ds/failed.yml
+- spec/fixtures/apis/cards/post3ds/successful.yml
+- spec/fixtures/apis/orders/cancel/failed.yml
+- spec/fixtures/apis/orders/cancel/successful.yml
 - spec/fixtures/apis/orders/create/successful.yml
 - spec/fixtures/apis/payments/confirm/failed.yml
 - spec/fixtures/apis/payments/confirm/failed_with_message.yml
@@ -234,6 +251,7 @@ test_files:
 - spec/fixtures/apis/payments/find/successful.yml
 - spec/fixtures/apis/payments/get/failed.yml
 - spec/fixtures/apis/payments/get/failed_with_message.yml
+- spec/fixtures/apis/payments/get/refunded.yml
 - spec/fixtures/apis/payments/get/successful.yml
 - spec/fixtures/apis/payments/post3ds/failed.yml
 - spec/fixtures/apis/payments/post3ds/successful.yml

data/spec/cloud_payments/client_spec.rb

@@ -1,6 +0,0 @@
-# frozen_string_literal: true
-require 'spec_helper'
-
-describe CloudPayments::Client do
-
-end