sbrf_merchant 3.0.0 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7e42a848b5a67244c5552ee10258612a6c2be0ce73ad3927051e52c1e8776fe0
-  data.tar.gz: 5588f6e57acb32f4104660251285a942cf199859374676352f947f29f1b62d03
+  metadata.gz: a6a5b6f47d214d86d9060dc1f22a90bb1978869578d5b7260e1512b0046ede11
+  data.tar.gz: eff4894c9b2ec93d898d5ee12409c33a58a2ddb46bcb7ce1a0e9d864484fc4b5
 SHA512:
-  metadata.gz: 120dfd1f558921d0c8dd6fdf444151301241366eee65734dccf7e8140ea6fc09e6accc7a844c8b6837a8e2d87a1929f97b39d817b9244c97ab702d62e4f8e7bb
-  data.tar.gz: '098e739143b5da07dd5638300cff26291ca1ffeddcc43670492db091213184dff71d07c8c52570b3f858d31dd4453a6b6389034dd37a04219ce5d800b569a71e'
+  metadata.gz: 596032ff87d08f9c8629e888e98af091f193aeeb72531658a64929509229169f3a0f1d975e1b87ba342992da4089d80abbc0d162cebe6aa0c1e00f82ed7a1a1d
+  data.tar.gz: 751bba5276208ea197b5a5b86259e4d94b81520f831b83d2155af81d8600ed498a034ac861e7889e42429cd658ed78ab32581d6573a9f7d0f90c0907fe3e6c93

data/README.md

@@ -58,6 +58,17 @@ response.success? # => true
 response.order_id #<order-id>
 
 ```
+### Использование альтернативного http клиента
+По умолчанию гем использует ```Net::Http``` для отправки HTTP запросов. Если в вашем проекте используется другой Http клиент, например [Faraday](https://github.com/lostisland/faraday) то нужно реализовать callable класс или Proc и передать его в конструктор:
+```ruby
+client = SBRF::Api::Client.new(
+  user_name: '<Merchant Username>',
+  password: '<Merchant Password>',
+  host: '<Sberbank API Host>' # например https://3dsec.sberbank.ru',
+  http_client: ->(uri, params) { Faraday.post(uri, params) }
+)  
+```
+
 ## Copyright
 Copyright (c) 2018 Eugene Kozlov.
 

data/lib/sbrf_merchant/api/client.rb

@@ -20,10 +20,10 @@ module SbrfMerchant
         user_name:,
         password:,
         host:,
-        response_body_postprocessor: SbrfMerchant::Api::Response::BodyPostProcessor,
-        request_body_preprocessor: SbrfMerchant::Api::Request::BodyPreProcessor,
-        http_client: SbrfMerchant::Utils::Http::Client,
-        uri_builder: SbrfMerchant::Api::Request::UriBuilder
+        response_body_postprocessor: SbrfMerchant::Api::Response::BodyPostProcessor.new,
+        request_body_preprocessor: SbrfMerchant::Api::Request::BodyPreProcessor.new,
+        http_client: SbrfMerchant::Utils::Http::Client.new,
+        uri_builder: SbrfMerchant::Api::Request::UriBuilder.new
       )
         @user_name = user_name
         @password = password

data/lib/sbrf_merchant/api/request/body_preprocessor.rb

@@ -6,9 +6,11 @@ require 'sbrf_merchant/utils/hash/to_camel_case_keys'
 module SbrfMerchant
   module Api
     module Request
-      BodyPreProcessor = SbrfMerchant::Utils::HighOrderFunctions::Compose.call(
-        SbrfMerchant::Utils::Hash::ToCamelCaseKeys
-      )
+      class BodyPreProcessor
+        def call(body)
+          SbrfMerchant::Utils::Hash::ToCamelCaseKeys.new.call(body)
+        end
+      end
     end
   end
 end

data/lib/sbrf_merchant/api/request/uri_builder.rb

@@ -6,8 +6,13 @@ require 'sbrf_merchant/utils/string/to_camel_case'
 module SbrfMerchant
   module Api
     module Request
-      UriBuilderConstructor = lambda do |method_name_converter|
-        lambda do |host, method_name|
+      class UriBuilder
+        attr_reader :method_name_converter
+        def initialize(method_name_converter: SbrfMerchant::Utils::String::ToCamelCase.new)
+          @method_name_converter = method_name_converter
+        end
+
+        def call(host, method_name)
           URI.join(
             host,
             '/payment/rest/',
@@ -15,8 +20,6 @@ module SbrfMerchant
           )
         end
       end
-
-      UriBuilder = UriBuilderConstructor.call(SbrfMerchant::Utils::String::ToCamelCase)
     end
   end
 end

data/lib/sbrf_merchant/api/response/append_success_flag_to_hash.rb

@@ -1,16 +1,21 @@
 # frozen_string_literal: true
 
-require 'ostruct'
-
 module SbrfMerchant
   module Api
     module Response
-      AppendSuccessFlagToHash = lambda do |hash|
-        hash.merge(success?: IsSuccess.call(hash))
-      end
+      class AppendSuccessFlagToHash
+        def call(hash)
+          hash.merge('success?' => success?(hash))
+        end
+
+        private
 
-      IsSuccess = lambda do |hash|
-        !hash[:form_url].nil? || hash[:error_code] == '0'
+        # Ответ считается успешным когда errorCode == '0' но есть ньюанс,
+        # В успешном ответе на запрос register errorCode отсутствует,
+        # поэтому проверяем по параметру formUrl
+        def success?(hash)
+          !hash['formUrl'].nil? || hash['errorCode'] == '0'
+        end
       end
     end
   end

data/lib/sbrf_merchant/api/response/body_decorator.rb

@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+require 'sbrf_merchant/utils/string/to_camel_case'
+
+module SbrfMerchant
+  module Api
+    module Response
+      # Проблема - API сбербанка возвращает ответ в формате camelCase,
+      # что не очень красиво выглядит в руби коде
+
+      # Решение - декоратор для хэша на котором будут вызываться методы в snake_case,
+      class BodyDecorator
+        attr_reader :hash, :to_camel_case
+
+        def initialize(hash, to_camel_case = ::SBRF::Utils::String::ToCamelCase.new)
+          @hash = hash
+          @to_camel_case = to_camel_case
+        end
+
+        def method_missing(meth, *args)
+          value = hash[key(meth)]
+
+          # Если значение не найдено то поведение по умолчанию
+          return super if value.nil?
+
+          # Если значение - хэш то возвращаем его, предварительно обернув в декоратор
+          return self.class.new(value) if value.is_a?(Hash)
+
+          # В остальных случаях возвращаем самое значение
+          value
+        end
+
+        def respond_to?(meth)
+          hash.key?(key(meth))
+        end
+
+        def respond_to_missing?(meth)
+          hash.key?(key(meth))
+        end
+
+        private
+
+        def key(meth)
+          to_camel_case.call(meth.to_s)
+        end
+      end
+    end
+  end
+end

data/lib/sbrf_merchant/api/response/body_postprocessor.rb

@@ -2,21 +2,21 @@
 
 require 'sbrf_merchant/utils/high_order_functions/compose'
 require 'sbrf_merchant/utils/json/to_hash_parser'
-require 'sbrf_merchant/utils/json/to_object_parser'
-require 'sbrf_merchant/utils/hash/to_snake_case_keys'
 require 'sbrf_merchant/api/response/append_success_flag_to_hash'
-require 'json/ext'
+require 'sbrf_merchant/api/response/body_decorator'
 
 module SbrfMerchant
   module Api
     module Response
-      BodyPostProcessor = SbrfMerchant::Utils::HighOrderFunctions::Compose.call(
-        SbrfMerchant::Utils::JSON::ToHashParser,
-        SbrfMerchant::Utils::Hash::ToSnakeCaseKeys,
-        SbrfMerchant::Api::Response::AppendSuccessFlagToHash,
-        ->(hash) { JSON.dump(hash) },
-        SbrfMerchant::Utils::JSON::ToObjectParser.call(OpenStruct)
-      )
+      class BodyPostProcessor
+        def call(body)
+          ::SbrfMerchant::Utils::HighOrderFunctions::Compose.new(
+            ::SbrfMerchant::Utils::JSON::ToHashParser.new,
+            ::SbrfMerchant::Api::Response::AppendSuccessFlagToHash.new,
+            ->(hash) { ::SbrfMerchant::Api::Response::BodyDecorator.new(hash) }
+          ).call(body)
+        end
+      end
     end
   end
 end

data/lib/sbrf_merchant/utils/hash/to_camel_case_keys.rb

@@ -5,7 +5,11 @@ require 'awrence'
 module SbrfMerchant
   module Utils
     module Hash
-      ToCamelCaseKeys = ->(hash) { hash.to_camelback_keys }
+      class ToCamelCaseKeys
+        def call(hash)
+          hash.to_camelback_keys
+        end
+      end
     end
   end
 end

data/lib/sbrf_merchant/utils/high_order_functions/compose.rb

@@ -3,11 +3,18 @@
 module SbrfMerchant
   module Utils
     module HighOrderFunctions
-      Compose = lambda { |*functions|
-        lambda { |arg|
-          functions.inject(arg) { |acc, function| function.call(acc) }
-        }
-      }
+      # Обьединяем несколько callable сущностей в одну
+      class Compose
+        attr_reader :functions
+
+        def initialize(*functions)
+          @functions = functions
+        end
+
+        def call(arg)
+          functions.inject(arg) { |acc, func| func.call(acc) }
+        end
+      end
     end
   end
 end

data/lib/sbrf_merchant/utils/http/client.rb

@@ -5,12 +5,14 @@ require 'net/http'
 module SbrfMerchant
   module Utils
     module Http
-      Client = lambda do |uri, params|
-        request = ::Net::HTTP::Post.new(uri)
-        request.set_form_data(params)
+      class Client
+        def call(uri, params)
+          request = ::Net::HTTP::Post.new(uri)
+          request.set_form_data(params)
 
-        ::Net::HTTP.start(uri.hostname, uri.port, use_ssl: true) do |http|
-          http.request(request)
+          ::Net::HTTP.start(uri.hostname, uri.port, use_ssl: true) do |http|
+            http.request(request)
+          end
         end
       end
     end

data/lib/sbrf_merchant/utils/json/to_hash_parser.rb

@@ -5,7 +5,11 @@ require 'json/ext'
 module SbrfMerchant
   module Utils
     module JSON
-      ToHashParser = ->(json) { ::JSON.parse(json, symbolize_names: true) }
+      class ToHashParser
+        def call(json)
+          ::JSON.parse(json)
+        end
+      end
     end
   end
 end

data/lib/sbrf_merchant/utils/string/to_camel_case.rb

@@ -3,9 +3,11 @@
 module SbrfMerchant
   module Utils
     module String
-      ToCamelCase = lambda do |str|
-        str.split('_').inject('') do |buffer, e|
-          buffer + (buffer.empty? ? e : e.capitalize)
+      class ToCamelCase
+        def call(str)
+          str.split('_').inject('') do |buffer, e|
+            buffer + (buffer.empty? ? e : e.capitalize)
+          end
         end
       end
     end

data/lib/sbrf_merchant/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SbrfMerchant
-  VERSION = '3.0.0'
+  VERSION = '3.0.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sbrf_merchant
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.1
 platform: ruby
 authors:
 - Eugene Kozlov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-23 00:00:00.000000000 Z
+date: 2019-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -122,20 +122,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: plissken
-  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'
 description: Sberbank Merchant API Client for Ruby
 email:
 - kozlovea8@gmail.com
@@ -151,13 +137,12 @@ files:
 - lib/sbrf_merchant/api/request/body_preprocessor.rb
 - lib/sbrf_merchant/api/request/uri_builder.rb
 - lib/sbrf_merchant/api/response/append_success_flag_to_hash.rb
+- lib/sbrf_merchant/api/response/body_decorator.rb
 - lib/sbrf_merchant/api/response/body_postprocessor.rb
 - lib/sbrf_merchant/utils/hash/to_camel_case_keys.rb
-- lib/sbrf_merchant/utils/hash/to_snake_case_keys.rb
 - lib/sbrf_merchant/utils/high_order_functions/compose.rb
 - lib/sbrf_merchant/utils/http/client.rb
 - lib/sbrf_merchant/utils/json/to_hash_parser.rb
-- lib/sbrf_merchant/utils/json/to_object_parser.rb
 - lib/sbrf_merchant/utils/string/to_camel_case.rb
 - lib/sbrf_merchant/version.rb
 homepage: https://github.com/abstractart/sbrf_merchant

data/lib/sbrf_merchant/utils/hash/to_snake_case_keys.rb

@@ -1,11 +0,0 @@
-# frozen_string_literal: true
-
-require 'plissken'
-
-module SbrfMerchant
-  module Utils
-    module Hash
-      ToSnakeCaseKeys = ->(hash) { hash.to_snake_keys }
-    end
-  end
-end

data/lib/sbrf_merchant/utils/json/to_object_parser.rb

@@ -1,15 +0,0 @@
-# frozen_string_literal: true
-
-require 'json/ext'
-
-module SbrfMerchant
-  module Utils
-    module JSON
-      ToObjectParser = lambda { |object_class|
-        lambda { |json|
-          ::JSON.parse(json, object_class: object_class)
-        }
-      }
-    end
-  end
-end