mercado_bitcoin 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9341f93059a854f69dc3aa52bc8e4a71ce3760a4
-  data.tar.gz: 426ea0f2d98143737c274cbb1ff131de80813cca
+  metadata.gz: 6025df04b0aa23fac07d2558151eca505e1b1846
+  data.tar.gz: 5ef2021541f98e82b7e03a922bb953ac10b95ee1
 SHA512:
-  metadata.gz: f4e36e2c72f15c771ad2d5106a27be748b1811573128d268ff27e82b67fbc6f35b4aa0c8929e908047c53bf39837e772df7cb75a43ae4b38f5a2911855117e05
-  data.tar.gz: 314a300b365ad98d79cd5070aded27106be504bb38391bd4d4b09d3e635e4cfa8299a35cc836a43517d24a5c257ac30e7d5f3b831219b26614b1a1fece0e8555
+  metadata.gz: 18bbaee0f9571f402291a71508145fd367d1c9b0e1ebfcd71ccfeef529fdb80fb61c983750b2ec0115c7f2153488c6a4c32ca8cdc7694862a2ddfb95b43e53db
+  data.tar.gz: 84329dddeb56770a65daa444234b62fa365184be0573cfb3767fb3460ea5768e2f8b083b6c55dbd16600c3f7a7c1e5544ad7598f25759ec86052041dfc114473

data/.rspec

@@ -1,2 +1,3 @@
+--require spec_helper
 --format progress
 --color

data/lib/mercado_bitcoin/errors.rb

@@ -3,4 +3,5 @@ module MercadoBitcoin
   class ParserError < Error; end
   class CoinTypeError < Error; end
   class TonceDesyncError < Error; end
+  class TonceAlreadyUsed < Error; end
 end

data/lib/mercado_bitcoin/trade_api.rb

@@ -13,6 +13,7 @@ module MercadoBitcoin
       @key = key
       @code = code
       @debug = debug
+      @retries = 0
     end
 
     def get_account_info
@@ -97,8 +98,18 @@ module MercadoBitcoin
       post(params)
     end
 
+    attr_writer :last_tapi_nonce
+
+    def last_tapi_nonce
+      @last_tapi_nonce ||= (Time.new.to_f * 10).to_i
+    end
+
+    def tapi_nonce
+      self.last_tapi_nonce += 1
+    end
+
     def post(params)
-      params[:tapi_nonce] = (Time.new.to_f * 10).to_i
+      params[:tapi_nonce] = tapi_nonce
       signature = sign(params)
       puts params.to_query_string if debug?
       result = JSON.parse(
@@ -108,6 +119,43 @@ module MercadoBitcoin
           header(signature)
         )
       )
+      deal_with_errors(result)
+    rescue MercadoBitcoin::TonceAlreadyUsed
+      retry
+    end
+
+    def deal_with_errors(result)
+      if result['status_code'] == 100
+        @retries = 0
+        return result
+      end
+
+      @retries += 1
+      if @retries >= 6
+        @retries = 0
+        result[:_mb_gem] = { code: 1, retries: @retries, error: 'maximum retries reached' }
+        return result
+      end
+
+      return deal_with_tapi_nonce(result) if result['status_code'] == 203
+
+      deal_with_errors_not_treated(result)
+    end
+
+    def deal_with_tapi_nonce(result)
+      if result['error_message'] =~ /utilizado: (\d+)/
+        self.last_tapi_nonce = $1.to_i
+        raise MercadoBitcoin::TonceAlreadyUsed.new
+      else
+        result[:_mb_gem] = { code: 2, retries: @retries, error: 'last tapi_nonce not found.' }
+        result
+      end
+    end
+
+    def deal_with_errors_not_treated(result)
+      result[:_mb_gem] = { code: 0, retries: @retries, error: 'not treated' }
+      @retries = 0
+      result
     end
 
     def base_path

data/lib/mercado_bitcoin/version.rb

@@ -1,3 +1,3 @@
 module MercadoBitcoin
-  VERSION = "0.4.0"
+  VERSION = "0.5.0"
 end

data/mercado_bitcoin.gemspec

@@ -23,6 +23,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.10"
   spec.add_development_dependency "pry", "~> 0.10"
   spec.add_development_dependency "byebug", "~> 9.0"
-  spec.add_development_dependency "rake", "~> 11.2"
+  spec.add_development_dependency "rake", "~> 12.0"
   spec.add_development_dependency "rspec", "~> 3.4"
+  spec.add_development_dependency 'webmock', '~> 3.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mercado_bitcoin
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Marco Carvalho
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-04 00:00:00.000000000 Z
+date: 2017-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: virtus
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.2'
+        version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.2'
+        version: '12.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -122,6 +122,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.4'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  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'
 description: 'Thin layer over public price api of MercadoBitcoin.com.br for more information
   about the API see https://www.mercadobitcoin.com.br/api '
 email:
@@ -139,7 +153,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- bin/mb_console.rb
+- bin/mb_console
 - docker-compose.yml
 - lib/mercado_bitcoin.rb
 - lib/mercado_bitcoin/api.rb
@@ -180,7 +194,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.6
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Thin layer over public price api of MercadoBitcoin.com.br