moneta-api 1.7.0 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a6c58596470fc640d704fa5c84ce4e22c2e50671
-  data.tar.gz: cd9a668ff8bbb2e143338ef8bfff0a7fc81f3137
+  metadata.gz: 4b259ad7ef797550ed047b3c8574a71e52b97f2e
+  data.tar.gz: ebc37bd7040d7fce6868e23d90704000827a5f7e
 SHA512:
-  metadata.gz: aee10955a8d808f7c41c1e6955f1377879f723bcfa4a3f5f7cea5e7b2592f8931cd828baa29c9f8c615aab85adf28e851481ec327c329b35e4cb4000d515c9cf
-  data.tar.gz: ae85e5e54591267827cdddf22cdcf08f3fadeed22fef37f204afed4f7bda193e712327a4ca1731cab67f31d8073c920a450f0342de744acab45d25b28ae32a2b
+  metadata.gz: d3a331bb23264266da8355fac205bb0287b253e84e6e03a1dd1e9134a433db26bd6d9557814d6c56e55e5b824a625794fa861f2729284133300163474b111a07
+  data.tar.gz: fe34ca732de7d0a369e3637ad99574d3c0efda9de2229a4145e6162342089276cc6ff7fe4bc6cf3cf7e0b4603b1383c7587d21a10e289f03df65409862cc5414

data/lib/moneta/api/connection_exception.rb

@@ -0,0 +1,5 @@
+module Moneta
+  module Api
+    class ConnectionException < Exception; end
+  end
+end

data/lib/moneta/api/exception.rb

@@ -1,5 +1,9 @@
 module Moneta
   module Api
-    class Exception < StandardError; end
+    class Exception < StandardError
+      def to_hash
+        { message: message }
+      end
+    end
   end
 end

data/lib/moneta/api/http_exception.rb

@@ -1,5 +1,25 @@
 module Moneta
   module Api
-    class HTTPException < Exception; end
+    class HTTPException < Exception
+      attr_reader :code
+
+      def initialize(code, message)
+        super(message)
+
+        @code = code
+      end
+
+
+      def inspect
+        "#{ @code }: #{ message }"
+      end
+
+      def to_hash
+        {
+          code: code,
+          message: message,
+        }
+      end
+    end
   end
 end

data/lib/moneta/api/runtime_exception.rb

@@ -1,5 +1,28 @@
 module Moneta
   module Api
-    class RuntimeException < Exception; end
+    class RuntimeException < Exception
+      attr_reader :code, :detail
+
+      def initialize(code, message, detail)
+        super(message)
+
+        @code = code
+        @detail = detail
+      end
+
+      def inspect
+        error = [ "#{ @code }: #{ message }" ]
+        error += detail.collect { |key, value| "#{ key }: #{ Array(value).join($/) }" }
+        error.join($/)
+      end
+
+      def to_hash
+        {
+          code: code,
+          message: message,
+          detail: detail
+        }
+      end
+    end
   end
 end

data/lib/moneta/api/service_methods.rb

@@ -192,9 +192,18 @@ module Moneta
 
         ResponseFactory.build(response)
       rescue Savon::SOAPFault => e
-        raise Moneta::Api::RuntimeException.new(e.message)
+        error_details = e.to_hash[:fault]
+
+        message = error_details[:faultstring]
+        code = error_details[:faultcode]
+        detail = error_details[:detail]
+
+        raise Moneta::Api::RuntimeException.new(code, message, detail)
       rescue Savon::HTTPError => e
-        raise Moneta::Api::HTTPException.new(e.message)
+        http = e.http
+        raise Moneta::Api::HTTPException.new(http.code, http.body)
+      rescue HTTPI::Error => e
+        raise Moneta::Api::ConnectionException.new(e.message)
       end
 
       def validate!(method, request)

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

@@ -31,14 +31,13 @@ module Moneta
         #   Операции выполняются в том порядке, в котором они переданы в запросе.
         #   / Set of transfers to be processed in one batch. Processed in order of appearance.
         #
-        # @param [Moneta::Api::Types::Entity*]
+        # @param [Moneta::Api::Types::ConfirmTransactionRequestType]
         # @return void
         def add_transaction(item)
-          parents = item.class.ancestors
-          if parents.include?(Moneta::Api::Types::Entity)
+          if item.is_a?(Moneta::Api::Types::ConfirmTransactionRequestType)
             (@transaction ||=[]).push(item)
           else
-            raise TypeError.new("TypeError: #{ item.class } have not parent Moneta::Api::Types::Entity")
+            raise TypeError.new("TypeError: #{ item.class } should be a Moneta::Api::Types::ConfirmTransactionRequestType")
           end
         end
       end

data/lib/moneta/api/version.rb

@@ -1,5 +1,5 @@
 module Moneta
   module Api
-    VERSION = '1.7.0'
+    VERSION = '1.8.0'
   end
 end

data/lib/moneta/api.rb

@@ -9,6 +9,7 @@ require 'moneta/api/key_value_serializer'
 require 'moneta/api/exception'
 require 'moneta/api/runtime_exception'
 require 'moneta/api/http_exception'
+require 'moneta/api/connection_exception'
 
 require 'moneta/api/types/account_access_info'
 require 'moneta/api/types/account_info'

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

@@ -0,0 +1,9 @@
+describe Moneta::Api::ConnectionException do
+  describe '.to_hash' do
+    let(:message) { 'error' }
+
+    subject { described_class.new(message).to_hash }
+
+    its([:message]) { is_expected.to eq message }
+  end
+end

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

@@ -0,0 +1,19 @@
+describe Moneta::Api::HTTPException do
+  let(:message) { 'Server Error' }
+  let(:code) { '500' }
+
+  let(:exception) { described_class.new(code, message) }
+
+  describe '.to_hash' do
+    subject { exception.to_hash }
+
+    its([:message]) { is_expected.to eq message }
+    its([:code]) { is_expected.to eq code }
+  end
+
+  describe '.inspect' do
+    subject { exception }
+
+    its(:inspect) { is_expected.to eq '500: Server Error' }
+  end
+end

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

@@ -0,0 +1,21 @@
+describe Moneta::Api::RuntimeException do
+  let(:message) { 'error' }
+  let(:code) { 'SOAP-ENV:Client' }
+  let(:detail) { { foo: ['bar'] } }
+
+  let(:exception) { described_class.new(code, message, detail) }
+
+  describe '.to_hash' do
+    subject { exception.to_hash }
+
+    its([:message]) { is_expected.to eq message }
+    its([:code]) { is_expected.to eq code }
+    its([:detail]) { is_expected.to eq detail }
+  end
+
+  describe '.inspect' do
+    subject { exception }
+
+    its(:inspect) { is_expected.to eq "SOAP-ENV:Client: error#{ $/ }foo: bar" }
+  end
+end

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

@@ -14,7 +14,7 @@ describe Moneta::Api::Service do
     context 'when soap raise error' do
       let(:account_id) { -1 }
 
-      it { expect { subject }.to raise_exception(Moneta::Api::RuntimeException, '(SOAP-ENV:Client) Validation error') }
+      it { expect { subject }.to raise_exception(Moneta::Api::RuntimeException, 'Validation error') }
     end
 
     context 'when soap http error' do

data/spec/lib/moneta/api/types/confirm_transaction_batch_request_type_spec.rb

@@ -0,0 +1,19 @@
+describe Moneta::Api::Types::ConfirmTransactionBatchRequestType do
+  describe '.add_transaction' do
+    let(:request) { described_class.new }
+
+    it 'should add transaction' do
+      transaction = Moneta::Api::Types::ConfirmTransactionRequestType.new
+
+      request.add_transaction(transaction)
+
+      expect(request.transaction).to include transaction
+    end
+
+    it 'should not add with wrong type' do
+      transaction = Moneta::Api::Types::Entity.new
+
+      expect { request.add_transaction(transaction) }.to raise_exception TypeError
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: moneta-api
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.8.0
 platform: ruby
 authors:
 - ssnikolay
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-18 00:00:00.000000000 Z
+date: 2016-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: savon
@@ -168,6 +168,7 @@ files:
 - README.md
 - Rakefile
 - lib/moneta/api.rb
+- lib/moneta/api/connection_exception.rb
 - lib/moneta/api/data_mapper.rb
 - lib/moneta/api/exception.rb
 - lib/moneta/api/http_exception.rb
@@ -273,6 +274,8 @@ files:
 - lib/moneta/api/version.rb
 - lib/moneta/core_ext/string.rb
 - moneta-api.gemspec
+- spec/lib/moneta/api/connection_exception_spec.rb
+- spec/lib/moneta/api/http_exception_spec.rb
 - spec/lib/moneta/api/requests/approve_phone_send_confirmation_request_spec.rb
 - spec/lib/moneta/api/requests/authorise_transaction_batch_request_spec.rb
 - spec/lib/moneta/api/requests/authorise_transaction_request_spec.rb
@@ -291,7 +294,9 @@ files:
 - spec/lib/moneta/api/requests/profile/edit_organization_profile_request_spec.rb
 - spec/lib/moneta/api/requests/transfer_request_spec.rb
 - spec/lib/moneta/api/response/find_account_by_id_spec.rb
+- spec/lib/moneta/api/runtime_exception_spec.rb
 - spec/lib/moneta/api/service_spec.rb
+- spec/lib/moneta/api/types/confirm_transaction_batch_request_type_spec.rb
 - spec/lib/moneta/api/types/operation_info_spec.rb
 - spec/lib/moneta/api/types/profile/client_spec.rb
 - spec/spec_helper.rb
@@ -360,6 +365,8 @@ signing_key:
 specification_version: 4
 summary: "МОНЕТА.РУ (MONETA.MerchantAPI.v2)"
 test_files:
+- spec/lib/moneta/api/connection_exception_spec.rb
+- spec/lib/moneta/api/http_exception_spec.rb
 - spec/lib/moneta/api/requests/approve_phone_send_confirmation_request_spec.rb
 - spec/lib/moneta/api/requests/authorise_transaction_batch_request_spec.rb
 - spec/lib/moneta/api/requests/authorise_transaction_request_spec.rb
@@ -378,7 +385,9 @@ test_files:
 - spec/lib/moneta/api/requests/profile/edit_organization_profile_request_spec.rb
 - spec/lib/moneta/api/requests/transfer_request_spec.rb
 - spec/lib/moneta/api/response/find_account_by_id_spec.rb
+- spec/lib/moneta/api/runtime_exception_spec.rb
 - spec/lib/moneta/api/service_spec.rb
+- spec/lib/moneta/api/types/confirm_transaction_batch_request_type_spec.rb
 - spec/lib/moneta/api/types/operation_info_spec.rb
 - spec/lib/moneta/api/types/profile/client_spec.rb
 - spec/spec_helper.rb