payanyway 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 01cb3c2c06e6d8fd8308a70d57ad554f2bbc8372
-  data.tar.gz: ddc79fad090341cf5bb6ac5f32d58600cb35c6da
+  metadata.gz: f21fd360b24af27284a7454e590e7d8a728d8f86
+  data.tar.gz: 397e913d3e2d7ff45bdb47194a3586a9dc4097b0
 SHA512:
-  metadata.gz: 3414f4fedbd1341f29f1d9d9449799c1aecdf4307e1f50a1eacf93fb04e7e45b6a438fd25ab6309b9a1e6a9c23a6e9f736faf386bf31c1ca98ebc0bc983a2c48
-  data.tar.gz: efb6b8178bbfc14e4a9ba724faf2c1c0b748d11e0b09eb2e0e9e035239868890b5b62d555b924cd59caa68bcda01592904de0772bacc73fc1756d5169cd448ed
+  metadata.gz: 5206c312a90c926b6d547332343326972ba2681ae6bbfe7b7eaf642ce0078538d3bdefbdde8735d6a1e2b30997659b8bfed4e61c3bb9683322b9344a4087cbd4
+  data.tar.gz: b54db4f2f3cf498a6a715536282febe168dc73658f4f1dd3043997d8c5bd3a7a1322c5f715dbfa57c35a9a66b8c21f579c0d590734350e59b4c7184b5c195976

data/README.md

