sbrf_merchant 0.1.3 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 4ad7e4d39e4c88a6c05fa2b30f74821ffcc3f0e9014d799640b6bbf9da089d83
-  data.tar.gz: d07e3efeefd524d652a0ce70db70805139c076282563250cd4b0964c091b9c1a
+SHA1:
+  metadata.gz: 6a6f8d675873a5f9a0efdf2ab640a379306cb8fe
+  data.tar.gz: 6ded6355ba85cebfa88ddba68ef5eb80b454048c
 SHA512:
-  metadata.gz: c492d3158996efeba115694db96282b7d0ada6b58932b1c311e6fb1eea5247a13d5a726138f1d7c1058b8f2da377e6df6a74833625fcdeb991b8ddf7a1a2616b
-  data.tar.gz: 150c67b8c58f8dfa20b46d1cc19ffccc4c14cbb3619cb90554e1f61164fa541aa138baddafe491cd2889cf48d0c2714743849b69a08a22830ec26e2af4644ec6
+  metadata.gz: 7a3e2c10f273bdadcb4b340f46d459796d8291b3bee82c9c75102623e47afe33d477d872f218e4b996b8adebb9dd17733ccae02c6c359b8c207a6c456dec5a8f
+  data.tar.gz: bc6a30710db9aa2f0220eddfd23ed35bd876f4dd069a9455221d4362b5c1aab4dc02d4deced54a8b3d94d9da442f60e70dfacc9b5f3d8cb345419776d41be992

data/.travis.yml

@@ -5,9 +5,6 @@ env:
 language: ruby
 rvm:
   - 2.5.1
-  - 2.4.4
-  - 2.3.7
-  - 2.2.10
 before_install: gem install bundler -v 1.16.5
 notifications:
   - false

data/README.md

@@ -33,12 +33,13 @@ end
 [RU](https://securepayments.sberbank.ru/wiki/doku.php/integration:api:start)
 
 # Usage Examples
-```ruby
-# First of all you need create order object
-new_order = SbrfMerchant::Order::OneStage.new(orderNumber: orderNumber)
-already_created_order = SbrfMerchant::Order::OneStage.new(orderNumber: orderNumber, orderId: orderId)
-```
-## Register Order
+
+**orderId** - order identificator in Sberbank Payment Gateway
+
+**orderNumber** - order identificator in your system
+
+## OneStage Order
+### Register
 ```ruby
 require 'securerandom'
 order = SbrfMerchant::Order::OneStage.new(orderNumber: SecureRandom.hex)
@@ -48,13 +49,13 @@ order.orderId # returns unique Id in Sberbank system
 response.success? # true
 response.formUrl # "https://3dsec.sberbank.ru/payment/merchants/sbersafe/payment_ru.html?mdOrder=<orderId>"
 ```
-## Order Status
+### Status
 ```ruby
 order = SbrfMerchant::Order::OneStage.new(orderNumber: orderNumber, orderId: orderId)
 response = order.get_info
 response.not_paid? # true or false
 ```
-## Refund
+### Refund
 ```ruby
 
 refund_amount = 1000
@@ -62,19 +63,13 @@ order = SbrfMerchant::Order::OneStage.new(orderNumber: orderNumber, orderId: ord
 response = order.refund(refund_amount)
 response.success? # true or false
 ```
-## Cancel
+### Cancel
 ```ruby
 
 order = SbrfMerchant::Order::OneStage.new(orderNumber: orderNumber, orderId: orderId)
 response = order.cancel
 response.success? # true or false
   ```
-## Supported Ruby Versions (Travis CI)
-
-- 2.5.1
-- 2.4.4
-- 2.3.7
-- 2.2.10
 
 ## Copyright
 Copyright (c) 2018 Eugene Kozlov. See [LICENSE][] for details.

data/lib/sbrf_merchant/api/client.rb

@@ -1,6 +1,6 @@
-require 'faraday'
-require 'active_support/core_ext/hash/indifferent_access'
 require 'json'
+require 'uri'
+require 'net/http'
 
 module SbrfMerchant
   module Api
@@ -14,19 +14,29 @@ module SbrfMerchant
       end
 
       def process_request(path, params)
-        JSON.parse(http_client.post(path, params).body).with_indifferent_access
+        parse_response_body(http_request(path, params))
       end
 
       private
 
-      def http_client
-        @client ||= Faraday.new(
-          url: host,
-          params: {
-            userName: userName,
-            password: password
-          }
+      def parse_response_body(response)
+        JSON.parse(response.body, symbolize_names: true)
+      end
+
+      def http_request(path, params)
+        uri = URI.join(host, path)
+
+        Net::HTTP.start(uri.hostname, uri.port, use_ssl: true) do |http|
+          http.request(build_net_http_request_object(uri, params))
+        end
+      end
+
+      def build_net_http_request_object(uri, params)
+        request = Net::HTTP::Post.new(uri)
+        request.set_form_data(
+          params.merge(userName: userName, password: password)
         )
+        request
       end
     end
   end

data/lib/sbrf_merchant/order/one_stage.rb

@@ -1,7 +1,5 @@
 require 'sbrf_merchant/api/client'
 require 'sbrf_merchant/api/action'
-require 'sbrf_merchant/config/container'
-require 'dry-auto_inject'
 require 'sbrf_merchant/response/base'
 require 'sbrf_merchant/response/create_order'
 require 'sbrf_merchant/response/order_status'
@@ -9,7 +7,13 @@ require 'sbrf_merchant/response/order_status'
 module SbrfMerchant
   module Order
     class OneStage
-      include Dry::AutoInject(Config::Container).hash['api_client']
+      attr_reader :api_client, :orderId, :orderNumber
+
+      def initialize(orderId: nil, orderNumber: nil, api_client: SbrfMerchant.api_client)
+        @orderId = orderId
+        @orderNumber = orderNumber
+        @api_client = api_client
+      end
 
       def register(**args)
         response = Response::CreateOrder.new(
@@ -32,12 +36,6 @@ module SbrfMerchant
         )
       end
 
-      def initialize(orderId: nil, orderNumber: nil, api_client:)
-        @orderId = orderId
-        @orderNumber = orderNumber
-        @api_client = api_client
-      end
-
       def cancel
         Response::Base.new(
           api_client.process_request(
@@ -56,14 +54,6 @@ module SbrfMerchant
         )
       end
 
-      def orderId
-        @orderId.freeze
-      end
-
-      def orderNumber
-        @orderNumber.freeze
-      end
-
       private
 
       def default_request_params

data/lib/sbrf_merchant/version.rb

@@ -1,3 +1,3 @@
 module SbrfMerchant
-  VERSION = '0.1.3'.freeze
+  VERSION = '0.2.0'.freeze
 end

data/lib/sbrf_merchant.rb

@@ -5,6 +5,14 @@ module SbrfMerchant
     attr_accessor :configuration
   end
 
+  def self.api_client
+    SbrfMerchant::Api::Client.new(
+      host: SbrfMerchant.configuration.host,
+      userName: SbrfMerchant.configuration.userName,
+      password: SbrfMerchant.configuration.password
+    )
+  end
+
   def self.configure
     self.configuration ||= Configuration.new
     yield(configuration)

data/sbrf_merchant.gemspec

@@ -12,6 +12,7 @@ Gem::Specification.new do |spec|
   spec.description   = 'Sberbank Merchant API Client for Ruby'
   spec.homepage      = 'https://github.com/abstractart/sbrf_merchant'
   spec.license       = 'MIT'
+  spec.required_ruby_version = '>= 2.0.0'
 
   spec.files = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test|spec|features)/})
@@ -27,8 +28,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'simplecov'
   spec.add_development_dependency 'simplecov-console'
 
-  spec.add_runtime_dependency 'activesupport'
-  spec.add_runtime_dependency 'dry-auto_inject'
-  spec.add_runtime_dependency 'faraday'
   spec.add_runtime_dependency 'json'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sbrf_merchant
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors:
 - Eugene Kozlov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-10-18 00:00:00.000000000 Z
+date: 2019-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -94,48 +94,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  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'
-- !ruby/object:Gem::Dependency
-  name: dry-auto_inject
-  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'
-- !ruby/object:Gem::Dependency
-  name: faraday
-  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'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -174,7 +132,6 @@ files:
 - lib/sbrf_merchant/api/client.rb
 - lib/sbrf_merchant/api/error_code.rb
 - lib/sbrf_merchant/api/order_status.rb
-- lib/sbrf_merchant/config/container.rb
 - lib/sbrf_merchant/order/one_stage.rb
 - lib/sbrf_merchant/response/base.rb
 - lib/sbrf_merchant/response/create_order.rb
@@ -193,7 +150,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -201,7 +158,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Sberbank Merchant

data/lib/sbrf_merchant/config/container.rb

@@ -1,17 +0,0 @@
-require 'dry-container'
-
-module SbrfMerchant
-  module Config
-    class Container
-      extend Dry::Container::Mixin
-
-      register 'api_client' do
-        SbrfMerchant::Api::Client.new(
-          host: SbrfMerchant.configuration.host,
-          userName: SbrfMerchant.configuration.userName,
-          password: SbrfMerchant.configuration.password
-        )
-      end
-    end
-  end
-end