mercado_bitcoin 0.2.4 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cf8f7d12fa21c1ec6a442308e8cd63c156783d3e
-  data.tar.gz: 7588adf292d1fbb72565f859d42fb256134c9364
+  metadata.gz: f6a463c5141cfcd838dcb6f58639314220f99010
+  data.tar.gz: 843f340e2d0b8a43053222874bb457693d759447
 SHA512:
-  metadata.gz: a4392debb609e0589fe0968ba39649032d618b241c3144c8d54780f7090eae7f1164b29a1f0f204ca2aaad4ae14b95a6673ea29e0b61c54dab7923e4d354b5c3
-  data.tar.gz: 02b6ea32d6b641f3dc3c795b11c0748cf775de6aa630e74cf1c7b685bb46ffd2530800d665b025cf179bafe87e53af68b2f04e0dc69cc6efc53c58b76227a91b
+  metadata.gz: b3bc9c8cc54b0e9ba6854859c203b12f6455de2255fb67eaf228d6aa674561719f46b150d8e144d6bfcdd8a532fa13db4f298e3d2863a7a95162841398fc3821
+  data.tar.gz: fb60a97d933425c725b77e7455aeb7072d2dbc1d945fb08a4a302e43f47536612e89d8b6a8266670b43434fe1586f58b9299f0193b192f595b4863ff1ab8441a

data/lib/mercado_bitcoin/errors.rb

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

data/lib/mercado_bitcoin/trade_api.rb

@@ -49,16 +49,31 @@ module MercadoBitcoin
     end
 
     def post(params)
+      params[:tonce] = Time.new.to_i + env_or_var_tonce
       signature = sign(params)
-      JSON.parse(
+      result = JSON.parse(
         RestClient.post(
           base_url,
           params.to_query_string,
           header(signature)
         )
       )
+      raise TonceDesyncError.new('desync') if tonce_error?(result)
+      result 
+    rescue TonceDesyncError
+      @tonce_correction = get_tonce_correction(result)
+      retry
     end
 
+    def tonce_error?(result)
+      if result['error'].to_s =~ /(\d+) e (\d+), tonce recebido (\d+)+/
+        $1.to_i - $3.to_i + 10
+      else
+        false
+      end
+    end
+    alias_method :get_tonce_correction, :tonce_error?
+
     def base_url
       @base_url ||= "https://www.mercadobitcoin.net/tapi/".freeze
     end
@@ -73,11 +88,18 @@ module MercadoBitcoin
 
     def base_params(method)
       {
-        method: method,
-        tonce: Time.new.to_i + (ENV['TONCE_CORRECTION'] || tonce_correction).to_i
+        method: method
       }
     end
 
+    def env_or_var_tonce
+      if ENV['TONCE_CORRECTION'].to_s =~ /\d+/
+        ENV['TONCE_CORRECTION'].to_i
+      else
+        tonce_correction
+      end
+    end
+
     def sign(string_or_hash)
       string_or_hash = string_or_hash.to_query_string if string_or_hash.is_a?(Hash)
       hmac = OpenSSL::HMAC.new(code, OpenSSL::Digest.new('sha512'))

data/lib/mercado_bitcoin/version.rb

@@ -1,3 +1,3 @@
 module MercadoBitcoin
-  VERSION = "0.2.4"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mercado_bitcoin
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.3.0
 platform: ruby
 authors:
 - Marco Carvalho