walletone 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 854585f01ea24db9a260cc1fe621aa29be19d1bf
-  data.tar.gz: 4132c58019eab414552fcb1f5de5ba28664f0ef1
+  metadata.gz: 5afa0d525c38be77b98d36d334e2a26bede7ca55
+  data.tar.gz: dc8fe82e3a77fc8566d0fd90cf26559b6263c54e
 SHA512:
-  metadata.gz: 5819cc1b3832bb12ad0eb03d9963f792402fdaebe6bd188cf4e82f366f518365fc78a3a08b1d61fd5a7b2ecb9b4a18ed8066c0ae9b67e4bd11bcb2813fcfd1f5
-  data.tar.gz: 63f4a9fd0083a6e3fb298677564445683ad3c2026ae42edd1b7620917ee31d8a8eae9e75e12e34dfd3dc5df7209388d5bdc0152c2fe1cf64a0cc3c8c1fc8a10d
+  metadata.gz: a1f78edea3a44df7fa8eac66123c37a0b2bde7b505b7e960670b76cc004d897e17555f18a852e072ec04b825f880625fe714c2e368cc4dee310bdc64b3ea610f
+  data.tar.gz: 153a3def129ee5fe3041834c71ec6225d98f68fb1f111c357e7c49639a94c92a94397a12412f30f6deb14d3fbb6c5315b203407cc5d8e6048e3e063c6e49beea

data/README.md

@@ -5,6 +5,13 @@
 
 ---
 
