walletone 0.1.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5afa0d525c38be77b98d36d334e2a26bede7ca55
-  data.tar.gz: dc8fe82e3a77fc8566d0fd90cf26559b6263c54e
+  metadata.gz: 2b0bdb40bad763d10f9d0b928d801527887dea09
+  data.tar.gz: bd4f7256beceb5f27bd5867ef4989c009e0016cf
 SHA512:
-  metadata.gz: a1f78edea3a44df7fa8eac66123c37a0b2bde7b505b7e960670b76cc004d897e17555f18a852e072ec04b825f880625fe714c2e368cc4dee310bdc64b3ea610f
-  data.tar.gz: 153a3def129ee5fe3041834c71ec6225d98f68fb1f111c357e7c49639a94c92a94397a12412f30f6deb14d3fbb6c5315b203407cc5d8e6048e3e063c6e49beea
+  metadata.gz: 5858ba537300604f708e9fa3f8337731897335abf55f5cce5fe2e337a9f221bbbe3ba048495bc2ee861090411aba7042c19aa9ff72f908d64bd3ac3726c3b5f5
+  data.tar.gz: 25e8bcb648e34a2c71f89ea9cea5f2ef1bc9bd095f5297ff754b5b2cf70c38018362aae2d6e0b3773ca853d9d4ccf9d0d8fe37f3b8c706b2fbcfb79c93c8b7a5

data/README.md