@@ -13,6 +13,7 @@
 - [Подключение](#setup)
 - [Использование](#usage)
     - [Запрос на оплату](#payment_url)
+    - [Получение URL для отображения виджета оплаты](#widget_url)
     - [Специальные URL'ы](#special_urls)
         - [Check URL](#check_url)
         - [Return URL и InProgress URL](#return_url)
@@ -101,6 +102,15 @@ production: <<: *config
 Payanyway::Gateway.payment_url(params, use_signature = true)
 ```
 
+###<a name="widget_url"></a> Получение URL для отображения виджета оплаты
+
+Чтобы получить ссылку на виджет для оплаты заказа пользователем,
+используйте хелпер
+
+```ruby
+Payanyway::Gateway.widget_url(params, use_signature = true)
+```
+
 Описание всех возможных параметров запроса (ключей params) находится [здесь](#params).
 
 Если в настройках счета в системе **moneta.ru** выставлен флаг «Можно переопределять настройки в URL», то можно так же передавать

data/lib/payanyway/factories/payment_url_factory.rb

@@ -1,58 +1,11 @@
 module Payanyway
   module Factories
     class PaymentUrlFactory
-      PARAMS = {
-          'MNT_ID'                  => :moneta_id,
-          'MNT_TEST_MODE'           => :test_mode,
-          'MNT_CURRENCY_CODE'       => :currency,
-
-          'MNT_TRANSACTION_ID'      => :transaction_id,
-          'MNT_AMOUNT'              => :amount,
-          'MNT_DESCRIPTION'         => :description,
-          'MNT_SUBSCRIBER_ID'       => :subscriber_id,
-
-          'MNT_SUCCESS_URL'         => :success_url,
-          'MNT_INPROGRESS_URL'      => :in_progress_url,
-          'MNT_FAIL_URL'            => :fail_url,
-          'MNT_RETURN_URL'          => :return_url,
-
-          'MNT_CUSTOM1'             => :custom1,
-          'MNT_CUSTOM2'             => :custom2,
-          'MNT_CUSTOM3'             => :custom3,
-
-          'moneta.locale'           => :locale,
-          'paymentSystem.limitIds'  => :payment_system_limit_ids,
-
-          # Дополнительные параметры запроса на оплату
-          'followup'                => :followup,
-          'paymentSystem.unitId'    => :payment_system_unit_id,
-          'javascriptEnabled'       => :javascript_enabled,
-          'paymentSystem.accountId' => :payment_system_account_id
-          # 'MNT_SIGNATURE'        => добавляется при use_signature == true
-      }.to_settings
-
-      class << self
-        def build(params, use_signature)
-          params_for_moneta = prepare_params(params, use_signature)
-          query_params = params_for_moneta.to_a.map { |option| option.map{ |opt| CGI::escape(opt.to_s) }.join('=') }.join('&')
-
-          "#{ Payanyway::Gateway.config['payment_url'] }?#{ query_params }"
-        end
-
-        private
-
-        def prepare_params(params, use_signature)
-          params_for_moneta = PARAMS.configure_by(params)
-          params_for_moneta = Payanyway::Gateway.config_for_moneta.merge(params_for_moneta)
-
-          use_signature ? add_signature(params_for_moneta) : params_for_moneta
-        end
-
-        def add_signature(params_for_moneta)
-          params_for_moneta.merge({
-            'MNT_SIGNATURE' => Payanyway::Helpers::SignatureGenerate.for_url(params_for_moneta)
-          })
-        end
+      def self.build(params, use_signature)
+        [
+          Payanyway::Gateway.config['payment_url'],
+          Payanyway::Factories::QueryParamsFactory.build(params, use_signature)
+        ].join('?')
       end
     end
   end

data/lib/payanyway/factories/query_params_factory.rb

@@ -0,0 +1,57 @@
+module Payanyway
+  module Factories
+    class QueryParamsFactory
+      PARAMS = {
+        'MNT_ID'                  => :moneta_id,
+        'MNT_TEST_MODE'           => :test_mode,
+        'MNT_CURRENCY_CODE'       => :currency,
+
+        'MNT_TRANSACTION_ID'      => :transaction_id,
+        'MNT_AMOUNT'              => :amount,
+        'MNT_DESCRIPTION'         => :description,
+        'MNT_SUBSCRIBER_ID'       => :subscriber_id,
+
+        'MNT_SUCCESS_URL'         => :success_url,
+        'MNT_INPROGRESS_URL'      => :in_progress_url,
+        'MNT_FAIL_URL'            => :fail_url,
+        'MNT_RETURN_URL'          => :return_url,
+
+        'MNT_CUSTOM1'             => :custom1,
+        'MNT_CUSTOM2'             => :custom2,
+        'MNT_CUSTOM3'             => :custom3,
+
+        'moneta.locale'           => :locale,
+        'paymentSystem.limitIds'  => :payment_system_limit_ids,
+
+        # Дополнительные параметры запроса на оплату
+        'followup'                => :followup,
+        'paymentSystem.unitId'    => :payment_system_unit_id,
+        'javascriptEnabled'       => :javascript_enabled,
+        'paymentSystem.accountId' => :payment_system_account_id
+        # 'MNT_SIGNATURE'        => добавляется при use_signature == true
+      }.to_settings
+
+      class << self
+        def build(params, use_signature)
+          params_for_moneta = prepare_params(params, use_signature)
+          params_for_moneta.to_a.map { |option| option.map{ |opt| CGI::escape(opt.to_s) }.join('=') }.join('&')
+        end
+
+        private
+
+        def prepare_params(params, use_signature)
+          params_for_moneta = PARAMS.configure_by(params)
+          params_for_moneta = Payanyway::Gateway.config_for_moneta.merge(params_for_moneta)
+
+          use_signature ? add_signature(params_for_moneta) : params_for_moneta
+        end
+
+        def add_signature(params_for_moneta)
+          params_for_moneta.merge({
+            'MNT_SIGNATURE' => Payanyway::Helpers::SignatureGenerate.for_url(params_for_moneta)
+          })
+        end
+      end
+    end
+  end
+end

data/lib/payanyway/factories/widget_url_factory.rb

@@ -0,0 +1,12 @@
+module Payanyway
+  module Factories
+    class WidgetUrlFactory
+      def self.build(params, use_signature)
+        [
+          Payanyway::Gateway.config['widget_url'],
+          Payanyway::Factories::QueryParamsFactory.build(params, use_signature)
+        ].join('?')
+      end
+    end
+  end
+end

data/lib/payanyway/gateway.rb

@@ -50,6 +50,10 @@ module Payanyway
       Payanyway::Factories::PaymentUrlFactory.build(params, use_signature)
     end
 
+    def widget_url(params, use_signature = true)
+      Payanyway::Factories::WidgetUrlFactory.build(params, use_signature)
+    end
+
     class << self
       extend Forwardable
       def_delegators(:instance, *Payanyway::Gateway.instance_methods(false))
@@ -61,4 +65,4 @@ module Payanyway
       YAML.load(File.read(File.join(Rails.root, 'config/payanyway.yml')))[@env]
     end
   end
-end
+end

data/lib/payanyway/version.rb

@@ -1,3 +1,3 @@
 module Payanyway
-  VERSION = '2.1.0'
+  VERSION = '2.2.0'
 end

data/spec/internal/config/payanyway.yml

@@ -2,5 +2,6 @@ test:
   moneta_id: 141290
   currency: RUB
   payment_url: https://demo.moneta.ru/assistant.htm
+  widget_url: https://demo.moneta.ru/assistant.widget
   test_mode: 1
   token: secret_token

data/spec/lib/payanyway/factories/{payment_url_factory_spec.rb → query_params_factory_spec.rb}

@@ -1,10 +1,10 @@
 require 'uri'
 
-describe Payanyway::Factories::PaymentUrlFactory do
+describe Payanyway::Factories::QueryParamsFactory do
   subject do
-    parse_url = URI(described_class.build(params, false))
+    built_params = described_class.build(params, false)
 
-    Hash[ URI.decode_www_form(parse_url.query) ]
+    Hash[ URI.decode_www_form(built_params) ]
   end
 
   context 'when reset urls' do

data/spec/lib/payanyway/gateway_spec.rb

@@ -29,4 +29,12 @@ describe Payanyway::Gateway do
       it { is_expected.to eq('https://demo.moneta.ru/assistant.htm?MNT_ID=54321&MNT_CURRENCY_CODE=RUB&MNT_TEST_MODE=1&MNT_AMOUNT=120.25&MNT_TRANSACTION_ID=FF790ABCD') }
     end
   end
+
+  describe '#widget_url' do
+    let(:params) { { amount: '120.25', transaction_id: 'FF790ABCD' } }
+
+    subject { described_class.widget_url(params, false) }
+
+    it { is_expected.to eq('https://demo.moneta.ru/assistant.widget?MNT_ID=141290&MNT_CURRENCY_CODE=RUB&MNT_TEST_MODE=1&MNT_AMOUNT=120.25&MNT_TRANSACTION_ID=FF790ABCD') }
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: payanyway
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - ssnikolay
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-31 00:00:00.000000000 Z
+date: 2017-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -169,6 +169,8 @@ files:
 - lib/payanyway/controller.rb
 - lib/payanyway/engine.rb
 - lib/payanyway/factories/payment_url_factory.rb
+- lib/payanyway/factories/query_params_factory.rb
+- lib/payanyway/factories/widget_url_factory.rb
 - lib/payanyway/gateway.rb
 - lib/payanyway/helpers/settings.rb
 - lib/payanyway/helpers/signature_generator.rb
@@ -184,7 +186,7 @@ files:
 - spec/internal/app/controllers/application_controller.rb
 - spec/internal/app/controllers/payanyway_controller.rb
 - spec/internal/config/payanyway.yml
-- spec/lib/payanyway/factories/payment_url_factory_spec.rb
+- spec/lib/payanyway/factories/query_params_factory_spec.rb
 - spec/lib/payanyway/gateway_spec.rb
 - spec/lib/payanyway/helpers/signature_generator_spec.rb
 - spec/lib/payanyway/request/base_spec.rb
@@ -222,7 +224,7 @@ test_files:
 - spec/internal/app/controllers/application_controller.rb
 - spec/internal/app/controllers/payanyway_controller.rb
 - spec/internal/config/payanyway.yml
-- spec/lib/payanyway/factories/payment_url_factory_spec.rb
+- spec/lib/payanyway/factories/query_params_factory_spec.rb
 - spec/lib/payanyway/gateway_spec.rb
 - spec/lib/payanyway/helpers/signature_generator_spec.rb
 - spec/lib/payanyway/request/base_spec.rb