moneta-api 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d1c57b143f1deaff1fd20aab54676724403a76ba
-  data.tar.gz: 1c2ace8fff474fb919bb77dca1a145b3a243fa14
+  metadata.gz: 2bd8ba9619326c34b72b79371521849fe44e5b78
+  data.tar.gz: 1a9a33ce255cb1a7c8bdf4a40c69999659992da7
 SHA512:
-  metadata.gz: c3b2b4bb3223ab341c26536bd36f98c777c8f10254ffef902db9d24e52ff26336faa758d5aa6d2d51fa2f5d2ee4c47f7a3a4d3755973feba121d03ea61f80638
-  data.tar.gz: 71ddfcf91f937a1cd72ce54a1fdbbbd58be77d71fa14a35bba2d6853635f36173ad02bede4f087111725e55af70b9aa29c8b6c0d15bf1b722c4acec9b307aab3
+  metadata.gz: ecd96715a52e1fc07270eb7e872ec91b6b7fc69c0521ef99b79c403ec41eda12574308fad9b8b94e4a0a161e85c3d82d10fdaa0625113f4de21d2864df634f40
+  data.tar.gz: d35540807da05ab55e0f9c7872da1f6567b36275a046d52d7ce27701ba89f4bbfc3555e0f44bbc03ed32824bbf9405c4c06e8d0d984ec71535ea0ac606b0aaf7

data/lib/moneta/api/requests/cancel_transaction_request.rb

@@ -1,6 +1,6 @@
 module Moneta
   module Api
-    module Request
+    module Requests
       # Запрос на отмену операции. Отменять операцию можно при выполнении всех условий:
       # незавершенные операции;
       # если есть доступ к счету плательщика и счету получателя (то есть свои внутренние операции).

data/lib/moneta/api/service.rb

@@ -1,6 +1,9 @@
 module Moneta
   module Api
     class Service
+      DEMO = 'https://demo.moneta.ru/services.wsdl'
+      PRODUCTION = 'https://www.moneta.ru/services.wsdl'
+
       include ServiceMethods
       attr_reader :client
 
@@ -11,7 +14,15 @@ module Moneta
       private
 
       def prepare_params(username, password, params)
-        { wsdl: 'https://demo.moneta.ru/services.wsdl', wsse_auth: [ username, password ] }
+        demo_mode = params.delete(:demo_mode)
+
+        { wsse_auth: [ username, password ] }
+          .merge(params)
+          .merge(wsdl: wsdl_url(demo_mode))
+      end
+
+      def wsdl_url(demo_mode)
+        demo_mode ? DEMO : PRODUCTION
       end
     end
   end

data/lib/moneta/api/types/authorise_transaction_batch_request_type.rb

@@ -1,3 +1,5 @@
+require_relative 'entity'
+
 module Moneta
   module Api
     module Types

data/lib/moneta/api/types/authorise_transaction_request_type.rb

@@ -1,3 +1,7 @@
+require_relative 'key_value_attribute'
+require_relative 'operation_info'
+require_relative 'transaction_request_type'
+
 module Moneta
   module Api
     module Types

data/lib/moneta/api/types/verify_transaction_response_type.rb

@@ -1,3 +1,5 @@
+require_relative 'verify_transfer_response_type'
+
 module Moneta
   module Api
     module Types

data/lib/moneta/api/version.rb

@@ -1,5 +1,5 @@
 module Moneta
   module Api
-    VERSION = '1.0.0'
+    VERSION = '1.0.1'
   end
 end

data/lib/moneta/api.rb

@@ -5,14 +5,6 @@ require 'moneta/api/service_methods'
 require 'moneta/api/service'
 require 'moneta/api/data_mapper'
 
-require 'moneta/api/types/entity'
-require 'moneta/api/types/key_value_attribute'
-require 'moneta/api/types/operation_info'
-require 'moneta/api/types/transaction_request_type'
-
-require 'moneta/api/types/forecast_transaction_response_type'
-require 'moneta/api/types/verify_transfer_response_type'
-
 %w(types responses requests).each do |folder|
   Dir["lib/moneta/api/#{ folder }/*.rb"].each do |file|
     require File.join(File.dirname(__FILE__), '../../', file)

data/spec/lib/moneta/api/requests/authorise_transaction_batch_request_spec.rb

@@ -27,7 +27,8 @@ describe Moneta::Api::Requests::AuthoriseTransactionBatchRequest do
   end
 
   describe 'use', vcr: true do
-    let(:service) { Moneta::Api::Service.new($username, $password) }
+    include_context 'moneta'
+
     let(:data) {
       {
         amount: 10,

data/spec/lib/moneta/api/requests/authorise_transaction_request_spec.rb

@@ -1,14 +1,10 @@
 describe Moneta::Api::Requests::AuthoriseTransactionRequest, vcr: true do
-  let(:service) { Moneta::Api::Service.new($username, $password) }
+  include_context 'moneta'
 
   describe '#authorise_transaction' do
     let(:request) do
       described_class.new.tap do |request|
-        request.payee = 28988504
-        request.payer = 10999
-        request.amount = 10
-        request.is_payer_amount = false
-        request.payment_password = '12345'
+        fill_base_settings.(request)
       end
     end
 

data/spec/lib/moneta/api/requests/create_account_request_spec.rb

@@ -1,5 +1,5 @@
 describe Moneta::Api::Requests::CreateAccountRequest, vcr: true do
-  let(:service) { Moneta::Api::Service.new($username, $password) }
+  include_context 'moneta'
 
   describe 'create account' do
     let(:request) do

data/spec/lib/moneta/api/requests/find_operations_list_request_spec.rb

@@ -1,5 +1,5 @@
 describe Moneta::Api::Requests::FindOperationsListRequest, vcr: true do
-  let(:service) { Moneta::Api::Service.new($username, $password) }
+  include_context 'moneta'
 
   describe 'find_operations_list' do
     let(:request) do

data/spec/lib/moneta/api/requests/forecast_transaction_request_spec.rb

@@ -1,14 +1,9 @@
 describe Moneta::Api::Requests::ForecastTransactionRequest, vcr: true do
-  let(:service) { Moneta::Api::Service.new($username, $password) }
-
+  include_context 'moneta'
   describe 'forecast_transaction' do
     let(:request) do
       described_class.new.tap do |request|
-        request.amount = 10
-        request.payee = 28988504
-        request.payer = 10999
-        request.is_payer_amount = false
-        request.payment_password = '12345'
+        fill_base_settings.(request)
       end
     end
 

data/spec/lib/moneta/api/requests/get_account_payment_password_challenge_request_spec.rb

@@ -1,5 +1,5 @@
 describe Moneta::Api::Requests::GetAccountPaymentPasswordChallengeRequest, vcr: true do
-  let(:service) { Moneta::Api::Service.new($username, $password) }
+  include_context 'moneta'
 
   describe 'get_account_payment_password_challenge' do
     let(:request) do

data/spec/lib/moneta/api/requests/payment_request_spec.rb

@@ -1,14 +1,10 @@
 describe Moneta::Api::Requests::PaymentRequest, vcr: true do
-  let(:service) { Moneta::Api::Service.new($username, $password) }
+  include_context 'moneta'
 
   describe 'payment' do
     let(:request) do
       described_class.new.tap do |request|
-        request.payee = 28988504
-        request.payer = 10999
-        request.amount = 10
-        request.is_payer_amount = false
-        request.payment_password = '12345'
+        fill_base_settings.(request)
       end
     end
 

data/spec/lib/moneta/api/requests/transfer_request_spec.rb

@@ -1,14 +1,10 @@
 describe Moneta::Api::Requests::TransferRequest, vcr: true do
-  let(:service) { Moneta::Api::Service.new($username, $password) }
+  include_context 'moneta'
 
   describe 'transfer' do
     let(:request) do
       described_class.new.tap do |request|
-        request.amount = 10
-        request.payee = 28988504
-        request.payer = 10999
-        request.is_payer_amount = false
-        request.payment_password = '12345'
+        fill_base_settings.(request)
       end
     end
 

data/spec/lib/moneta/api/service_spec.rb

@@ -1,9 +1,24 @@
-describe Moneta::Api::Service, vcr: true do
-  let(:service) { described_class.new($username, $password) }
+describe Moneta::Api::Service do
+  let(:params) { { demo_mode: true } }
+  let(:service) { described_class.new($username, $password, params) }
 
-  describe '#find_account_by_id' do
+  describe '#find_account_by_id', vcr: true do
     subject { service.find_account_by_id(10999) }
 
     its('account.id') { is_expected.to eq '10999' }
   end
+
+  describe 'wsdl url' do
+    subject{ service.client.globals.instance_variable_get('@options')[:wsdl] }
+
+    context 'when demo mode' do
+      it { is_expected.to eq 'https://demo.moneta.ru/services.wsdl' }
+    end
+
+    context 'when demo mode' do
+      let(:params) { {} }
+
+      it { is_expected.to eq 'https://www.moneta.ru/services.wsdl' }
+    end
+  end
 end

data/spec/support/context.rb

@@ -0,0 +1,13 @@
+RSpec.shared_context 'moneta' do
+  let(:service) { Moneta::Api::Service.new($username, $password, { demo_mode: true }) }
+
+  let(:fill_base_settings) do
+    Proc.new do |request|
+      request.payee = 28988504
+      request.payer = 10999
+      request.amount = 10
+      request.is_payer_amount = false
+      request.payment_password = '12345'
+    end
+  end
+end

data/spec/vcr/moneta_api_requests_authorisetransactionrequest_authorise_transaction/should_success.yml

@@ -21,7 +21,7 @@ http_interactions:
       server:
       - nginx
       date:
-      - Fri, 10 Apr 2015 12:27:00 GMT
+      - Tue, 14 Apr 2015 08:37:20 GMT
       content-type:
       - text/xml
       transfer-encoding:
@@ -10733,7 +10733,7 @@ http_interactions:
         ZXMiLz4KICAgICAgPC93c2RsOnBvcnQ+CiAgIDwvd3NkbDpzZXJ2aWNlPgo8
         L3dzZGw6ZGVmaW5pdGlvbnM+
     http_version: '1.1'
-  recorded_at: Fri, 10 Apr 2015 12:27:03 GMT
+  recorded_at: Tue, 14 Apr 2015 08:37:23 GMT
 - request:
     method: post
     uri: https://demo.moneta.ru/services
@@ -10766,7 +10766,7 @@ http_interactions:
       server:
       - nginx
       date:
-      - Fri, 10 Apr 2015 12:27:03 GMT
+      - Tue, 14 Apr 2015 08:37:23 GMT
       content-type:
       - text/xml;charset=utf-8
       content-length:
@@ -10784,7 +10784,7 @@ http_interactions:
     body:
       encoding: UTF-8
       string: <SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/"><SOAP-ENV:Header/><SOAP-ENV:Body><ns2:AuthoriseTransactionResponse
-        xmlns:ns2="http://www.moneta.ru/schemas/messages.xsd"><ns2:id>340023</ns2:id><ns2:attribute><ns2:key>category</ns2:key><ns2:value>BUSINESS</ns2:value></ns2:attribute><ns2:attribute><ns2:key>sourcecurrencycode</ns2:key><ns2:value>RUB</ns2:value></ns2:attribute><ns2:attribute><ns2:key>sourceamount</ns2:key><ns2:value>10</ns2:value></ns2:attribute><ns2:attribute><ns2:key>typeid</ns2:key><ns2:value>10</ns2:value></ns2:attribute><ns2:attribute><ns2:key>targetamount</ns2:key><ns2:value>-10</ns2:value></ns2:attribute><ns2:attribute><ns2:key>protectioncode</ns2:key><ns2:value>88776</ns2:value></ns2:attribute><ns2:attribute><ns2:key>targetcurrencycode</ns2:key><ns2:value>RUB</ns2:value></ns2:attribute><ns2:attribute><ns2:key>statusid</ns2:key><ns2:value>INPROGRESS</ns2:value></ns2:attribute><ns2:attribute><ns2:key>sourceamounttotal</ns2:key><ns2:value>10</ns2:value></ns2:attribute><ns2:attribute><ns2:key>modified</ns2:key><ns2:value>2015-04-10T15:27:03.000+03:00</ns2:value></ns2:attribute><ns2:attribute><ns2:key>targetaccountid</ns2:key><ns2:value>10999</ns2:value></ns2:attribute><ns2:attribute><ns2:key>protectioncodeexpirationdate</ns2:key><ns2:value>2015-04-11T15:27:02.000+03:00</ns2:value></ns2:attribute><ns2:attribute><ns2:key>sourceaccountid</ns2:key><ns2:value>28988504</ns2:value></ns2:attribute><ns2:attribute><ns2:key>isreversed</ns2:key><ns2:value>true</ns2:value></ns2:attribute></ns2:AuthoriseTransactionResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
+        xmlns:ns2="http://www.moneta.ru/schemas/messages.xsd"><ns2:id>340167</ns2:id><ns2:attribute><ns2:key>category</ns2:key><ns2:value>BUSINESS</ns2:value></ns2:attribute><ns2:attribute><ns2:key>sourcecurrencycode</ns2:key><ns2:value>RUB</ns2:value></ns2:attribute><ns2:attribute><ns2:key>sourceamount</ns2:key><ns2:value>10</ns2:value></ns2:attribute><ns2:attribute><ns2:key>typeid</ns2:key><ns2:value>10</ns2:value></ns2:attribute><ns2:attribute><ns2:key>targetamount</ns2:key><ns2:value>-10</ns2:value></ns2:attribute><ns2:attribute><ns2:key>protectioncode</ns2:key><ns2:value>49754</ns2:value></ns2:attribute><ns2:attribute><ns2:key>targetcurrencycode</ns2:key><ns2:value>RUB</ns2:value></ns2:attribute><ns2:attribute><ns2:key>statusid</ns2:key><ns2:value>INPROGRESS</ns2:value></ns2:attribute><ns2:attribute><ns2:key>sourceamounttotal</ns2:key><ns2:value>10</ns2:value></ns2:attribute><ns2:attribute><ns2:key>modified</ns2:key><ns2:value>2015-04-14T11:37:23.000+03:00</ns2:value></ns2:attribute><ns2:attribute><ns2:key>targetaccountid</ns2:key><ns2:value>10999</ns2:value></ns2:attribute><ns2:attribute><ns2:key>protectioncodeexpirationdate</ns2:key><ns2:value>2015-04-15T11:37:22.000+03:00</ns2:value></ns2:attribute><ns2:attribute><ns2:key>sourceaccountid</ns2:key><ns2:value>28988504</ns2:value></ns2:attribute><ns2:attribute><ns2:key>isreversed</ns2:key><ns2:value>true</ns2:value></ns2:attribute></ns2:AuthoriseTransactionResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
     http_version: '1.1'
-  recorded_at: Fri, 10 Apr 2015 12:27:04 GMT
+  recorded_at: Tue, 14 Apr 2015 08:37:24 GMT
 recorded_with: VCR 2.9.3

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: moneta-api
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - ssnikolay
@@ -238,6 +238,7 @@ files:
 - spec/lib/moneta/api/service_spec.rb
 - spec/lib/moneta/api/types/operation_info_spec.rb
 - spec/spec_helper.rb
+- spec/support/context.rb
 - spec/support/matchers.rb
 - spec/support/wsdl
 - spec/vcr/moneta_api_requests_authorisetransactionbatchrequest/use_when_one_operation_transaction_transaction_.yml
@@ -287,6 +288,7 @@ test_files:
 - spec/lib/moneta/api/service_spec.rb
 - spec/lib/moneta/api/types/operation_info_spec.rb
 - spec/spec_helper.rb
+- spec/support/context.rb
 - spec/support/matchers.rb
 - spec/support/wsdl
 - spec/vcr/moneta_api_requests_authorisetransactionbatchrequest/use_when_one_operation_transaction_transaction_.yml