sbrf_merchant 2.0.1 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: faada4cbbe623865c865d04992845d0c1a1e805c03c03b126d627c1263aa9484
-  data.tar.gz: ae29ef50e146c42ae8ad65c9121607b2d5b106c11f047a96bf188d88f9334c26
+  metadata.gz: 7e42a848b5a67244c5552ee10258612a6c2be0ce73ad3927051e52c1e8776fe0
+  data.tar.gz: 5588f6e57acb32f4104660251285a942cf199859374676352f947f29f1b62d03
 SHA512:
-  metadata.gz: 1ffda247254ac00d4c2ff5181afde604c5cfd204c2f679e3b8a7948a851785a3c96bb91f291fd6d4155773b7696703cb64ffced0fdb14e6597aaf0c96781147b
-  data.tar.gz: f9960bb76468d78f4bb049c796553bec9c2c17a849ed5fdf56cda9db3a6dfdb868c57fab06a10e6bcf1a635d67afecf9899f17e1cc7b3945b5d6348adc201544
+  metadata.gz: 120dfd1f558921d0c8dd6fdf444151301241366eee65734dccf7e8140ea6fc09e6accc7a844c8b6837a8e2d87a1929f97b39d817b9244c97ab702d62e4f8e7bb
+  data.tar.gz: '098e739143b5da07dd5638300cff26291ca1ffeddcc43670492db091213184dff71d07c8c52570b3f858d31dd4453a6b6389034dd37a04219ce5d800b569a71e'

data/README.md

@@ -25,7 +25,7 @@ Ruby клиент для работы с платёжным шлюзом Сбе
 
 ```ruby
 # Gemfile
-gem 'sbrf_merchant', '~> 2.0.0`
+gem 'sbrf_merchant'
 ```
 ## Документация
 - [Site(RU)](https://securepayments.sberbank.ru/wiki/doku.php/integration:api:start)
@@ -34,35 +34,31 @@ gem 'sbrf_merchant', '~> 2.0.0`
 ## Использование
 ### Пример регистрации заказа
 ```ruby
-# Перед использованием необходимо проинициализировать библиотеку.
-SbrfMerchant.configure do |config|
-  config.user_name = '<Merchant Username>'
-  config.password = '<Merchant Password>'
-  config.host =     '<Sberbank API Host>'
-end
-
-# или
-
-SbrfMerchant.configuration = SbrfMerchant::Configuration.new(
-  host: '<Sberbank API Host>',
+# Cоздаем клиент
+client = SBRF::Api::Client.new(
   user_name: '<Merchant Username>',
-  password: '<Merchant Password>'
+  password: '<Merchant Password>',
+  host: '<Sberbank API Host>' # например https://3dsec.sberbank.ru'
 )
 
-
-# Cоздаем клиент
-client = SbrfMerchant::Api::Client.new
-
 # Вызываем метод API.
 # :register - название метода согласно документации Cбербанка в snake_case.
-# Далее параметры запроса. Имена передаются в snake_case, перед отправкой запроса все параметры приведутся к camelCase.
-response = client.call(:register, amount: 100, order_number: SecureRandom.hex, return_url: 'localhost:3000')
+# Далее параметры запроса. Имена передаются в snake_case,
+# перед отправкой запроса все параметры приведутся к camelCase.
+
+params = {
+  amount: 100,
+  order_number: "something_unique_string",
+  return_url: 'localhost:3000'
+}
+response = client.call(:register, params)
+
 response.success? # => true
-# В ответе имена возвращаются в snake_case
+# В ответе доступ к атрибутам в snake_case
 response.order_id #<order-id>
 
 ```
 ## Copyright
-Copyright (c) 2018 Eugene Kozlov. See [LICENSE][] for details.
+Copyright (c) 2018 Eugene Kozlov.
 
 [license]: LICENSE.md

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 

data/lib/sbrf_merchant.rb

@@ -1,24 +1,8 @@
+# frozen_string_literal: true
+
 require 'sbrf_merchant/api/client'
 
 module SbrfMerchant
-  class << self
-    attr_accessor :configuration
-
-    def configure
-      self.configuration ||= Configuration.new
-      yield(configuration)
-    end
-  end
-
-  class Configuration
-    attr_accessor :host, :user_name, :password
-
-    def initialize(host: nil, user_name: nil, password: nil)
-      @host = host
-      @user_name = user_name
-      @password = password
-    end
-  end
 end
 
 Sberbank = SbrfMerchant

data/lib/sbrf_merchant/api/client.rb

@@ -1,50 +1,51 @@
+# frozen_string_literal: true
+
 require 'sbrf_merchant/api/response/body_postprocessor'
 require 'sbrf_merchant/api/request/body_preprocessor'
+require 'sbrf_merchant/api/request/uri_builder'
 require 'sbrf_merchant/utils/http/client'
-require 'sbrf_merchant/utils/string/to_camel_case'
 
 module SbrfMerchant
   module Api
     class Client
-      attr_reader :config,
+      attr_reader :user_name,
+                  :password,
+                  :host,
                   :response_body_postprocessor,
                   :http_client,
-                  :method_name_converter,
+                  :uri_builder,
                   :request_body_preprocessor
 
       def initialize(
-        config: SbrfMerchant.configuration,
+        user_name:,
+        password:,
+        host:,
         response_body_postprocessor: SbrfMerchant::Api::Response::BodyPostProcessor,
         request_body_preprocessor: SbrfMerchant::Api::Request::BodyPreProcessor,
         http_client: SbrfMerchant::Utils::Http::Client,
-        method_name_converter: SbrfMerchant::Utils::String::ToCamelCase
+        uri_builder: SbrfMerchant::Api::Request::UriBuilder
       )
-        @config = config
+        @user_name = user_name
+        @password = password
+        @host = host
         @response_body_postprocessor = response_body_postprocessor
         @http_client = http_client
-        @method_name_converter = method_name_converter
+        @uri_builder = uri_builder
         @request_body_preprocessor = request_body_preprocessor
       end
 
-      def call(method, **params)
+      def call(method_name, **params)
         prepared_params = request_body_preprocessor.call(auth_params.merge(params))
-        response = http_client.call(uri(method), prepared_params)
+        uri = uri_builder.call(host, method_name)
 
+        response = http_client.call(uri, prepared_params)
         response_body_postprocessor.call(response.body)
       end
 
       private
 
       def auth_params
-        { user_name: config.user_name, password: config.password }
-      end
-
-      def uri(method)
-        URI.join(
-          config.host,
-          '/payment/rest/',
-          method_name_converter.call(method.to_s) + '.do'
-        )
+        { user_name: user_name, password: password }
       end
     end
   end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'sbrf_merchant/utils/high_order_functions/compose'
 require 'sbrf_merchant/utils/hash/to_camel_case_keys'
 

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

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+require 'uri'
+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|
+          URI.join(
+            host,
+            '/payment/rest/',
+            method_name_converter.call(method_name.to_s) + '.do'
+          )
+        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,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'ostruct'
 
 module SbrfMerchant

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'sbrf_merchant/utils/high_order_functions/compose'
 require 'sbrf_merchant/utils/json/to_hash_parser'
 require 'sbrf_merchant/utils/json/to_object_parser'

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'awrence'
 
 module SbrfMerchant

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'plissken'
 
 module SbrfMerchant

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SbrfMerchant
   module Utils
     module HighOrderFunctions

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'net/http'
 
 module SbrfMerchant

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'json/ext'
 
 module SbrfMerchant

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'json/ext'
 
 module SbrfMerchant

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

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 module SbrfMerchant
   module Utils
     module String
       ToCamelCase = lambda do |str|
         str.split('_').inject('') do |buffer, e|
-          buffer << (buffer.empty? ? e : e.capitalize!)
+          buffer + (buffer.empty? ? e : e.capitalize)
         end
       end
     end

data/lib/sbrf_merchant/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SbrfMerchant
-  VERSION = '2.0.1'.freeze
+  VERSION = '3.0.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sbrf_merchant
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 3.0.0
 platform: ruby
 authors:
 - Eugene Kozlov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-12 00:00:00.000000000 Z
+date: 2019-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -149,6 +149,7 @@ files:
 - lib/sbrf_merchant.rb
 - lib/sbrf_merchant/api/client.rb
 - 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_postprocessor.rb
 - lib/sbrf_merchant/utils/hash/to_camel_case_keys.rb
@@ -171,15 +172,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.2.0
+      version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Sberbank Merchant