assist-ruby-sdk 0.1.1 → 0.2.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MWJjZDNmYThjNTYwOGUzY2M2NzU3ZDIwY2ZmMjI2MDZlOTIzOTkyMw==
-  data.tar.gz: !binary |-
-    NDFjNGNkMGNjY2FhNzZkOWNkZTc3Zjk1NmZmYjZjNmIzYWRlYjMwZg==
+SHA1:
+  metadata.gz: 6af43a889ea408444610358d9ad2cf24444fcabd
+  data.tar.gz: 50e7f7db96d1c542a780f308ed41f0e7392404a7
 SHA512:
-  metadata.gz: !binary |-
-    YmNkMGY0M2UwZTZkMTRkZGEyMGEzMTMxMDc0ZTYxYjcyODM5MzgyZTdjNTRj
-    OTM4YjMxMWY4ZDgxYWYxMjY2MzE5NDg2OTU4NTg4NWMyNWJhYTQzN2RmMGI3
-    NTQxMjNhODdiNDU5MDIxOTc1ZjliNThmYTM2NDEzYTI5MGQ1YWU=
-  data.tar.gz: !binary |-
-    MjM2NjVlNWJiMDA1N2U4Njg4MmMxY2I5ZTI2YmU3ZmVkNDFjMjM3MDBhM2M0
-    NzkyMzgzYjVlNDg5ZDkxN2FkYWIyY2IxNDViM2E3OWE1Y2FlZDg0YTgwYjA2
-    MDdlYjY0ZGMxZTIyMzEyODU5YzUyZWE5NzExNGQyMjY0NzU0MGM=
+  metadata.gz: 0d5c68068aa5a46d7ff0372c36fd73ccf115c68c1bf479b9a35616670acf41d2d50aa8f31086a3d8be7ebbca2a3ef5dc5d66b6212f73a302c5fdecd397500721
+  data.tar.gz: c75bc7f1e4fb0da329dcc9674a9159f8202e170500a01958c9c19cac6821f66253ac0886b6953fe8adc827f496cb61372e493ff0b10da7638639f120d1d7e761

data/README.md

@@ -120,8 +120,7 @@ See "Receiving status by order number" and "OrderState field values" in the docu
 ### Canceling payment
 
 ```ruby
-# `billnumber` - number of payment in Assist
-billnumber = "5775486652369300"
+billnumber = "5775486652369300" # number of payment in Assist
 result = Assist.cancel_order(billnumber)
 
 # with additional parameters
@@ -132,15 +131,37 @@ result = Assist.cancel_order(billnumber, extra_params)
 result.request_params # => {merchant_id: '111111', login: 'login',
                       #     password: 'password', ...}
 
-# response
+# response parameters
 result.result # => {:ordernumber=>"999", :responsecode=>"AS000",
-              #     :recommendation=>nil, :orderdate=>"28.09.2016 23:31:00",
+              #     :orderstate=>"Canceled", :orderdate=>"28.09.2016 23:31:00",
               #     :amount=>"111.00", :currency=>"RUB", :billnumber=>"5775486652369300",
               #     ...
               #    }
 
 # raw http response returned from Assist server (in XML format)
-order_status.original_response # => #<Net::HTTPOK 200 OK readbody=true>
+result.original_response # => #<Net::HTTPOK 200 OK readbody=true>
+```
+
+### Delayed (double-stage) payment
+
+When the double-stage operation mode is used the customer's account is withdrawn
+only after the payment has been confirmed by the merchant. In order to use this mode you need to send the parameter Delay=1 in the authorization request.
+
+```ruby
+# authorization url
+url = Assist.payment_url(order_number, order_amount, delay: 1)
+
+# Confirm order
+billnumber = "5775486652369300" # number of payment in Assist
+extra_params = {}               # additional parameters
+result = Assist.confirm_order(billnumber, extra_params)
+
+# response parameters
+result.result # => {:ordernumber=>"999", :responsecode=>"AS000",
+              #     :orderstate=>"Approved", :orderdate=>"28.09.2016 23:31:00",
+              #     :amount=>"111.00", :currency=>"RUB", :billnumber=>"5775486652369300",
+              #     ...
+              #    }
 ```
 
 ## API Errors

