From d3ba4ebbf2f60a8f5810fd5652b60b52391a3a61 Mon Sep 17 00:00:00 2001
From: Ethan Barron <ebarron@uco.edu>
Date: Thu, 13 Mar 2014 18:57:05 -0500
Subject: [PATCH] #3 - Implemented better EAPI:InvalidNonce solution

---
 lib/kraken_ruby/client.rb |  8 +++++++-
 spec/client_spec.rb       | 42 +++++++++++++++++++++++++++++++++------
 2 files changed, 43 insertions(+), 7 deletions(-)

diff --git a/lib/kraken_ruby/client.rb b/lib/kraken_ruby/client.rb
index 9eab29f..e1a72c1 100644
--- a/lib/kraken_ruby/client.rb
+++ b/lib/kraken_ruby/client.rb
@@ -84,7 +84,11 @@ def balance#(opts={})
       post_private 'Balance', {} #opts
     end
 
-    def trade_balance(opts={})
+    def trade_balance(assets=nil, opts={})
+      if assets
+        raise ArgumentError if !assets.is_a?(String)
+        opts[:asset] = assets
+      end
       post_private 'TradeBalance', opts
     end
 
@@ -144,6 +148,8 @@ def add_order(opts={})
     private
 
       def post_private(method, opts={})
+        sleep 0.3
+        
         opts['nonce'] = nonce
         post_data = encode_options(opts)
 
diff --git a/spec/client_spec.rb b/spec/client_spec.rb
index e8bc294..46ad783 100644
--- a/spec/client_spec.rb
+++ b/spec/client_spec.rb
@@ -4,12 +4,15 @@
 describe Kraken::Client do
 
   before :each do
-    # FIXME: perhaps it would be wiser or make more sense to implement
-    # this sleep within the actual library -- just not sure if that is
-    # a desired default behavior or if it's something that maybe should 
-    # be left up to the developer using the library
+    # I moved this sleep into the post_private() method of the Client
+    # class, because in an actual production scenario, using the library
+    # would, in some cases, suffer the same problem that I guess you
+    # were suffering here (EAPI:InvalidNonce). So, the fix should be
+    # applied over the entire library, not only during spec runs.
+    # Additionally, it makes the spec suite run MUCH faster, since
+    # a nonce is not necessary for public requests.
     
-    sleep 0.3 # to prevent rapidly pinging the Kraken server
+    #sleep 0.3 # to prevent rapidly pinging the Kraken server
   end
 
   let(:kraken){ Kraken::Client.new(API_KEY, API_SECRET) }
@@ -278,7 +281,7 @@
   context "fetching private data" do # More tests to come
     context "using balance()" do
       context "given no input" do
-        it "gets the user's balance(s)" do
+        it "gets the user's balance(s) in ZUSD" do
           expect(kraken.balance).to be_instance_of(Hash)
         end
       end
@@ -292,6 +295,33 @@
           expect { kraken.balance({:asset => 'XLTCXXDG'}) }.to raise_error(ArgumentError)
         end
       end
+    end
+    
+    context "using trade_balance()" do
+      context "given no input" do
+        it "gets the user's trade balance(s) in ZUSD" do
+          expect(kraken.trade_balance).to be_instance_of(Hash)
+        end
+      end
+      
+      context "given valid input" do
+        it "gets the user's trade balance(s) in the specified asset" do
+          zusd = kraken.trade_balance
+          expect(zusd).to be_instance_of(Hash)
+          xxdg = kraken.trade_balance('XXDG')
+          expect(xxdg).to be_instance_of(Hash)
+          expect(zusd).not_to eq xxdg
+        end
+      end
+      
+      context "given invalid input" do
+        it "throws an ArgumentError exception" do
+          expect { kraken.trade_balance(1234) }.to raise_error(ArgumentError)
+          expect { kraken.trade_balance(1234.56) }.to raise_error(ArgumentError)
+          expect { kraken.trade_balance({}) }.to raise_error(ArgumentError)
+          expect { kraken.trade_balance([]) }.to raise_error(ArgumentError)
+        end
+      end
     end  
   end