@@ -2,6 +2,8 @@
 
 [![Build Status](https://travis-ci.org/BrandyMint/walletone.svg)](https://travis-ci.org/BrandyMint/walletone)
 [![Code Climate](https://codeclimate.com/github/BrandyMint/walletone/badges/gpa.svg)](https://codeclimate.com/github/BrandyMint/walletone)
+[![Test
+Coverage](https://codeclimate.com/github/BrandyMint/walletone/badges/coverage.svg)](https://codeclimate.com/github/BrandyMint/walletone)
 
 ---
 
@@ -116,6 +118,10 @@ form = payment.form
 
 1. [Walletone Open API](https://api.w1.ru/OpenApi/)
 2. [Документация (API)](http://www.walletone.com/ru/merchant/documentation/)
+3. [Доставка redexpress](http://www.walletone.com/en/merchant/delivery/about/)
+4. [Рекуренты](https://docs.google.com/document/d/1_1HponT9Xv5dJ10Lqh23JyNGhqhNq9myb4xXl-gUOCI/pub?embedded=true)
+5.
+[InvoicingAPI](https://docs.google.com/document/d/18YaYbAwHo5jKCx88ox3okj1RJqcPF_2gSDdzpK2XHDI/pub?embedded=true)
 
 Sponsored by http://taaasty.com and http://kiiiosk.ru
 Developers are http://brandymint.com
@@ -129,3 +135,4 @@ Developers are http://brandymint.com
 3. Commit your changes (`git commit -am 'add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
+

data/lib/walletone.rb

@@ -5,6 +5,9 @@ require 'walletone/payment'
 require 'walletone/notification'
 require 'walletone/form'
 require 'walletone/middleware/base'
+require 'walletone/recurrent'
+require 'walletone/invoicing'
+require 'walletone/error_response'
 
 module Walletone
   API_URL          = 'https://api.w1.ru/OpenApi/'

data/lib/walletone/error_response.rb

@@ -0,0 +1,16 @@
+module Walletone
+  class ErrorResponse < StandardError
+    def initialize(response)
+      fail 'Must be a Net::HTTPInternalServerError' unless response.is_a? Net::HTTPInternalServerError
+      @response = response
+    end
+
+    def message
+      "[#{response.code}] #{response.body}"
+    end
+
+    private
+
+    attr_reader :response
+  end
+end

data/lib/walletone/fields.rb

@@ -7,7 +7,7 @@ module Walletone
       # > payment.WMI_MERCHANT_ID
       # > payment.WMI_MERCHANT_ID=123
       #
-      # > payment.WMI_PTENABLED = 
+      # > payment.WMI_PTENABLED =
       fields.each do |k|
         define_method k do
           fetch k
@@ -48,6 +48,10 @@ module Walletone
       end
     end
 
+    def to_s
+      as_list.to_s
+    end
+
     private
 
     def signer

data/lib/walletone/form.rb

@@ -11,6 +11,14 @@ module Walletone
       @payment = payment
     end
 
+    def to_s
+      payment.to_s
+    end
+
+    def as_list
+      payment.as_list
+    end
+
     def checkout_url
       Walletone.config.web_checkout_url
     end
@@ -32,6 +40,5 @@ module Walletone
     def hidden_field_tag name, value
       "<input name=\"#{CGI.escapeHTML(name.to_s)}\" type=\"hidden\" value=\"#{CGI.escapeHTML(value.to_s)}\" />"
     end
-
   end
 end

data/lib/walletone/invoicing.rb

@@ -0,0 +1,5 @@
+module Walletone
+  module Invoicing
+    require 'walletone/invoicing/client'
+  end
+end

data/lib/walletone/invoicing/client.rb

@@ -0,0 +1,103 @@
+require 'money'
+require 'multi_json'
+
+# Invoicing: https://docs.google.com/document/d/18YaYbAwHo5jKCx88ox3okj1RJqcPF_2gSDdzpK2XHDI/pub?embedded=true
+# Recurrent: https://docs.google.com/document/d/1_1HponT9Xv5dJ10Lqh23JyNGhqhNq9myb4xXl-gUOCI/pub?embedded=true
+#
+module Walletone::Invoicing
+  class Client
+    CABINET_ID      = 'checkout' # yessplaycheckout
+    OPERATORS       =  %w(MtsRUB MegafonRUB Tele2RUB BeelineRUB)
+
+    BASE_URL = "https://wl.walletone.com/#{CABINET_ID}/invoicingapi/"
+
+    def initialize(user_id:, secret_key:, hash_type: Walletone::Signer::DEFAULT_HASH_TYPE)
+      @user_id    = user_id or fail 'no user_id'
+      @user_id    = @user_id.to_s
+      @secret_key = secret_key or fail 'no secret_key'
+      @hash_type  = hash_type or fail 'no hash_type'
+      @timestamp  = Time.now.utc.strftime('%FT%T')
+    end
+
+    def do_phone_payment(amount:, order_id:, phone: ,additional_params:)
+      invoice = make_invoice amount: amount, order_id: order_id, additional_params: additional_params
+      make_payments_process_with_phone payment_id: invoice['Invoice']['Payment']['PaymentId'], phone: phone
+    end
+
+    # Для рекурентов
+    # {
+    # "CustomerId":"123456",
+    # "UseSavedAuthData":true,
+    # "CreditCardTerminal":Non3Ds,
+    # "AuthData": [
+    #            "RecurrentCreditCardAuthSecurityCode":"123"
+    # ]
+    # }
+
+    def make_payments_process(payment_id, params = {})
+      fail 'must be payment_id' unless payment_id
+      make_request "payments/#{payment_id}/process", params.to_json
+    end
+
+    def make_payments_process_with_phone(payment_id:, customer_id:, phone:)
+      make_payments_process payment_id, { 'CustomerId' => customer_id, 'AuthData' => { 'MobileCommercePhoneNumber' => phone } }
+    end
+
+    def make_invoice(invoice)
+      fail 'Must be a RecurrentInvoice' unless invoice.is_a? Walletone::Recurrent::Invoice
+
+      body = {
+        'OrderId'       => invoice.OrderId.to_s,
+        'Amount'        => invoice.Amount.to_f,
+        'CurrencyId'    => invoice.CurrencyId,
+        'PaymentTypeId' => invoice.PaymentTypeId
+      }
+
+      body['InvoiceAdditionalParams'] = invoice.InvoiceAdditionalParams if invoice.InvoiceAdditionalParams.is_a?(Hash) && !invoice.InvoiceAdditionalParams.empty?
+
+      make_request 'invoices', body.to_json
+    end
+
+    private
+
+    attr_reader :user_id, :secret_key, :timestamp, :hash_type
+
+    def make_request(path, body)
+      uri = URI.parse BASE_URL + path
+
+      headers = build_headers(uri.to_s, body)
+
+      req = Net::HTTP::Post.new uri, headers
+      req.body = body
+
+      log "Request [#{uri}]: #{body}"
+      http = build_http uri
+      response = http.request req
+      log "Response [#{uri}] #{body}: [#{response.code}] #{response.body}"
+      fail Walletone::ErrorResponse, response if response.is_a? Net::HTTPInternalServerError
+
+      MultiJson.load response.body
+    end
+
+    def build_http(uri)
+      Net::HTTP.start uri.host, uri.port, use_ssl: true, verify_mode: OpenSSL::SSL::VERIFY_NONE # OpenSSL::SSL::VERIFY_PEER
+    end
+
+    def signature url, body
+      Walletone::Signer.sign [url, user_id, timestamp, body, secret_key].join, hash_type
+    end
+
+    def log(message)
+      Walletone.logger.info "InvoicingAPI: #{message}"
+    end
+
+    def build_headers(url, body)
+      {
+        'Content-Type'       => 'application/json; charset=utf-8',
+        'X-Wallet-Timestamp' => timestamp,
+        'X-Wallet-UserId'    => user_id,
+        'X-Wallet-Signature' => signature(url, body)
+      }
+    end
+  end
+end

data/lib/walletone/notification.rb

@@ -6,19 +6,34 @@ require 'walletone/fields'
 module Walletone
   class Notification < Fields
     FIELDS = %i(
-    WMI_MERCHANT_ID
-    WMI_PAYMENT_AMOUNT
-    WMI_COMMISSION_AMOUNT
-    WMI_CURRENCY_ID
-    WMI_TO_USER_ID
-    WMI_PAYMENT_NO
-    WMI_ORDER_ID
-    WMI_DESCRIPTION
-    WMI_SUCCESS_URL WMI_FAIL_URL
-    WMI_EXPIRED_DATE
-    WMI_CREATE_DATE WMI_UPDATE_DATE
-    WMI_ORDER_STATE
-    WMI_SIGNATURE
+      WMI_AUTO_ACCEPT
+
+      WMI_NOTIFY_COUNT
+      WMI_LAST_NOTIFY_DATE
+
+      WMI_MERCHANT_ID
+
+      WMI_RECURRING_PAYMENTS_APPROVED
+
+      WMI_PAYMENT_NO
+      WMI_PAYMENT_AMOUNT
+      WMI_PAYMENT_TYPE
+
+      WMI_COMMISSION_AMOUNT
+      WMI_CURRENCY_ID
+      WMI_TO_USER_ID
+
+      WMI_ORDER_ID
+      WMI_ORDER_STATE
+
+      WMI_DESCRIPTION
+      WMI_SUCCESS_URL WMI_FAIL_URL
+      WMI_EXPIRED_DATE
+      WMI_CREATE_DATE WMI_UPDATE_DATE
+
+      WMI_RECURRENCE_STATE_ID
+
+      WMI_SIGNATURE
     )
 
     define_fields FIELDS

data/lib/walletone/payment.rb

@@ -28,9 +28,9 @@ module Walletone
         WMI_CUSTOMER_FIRSTNAME WMI_CUSTOMER_LASTNAME WMI_CUSTOMER_EMAIL
         WMI_CULTURE_ID
         WMI_SIGNATURE
-        WMI_DELIVERY_REQUEST 
+        WMI_DELIVERY_REQUEST
         WMI_DELIVERY_COUNTRY WMI_DELIVERY_REGION WMI_DELIVERY_CITY WMI_DELIVERY_ADDRESS
-        WMI_DELIVERY_CONTACTINFO WMI_DELIVERY_COMMENTS WMI_DELIVERY_ORDERID 
+        WMI_DELIVERY_CONTACTINFO WMI_DELIVERY_COMMENTS WMI_DELIVERY_ORDERID
         WMI_DELIVERY_DATEFROM WMI_DELIVERY_DATETILL
         WMI_PSP_MERCHANT_ID
     )
@@ -87,6 +87,5 @@ module Walletone
       value = fetch :WMI_EXPIRED_DATE
       value ? value.iso8601 : value
     end
-
   end
 end

data/lib/walletone/recurrent.rb

@@ -0,0 +1,8 @@
+module Walletone
+  module Recurrent
+    require 'walletone/recurrent/client'
+    require 'walletone/recurrent/payment'
+    require 'walletone/recurrent/invoice'
+    require 'walletone/recurrent/result_invoice'
+  end
+end

data/lib/walletone/recurrent/client.rb

@@ -0,0 +1,76 @@
+require 'faraday'
+
+module Walletone::Recurrent
+  require 'walletone/recurrent/invoice'
+  require 'walletone/recurrent/result_invoice'
+
+  class Client
+    RECURRENT_API        = 'https://wl.walletone.com/checkout/invoicingapi/'
+    INVOICE_CLASS        = Walletone::Recurrent::Invoice
+    RESULT_INVOICE_CLASS = Walletone::Recurrent::ResultInvoice
+
+    # @param [merchant_id]
+    #
+    def initialize(merchant_id:, customer_id:, secret_key:, hash_type: Walletone::Signer::DEFAULT_HASH_TYPE)
+      @merchant_id = merchant_id.to_s
+      @customer_id = customer_id.to_s
+      @secret_key  = secret_key.to_s
+      @hash_type   = hash_type
+      @timestamp   = Time.now.utc.strftime('%FT%T')
+    end
+
+    def create_invoice(invoice)
+      fail "Must be a #{INVOICE_CLASS} (#{invoice})" unless invoice.is_a? INVOICE_CLASS
+
+      result = do_request RECURRENT_API + 'invoices', invoice.to_json
+
+      RESULT_INVOICE_CLASS.new result
+    end
+
+    def make_payment(payment_id: nil, email: nil)
+      body = { CustomerId: customer_id, CreditCardTerminal: 'Non3Ds', UseSavedAuthData: 'true', AuthData: { RecurrentCreditCardEmail: email } }.to_json
+
+      do_request RECURRENT_API + "payments/#{payment_id}/process", body
+    end
+
+    private
+
+    attr_reader :merchant_id, :customer_id, :secret_key, :hash_type, :timestamp, :hash_type
+
+    def do_request url, body
+      uri = URI.parse url
+
+      req = Net::HTTP::Post.new uri, build_headers(url, body)
+      req.body = body
+
+      log "Request [#{uri}]: #{body}"
+      http = build_http uri
+      response = http.request req
+      log "Response [#{uri}] #{body}:\n    [#{response.code}] #{response.body}"
+      fail Walletone::ErrorResponse, response if response.is_a? Net::HTTPInternalServerError
+
+      MultiJson.load response.body
+    end
+
+    def build_http(uri)
+      Net::HTTP.start uri.host, uri.port, use_ssl: true, verify_mode: OpenSSL::SSL::VERIFY_NONE # OpenSSL::SSL::VERIFY_PEER
+    end
+
+    def build_headers(url, body)
+      {
+        'Content-Type'       => 'application/json; charset=utf-8',
+        'X-Wallet-UserId'    => merchant_id,
+        'X-Wallet-Timestamp' => timestamp,
+        'X-Wallet-Signature' => signature(url, body)
+      }
+    end
+
+    def log(message)
+      Walletone.logger.info "Recurrent::Client: #{message}"
+    end
+
+    def signature url, body
+      Walletone::Signer.sign [url, merchant_id, timestamp, body, secret_key].join, hash_type
+    end
+  end
+end

data/lib/walletone/recurrent/invoice.rb

@@ -0,0 +1,15 @@
+module Walletone::Recurrent
+  class Invoice
+    include Virtus.model strict: true, coerce: false
+
+    attribute :OrderId,                 String,  required: true
+    attribute :Amount,                  Float,   required: true
+    attribute :CurrencyId,              Integer, required: true, default: 643 # rub
+    attribute :PaymentTypeId,           String,  required: true, default: 'CreditCardRUB' #  MtsRUB, MegafonRUB, Tele2RUB, BeelineRUB
+    attribute :InvoiceAdditionalParams, Hash
+
+    def to_json
+      to_h.to_json
+    end
+  end
+end

data/lib/walletone/recurrent/payment.rb

@@ -0,0 +1,7 @@
+class Walletone::Recurrent::Payment < Walletone::Payment
+  define_fields %i(WMI_CUSTOMER_ID WMI_RECURRING_AGREEMENT_URL WMI_CUSTOMER_PHONE)
+
+  def valid?
+    super && self.WMI_CUSTOMER_ID && self.WMI_RECURRING_AGREEMENT_URL
+  end
+end

data/lib/walletone/recurrent/result_invoice.rb

@@ -0,0 +1,66 @@
+module Walletone::Recurrent
+  class ResultInvoice
+    class InvoiceInfo
+      RAW_EXAMPLE =
+        {"Invoice"=>
+         {"InvoiceId"=>345539868062,
+          "Amount"=>1.24,
+          "CurrencyId"=>643,
+          "InvoiceStateId"=>"Created",
+          "CreateDate"=>"2015-12-31T08:20:13",
+          "UpdateDate"=>"2015-12-31T08:20:13",
+          "Payment"=>
+         {"PaymentId"=>69904496,
+          "PaymentCode"=>"345539868062",
+          "PaymentCodeType"=>"InvoiceId",
+          "CreateDate"=>"2015-12-31T08:20:14.137",
+          "UpdateDate"=>"2015-12-31T08:20:14.137",
+          "PaymentStateId"=>"Created",
+          "PaymentTypeId"=>"CreditCardRUB"}},
+          "CanSaveAsExternalAccount"=>true}
+
+      class PaymentInfo
+        include Virtus.model strict: true
+
+        attribute :PaymentId,       Integer
+        attribute :PaymentCode,     String
+        attribute :PaymentCodeType, String # 'InvoiceId'
+        attribute :CreateDate,      Time
+        attribute :UpdateDate,      Time
+        attribute :PaymentStateId,    String # 'Created'
+        # Состояние платежа в ответе на запрос подтверждения списания средств. Может принимать одно из следующих состояний:
+        # Paid — списание произошло успешно.
+        # Error — произошла ошибка
+        # Created — создан, оплата не поступала
+        # Processing — в обработке
+        attribute :PaymentTypeId,   String # 'CreditCardRUB'
+      end
+
+      include Virtus.model strict: true
+
+      attribute :InvoiceId,      Integer
+      attribute :Amount,         Float
+      attribute :InvoiceStateId, String # 'Created'
+      # Параметр “InvoiceStateId”
+      # Сосотяние выставленного счета в ответе на создание счета. Может принимать одно из следующих значений:
+      # Created — счет успешно создан.
+      # Canceled — отменен
+      # Accepted — оплачен
+      # Expired — вышел срок действия
+      # Processing — в процессе подтверждения
+      # Received — получен, ожидает принятия
+      # Rejected — отвергнут
+      # PartiallyPaid — частично оплачен
+      # OverPaid — переплачен
+      attribute :CreateDate,     Time
+      attribute :UpdateDate,     Time
+      attribute :Payment,        PaymentInfo
+    end
+
+    include Virtus.model strict: true
+
+    attribute :Invoice,                  InvoiceInfo, required: true
+    attribute :CanSaveAsExternalAccount, Boolean
+  end
+end
+

data/lib/walletone/signer.rb

@@ -12,17 +12,21 @@ module Walletone
 
     attribute :fields,     Walletone::Fields, requried: true
 
-    def signature secret_key, hash_type=DEFAULT_HASH_TYPE
+    def self.sign(content, hash_type)
       case hash_type
       when :md5
-        Digest::MD5.base64digest( fields_as_string( secret_key ) )
+        Digest::MD5.base64digest content
       when :sha1
-        Digest::SHA1.base64digest( fields_as_string( secret_key ) )
+        Digest::SHA1.base64digest content
       else
         raise ArgumentError, hash_type
       end
     end
 
+    def signature secret_key, hash_type=DEFAULT_HASH_TYPE
+      self.class.sign fields_as_string( secret_key ), hash_type
+    end
+
     private
 
     def fields_as_string secret_key
@@ -34,7 +38,7 @@ module Walletone
     def sorted_values
       fields
         .as_list
-        .reject { |k, v| k == WMI_SIGNATURE }
+        .reject { |f| f.first == WMI_SIGNATURE }
         .sort { |a, b|  [ a[0], a[1] ] <=> [ b[0], b[1] ] }
         .map(&:last)
         .map(&:to_s)

data/lib/walletone/version.rb

@@ -1,3 +1,3 @@
 module Walletone
-  VERSION = '0.1.2'
+  VERSION = '0.3.0'
 end

data/spec/spec_helper.rb

@@ -2,6 +2,10 @@ require 'walletone'
 require 'fabrication'
 require 'ffaker'
 require 'pry'
+require "codeclimate-test-reporter"
+require 'webmock/rspec'
+
+CodeClimate::TestReporter.start
 
 Dir["./spec/support/**/*.rb"].sort.each { |f| require f}
 

data/spec/walletone/invoicing/client_spec.rb

@@ -0,0 +1,21 @@
+require 'walletone/invoicing'
+
+describe Walletone::Invoicing::Client do
+  let(:user_id) { 127830694600 }
+  let(:secret_key) { 'abc' }
+  let(:amount) { Money.new 1000, 'rub' }
+  let(:order_id) { '123' }
+
+  let(:success_response) { '{"Invoice":{"InvoiceId":123,"Amount":10.0000,"CurrencyId":643,"InvoiceStateId":"Created","CreateDate":"2015-11-02T08:11:57","UpdateDate":"2015-11-02T08:11:57","Payment":{"PaymentId":123,"Amount":10.0000,"CurrencyId":643,"PaymentCode":"123","PaymentCodeType":"InvoiceId","CreateDate":"2015-11-02T08:11:57","UpdateDate":"2015-11-02T08:11:57","PaymentStateId":"Created","PaymentTypeId":"MtsRUB","ExternalAccountId":null}},"CanSaveAsExternalAccount":false}' }
+
+  subject { Walletone::Invoicing::Client.new user_id: user_id, secret_key: secret_key }
+
+  let(:invoice) { Walletone::Recurrent::Invoice.new Amount: amount, OrderId: order_id }
+
+  context '#make_invoice' do
+    it do
+      stub_request(:post, Walletone::Invoicing::Client::BASE_URL + 'invoices').to_return(body: success_response)
+      expect(subject.make_invoice(invoice)).to be_a(Hash)
+    end
+  end
+end

data/spec/walletone/middleware/base_spec.rb

@@ -4,7 +4,7 @@ require 'walletone/middleware/base'
 describe Walletone::Middleware::Base do
   let(:middleware) { described_class.new }
   let!(:params) { { cp1251: 'привет'.encode('windows-1251') } }
-  subject! { Rack::MockRequest.new(middleware).post('/', params: params ) }
+  subject { Rack::MockRequest.new(middleware).post('/', params: params ) }
 
   it do
     expect(subject.status).to eq 200

data/spec/walletone/middleware/callback_spec.rb

@@ -5,7 +5,7 @@ describe Walletone::Middleware::Callback do
   let(:callback) { -> (notify, env) { } }
   let(:middleware) { described_class.new callback }
   let!(:params) { { cp1251: 'привет'.encode('windows-1251') } }
-  subject! { Rack::MockRequest.new(middleware).post('/', params: params ) }
+  subject { Rack::MockRequest.new(middleware).post('/', params: params ) }
 
   it do
     expect(subject.body).to eq 'WMI_RESULT=OK' 

data/spec/walletone/notification_spec.rb

@@ -39,4 +39,30 @@ describe Walletone::Notification do
       expect( subject).to be_accepted
     end
   end
+
+  describe 'recurrent' do
+    let(:raw_params) do
+      {
+        "WMI_AUTO_ACCEPT": "1",
+        "WMI_COMMISSION_AMOUNT": "0.04",
+        "WMI_CREATE_DATE": "2015-11-08 06:04:05",
+        "WMI_CURRENCY_ID": "643",
+        "WMI_EXPIRED_DATE": "2015-12-08 06:04:05",
+        "WMI_EXTERNAL_ACCOUNT_ID": "521324******2146",
+        "WMI_FAIL_URL": "http://kiosk.3001.vkontraste.ru/payments/w1/failure",
+        "WMI_LAST_NOTIFY_DATE": "2015-11-08 11:17:49",
+        "WMI_MERCHANT_ID": "120464954417",
+        "WMI_NOTIFY_COUNT": "29",
+        "WMI_ORDER_ID": "345825935381",
+        "WMI_ORDER_STATE": "Accepted",
+        "WMI_PAYMENT_AMOUNT": "1.00",
+        "WMI_PAYMENT_NO": "merchant-68-invoice-1",
+        "WMI_PAYMENT_TYPE": "CreditCardRUB",
+        "WMI_RECURRING_PAYMENTS_APPROVED": "1",
+        "WMI_SUCCESS_URL": "http://kiosk.3001.vkontraste.ru/payments/w1/success",
+        "WMI_UPDATE_DATE": "2015-11-08 06:18:33",
+        "WMI_SIGNATURE": signature
+      }
+    end
+  end
 end

data/spec/walletone/recurrent/client_spec.rb

@@ -0,0 +1,63 @@
+require 'walletone/recurrent'
+require 'walletone/recurrent/invoice'
+require 'walletone/recurrent/client'
+
+describe Walletone::Recurrent::Client do
+  let(:merchant_id) { 127830694690 }
+  let(:secret_key) { '3475706857624f46344e573753316e387c396e5f4b54767b796c4c' }
+  let(:customer_id) { 123 }
+
+  let(:client) { Walletone::Recurrent::Client.new merchant_id: merchant_id, secret_key: secret_key, customer_id: customer_id }
+
+  let(:fields) do
+    Walletone::Fields.new WMI_PAYMENT_AMOUNT: 123, WMI_MERCHANT_ID: merchant_id, WMI_CUSTOMER_ID: 123, WMI_RECURRING_AGREEMENT_URL: 'http://'
+  end
+
+  let(:invoice) { Walletone::Recurrent::Invoice.new Amount: 123, OrderId: 456 }
+
+  context '#create_invoice' do
+    let(:result) {
+      {"Invoice"=>
+       {"InvoiceId"=>345539868062,
+        "Amount"=>1.24,
+        "CurrencyId"=>643,
+        "InvoiceStateId"=>"Created",
+        "CreateDate"=>"2015-12-31T08:20:13",
+        "UpdateDate"=>"2015-12-31T08:20:13",
+        "Payment"=>
+       {"PaymentId"=>69904496,
+        "PaymentCode"=>"345539868062",
+        "PaymentCodeType"=>"InvoiceId",
+        "CreateDate"=>"2015-12-31T08:20:14.137",
+        "UpdateDate"=>"2015-12-31T08:20:14.137",
+        "PaymentStateId"=>"Created",
+        "PaymentTypeId"=>"CreditCardRUB"}},
+        "CanSaveAsExternalAccount"=>true}
+    }
+    before do
+      stub_request(:post, "https://wl.walletone.com/checkout/invoicingapi/invoices").
+        with(:body => "{\"OrderId\":456,\"Amount\":123,\"CurrencyId\":643,\"PaymentTypeId\":\"CreditCardRUB\",\"InvoiceAdditionalParams\":{}}").
+        to_return(:status => 200, :body => result.to_json, :headers => {'Content-Type'=>'application/json; charset=utf-8'})
+    end
+    it do
+      res = client.create_invoice invoice
+      expect(res).to be_a Walletone::Recurrent::ResultInvoice
+    end
+  end
+
+  context '#make_payment' do
+    let(:payment_id) { 123 }
+    let(:result) { {} }
+    before do
+      stub_request(:post, "https://wl.walletone.com/checkout/invoicingapi/payments/123/process").
+        with(:body => "{\"CustomerId\":\"123\",\"CreditCardTerminal\":\"Non3Ds\",\"UseSavedAuthData\":\"true\",\"AuthData\":{\"RecurrentCreditCardEmail\":\"some@email.ru\"}}").
+        to_return(:status => 200, :body => result.to_json, :headers => {'Content-Type'=>'application/json; charset=utf-8'})
+
+    end
+    pending 'ответ'
+    #it do
+      #res = client.make_payment payment_id: payment_id, email: 'some@email.ru'
+      #expect(res).to eq 'aaa'
+    #end
+  end
+end

data/spec/walletone/recurrent/payment_spec.rb

@@ -0,0 +1,21 @@
+require 'walletone/recurrent'
+require 'walletone/recurrent/payment'
+
+describe Walletone::Recurrent::Payment do
+  let(:merchant_id) { 127830694690 }
+  let(:secret_key) { '3475706857624f46344e573753316e387c396e5f4b54767b796c4c' }
+
+  subject { described_class.new( fields ) }
+
+  let(:fields) do
+    Walletone::Fields.new WMI_PAYMENT_AMOUNT: 123, WMI_MERCHANT_ID: merchant_id, WMI_CUSTOMER_ID: 123, WMI_RECURRING_AGREEMENT_URL: 'http://'
+  end
+
+  it 'works' do
+    expect(subject.WMI_MERCHANT_ID).to eq(merchant_id)
+  end
+
+  it 'valid' do
+    expect(subject).to be_valid
+  end
+end

data/spec/walletone_spec.rb

@@ -5,19 +5,26 @@ describe Walletone do
     end
   end
 
+  #let(:notifier) { notifier = Class.new; def notifier.notify *args; end }
+  #let(:notifier) { double }
+
   describe 'Использует Bugsnag если он есть' do
     before do
-      ::Bugsnag = double
       # Сбрасываем конфигурацию, чтобы она еще раз создалась
       Walletone::Configuration.instance_variable_set('@singleton__instance__',nil)
     end
 
     it 'должен найти и применить Bugsnag' do
+      module ::Bugsnag
+        def self.notify *args
+        end
+      end
       expect(Walletone.config.error_notifier).to eq Bugsnag
     end
 
     after do
-      ::Bugsnag = nil
+      Walletone::Configuration.instance_variable_set('@singleton__instance__',nil)
+      Object.send(:remove_const, :Bugsnag)
     end
   end
 

data/walletone.gemspec

@@ -21,15 +21,20 @@ Gem::Specification.new do |s|
   s.add_dependency 'virtus', '~> 1.0'
   s.add_dependency 'rack',   '~> 1.5'
 
+  s.add_runtime_dependency 'faraday'
+  s.add_runtime_dependency 'money'
+
+  s.add_development_dependency 'multi_json', '>= 1.3.2'
+  s.add_development_dependency 'webmock', '>= 1.22'
   s.add_development_dependency 'rake', '>= 10.4.0'
   s.add_development_dependency 'rspec', '>= 3.2.0'
   s.add_development_dependency 'ffaker', '>= 2.0.0'
   s.add_development_dependency 'fabrication', '>= 2.12'
   s.add_development_dependency "pry", '~> 0'
   s.add_development_dependency "pry-nav", '~> 0'
-  s.add_development_dependency "webmock", '>= 1.21'
   s.add_development_dependency "guard", '>= 2.12'
   s.add_development_dependency "guard-rspec", '>= 4.5.0'
   s.add_development_dependency 'guard-ctags-bundler', '>= 1.4.0'
   s.add_development_dependency 'yard', '~> 0'
+  s.add_development_dependency "codeclimate-test-reporter"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: walletone
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Danil Pismenny
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-10 00:00:00.000000000 Z
+date: 2015-12-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: virtus
@@ -39,6 +39,62 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
+- !ruby/object:Gem::Dependency
+  name: faraday
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: money
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: multi_json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.3.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.3.2
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.22'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.22'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -123,20 +179,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: webmock
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.21'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.21'
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
@@ -193,6 +235,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: codeclimate-test-reporter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: "Клиент для приема оплаты через walletone.com"
 email:
 - danil@brandymint.ru
@@ -204,13 +260,21 @@ files:
 - LICENSE
 - README.md
 - lib/walletone.rb
+- lib/walletone/error_response.rb
 - lib/walletone/fields.rb
 - lib/walletone/form.rb
+- lib/walletone/invoicing.rb
+- lib/walletone/invoicing/client.rb
 - lib/walletone/middleware.rb
 - lib/walletone/middleware/base.rb
 - lib/walletone/middleware/callback.rb
 - lib/walletone/notification.rb
 - lib/walletone/payment.rb
+- lib/walletone/recurrent.rb
+- lib/walletone/recurrent/client.rb
+- lib/walletone/recurrent/invoice.rb
+- lib/walletone/recurrent/payment.rb
+- lib/walletone/recurrent/result_invoice.rb
 - lib/walletone/signer.rb
 - lib/walletone/version.rb
 - spec/fabricators/fields_fabricator.rb
@@ -218,10 +282,13 @@ files:
 - spec/spec_helper.rb
 - spec/walletone/fields_spec.rb
 - spec/walletone/form_spec.rb
+- spec/walletone/invoicing/client_spec.rb
 - spec/walletone/middleware/base_spec.rb
 - spec/walletone/middleware/callback_spec.rb
 - spec/walletone/notification_spec.rb
 - spec/walletone/payment_spec.rb
+- spec/walletone/recurrent/client_spec.rb
+- spec/walletone/recurrent/payment_spec.rb
 - spec/walletone/signer_spec.rb
 - spec/walletone_spec.rb
 - walletone.gemspec
@@ -245,20 +312,23 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: walleton.com Checkout client
 test_files:
-- spec/walletone/payment_spec.rb
+- spec/walletone_spec.rb
+- spec/fabricators/payment_fabricator.rb
+- spec/fabricators/fields_fabricator.rb
+- spec/spec_helper.rb
+- spec/walletone/signer_spec.rb
 - spec/walletone/fields_spec.rb
+- spec/walletone/payment_spec.rb
+- spec/walletone/invoicing/client_spec.rb
 - spec/walletone/form_spec.rb
-- spec/walletone/notification_spec.rb
-- spec/walletone/middleware/callback_spec.rb
 - spec/walletone/middleware/base_spec.rb
-- spec/walletone/signer_spec.rb
-- spec/spec_helper.rb
-- spec/fabricators/payment_fabricator.rb
-- spec/fabricators/fields_fabricator.rb
-- spec/walletone_spec.rb
+- spec/walletone/middleware/callback_spec.rb
+- spec/walletone/notification_spec.rb
+- spec/walletone/recurrent/payment_spec.rb
+- spec/walletone/recurrent/client_spec.rb
 has_rdoc: