mandarin-api 0.4.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d26d560afb95e6d1924115c5c6a95f3212a249cc
-  data.tar.gz: 5c64b4f9f8a43cc07b22e3aaa1657f80b5ddf1b8
+  metadata.gz: d84ee559361d1d97dae3c114dc85adb59e47b4af
+  data.tar.gz: b87a8eb6b57c209ea8a378899ac848675bf194f5
 SHA512:
-  metadata.gz: cd31f05153afbe749e926487464ec729fe8707623cab89d4d769a830067ca40a8362ebf54b62dcd840278a8240c0782470494aa08f40ebf6737f51876b07dd5c
-  data.tar.gz: 61308ee7e37a8bbf39ee4a19a8370fcfc4eedf9cf719a56f7c67c1109eb5e1830a26c784677fbe63c25909be4c1f4fb5c0a694a1719b1bf47d195db75458e95a
+  metadata.gz: 722e27b9a71289c02dfb62da6fd33f6e8aa64bc987d9788a1b14784c052ec9f90355bede7e227539105359151d9701345cd7d10d48d37daaca1510d9760be518
+  data.tar.gz: c97df2fe2d0a0be03acc7a9ac173eec02c62ce351245b8f44a60dfb21595df7e1e17470dafc4d4a1448998c3087f48b5fbcb7b3a859bc283d0f1a27da1d2540b

data/Gemfile

@@ -1,8 +1,3 @@
-source "https://rubygems.org"
+source 'https://rubygems.org'
 
 gemspec name: 'mandarin-api'
-
-group :test do
-  gem 'rake'
-  gem 'activesupport'
-end

data/Gemfile.lock

@@ -1,99 +1,46 @@
 PATH
   remote: .
   specs:
-    mandarin-api (0.4.0)
-      rest-client (>= 2.0, < 3.0)
+    mandarin-api (1.0.0)
+      curb (~> 0.9.4)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (5.0.0.1)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (~> 0.7)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-    addressable (2.4.0)
-    byebug (9.0.6)
-    coderay (1.1.1)
-    concurrent-ruby (1.0.2)
+    addressable (2.5.2)
+      public_suffix (>= 2.0.2, < 4.0)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
-    diff-lcs (1.2.5)
-    domain_name (0.5.20160826)
-      unf (>= 0.0.5, < 1.0.0)
-    faker (1.6.6)
-      i18n (~> 0.5)
-    hashdiff (0.3.0)
-    http-cookie (1.0.3)
-      domain_name (~> 0.5)
-    i18n (0.7.0)
-    json (1.8.3)
-    method_source (0.8.2)
-    mime-types (3.1)
-      mime-types-data (~> 3.2015)
-    mime-types-data (3.2016.0521)
-    minitest (5.9.1)
-    netrc (0.11.0)
-    pry (0.10.4)
-      coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
-    pry-byebug (3.4.2)
-      byebug (~> 9.0)
-      pry (~> 0.10)
-    pry-doc (0.9.0)
-      pry (~> 0.9)
-      yard (~> 0.8)
-    rake (11.3.0)
-    rb-readline (0.5.5)
-    rdoc (4.2.2)
-      json (~> 1.4)
-    rest-client (2.0.0)
-      http-cookie (>= 1.0.2, < 2.0)
-      mime-types (>= 1.16, < 4.0)
-      netrc (~> 0.8)
-    rspec (3.5.0)
-      rspec-core (~> 3.5.0)
-      rspec-expectations (~> 3.5.0)
-      rspec-mocks (~> 3.5.0)
-    rspec-core (3.5.4)
-      rspec-support (~> 3.5.0)
-    rspec-expectations (3.5.0)
+    curb (0.9.4)
+    diff-lcs (1.3)
+    hashdiff (0.3.7)
+    public_suffix (3.0.1)
+    rspec (3.7.0)
+      rspec-core (~> 3.7.0)
+      rspec-expectations (~> 3.7.0)
+      rspec-mocks (~> 3.7.0)
+    rspec-core (3.7.0)
+      rspec-support (~> 3.7.0)
+    rspec-expectations (3.7.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-mocks (3.5.0)
+      rspec-support (~> 3.7.0)
+    rspec-mocks (3.7.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-support (3.5.0)
+      rspec-support (~> 3.7.0)
+    rspec-support (3.7.0)
     safe_yaml (1.0.4)
-    slop (3.6.0)
-    thread_safe (0.3.5)
-    tzinfo (1.2.2)
-      thread_safe (~> 0.1)
-    unf (0.1.4)
-      unf_ext
-    unf_ext (0.0.7.2)
-    webmock (2.1.0)
+    webmock (3.1.1)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff
-    yard (0.9.5)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  activesupport
-  faker (>= 1.6, < 1.7)
   mandarin-api!
-  pry (~> 0)
-  pry-byebug (~> 3.0)
-  pry-doc (~> 0)
-  rake
-  rb-readline (~> 0.5)
-  rdoc (>= 2.4.2, < 5.0)
-  rspec (~> 3.0)
-  webmock (~> 2.1)
+  rspec (~> 3.7, >= 3.7.0)
+  webmock (~> 3.1, >= 3.1.1)
 
 BUNDLED WITH
-   1.13.6
+   1.16.0

data/lib/mandarin_api/wrapper.rb

@@ -1,7 +1,9 @@
 # frozen_string_literal: true
 
+require 'securerandom'
 require 'json'
-require 'rest-client'
+require 'curb'
+
 module MandarinApi
   # Wraps request sending
   class Wrapper
@@ -14,14 +16,12 @@ module MandarinApi
     def request(endpoint, params = {})
       url = URI.join(MandarinApi.config.request_url, endpoint).to_s
       perform_loging url, params, header
-      RestClient.post(url, json(params), header) do |response|
-        case response.code
-        when 200
-          JSON.parse response.body
-        else
-          { 'status' => response.code, 'error' => 'Invalid request' }
-        end
-      end
+      curl = Curl::Easy.new(url)
+      curl.headers = header
+      curl.post(json(params))
+      body = JSON.parse(curl.body_str)
+      return body if curl.response_code == 200
+      { 'status' => curl.response_code, 'error' => body }
     end
 
     private
@@ -33,8 +33,8 @@ module MandarinApi
 
     def header
       {
-        content_type: :json,
-        x_auth: generate_x_auth_header(@merchant_id, @secret)
+        'content_type' => 'application/json',
+        'x_auth' => generate_x_auth_header(@merchant_id, @secret)
       }
     end
 
@@ -50,7 +50,7 @@ module MandarinApi
 
     def key_transform(hash)
       new_hash = {}
-      hash.keys.each do |key|
+      hash.each_key do |key|
         new_hash[camelize(key.to_s)] = case hash[key]
                                        when Hash then key_transform hash[key]
                                        when Array then hash[key].map { |e| key_transform e }

data/mandarin-api.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = 'mandarin-api'
-  s.version = '0.4.0'
+  s.version = '1.0.0'
   s.authors = ['Vladimir Bogaevsky']
   s.email = 'gitvbogaevsky@gmail.com'
   s.licenses = ['MIT']
@@ -13,16 +13,10 @@ Gem::Specification.new do |s|
   s.extra_rdoc_files = ['README.md', 'plantuml/callbacks.puml']
   s.require_paths = ['lib']
 
-  s.add_development_dependency('webmock', '~> 2.1')
-  s.add_development_dependency('rspec', '~> 3.0')
-  s.add_development_dependency('pry', '~> 0')
-  s.add_development_dependency('rb-readline', '~> 0.5')
-  s.add_development_dependency('pry-doc', '~> 0')
-  s.add_development_dependency('rdoc', '>= 2.4.2', '< 5.0')
-  s.add_development_dependency('faker', '>= 1.6', '< 1.7')
-  s.add_development_dependency('pry-byebug', '~> 3.0')
+  s.add_development_dependency('rspec',   '~> 3.7', '>= 3.7.0')
+  s.add_development_dependency('webmock', '~> 3.1', '>= 3.1.1')
 
-  s.add_dependency 'rest-client', '>= 2.0', '< 3.0'
+  s.add_dependency('curb', '~> 0.9.4')
 
-  s.required_ruby_version = '>= 2.2.0'
+  s.required_ruby_version = '>= 2.4.2'
 end

data/spec/lib/mandarin_api/payment_manager_spec.rb

@@ -27,8 +27,8 @@ RSpec.describe MandarinApi::PaymentManager do
   end
 
   describe '#perform_charge' do
-    let(:email) { Faker::Internet.free_email }
-    let(:phone) { "+7#{Faker::Number.between(100_000_000, 999_999_999)}" }
+    let(:email) { "email-email+#{rand(1000)}@gmail.com" }
+    let(:phone) { "+7#{rand(100_000_000..999_999_999)}" }
     let(:action) { 'pay' }
     let(:params) do
       {

data/spec/lib/mandarin_api/wrapper_spec.rb

@@ -1,24 +1,16 @@
 # frozen_string_literal: true
 require 'logger'
-require 'active_support/logger'
 
 RSpec.describe MandarinApi::Wrapper do
   include_context 'mocks'
 
   let(:wrapper) do
-    MandarinApi::Wrapper
-      .new(merchant_id: rand(1000), secret: SecureRandom.hex(5), logger: logger)
+    MandarinApi::Wrapper.new(merchant_id: rand(1000), secret: SecureRandom.hex(5), logger: logger)
   end
   let(:logger) { nil }
 
   describe 'request' do
-    let(:params) do
-      {
-        customer_info: {
-          email: 'ololo@gmail.com', phone: '8-909-999-88-77'
-        }
-      }
-    end
+    let(:params) { { customer_info: { email: 'ololo@gmail.com', phone: '8-909-999-88-77' } } }
     let(:x_auth) { 'x-auth' }
     let(:mandarin_adress) { 'https://secure.mandarinpay.com/' }
     let(:expected) do
@@ -50,7 +42,7 @@ RSpec.describe MandarinApi::Wrapper do
       end
 
       let(:expected) do
-        header = { content_type: :json, x_auth: x_auth }
+        header = { 'content_type' => 'application/json', 'x_auth' => x_auth }
         url = URI.join(MandarinApi.config.request_url, 'api/card-bindings').to_s
         "Calling MandarinBank at: #{url}; body: #{params}, header: #{header}\n"
       end
@@ -69,17 +61,6 @@ RSpec.describe MandarinApi::Wrapper do
           expect(actual).to eq expected
         end
       end
-
-      context 'ActiveSupport::Logger' do
-        let(:logger) { ActiveSupport::Logger.new('spec/temp/logfile') }
-        it 'logs' do
-          allow(wrapper).to receive(:generate_x_auth_header).and_return(x_auth)
-          allow(MandarinApi).to \
-            receive_message_chain(:config, :request_url).and_return(mandarin_adress)
-          wrapper.request('api/card-bindings', params)
-          expect(actual).to eq expected
-        end
-      end
     end
   end
   describe 'camelize' do

data/spec/mocks.rb

@@ -1,24 +1,14 @@
 # frozen_string_literal: true
 RSpec.shared_context 'mocks', shared_contex: :metadata do
   before :each do
-    user_agent = "rest-client/#{Gem.loaded_specs['rest-client'].version} " \
-      "(#{RbConfig::CONFIG['host_os']} #{RbConfig::CONFIG['host_cpu']}) " \
-      "ruby/#{RUBY_VERSION}p#{RUBY_PATCHLEVEL}"
     card_assign_body = JSON.generate(customerInfo: { email: 'ololo@gmail.com',
                                                      phone: '8-909-999-88-77' })
-    payout_body =
-      JSON.generate(
-        payment: { orderId: 123_321, action: 'payout', price: 35_000 },
-        target: { card: '0eb51e74-e704-4c36-b5cb-8f0227621518' },
-        customValues: [{ name: 'a', value: 'A' }, {name: 'b', value: 'B' }]
-      )
-    header = {
-      'Accept' => '*/*', 'Accept-Encoding' => 'gzip, deflate',
-      'Content-Length' => '70', 'Content-Type' => 'application/json',
-      'Host' => 'secure.mandarinpay.com',
-      'User-Agent' => user_agent,
-      'X-Auth' => 'x-auth'
-    }
+    payout_body = JSON.generate(
+      payment: { orderId: 123_321, action: 'payout', price: 35_000 },
+      target: { card: '0eb51e74-e704-4c36-b5cb-8f0227621518' },
+      customValues: [{ name: 'a', value: 'A' }, { name: 'b', value: 'B' }]
+    )
+    header = { 'Content-Type' => 'application/json', 'X-Auth' => 'x-auth' }
     stub_request(:post, 'https://secure.mandarinpay.com/api/card-bindings')
       .with(
         body: card_assign_body,

data/spec/spec_helper.rb

@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 require 'webmock/rspec'
 require 'mocks'
-require 'faker'
-require 'pry-byebug'
 
 Dir['./lib/**/*.rb'].each { |f| require f }
 

metadata

@@ -1,159 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: mandarin-api
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Vladimir Bogaevsky
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-08 00:00:00.000000000 Z
+date: 2017-12-11 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: webmock
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.1'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: pry
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
+        version: '3.7'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.7.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rb-readline
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.5'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
+        version: '3.7'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: 3.7.0
 - !ruby/object:Gem::Dependency
-  name: pry-doc
+  name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rdoc
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
+        version: '3.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.4.2
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 3.1.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.4.2
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
-- !ruby/object:Gem::Dependency
-  name: faker
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
+        version: '3.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.6'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '1.7'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.6'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '1.7'
+        version: 3.1.1
 - !ruby/object:Gem::Dependency
-  name: pry-byebug
+  name: curb
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: rest-client
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 0.9.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.0'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 0.9.4
 description: 
 email: gitvbogaevsky@gmail.com
 executables: []
@@ -197,7 +107,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.2.0
+      version: 2.4.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -205,7 +115,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.7
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: mandarinpay.com api wrapper for ruby