alfabank 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: a993d7b06fd8bbcb32db85a1729763a29aebafe8
-  data.tar.gz: 69e1f591c5d827668f9617ead8de3b95d259562c
+SHA256:
+  metadata.gz: 240f816190cd982f668b2f7f819600e4521cbd5f3cbed3f2cbbaf5be53af13e9
+  data.tar.gz: ab180f05add97f32ec4e95509cd292c91ff672c389d0c2ffefb413b98e302b61
 SHA512:
-  metadata.gz: c020e0f5ff98a2d95419e358af2913e04c51c548032a3eb3f9f0bfd5c8d90d23540002e62e3cfdab1a28ae4774bf4d586c88e5227c424d8afe170a09abdfaa3c
-  data.tar.gz: 91f45d638d679bd6f73a04544c554ff612c324e52727b5033591d45099fcd3b0fc2150972058eae7406281d2e02e5be831528d35c0cf7083e8aed6f59f7628a5
+  metadata.gz: fbd34cc48a3e60914801d71e3e4e49402da7376d0238e94ebf6e927a484183ddab1341d7094a5899012661d4befd8ed661f3b084722f1abcae3c6c8d8fbae731
+  data.tar.gz: fa5f6349905f7b9c42f4204e6c12ac5619f7be6f4a541afa22aa8465833fc8654db58146175d293ddd90be09cc9dd9ad261ebdb6dae3b3fc7ffd6cc4b01ee02a

data/.travis.yml

@@ -1,4 +1,7 @@
 language: ruby
 rvm:
-  - 2.2.1
+  - 2.2.9
+  - 2.3.6
+  - 2.4.3
+  - 2.5.0
 before_install: gem install bundler -v 1.11.2

data/README.md

@@ -1,5 +1,5 @@
 # Alfabank
-[![Build Status](https://travis-ci.org/mendab1e/alfabank.svg)](https://travis-ci.org/mendab1e/alfabank) [![Gem Version](https://badge.fury.io/rb/alfabank.svg)](https://badge.fury.io/rb/alfabank)
+[![Build Status](https://travis-ci.org/mendab1e/alfabank.svg?branch=master)](https://travis-ci.org/mendab1e/alfabank) [![Gem Version](https://badge.fury.io/rb/alfabank.svg)](https://badge.fury.io/rb/alfabank)
 
 This gem provides support for the API of [Alfabank acquiring gateway](https://engine.paymentgate.ru/ecommerce/).
 

data/lib/alfabank.rb

@@ -4,15 +4,21 @@ require "alfabank/api"
 require "alfabank/configuration"
 
 module Alfabank
-  def register(binding_id = nil)
-    Api::Registration.new(self).process(binding_id)
+  def register(use_binding: false)
+    Api::Registration.new(self).process(use_binding: use_binding)
   end
 
-  def check_status
-    Api::Status.new(self).process
+  def check_status(use_binding: false)
+    Api::Status.new(self).process(use_binding: use_binding)
+  end
+
+  def payment_order_binding(binding_id)
+    Api::PaymentOrderBinding.new(self).process(binding_id)
   end
 
   class << self
+    attr_accessor :logger
+
     def setup(&block)
       yield Configuration
     end

data/lib/alfabank/api.rb

@@ -1,3 +1,4 @@
 require "alfabank/api/base"
 require "alfabank/api/registration"
 require "alfabank/api/status"
+require "alfabank/api/payment_order_binding"

data/lib/alfabank/api/base.rb

@@ -2,7 +2,7 @@ require 'httparty'
 
 module Alfabank::Api
   class Base
-    attr_reader :payment
+    attr_reader :payment, :use_binding
 
     def initialize(payment)
       @payment = payment
@@ -19,10 +19,14 @@ module Alfabank::Api
     end
 
     def url
-      if Alfabank::Configuration.mode == :test
-        self.class::TEST_URL
-      elsif Alfabank::Configuration.mode == :production
-        self.class::URL
+      Alfabank::Configuration.mode == :production ? self.class::URL : self.class::TEST_URL
+    end
+
+    def credentials
+      if use_binding
+        Alfabank::Configuration.binding_credentials
+      else
+        Alfabank::Configuration.common_credentials
       end
     end
   end

data/lib/alfabank/api/payment_order_binding.rb

@@ -0,0 +1,29 @@
+module Alfabank::Api
+  class PaymentOrderBinding < Base
+    TEST_URL = 'https://web.rbsuat.com/ab/rest/paymentOrderBinding.do'
+    URL = "https://engine.paymentgate.ru/payment/rest/paymentOrderBinding.do"
+
+    def process(binding_id)
+      fail 'alfa_order_id is nil' if payment.alfa_order_id.nil?
+      @binding_id = binding_id
+
+      process_response(make_request.parsed_response)
+    end
+
+    private
+
+    def process_response(response)
+      response
+    end
+
+    def generate_params
+      params = {
+        userName: Alfabank::Configuration.binding_username,
+        password: Alfabank::Configuration.binding_password,
+        bindingId: @binding_id,
+        mdOrder: payment.alfa_order_id
+      }
+      params.map { |k, v| "#{k}=#{v}" }.join('&')
+    end
+  end
+end

data/lib/alfabank/api/registration.rb

@@ -1,15 +1,13 @@
 module Alfabank::Api
   class Registration < Base
-    TEST_URL = "https://test.paymentgate.ru/testpayment/rest/register.do"
+    TEST_URL = 'https://web.rbsuat.com/ab/rest/register.do'
     URL = "https://engine.paymentgate.ru/payment/rest/register.do"
 
-    def process(binding_id = nil)
+    def process(use_binding: false)
       return {url: payment.alfa_form_url} if payment.alfa_order_id
-      @binding_id = binding_id
+      @use_binding = use_binding
 
       process_response(make_request.parsed_response)
-    rescue
-      {error: 'Internal server error'}
     end
 
     private
@@ -24,24 +22,15 @@ module Alfabank::Api
     end
 
     def generate_params
-      params = {
-        userName: Alfabank::Configuration.username,
-        password: Alfabank::Configuration.password,
+      params = credentials.merge(
         description: payment.description,
         language: Alfabank::Configuration.language,
-        orderNumber: "#{Alfabank::Configuration.order_number_prefix}#{payment.id}",
+        orderNumber: order_number,
         amount: payment.price * 100,
         currency: Alfabank::Configuration.currency,
         clientId: payment.user_id,
         returnUrl: Alfabank::Configuration.return_url
-      }
-
-      if @binding_id
-        params.merge!(
-          userName: Alfabank::Configuration.binding_username,
-          bindingId: @binding_id
-        )
-      end
+      )
 
       params.map { |k, v| "#{k}=#{v}" }.join('&')
     end
@@ -52,5 +41,10 @@ module Alfabank::Api
         alfa_form_url: response["formUrl"]
       )
     end
+
+    def order_number
+      number = payment.to_order_number rescue payment.id
+      "#{Alfabank::Configuration.order_number_prefix}#{number}"
+    end
   end
 end

data/lib/alfabank/api/status.rb

@@ -1,10 +1,12 @@
 module Alfabank::Api
   class Status < Base
-    TEST_URL = "https://test.paymentgate.ru/testpayment/rest/getOrderStatus.do"
+    TEST_URL = 'https://web.rbsuat.com/ab/rest/getOrderStatus.do'
     URL = "https://engine.paymentgate.ru/payment/rest/getOrderStatus.do"
     PAID = 2
 
-    def process
+    def process(use_binding: false)
+      @use_binding = use_binding
+
       response = make_request.parsed_response
       process_response(response)
 
@@ -15,24 +17,25 @@ module Alfabank::Api
         error_code: response["ErrorCode"].to_i,
         error_message: response["ErrorMessage"]
       }
-    rescue
-      {error_message: 'Internal server error'}
     end
 
     private
 
     def process_response(response)
-      if response["OrderStatus"].to_i == PAID
-        payment.update_attribute(:paid, true)
+      return unless response["OrderStatus"].to_i == PAID
+
+      payment.paid = true
+      payment.card_number = response["Pan"] if payment.respond_to?(:card_number)
+      if payment.respond_to?(:binding_id)
+        payment.binding_id = response["bindingId"]
       end
+      payment.save(validate: false)
     end
 
     def generate_params
-      {
-        userName: Alfabank::Configuration.username,
-        password: Alfabank::Configuration.password,
-        orderId: payment.alfa_order_id
-      }.map { |k, v| "#{k}=#{v}" }.join('&')
+      credentials.merge(orderId: payment.alfa_order_id).map do |k, v|
+        "#{k}=#{v}"
+      end.join('&')
     end
   end
 end

data/lib/alfabank/configuration.rb

@@ -2,7 +2,22 @@ module Alfabank
   class Configuration
     class << self
       attr_accessor :username, :password, :language, :return_url
-      attr_accessor :currency, :order_number_prefix, :binding_username, :mode
+      attr_accessor :currency, :order_number_prefix, :mode
+      attr_accessor :binding_username, :binding_password
+
+      def binding_credentials
+        {
+          userName: binding_username,
+          password: binding_password
+        }
+      end
+
+      def common_credentials
+        {
+          userName: username,
+          password: password
+        }
+      end
     end
   end
 end

data/lib/alfabank/version.rb

@@ -1,3 +1,3 @@
 module Alfabank
-  VERSION = "0.1.2"
+  VERSION = "0.2.0"
 end

data/lib/generators/alfabank/templates/config/initializers/alfabank.rb

@@ -6,5 +6,8 @@ Alfabank.setup do |config|
   config.currency = Alfabank::Currency::RUB
   config.order_number_prefix = 'payment-'
   config.binding_username = 'binding_username'
+  config.binding_password = 'binding_password'
   config.mode = :test # :production
 end
+
+Alfabank.logger = Rails.logger

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: alfabank
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Timur Yanberdin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-02-22 00:00:00.000000000 Z
+date: 2018-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -114,6 +114,7 @@ files:
 - lib/alfabank.rb
 - lib/alfabank/api.rb
 - lib/alfabank/api/base.rb
+- lib/alfabank/api/payment_order_binding.rb
 - lib/alfabank/api/registration.rb
 - lib/alfabank/api/status.rb
 - lib/alfabank/configuration.rb
@@ -144,7 +145,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Unofficial alfabank payment gateway gem