cloud_payments 0.0.2 → 1.0.1

data/lib/cloud_payments/models/on_pay.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+module CloudPayments
+  class OnPay < Model
+    property :id, from: :transaction_id, required: true
+    property :amount, transform_with: DecimalTransform, required: true
+    property :currency, required: true
+    property :invoice_id
+    property :account_id
+    property :subscription_id
+    property :email
+    property :description
+    property :metadata, from: :data, default: {}
+    property :date_time, transform_with: DateTimeTransform
+    property :auth_code
+    property :test_mode, required: true
+    property :ip_address
+    property :ip_country
+    property :ip_city
+    property :ip_region
+    property :ip_district
+    property :ip_lat, from: :ip_latitude
+    property :ip_lng, from: :ip_longitude
+    property :card_first_six, required: true
+    property :card_last_four, required: true
+    property :card_type, required: true
+    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 :token
+  end
+end

data/lib/cloud_payments/models/on_recurrent.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+module CloudPayments
+  class OnRecurrent < Model
+    property :id, required: true
+    property :account_id, required: true
+    property :description, required: true
+    property :email, required: true
+    property :amount, transform_with: DecimalTransform, required: true
+    property :currency, required: true
+    property :require_confirmation, transform_with: BooleanTransform, required: true
+    property :started_at, from: :start_date, with: DateTimeTransform, required: true
+    property :interval, required: true
+    property :period, transform_with: IntegralTransform, required: true
+    property :status, required: true
+    property :successful_transactions, from: :successful_transactions_number, with: IntegralTransform, required: true
+    property :failed_transactions, from: :failed_transactions_number, with: IntegralTransform, required: true
+    property :last_transaction_at, from: :last_transaction_date, with: DateTimeTransform
+    property :next_transaction_at, from: :next_transaction_date, with: DateTimeTransform
+
+    include LikeSubscription
+  end
+end

data/lib/cloud_payments/models/order.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+module CloudPayments
+  class Order < Model
+    property :id, required: true
+    property :number, required: true
+    property :amount, transform_with: DecimalTransform, required: true
+    property :currency, required: true
+    property :currency_code, required: true
+    property :email
+    property :description, required: true
+    property :require_confirmation, transform_with: BooleanTransform, required: true
+    property :url, required: true
+  end
+end

data/lib/cloud_payments/models/secure3d.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module CloudPayments
   class Secure3D < Model
     property :transaction_id, required: true

data/lib/cloud_payments/models/subscription.rb

@@ -1,49 +1,26 @@
+# frozen_string_literal: true
 module CloudPayments
   class Subscription < Model
-    ACTIVE = 'Active'
-    PAST_DUE = 'PastDue'
-    CANCELLED = 'Cancelled'
-    REJECTED = 'Rejected'
-    EXPIRED = 'Expired'
+    include LikeSubscription
 
     property :id, required: true
     property :account_id, required: true
-    property :description, required: true
+    property :description
     property :email, required: true
-    property :amount, required: true
+    property :amount, transform_with: DecimalTransform, required: true
     property :currency, required: true
     property :currency_code, required: true
-    property :require_confirmation, required: true
-    property :started_at, from: :start_date_iso, with: ->(v){ DateTime.parse(v) if v }, required: true
+    property :require_confirmation, transform_with: BooleanTransform, required: true
+    property :started_at, from: :start_date_iso, with: DateTimeTransform, required: true
     property :interval, required: true
     property :interval_code, required: true
-    property :period, required: true
+    property :period, transform_with: IntegralTransform, required: true
     property :max_periods
     property :status, required: true
     property :status_code, required: true
     property :successful_transactions, from: :successful_transactions_number, required: true
     property :failed_transactions, from: :failed_transactions_number, required: true
-    property :last_transaction_at, from: :last_transaction_date_iso, with: ->(v){ DateTime.parse(v) if v }
-    property :next_transaction_at, from: :next_transaction_date_iso, with: ->(v){ DateTime.parse(v) if v }
-
-    def active?
-      status == ACTIVE
-    end
-
-    def past_due?
-      status == PAST_DUE
-    end
-
-    def cancelled?
-      status == CANCELLED
-    end
-
-    def rejected?
-      status == REJECTED
-    end
-
-    def expired?
-      status == EXPIRED
-    end
+    property :last_transaction_at, from: :last_transaction_date_iso, with: DateTimeTransform
+    property :next_transaction_at, from: :next_transaction_date_iso, with: DateTimeTransform
   end
 end

data/lib/cloud_payments/models/transaction.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module CloudPayments
   class Transaction < Model
     AWAITING_AUTHENTICATION = 'AwaitingAuthentication'
@@ -16,10 +17,10 @@ module CloudPayments
     property :email
     property :description
     property :metadata, from: :json_data, default: {}
-    property :date_time, transform_with: ->(v){ DateTime.parse(v) if v }
-    property :created_at, from: :created_date_iso, with: ->(v){ DateTime.parse(v) if v }
-    property :authorized_at, from: :auth_date_iso, with: ->(v){ DateTime.parse(v) if v }
-    property :confirmed_at, from: :confirm_date_iso, with: ->(v){ DateTime.parse(v) if v }
+    property :date_time, transform_with: DateTimeTransform
+    property :created_at, from: :created_date_iso, with: DateTimeTransform
+    property :authorized_at, from: :auth_date_iso, with: DateTimeTransform
+    property :confirmed_at, from: :confirm_date_iso, with: DateTimeTransform
     property :auth_code
     property :test_mode, required: true
     property :ip_address
@@ -35,13 +36,17 @@ 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
 
     def required_secure3d?
       false
@@ -78,5 +83,9 @@ module CloudPayments
     def declined?
       status == DECLINED
     end
+
+    def refunded?
+      refunded
+    end
   end
 end

data/lib/cloud_payments/namespaces.rb

@@ -1,8 +1,11 @@
+# frozen_string_literal: true
 require 'cloud_payments/namespaces/base'
 require 'cloud_payments/namespaces/cards'
 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'
 
 module CloudPayments
   module Namespaces
@@ -10,13 +13,21 @@ module CloudPayments
       Payments.new(self)
     end
 
+    def kassa
+      Kassa.new(self)
+    end
+
     def subscriptions
       Subscriptions.new(self)
     end
 
+    def orders
+      Orders.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/namespaces/base.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module CloudPayments
   module Namespaces
     class Base
@@ -23,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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module CloudPayments
   module Namespaces
     class Cards < Base
@@ -11,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

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+module CloudPayments
+  module Namespaces
+    class Orders < Base
+      def create(attributes)
+        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/payments.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module CloudPayments
   module Namespaces
     class Payments < Base
@@ -27,6 +28,16 @@ module CloudPayments
         response = request(:post3ds, transaction_id: id, pa_res: pa_res)
         Transaction.new(response[:model])
       end
+
+      def get(id)
+        response = request(:get, transaction_id: id)
+        Transaction.new(response[:model])
+      end
+
+      def find(invoice_id)
+        response = request(:find, invoice_id: invoice_id)
+        Transaction.new(response[:model])
+      end
     end
   end
 end

data/lib/cloud_payments/namespaces/subscriptions.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module CloudPayments
   module Namespaces
     class Subscriptions < Base
@@ -6,6 +7,11 @@ module CloudPayments
         Subscription.new(response[:model])
       end
 
+      def find_all(account_id)
+        response = request(:find, account_id: account_id)
+        Array(response[:model]).map { |item| Subscription.new(item) }
+      end
+
       def create(attributes)
         response = request(:create, attributes)
         Subscription.new(response[:model])

data/lib/cloud_payments/namespaces/tokens.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module CloudPayments
   module Namespaces
     class Tokens < Base

data/lib/cloud_payments/version.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module CloudPayments
-  VERSION = '0.0.2'
+  VERSION = '1.0.1'
 end

data/lib/cloud_payments/webhooks.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+require 'openssl'
+require 'base64'
+
+module CloudPayments
+  class Webhooks
+    class HMACError < StandardError; end
+
+    attr_reader :config
+
+    def initialize(config = nil)
+      @config = config || CloudPayments.config
+      @digest = OpenSSL::Digest.new('sha256')
+      @serializer = Client::Serializer::Base.new(config)
+    end
+
+    def data_valid?(data, hmac)
+      Base64.decode64(hmac) == OpenSSL::HMAC.digest(@digest, config.secret_key, data)
+    end
+
+    def validate_data!(data, hmac)
+      raise HMACError unless data_valid?(data, hmac)
+      true
+    end
+
+    def kassa_receipt(data)
+      OnKassaReceipt.new(@serializer.load(data))
+    end
+
+    def on_recurrent(data)
+      OnRecurrent.new(@serializer.load(data))
+    end
+
+    def on_pay(data)
+      OnPay.new(@serializer.load(data))
+    end
+
+    def on_fail(data)
+      OnFail.new(@serializer.load(data))
+    end
+  end
+end

data/spec/cloud_payments/client/response_spec.rb

@@ -1,8 +1,9 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe CloudPayments::Client::Response do
   let(:status){ 200 }
-  let(:body){ '{"Model":{"Id":123,"CurrencyCode":"RUB","Amount":120},"Success":true}' }
+  let(:body){ '{"Model":{"Id":123,"CurrencyCode":"RUB","Amount":120},"Success":true}'.dup.force_encoding('CP1251').freeze }
   let(:headers){ { 'content-type' => 'application/json' } }
 
   subject{ CloudPayments::Client::Response.new(status, body, headers) }
@@ -13,6 +14,7 @@ describe CloudPayments::Client::Response do
     context 'wnen content type does not match /json/' do
       let(:headers){ { 'content-type' => 'text/plain' } }
       specify{ expect(subject.body).to eq(body) }
+      specify{ expect(subject.body.encoding.name).to eq('UTF-8') }
     end
   end
 

data/spec/cloud_payments/client/serializer/multi_json_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe CloudPayments::Client::Serializer::MultiJson do

data/spec/cloud_payments/models/order_spec.rb

@@ -0,0 +1,62 @@
+#!/usr/bin/env ruby
+# encoding: utf-8
+# frozen_string_literal: true
+require 'spec_helper'
+
+describe CloudPayments::Order do
+  subject{ described_class.new(attributes) }
+
+  let(:attributes) do
+    {
+      id: 'f2K8LV6reGE9WBFn',
+      number: 61,
+      amount: 10.0,
+      currency: 'RUB',
+      currency_code: 0,
+      email: 'client@test.local',
+      description: 'Оплата на сайте example.com',
+      require_confirmation: true,
+      url:'https://orders.cloudpayments.ru/d/f2K8LV6reGE9WBFn'
+    }
+  end
+
+  describe 'properties' do
+    specify{ expect(subject.id).to eq('f2K8LV6reGE9WBFn') }
+    specify{ expect(subject.number).to eq(61) }
+    specify{ expect(subject.amount).to eq(10.0) }
+    specify{ expect(subject.currency).to eq('RUB') }
+    specify{ expect(subject.currency_code).to eq(0) }
+    specify{ expect(subject.email).to eq('client@test.local') }
+    specify{ expect(subject.description).to eq('Оплата на сайте example.com') }
+    specify{ expect(subject.require_confirmation).to eq(true) }
+    specify{ expect(subject.url).to eq('https://orders.cloudpayments.ru/d/f2K8LV6reGE9WBFn') }
+
+    it_behaves_like :raise_without_attribute, :id
+    it_behaves_like :raise_without_attribute, :number
+    it_behaves_like :raise_without_attribute, :amount
+    it_behaves_like :raise_without_attribute, :currency
+    it_behaves_like :raise_without_attribute, :currency_code
+    it_behaves_like :raise_without_attribute, :description
+    it_behaves_like :raise_without_attribute, :require_confirmation
+    it_behaves_like :raise_without_attribute, :url
+
+    it_behaves_like :not_raise_without_attribute, :email
+  end
+
+  describe 'transformations' do
+    context 'amount from string' do
+      before { attributes[:amount] = '293.42' }
+      specify{ expect(subject.amount).to eql(293.42) }
+    end
+
+    context 'require_confirmation from "1"' do
+      before { attributes[:require_confirmation] = '1' }
+      specify{ expect(subject.require_confirmation).to eql(true) }
+    end
+
+    context 'require_confirmation from "0"' do
+      before { attributes[:require_confirmation] = '0' }
+      specify{ expect(subject.require_confirmation).to eql(false) }
+    end
+  end
+end