+Привет!
+
+Мы сделали этот модуль очень удобным для Вас. Вы сделаете нам приятно и полезно,
+если зарегистрируете своего мерчанта по [этой промо-ссылке](http://www.walletone.com/ru/merchant/?promo=EtRa48zZP)
+
+Так вы получите сниженный процент за прием платежей по картам visa/mastercard - 3,5%
+
 ## Прием уведомлений об оплате (rack middleware)
 
 ### 1. Создаем rack middleware для приема уведомлений
@@ -17,9 +24,13 @@
 wm = Walletone::Middleware::Callback.new do |notify, env|
   # notify is a Walletone::Notification instance
 
-  raise 'Wrong sign' unless notify.valid? W1_SECRET_KEY
+  raise 'WARNING! Wrong signature!' unless notify.valid? W1_SECRET_KEY
 
-  # TODO something with notify
+  if notify.accepted?
+    # Successful payed. Deliver your goods to the client
+  else
+    # Payment is failed. Notify you client.
+  end
 
   'Return some message for OK response'
 end
@@ -73,18 +84,19 @@ payment = Walletone::Payment.new(
     SOME_CUSTOM_FIELD:  'value'
     # etc любые другие поля
 )
+payment.sign! 'you secret key'
+form = payment.form
 ```
 
 
 ### Собственно генераця формы
 
 ```haml
-- form = Walletone::Form.new payment
 
 %h5 В течение 5-и секунд вы будете переправлены на страницу оплаты.
 = form_tag form.checkout_url, form.options.merge(data: {autosubmit: true}) do |f|
-  = form.hidden_fields_tags
-  = submit_tag 'Перейти к оплате', 
+  = raw form.hidden_fields_tags
+  = button_tag 'Перейти к оплате', 
     :class=>'btn btn-primary',
     :data =>{:disable_with => 'Переправляю на сайт оплаты..'}
 
@@ -94,11 +106,20 @@ payment = Walletone::Payment.new(
   $ -> $('[data-autosubmit]').submit()
 ```
 
+# Подсказки
+
+Не используйте в форме кнопку `submit` с установленным `value` и `name`, потому что в
+таком случае ее значение на сервер придет в параметрах и его тоже придется
+включать в подписываемые поля.
+
 # Прочие ссылки
 
 1. [Walletone Open API](https://api.w1.ru/OpenApi/)
 2. [Документация (API)](http://www.walletone.com/ru/merchant/documentation/)
 
+Sponsored by http://taaasty.com and http://kiiiosk.ru
+Developers are http://brandymint.com
+
 ---
 
 ### Contributing

data/lib/walletone.rb

@@ -1,11 +1,9 @@
 require 'logger'
 require 'virtus'
 
-require 'walletone/errors/walletone_error'
-require 'walletone/errors/bad_url_error'
-
 require 'walletone/payment'
 require 'walletone/notification'
+require 'walletone/form'
 require 'walletone/middleware/base'
 
 module Walletone
@@ -38,6 +36,11 @@ module Walletone
     config.error_notifier.send self.config.error_notify_method, error, *args
   end
 
+  def self.raise_error error
+    notify_error error
+    fail error
+  end
+
   def self.config
     Configuration.instance
   end

data/lib/walletone/fields.rb

@@ -2,43 +2,20 @@
 #
 module Walletone
   class Fields < Hash
-    # http://www.walletone.com/ru/merchant/documentation/#step2
-    #
-    #
-    W1_KEYS = %i(
-        WMI_MERCHANT_ID
-        WMI_PAYMENT_AMOUNT
-        WMI_CURRENCY_ID
-        WMI_PAYMENT_NO
-        WMI_DESCRIPTION
-        WMI_SUCCESS_URL WMI_FAIL_URL
-        WMI_EXPIRED_DATE
-        WMI_PTENABLED WMI_PTDISABLED
-        WMI_RECIPIENT_LOGIN
-        WMI_CUSTOMER_FIRSTNAME WMI_CUSTOMER_LASTNAME WMI_CUSTOMER_EMAIL
-        WMI_CULTURE_ID
-        WMI_SIGNATURE
-        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_DATEFROM WMI_DELIVERY_DATETILL
-        WMI_PSP_MERCHANT_ID
-    )
-
-    MULTIPLE_VALUES = %i(WMI_PTENABLED WMI_PTDISABLED)
-
-    # Определяем методы для прямого доступа
-    # > payment.WMI_MERCHANT_ID
-    # > payment.WMI_MERCHANT_ID=123
-    #
-    # > payment.WMI_PTENABLED = 
-    W1_KEYS.each do |k|
-      define_method k do
-        fetch k
-      end
-
-      define_method "#{k}=" do |value|
-        self[k]= value
+    def self.define_fields fields
+      # Определяем методы для прямого доступа
+      # > payment.WMI_MERCHANT_ID
+      # > payment.WMI_MERCHANT_ID=123
+      #
+      # > payment.WMI_PTENABLED = 
+      fields.each do |k|
+        define_method k do
+          fetch k
+        end
+
+        define_method "#{k}=" do |value|
+          self[k]= value
+        end
       end
     end
 

data/lib/walletone/form.rb

@@ -1,8 +1,15 @@
 require 'cgi'
+require 'walletone/payment'
 module Walletone
   class Form
-    include Virtus.model strict: true, coerce: false
-    attribute :payment, Payment, required: true
+    attr_reader :payment
+
+    def initialize payment
+      unless payment.is_a?( Walletone::Payment ) && payment.valid? && payment.signed?
+        Walletone.raise_error ArgumentError.new("Must be valid and signed Payment #{payment}")
+      end
+      @payment = payment
+    end
 
     def checkout_url
       Walletone.config.web_checkout_url

data/lib/walletone/notification.rb

@@ -1,17 +1,44 @@
 require 'walletone/fields'
-# Уведомление от walletone которое пришло через rack middleware callback
+
+# Уведомление об оплате от walletone которое пришло через rack middleware callback
 #
 
 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
+    )
+
+    define_fields FIELDS
 
     def initialize params
       super( params ).freeze
     end
 
+    # Обязательно проверяем валидость уведомления, вдруг его
+    # прислал злоумышленник.
+    #
     def valid?(secret_key, hash_type = Signer::DEFAULT_HASH_TYPE)
       self.WMI_SIGNATURE == signer.signature( secret_key, hash_type )
     end
 
+    # Принята оплата или не прошла?
+    #
+    def accepted?
+      self['WMI_ORDER_STATE'].to_s.upcase == 'ACCEPTED'
+    end
+
   end
 end

data/lib/walletone/payment.rb

@@ -7,9 +7,41 @@ require 'time'
 #
 module Walletone
   class Payment < Fields
+    # http://www.walletone.com/ru/merchant/documentation/#step2
+    #
+    #
+    class << self
+      attr_accessor :encode_description
+    end
+
+    DESCRIPTION_TRUNCATE_LENGTH = 250
+    FIELDS = %i(
+        WMI_MERCHANT_ID
+        WMI_PAYMENT_NO
+        WMI_PAYMENT_AMOUNT
+        WMI_CURRENCY_ID
+        WMI_DESCRIPTION
+        WMI_SUCCESS_URL WMI_FAIL_URL
+        WMI_EXPIRED_DATE
+        WMI_PTENABLED WMI_PTDISABLED
+        WMI_RECIPIENT_LOGIN
+        WMI_CUSTOMER_FIRSTNAME WMI_CUSTOMER_LASTNAME WMI_CUSTOMER_EMAIL
+        WMI_CULTURE_ID
+        WMI_SIGNATURE
+        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_DATEFROM WMI_DELIVERY_DATETILL
+        WMI_PSP_MERCHANT_ID
+    )
+
+    MULTIPLE_VALUES = %i(WMI_PTENABLED WMI_PTDISABLED)
+
     RUB_ISO_NUMBER = 643
     DEFAULT_CURRENTY = RUB_ISO_NUMBER
 
+    define_fields FIELDS
+
     def sign!(secret_key, hash_type=Signer::DEFAULT_HASH_TYPE)
       raise 'Already signed!' if signed?
       self.WMI_SIGNATURE = signer.signature secret_key, hash_type
@@ -21,22 +53,38 @@ module Walletone
       self.WMI_SIGNATURE.is_a?(String) && ! self.WMI_SIGNATURE.empty?
     end
 
+    def valid?
+      # Где узнать какие поля обязательные?
+      self.WMI_PAYMENT_AMOUNT && self.WMI_MERCHANT_ID
+    end
+
+    # Form generation shortcut
+    def form
+      Walletone::Form.new self
+    end
+
     def WMI_CURRENCY_ID
-      super || DEFAULT_CURRENTY
+      fetch(:WMI_CURRENCY_ID) || DEFAULT_CURRENTY
     end
 
     def WMI_PAYMENT_AMOUNT
-      value = super
+      value = fetch :WMI_PAYMENT_AMOUNT
       "%.2f" % value if value
     end
 
     def WMI_DESCRIPTION
-      value = super
-      "BASE64:#{Base64.encode64(value[0...250])[0..-2]}" if value
+      value = fetch :WMI_DESCRIPTION
+      return value unless value
+      if self.class.encode_description
+        # TODO энкодить автоматически, если встречаются национальные символы
+        "BASE64:#{Base64.encode64(value[0...250])[0..-2]}"
+      else
+        value.slice 0, DESCRIPTION_TRUNCATE_LENGTH
+      end
     end
 
     def WMI_EXPIRED_DATE
-      value = super
+      value = fetch :WMI_EXPIRED_DATE
       value ? value.iso8601 : value
     end
 

data/lib/walletone/version.rb

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

data/spec/walletone/fields_spec.rb

@@ -3,7 +3,7 @@ require 'walletone/fields'
 describe Walletone::Fields do
 
   describe 'Именованные поля' do
-    subject { described_class.new }
+    subject { Walletone::Payment.new }
     let(:merchant_id) { 'some_id' }
 
     it 'nill by default' do
@@ -22,7 +22,7 @@ describe Walletone::Fields do
   describe '#initialize' do
     let(:fail_url) { 'someurl' }
     let(:attrs)   { { 'WMI_FAIL_URL' => fail_url } }
-    subject { described_class.new attrs }
+    subject { Walletone::Payment.new attrs }
 
     it { expect(subject.WMI_FAIL_URL).to eq fail_url }
     it { expect(subject['WMI_FAIL_URL']).to eq fail_url }

data/spec/walletone/form_spec.rb

@@ -1,9 +1,9 @@
 require 'walletone/form'
 
 describe Walletone::Form do
-  let(:payment) { Fabricate :payment }
+  let(:payment) { Fabricate( :payment ).sign! 'somekey' }
 
-  subject { described_class.new payment: payment }
+  subject { described_class.new payment }
 
   describe '#checkout_url' do
     it { expect(subject.checkout_url).to eq Walletone.config.web_checkout_url }

data/spec/walletone/notification_spec.rb

@@ -33,4 +33,10 @@ describe Walletone::Notification do
       expect( subject.valid?(secret) ).to be_truthy
     end
   end
+
+  context '#accepted?' do
+    it do
+      expect( subject).to be_accepted
+    end
+  end
 end

data/spec/walletone/payment_spec.rb

@@ -1,8 +1,14 @@
+require 'walletone/form'
+
 describe Walletone::Payment do
   let(:merchant_id) { 127830694690 }
   let(:secret_key) { '3475706857624f46344e573753316e387c396e5f4b54767b796c4c' }
 
-  subject { described_class.new fields }
+  before do
+    described_class.encode_description = true
+  end
+
+  subject { described_class.new( fields ) }
 
   context '.new' do
     let(:fields) { Walletone::Fields.new WMI_MERCHANT_ID: merchant_id }
@@ -31,8 +37,13 @@ describe Walletone::Payment do
 
     it { expect(subject).to be_frozen }
     it { expect(subject).to be_signed }
+    it { expect(subject).to be_valid }
     it { expect(subject.WMI_SIGNATURE).to eq signature }
 
+    it '#form' do
+      expect(subject.form).to be_a Walletone::Form
+    end
+
   end
 
   it 'WMI_PAYMENT_AMOUNT' do

data/spec/walletone_spec.rb

@@ -5,6 +5,22 @@ describe Walletone do
     end
   end
 
+  describe 'Использует Bugsnag если он есть' do
+    before do
+      ::Bugsnag = double
+      # Сбрасываем конфигурацию, чтобы она еще раз создалась
+      Walletone::Configuration.instance_variable_set('@singleton__instance__',nil)
+    end
+
+    it 'должен найти и применить Bugsnag' do
+      expect(Walletone.config.error_notifier).to eq Bugsnag
+    end
+
+    after do
+      ::Bugsnag = nil
+    end
+  end
+
   context '.notify_error' do
     let(:error) { StandardError.new }
     it do

data/walletone.gemspec

@@ -19,17 +19,17 @@ Gem::Specification.new do |s|
   s.test_files = Dir.glob("spec/**/*")
 
   s.add_dependency 'virtus', '~> 1.0'
-  s.add_dependency 'rack',   '~> 1.6'
+  s.add_dependency 'rack',   '~> 1.5'
 
-  s.add_development_dependency 'rake'
-  s.add_development_dependency 'rspec', '~> 3.2.0'
+  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.2'
-  s.add_development_dependency "pry"
-  s.add_development_dependency "pry-nav"
-  s.add_development_dependency "webmock"
-  s.add_development_dependency "guard"
-  s.add_development_dependency "guard-rspec"
-  s.add_development_dependency 'guard-ctags-bundler'
-  s.add_development_dependency 'yard'
+  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'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: walletone
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Danil Pismenny
@@ -31,40 +31,40 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 10.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 10.4.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.0
 - !ruby/object:Gem::Dependency
@@ -85,42 +85,42 @@ dependencies:
   name: fabrication
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.12.2
+        version: '2.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.12.2
+        version: '2.12'
 - !ruby/object:Gem::Dependency
   name: pry
   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'
 - !ruby/object:Gem::Dependency
   name: pry-nav
   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'
 - !ruby/object:Gem::Dependency
@@ -129,68 +129,68 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.21'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.21'
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.12'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.5.0
 - !ruby/object:Gem::Dependency
   name: guard-ctags-bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.4.0
 - !ruby/object:Gem::Dependency
   name: yard
   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"
@@ -204,8 +204,6 @@ files:
 - LICENSE
 - README.md
 - lib/walletone.rb
-- lib/walletone/errors/bad_url_error.rb
-- lib/walletone/errors/walletone_error.rb
 - lib/walletone/fields.rb
 - lib/walletone/form.rb
 - lib/walletone/middleware.rb

data/lib/walletone/errors/bad_url_error.rb

@@ -1,4 +0,0 @@
-module Walletone
-  class BadUrlError < WalletoneError
-  end
-end

data/lib/walletone/errors/walletone_error.rb

@@ -1,4 +0,0 @@
-module Walletone
-  class WalletoneError < StandardError
-  end
-end