data/lib/assist/api_methods.rb

@@ -1,14 +1,19 @@
 require 'assist/web_services/order_status'
 require 'assist/web_services/cancel_order'
+require 'assist/web_services/confirm_order'
 
 module Assist
   module ApiMethods
     def order_status(*args)
-      WebServices::OrderStatus.new(*args)
+      WebServices::OrderStatus.new(*args).perform
     end
 
     def cancel_order(*args)
-      WebServices::CancelOrder.new(*args)
+      WebServices::CancelOrder.new(*args).perform
+    end
+
+    def confirm_order(*args)
+      WebServices::ConfirmOrder.new(*args).perform
     end
   end
 end

data/lib/assist/payment_interface.rb

@@ -12,7 +12,7 @@ module Assist
     PERMITTED_EXTRA_PARAMS = %w(
       OrderCurrency Language OrderComment Lastname Firstname Middlename
       Email Address HomePhone WorkPhone MobilePhone Fax Country State City
-      Zip MobileDevice URL_RETURN URL_RETURN_OK URL_RETURN_NO
+      Zip MobileDevice Delay URL_RETURN URL_RETURN_OK URL_RETURN_NO
       CardPayment YMPayment WMPayment QIWIPayment
       QIWIMtsPayment QIWIMegafonPayment QIWIBeelinePayment QIWITele2Payment
     ).map(&normalize_block).freeze
@@ -50,11 +50,13 @@ module Assist
 
     def default_params
       attrs = {merchant_id: Assist.config.merchant_id}
+
       {
         return_url: :url_return,
         success_url: :url_return_ok,
         fail_url: :url_return_no
-      }.each do |key, value|
+      }
+      .each do |key, value|
         attrs[value] = Assist.config[key] if Assist.config[key]
       end
 

data/lib/assist/version.rb

@@ -1,3 +1,3 @@
 module Assist
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

data/lib/assist/web_services/base.rb

@@ -16,6 +16,11 @@ module Assist
         @params = default_params.merge(extra_params)
       end
 
+      def perform
+        response
+        self
+      end
+
       def result
         @result ||= parse_result
       end

data/lib/assist/web_services/confirm_order.rb

@@ -0,0 +1,25 @@
+require 'assist/web_services/base'
+
+module Assist
+  module WebServices
+    class ConfirmOrder < Base
+      SERVICE_PATH = "/charge/charge.cfm".freeze
+
+      PERMITTED_EXTRA_PARAMS = %w(
+        Amount Currency Language ClientIP
+      ).map(&normalize_block).freeze
+
+      def initialize(billnumber, extra_params = {})
+        super(extra_params)
+        @params[:billnumber] = billnumber
+      end
+
+      private
+
+      def parse_result
+        last_result = response_xml.elements.each("result/orders/order") {}.last
+        Hash[last_result.elements.map { |e| [normalize(e.name), e.text] }]
+      end
+    end
+  end
+end

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: assist-ruby-sdk
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Anton Chumakov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-03 00:00:00.000000000 Z
+date: 2016-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.12'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.1'
 description: The Assist Ruby SDK provides Ruby APIs to create, process and manage
@@ -76,9 +76,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE.txt
@@ -99,6 +99,7 @@ files:
 - lib/assist/version.rb
 - lib/assist/web_services/base.rb
 - lib/assist/web_services/cancel_order.rb
+- lib/assist/web_services/confirm_order.rb
 - lib/assist/web_services/order_status.rb
 homepage: https://github.com/chumakoff/assist-ecommerce-sdk-ruby
 licenses:
@@ -110,18 +111,19 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Assist Online Payment System SDK for Ruby.
 test_files: []
+has_rdoc: