coingate 1.0.1 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d5cacfa153fb957d6aabc39b4256088635c10476
-  data.tar.gz: 46c1dd848e2f5aef091c8b4767550794b5a7d8f9
+  metadata.gz: 20d0f614e7f63f731fcf8be425e7996815f2821a
+  data.tar.gz: e881bbb6daa9a65d4c3aecfa42b180a0ecf2eba9
 SHA512:
-  metadata.gz: 95110b8ac7444f6867193206ef5a9ba35c1bfca54d8d802d985a11cbd3cd0ef4f1df681e92bd754d11406276012e7d0153c02fe9549e230a35988a002795545f
-  data.tar.gz: b9ebb74fa958b7c0cee75cda771ac1f2e18c6c59dbc0962bada10b3401859f3f7b8849d2303620ee491a773e3d9be03d902e09e7df0af5369249c99b23604c5d
+  metadata.gz: f482452dadb80bdd536b96a133ed4b2c5892cb97a54fc57930935439b97bc07407022dfdf1acbc5f590d24becb0db993fddfee5cffc77d11b6893d1e1a7708d1
+  data.tar.gz: 8b36ae10c932f22763edd06395d8fb21a9325be0e185d9203e5dc57b4ad7cab90ce763ba9aae8659ec82ef13360db798e76b8fd2385e34075b5a9a7491cee306

data/Gemfile.lock

@@ -1,24 +1,26 @@
 PATH
   remote: .
   specs:
-    coingate (1.0.0)
+    coingate (2.0.0)
       rest-client
 
 GEM
   remote: https://rubygems.org/
   specs:
     diff-lcs (1.2.5)
-    domain_name (0.5.20160310)
+    domain_name (0.5.20180417)
       unf (>= 0.0.5, < 1.0.0)
-    http-cookie (1.0.2)
+    http-cookie (1.0.3)
       domain_name (~> 0.5)
-    mime-types (2.99.1)
+    mime-types (3.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2016.0521)
     netrc (0.11.0)
     rake (10.5.0)
-    rest-client (1.8.0)
+    rest-client (2.0.2)
       http-cookie (>= 1.0.2, < 2.0)
-      mime-types (>= 1.16, < 3.0)
-      netrc (~> 0.7)
+      mime-types (>= 1.16, < 4.0)
+      netrc (~> 0.8)
     rspec (3.4.0)
       rspec-core (~> 3.4.0)
       rspec-expectations (~> 3.4.0)
@@ -34,7 +36,7 @@ GEM
     rspec-support (3.4.1)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.7.2)
+    unf_ext (0.0.7.5)
 
 PLATFORMS
   ruby
@@ -46,4 +48,4 @@ DEPENDENCIES
   rspec
 
 BUNDLED WITH
-   1.10.6
+   1.16.0

data/README.md

@@ -21,7 +21,7 @@ And then execute:
 Or install it yourself by executing:
 
     $ gem install coingate
-    
+
 ## Usage
 
 ### Create API credentials
@@ -34,17 +34,17 @@ You can set default configuration like this:
 
 ```ruby
 CoinGate.config do |config|
-  config.app_id      = 1
-  config.api_key     = 'get_your_key_at_coingatecom'
-  config.api_secret  = 'get_your_key_at_coingatecom'
+  config.auth_token  = 'get_your_auth_token_at_coingatecom'
   config.environment = 'live' # live or sandbox. Default: live
 end
+
+order = CoinGate::Merchant::Order.find(1)
 ```
 
 Or you can pass authentication params individually, for example:
 
 ```ruby
-CoinGate::Merchant::Order.find(1, {app_id: 1, api_key: 'coingate', api_secret: 'coingate', environment: 'sandbox'})
+order = CoinGate::Merchant::Order.find(1, {auth_token: 'coingate', environment: 'sandbox'})
 ```
 
 ### Create Order
@@ -54,8 +54,8 @@ CoinGate::Merchant::Order.find(1, {app_id: 1, api_key: 'coingate', api_secret: '
 ```ruby
 post_params = {
   order_id:         'ORDER-1412759367',
-  price:            1050.99,
-  currency:         'USD',
+  price_amount:     1050.99,
+  price_currency:   'USD',
   receive_currency: 'EUR',
   callback_url:     'https://example.com/payments/callback?token=6tCENGUYI62ojkuzDPX7Jg',
   cancel_url:       'https://example.com/cart',
@@ -77,8 +77,8 @@ end
 ```ruby
 post_params = {
   order_id:         'ORDER-1412759367',
-  price:            1050.99,
-  currency:         'USD',
+  price_amount:     1050.99,
+  price_currency:   'USD',
   receive_currency: 'EUR',
   callback_url:     'https://example.com/payments/callback?token=6tCENGUYI62ojkuzDPX7Jg',
   cancel_url:       'https://example.com/cart',

data/lib/coingate.rb

@@ -12,21 +12,19 @@ require 'json'
 
 module CoinGate
   class << self
-    attr_accessor :app_id, :api_key, :api_secret, :environment
+    attr_accessor :auth_token, :environment
 
     def config
       yield self
     end
 
     def api_request(url, request_method = :post, params = {}, authentication = {})
-      app_id      = authentication[:app_id] || self.app_id
-      api_key     = authentication[:api_key] || self.api_key
-      api_secret  = authentication[:api_secret] || self.api_secret
+      auth_token  = authentication[:auth_token] || self.auth_token
       environment = authentication[:environment] || self.environment || 'live'
 
-      # Check if credentials was passed
-      if app_id.nil? || api_key.nil? || api_secret.nil?
-        CoinGate.raise_error(400, {'reason' => 'CredentialsMissing'})
+      # Check if auth_token was passed
+      if auth_token.nil?
+        CoinGate.raise_error(400, {'reason' => 'AuthTokenMissing'})
       end
 
       # Check if right environment passed
@@ -39,19 +37,13 @@ module CoinGate
       url = (
       case environment
         when 'sandbox'
-          'https://api-sandbox.coingate.com/v1'
+          'https://api-sandbox.coingate.com/v2'
         else
-          'https://api.coingate.com/v1'
+          'https://api.coingate.com/v2'
       end) + url
 
-      nonce     = (Time.now.to_f * 1e6).to_i
-      message   = nonce.to_s + app_id.to_s + api_key
-      signature = OpenSSL::HMAC.hexdigest(OpenSSL::Digest.new('sha256'), api_secret, message)
-
       headers = {
-          'Access-Nonce'     => nonce,
-          'Access-Key'       => api_key,
-          'Access-Signature' => signature
+        Authorization: "Token #{auth_token}"
       }
 
       begin

data/lib/coingate/api_error.rb

@@ -3,12 +3,12 @@ module CoinGate
 
   # HTTP Status 400
   class BadRequest < APIError; end
-  class CredentialsMissing < BadRequest; end
+  class AuthTokenMissing < BadRequest; end
   class BadEnvironment < BadRequest; end
 
   # HTTP Status 401
   class Unauthorized < APIError; end
-  class BadCredentials < Unauthorized; end
+  class BadAuthToken < Unauthorized; end
 
   # HTTP Status 404
   class NotFound < APIError; end
@@ -19,6 +19,9 @@ module CoinGate
   # HTTP Status 422
   class UnprocessableEntity < APIError; end
   class OrderIsNotValid < UnprocessableEntity; end
+  
+  # HTTP Status 429
+  class RateLimitException < UnprocessableEntity; end
 
   # HTTP Status 500
   class InternalServerError < APIError; end

data/lib/coingate/error_handler.rb

@@ -9,14 +9,14 @@ module CoinGate
     raise (case http_code
       when 400
         case reason
-          when 'CredentialsMissing' then CredentialsMissing
+          when 'AuthTokenMissing' then AuthTokenMissing
           when 'BadEnvironment' then BadEnvironment
           else BadRequest
         end
 
       when 401 then
         case reason
-          when 'BadCredentials' then BadCredentials
+          when 'BadAuthToken' then BadAuthToken
           else Unauthorized
         end
 
@@ -34,6 +34,8 @@ module CoinGate
           when 'OrderIsNotValid' then OrderIsNotValid
           else UnprocessableEntity
         end
+        
+      when 429 then RateLimitException
 
       when 500 then InternalServerError
 

data/lib/coingate/merchant/order.rb

@@ -1,5 +1,5 @@
 class CoinGate::Merchant::Order
-  STATUSES = %w(pending confirming paid invalid canceled expired failed)
+  STATUSES = %w(new pending confirming paid invalid canceled expired failed)
 
   def initialize(params)
     @order = params

data/lib/coingate/version.rb

@@ -1,3 +1,3 @@
 module CoinGate
-  VERSION = '1.0.1'
+  VERSION = '2.0.0'
 end

data/spec/merchant/order_spec.rb

@@ -6,8 +6,8 @@ describe CoinGate::Merchant::Order do
   let(:valid_order_params) do
     {
         order_id:         'ORDER-1412759367',
-        price:            1050.99,
-        currency:         'USD',
+        price_amount:     1050.99,
+        price_currency:   'USD',
         receive_currency: 'EUR',
         callback_url:     'https://example.com/payments/callback?token=6tCENGUYI62ojkuzDPX7Jg',
         cancel_url:       'https://example.com/cart',
@@ -18,9 +18,7 @@ describe CoinGate::Merchant::Order do
 
   before do
     CoinGate.config do |config|
-      config.app_id      = @authentication[:app_id]
-      config.api_key     = @authentication[:api_key]
-      config.api_secret  = @authentication[:api_secret]
+      config.auth_token  = @authentication[:auth_token]
       config.environment = @authentication[:environment]
     end
   end
@@ -32,8 +30,8 @@ describe CoinGate::Merchant::Order do
     end
 
     context 'valid' do
-      it { expect(CoinGate::Merchant::Order.create(valid_order_params).pending?).to be true }
-      it { expect(CoinGate::Merchant::Order.create!(valid_order_params).pending?).to be true }
+      it { expect(CoinGate::Merchant::Order.create(valid_order_params).new?).to be true }
+      it { expect(CoinGate::Merchant::Order.create!(valid_order_params).new?).to be true }
     end
   end
 
@@ -42,8 +40,8 @@ describe CoinGate::Merchant::Order do
       it do
         order = CoinGate::Merchant::Order.create(valid_order_params)
 
-        expect(CoinGate::Merchant::Order.find(order.id).pending?).to be true
-        expect(CoinGate::Merchant::Order.find!(order.id).pending?).to be true
+        expect(CoinGate::Merchant::Order.find(order.id).new?).to be true
+        expect(CoinGate::Merchant::Order.find!(order.id).new?).to be true
       end
     end
 
@@ -56,28 +54,23 @@ describe CoinGate::Merchant::Order do
   describe 'passing auth params through arguments' do
     before do
       CoinGate.config do |config|
-        config.app_id      = nil
-        config.api_key     = nil
-        config.api_secret  = nil
-        config.environment = nil
+        config.auth_token = nil
       end
     end
 
     describe 'create order' do
       context 'params not passed' do
-        it { expect { CoinGate::Merchant::Order.create({}) }.to raise_error CoinGate::CredentialsMissing }
-        it { expect { CoinGate::Merchant::Order.create!({}) }.to raise_error CoinGate::CredentialsMissing }
+        it { expect { CoinGate::Merchant::Order.create({}) }.to raise_error CoinGate::AuthTokenMissing }
+        it { expect { CoinGate::Merchant::Order.create!({}) }.to raise_error CoinGate::AuthTokenMissing }
       end
 
       context 'invalid params passed' do
         authentication = {
-            app_id: 1,
-            api_key: 'a',
-            api_secret: 'a'
+          auth_token: 'a'
         }
 
-        it { expect { CoinGate::Merchant::Order.create({}, authentication) }.to raise_error CoinGate::BadCredentials }
-        it { expect { CoinGate::Merchant::Order.create!({}, authentication) }.to raise_error CoinGate::BadCredentials }
+        it { expect { CoinGate::Merchant::Order.create({}, authentication) }.to raise_error CoinGate::BadAuthToken }
+        it { expect { CoinGate::Merchant::Order.create!({}, authentication) }.to raise_error CoinGate::BadAuthToken }
       end
 
       context 'valid params passed' do
@@ -88,19 +81,17 @@ describe CoinGate::Merchant::Order do
 
     describe 'find order' do
       context 'params not passed' do
-        it { expect { CoinGate::Merchant::Order.find(0) }.to raise_error CoinGate::CredentialsMissing }
-        it { expect { CoinGate::Merchant::Order.find!(0) }.to raise_error CoinGate::CredentialsMissing }
+        it { expect { CoinGate::Merchant::Order.find(0) }.to raise_error CoinGate::AuthTokenMissing }
+        it { expect { CoinGate::Merchant::Order.find!(0) }.to raise_error CoinGate::AuthTokenMissing }
       end
 
       context 'invalid params passed' do
         authentication = {
-            app_id: 1,
-            api_key: 'a',
-            api_secret: 'a'
+          auth_token: 'a',
         }
 
-        it { expect { CoinGate::Merchant::Order.find(0, authentication) }.to raise_error CoinGate::BadCredentials }
-        it { expect { CoinGate::Merchant::Order.find!(0, authentication) }.to raise_error CoinGate::BadCredentials }
+        it { expect { CoinGate::Merchant::Order.find(0, authentication) }.to raise_error CoinGate::BadAuthToken }
+        it { expect { CoinGate::Merchant::Order.find!(0, authentication) }.to raise_error CoinGate::BadAuthToken }
       end
 
       context 'valid params passed' do

data/spec/shared.rb

@@ -1,9 +1,7 @@
 RSpec.shared_context 'shared' do
   before(:all) do
     @authentication = {
-        app_id:     1,
-        api_key:    'iob0ctFgeHLajvfxzYnIPB',
-        api_secret: 'ytaqXRWZ17ONlpshPTQuF50rIVLwBbmi',
+        auth_token: 'gYEWru1zBeUU2p4FVHTfVYmxZ7jzTxxBPphgHjET',
         environment: 'sandbox'
     }
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: coingate
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 2.0.0
 platform: ruby
 authors:
 - Tomas Achmedovas
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-19 00:00:00.000000000 Z
+date: 2018-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -110,7 +110,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: Library for CoinGate