cointrader.net 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c04efa6cfe08064cb0a38a0a0833cd0c381e7c1f
-  data.tar.gz: 3ff238c3c11eddece8093c43a0dd36c94f2135d9
+  metadata.gz: 7ecad613ebfbea1bf2859dfc6a00029ef45610b6
+  data.tar.gz: bdfbb95bb25cbabcc7ba0399734d6455f6562ace
 SHA512:
-  metadata.gz: 174fa7f56e4f7c47e43a560eec5bca74b7f39646151b1e5c49025155e753bc17f52356019052a4cd61883ebc0e67ed9072c749fd401335509dc949c3aa458c8a
-  data.tar.gz: 8c8f63407026fdf073e2daf634fdaa68b2286148e2cabc6583f825990c5736303153897aef0a5fdd6cb08df90e5bd59160fd28f4ec9da027e0392c867ab6cd47
+  metadata.gz: ea34eb938fc6805bb1728a9ba78c3692760d2769e8f6f2b9e7732fd97ec1f8ce83a91469d27a499372abca87518f829d89f57fbfe9e4f892573bd048981f301b
+  data.tar.gz: 79a0c0b1bb3bc3fbd72729dad7d6d607bc143b6b7904a3d56a10cdd44dfb085757ae6adbcaa5d3c3b6ebf908c1de47ce0b0787fb7aa1917ca7b4f15a1045b63c

data/lib/cointrader.net/client.rb

@@ -2,6 +2,7 @@ require_relative 'client/request'
 require_relative 'client/stats'
 require_relative 'client/account'
 require_relative 'client/order'
+require_relative 'client/error'
 
 module Cointrader
   class Client

data/lib/cointrader.net/client/error.rb

@@ -0,0 +1,6 @@
+module Cointrader 
+  class Error             < StandardError; end
+  class Unauthorized      < Error; end
+  class InsufficientFunds < Error; end
+  class NoOpenOrders      < Error; end
+end

data/lib/cointrader.net/client/request.rb

@@ -39,9 +39,11 @@ module Cointrader
     end
 
     def request(method, path, body={})
-      JSON.parse(hmac_request(method, path, body))
+      check_errors(JSON.parse(hmac_request(method, path, body)))
     end
 
+    private
+
     def hmac_request method, path, body={}
       payload = {}
       headers = { :content_type => 'application/json' }
@@ -77,5 +79,32 @@ module Cointrader
         headers: headers,
       )
     end
+
+    # Returns the error code from `response` or `nil` if there is none.
+    def extract_error_code response
+      return unless response
+      return unless response['data'] && response['data'].class == Hash
+      return unless response['data']['errorCode']
+
+      response['data']['errorCode'].to_i
+    end
+
+    def check_errors response
+      code = extract_error_code(response)
+
+      if code
+        errorClass = 
+          case code
+          when 401      then Unauthorized
+          when 802, 803 then InsufficientFunds # Fiat, Crypto respectively.
+          when 801      then NoOpenOrders
+          else Error
+          end
+
+        raise errorClass.new(response['message'])
+      end
+
+      response
+    end
   end
 end

data/lib/cointrader.net/version.rb

@@ -1,3 +1,3 @@
 module Cointrader
-  VERSION = "0.8.0"
+  VERSION = "0.9.0"
 end

data/spec/client_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Cointrader::Client do
+describe Cointrader::Client, vcr: true do
   def limit_buy 
     subject.limit_buy(total_quantity: 1, price: 10)
   end
@@ -17,57 +17,33 @@ describe Cointrader::Client do
     subject.market_sell(total_amount: 1)
   end
 
-  def safe_limit_buy
-    VCR.use_cassette('limit_buy', &method(:limit_buy))
-  end
-
-  def safe_limit_sell
-    VCR.use_cassette('limit_sell', &method(:limit_sell))
-  end
-
-  def safe_market_buy
-    VCR.use_cassette('market_buy', &method(:market_buy))
-  end
-
-  def safe_market_sell
-    VCR.use_cassette('market_sell', &method(:market_sell))
-  end
-
   describe 'stats' do
     describe '#symbol' do
       it 'returns supported currencies' do
-        VCR.use_cassette('symbol') do
-          response = subject.symbol
-          expect_success(response)
-          expect(response['data'][0]['name']).to eq 'Bitcoin (BTC)'
-        end
+        response = subject.symbol
+        expect_success(response)
+        expect(response['data'][0]['name']).to eq 'Bitcoin (BTC)'
       end
     end
 
     describe '#stats_24h' do
       it 'returns 24 hour sliding statistics' do
-        VCR.use_cassette('stats_24h') do
-          response = subject.stats_24h
-          expect_success(response)
-        end
+        response = subject.stats_24h
+        expect_success(response)
       end
     end
 
     describe '#stats_7d' do
       it 'returns 7 day sliding statistics' do
-        VCR.use_cassette('stats_7d') do
-          response = subject.stats_7d
-          expect_success(response)
-        end
+        response = subject.stats_7d
+        expect_success(response)
       end
     end
 
     describe '#orders' do
       it 'returns open orders' do
-        VCR.use_cassette('orders') do
-          response = subject.orders
-          expect_success(response)
-        end
+        response = subject.orders
+        expect_success(response)
       end
     end
   end
@@ -75,21 +51,17 @@ describe Cointrader::Client do
   describe 'account' do
     describe '#balance' do
       it 'returns a balance' do
-        VCR.use_cassette('balance') do
-          response = subject.balance
+        response = subject.balance
 
-          expect_success(response)
-          expect(response['data']['BTC']['available']).not_to be_nil
-        end
+        expect_success(response)
+        expect(response['data']['BTC']['available']).not_to be_nil
       end
     end
 
     describe '#tradehistory' do
       it 'returns trade history' do
-        VCR.use_cassette('tradehistory') do
-          response = subject.tradehistory
-          expect_success(response)
-        end
+        response = subject.tradehistory
+        expect_success(response)
       end
     end
   end
@@ -97,74 +69,72 @@ describe Cointrader::Client do
   describe 'order' do
     describe '#limit_buy' do
       it 'returns an order' do
-        VCR.use_cassette('limit_buy') do
-          response = limit_buy
-          expect_success(response)
-          expect(response['data']['id']).not_to be_nil
-        end
+        response = limit_buy
+        expect_success(response)
+        expect(response['data']['id']).not_to be_nil
+      end
+
+      it 'throws an error when there are insufficient funds' do
+        expect { subject.limit_buy(price: 1_000_000, total_quantity: 1) }.to raise_error(Cointrader::InsufficientFunds)
       end
     end
 
     describe '#limit_sell' do
       it 'returns an order' do
-        VCR.use_cassette('limit_sell') do
-          response = limit_sell
-          expect_success(response)
-          expect(response['data']['id']).not_to be_nil
-        end
+        response = limit_sell
+        expect_success(response)
+        expect(response['data']['id']).not_to be_nil
       end
     end
 
     describe '#cancel' do
-      let(:order) { safe_limit_buy }
+      let(:order) { limit_buy }
 
-      it 'cancels and order' do
-        VCR.use_cassette('cancel') do
-          response = subject.cancel(order_id: order['data']['id'])
-          expect_success(response)
-          # expect(response['data']['id']).not_to be_nil
-          # expect(response['data']['currency_pair']).not_to be_nil
-        end
+      it 'cancels an order' do
+        response = subject.cancel(order_id: order['data']['id'])
+        expect_success(response)
       end
     end
 
     describe '#list' do
-      it 'lists open limit orders' do
-        VCR.use_cassette('list') do
+      context 'when there are orders' do
+        let(:order) { limit_buy }
+        after { subject.cancel(order_id: order['data']['id'] )}
+
+        it 'lists open limit orders' do
+          order
           response = subject.list
           expect_success(response)
-          # expect(response['data'][0]['type'])
+        end
+      end
+
+      context 'when there are no orders' do
+        it 'throws an error' do
+          expect { subject.list }.to raise_error(Cointrader::NoOpenOrders)
         end
       end
     end
 
     describe '#market_buy' do
       it 'returns an order' do
-        VCR.use_cassette('market_buy') do
-          response = market_buy
-          expect_success(response)
-          expect(response['message']).not_to eq('Unauthorized')
-        end
+        response = market_buy
+        expect_success(response)
+        expect(response['message']).not_to eq('Unauthorized')
       end
     end
 
     describe '#market_sell' do
       it 'returns an order' do
-        VCR.use_cassette('market_sell') do
-          response = market_sell
-          expect_success(response)
-          expect(response['message']).not_to eq('Unauthorized')
-        end
+        response = market_sell
+        expect_success(response)
+        expect(response['message']).not_to eq('Unauthorized')
       end
     end
 
     describe '#trades' do
       it 'lists recent trades executed' do
-        VCR.use_cassette('trades') do
-          response = subject.trades
-          expect_success(response)
-          # expect(response['data'][0]['price'])
-        end
+        response = subject.trades
+        expect_success(response)
       end
     end
   end

data/spec/fixtures/vcr_cassettes/{balance.yml → Cointrader_Client/account/_balance/returns_a_balance.yml}

@@ -5,8 +5,8 @@ http_interactions:
     uri: https://sandbox.cointrader.net/api4/account/balance
     body:
       encoding: UTF-8
-      string: '{"secret":"2MlxW8mUU9MG4bvq7C6M4PSd5J8SaauW4H2dXnyJyAcN","t":"2015-06-13
-        23:00:21 UTC"}'
+      string: '{"secret":"2MlxW8mUU9MG4bvq7C6M4PSd5J8SaauW4H2dXnyJyAcN","t":"2015-07-06
+        00:33:09 UTC"}'
     headers:
       Accept:
       - "*/*; q=0.5, application/xml"
@@ -17,7 +17,7 @@ http_interactions:
       X-Auth:
       - nCsNvmrxTpYFnJQyU16gq6R9ncOUA6UhF4wZnuf7IqkL
       X-Auth-Hash:
-      - 149ab2f07d5f872b8244e00a63e7978aa961760215f523c46869aba6c69b41a9
+      - e6bb80adc0eaaa0c1b6de259208d310034606062bc0c6e9d27a892364d08c6e8
       Content-Length:
       - '87'
       User-Agent:
@@ -28,7 +28,7 @@ http_interactions:
       message: OK
     headers:
       Date:
-      - Sat, 13 Jun 2015 23:00:26 GMT
+      - Mon, 06 Jul 2015 00:33:10 GMT
       Server:
       - Apache
       X-Frame-Options:
@@ -40,7 +40,7 @@ http_interactions:
       X-Powered-By:
       - ''
       Set-Cookie:
-      - CTXIDSCK=rumaii5548fj7n7g95sjggu251; path=/; HttpOnly
+      - CTXIDSCK=4f9kvstmt2ff4r5i4i42ssv4q0; path=/; HttpOnly
       Expires:
       - Thu, 19 Nov 1981 08:52:00 GMT
       Cache-Control:
@@ -62,5 +62,5 @@ http_interactions:
         EnMS84BKlHSUUhJLEpWsqpWcQpxBVGJZYmZOYlIOSLWBngEUANXl58Vn5Oek
         oAuX5Jck5qAK1uoohQa7YDMMwxg0A0BanR3J1FpbywUAkRGfN/oAAAA=
     http_version: 
-  recorded_at: Sat, 13 Jun 2015 23:00:26 GMT
+  recorded_at: Mon, 06 Jul 2015 00:33:11 GMT
 recorded_with: VCR 2.9.3

data/spec/fixtures/vcr_cassettes/{tradehistory.yml → Cointrader_Client/account/_tradehistory/returns_trade_history.yml}

@@ -5,8 +5,8 @@ http_interactions:
     uri: https://sandbox.cointrader.net/api4/account/tradehistory/BTCUSD
     body:
       encoding: UTF-8
-      string: '{"secret":"2MlxW8mUU9MG4bvq7C6M4PSd5J8SaauW4H2dXnyJyAcN","t":"2015-06-13
-        23:00:26 UTC"}'
+      string: '{"secret":"2MlxW8mUU9MG4bvq7C6M4PSd5J8SaauW4H2dXnyJyAcN","t":"2015-07-06
+        00:33:11 UTC"}'
     headers:
       Accept:
       - "*/*; q=0.5, application/xml"
@@ -17,7 +17,7 @@ http_interactions:
       X-Auth:
       - nCsNvmrxTpYFnJQyU16gq6R9ncOUA6UhF4wZnuf7IqkL
       X-Auth-Hash:
-      - df4718084a819b003d263c40e0ab07f5c3d0f323d2e8bbd4dd7f96111ea2219f
+      - 70b3415aa79e305dd4bbc7035576a776fc19e79f78a19bb11f3348b0d3286774
       Content-Length:
       - '87'
       User-Agent:
@@ -28,7 +28,7 @@ http_interactions:
       message: OK
     headers:
       Date:
-      - Sat, 13 Jun 2015 23:00:27 GMT
+      - Mon, 06 Jul 2015 00:33:13 GMT
       Server:
       - Apache
       X-Frame-Options:
@@ -40,7 +40,7 @@ http_interactions:
       X-Powered-By:
       - ''
       Set-Cookie:
-      - CTXIDSCK=gdillhuvabvuc9994n1t8an4q7; path=/; HttpOnly
+      - CTXIDSCK=vdddf8frh65pplqpfcakv5lfg4; path=/; HttpOnly
       Expires:
       - Thu, 19 Nov 1981 08:52:00 GMT
       Cache-Control:
@@ -62,5 +62,5 @@ http_interactions:
         yiWmpypZKfnlKwQkFpcohBQlpqQWK7gBlaQo6SilJJYkKllFx9ZyAQBQ0dFf
         TAAAAA==
     http_version: 
-  recorded_at: Sat, 13 Jun 2015 23:00:27 GMT
+  recorded_at: Mon, 06 Jul 2015 00:33:14 GMT
 recorded_with: VCR 2.9.3

data/spec/fixtures/vcr_cassettes/{cancel.yml → Cointrader_Client/order/_cancel/cancels_an_order.yml}

@@ -2,11 +2,11 @@
 http_interactions:
 - request:
     method: post
-    uri: https://sandbox.cointrader.net/api4/order/BTCUSD/cancel
+    uri: https://sandbox.cointrader.net/api4/order/BTCUSD/buy
     body:
       encoding: UTF-8
-      string: '{"order_id":"2222321","secret":"2MlxW8mUU9MG4bvq7C6M4PSd5J8SaauW4H2dXnyJyAcN","t":"2015-06-13
-        23:01:51 UTC"}'
+      string: '{"total_quantity":"1.00000000","price":"10.00","secret":"2MlxW8mUU9MG4bvq7C6M4PSd5J8SaauW4H2dXnyJyAcN","t":"2015-07-06
+        00:33:24 UTC"}'
     headers:
       Accept:
       - "*/*; q=0.5, application/xml"
@@ -17,9 +17,9 @@ http_interactions:
       X-Auth:
       - nCsNvmrxTpYFnJQyU16gq6R9ncOUA6UhF4wZnuf7IqkL
       X-Auth-Hash:
-      - f6f960802d0ec32112a9b5c659ceac1a46cbe62ad22bdc38070451fa0c09ae50
+      - 6bdad317ad5711f68b05097d42aa897691ef2d9a72a4e5eab3658d00ddc703d5
       Content-Length:
-      - '108'
+      - '133'
       User-Agent:
       - Ruby
   response:
@@ -28,7 +28,7 @@ http_interactions:
       message: OK
     headers:
       Date:
-      - Sat, 13 Jun 2015 23:01:53 GMT
+      - Mon, 06 Jul 2015 00:33:26 GMT
       Server:
       - Apache
       X-Frame-Options:
@@ -40,7 +40,7 @@ http_interactions:
       X-Powered-By:
       - ''
       Set-Cookie:
-      - CTXIDSCK=pmv8crr36dojr43dlq3784r1d1; path=/; HttpOnly
+      - CTXIDSCK=a0mojedrbeebc6pr9poeodriu7; path=/; HttpOnly
       Expires:
       - Thu, 19 Nov 1981 08:52:00 GMT
       Cache-Control:
@@ -52,15 +52,15 @@ http_interactions:
       Content-Encoding:
       - gzip
       Content-Length:
-      - '114'
+      - '131'
       Content-Type:
       - application/json
     body:
       encoding: ASCII-8BIT
       string: !binary |-
-        H4sIAAAAAAAAA6tWKi5NTk4tLlaySkvMKU7VUcoFchLTU5WslPyLUlKLFPzy
-        SxTc8kvzUpR0lFISSxKVrKqVUouK8ouc81NAqiwMDJSQdYVkpCrkg3Wm5KcW
-        56mXKKRWZBaX6CnV1nIBAHEGK69uAAAA
+        H4sIAAAAAAAAA6tWKi5NTk4tLlaySkvMKU7VUcoFchLTU5WslJxKKxX8i1JS
+        ixRci4ryi6wUPPOKS9PSMpMzU/NKFNxK81KK9RSCUnMTM/My89KtFAz0DKBA
+        QUlHKSWxJFHJqlopFaTXOT8FZKKFgZESsg0kGFhbywUAxhnDjqwAAAA=
     http_version: 
-  recorded_at: Sat, 13 Jun 2015 23:01:55 GMT
+  recorded_at: Mon, 06 Jul 2015 00:33:27 GMT
 recorded_with: VCR 2.9.3

data/spec/fixtures/vcr_cassettes/Cointrader_Client/order/_limit_buy/returns_an_order.yml

@@ -0,0 +1,66 @@
+---
+http_interactions:
+- request:
+    method: post
+    uri: https://sandbox.cointrader.net/api4/order/BTCUSD/buy
+    body:
+      encoding: UTF-8
+      string: '{"total_quantity":"1.00000000","price":"10.00","secret":"2MlxW8mUU9MG4bvq7C6M4PSd5J8SaauW4H2dXnyJyAcN","t":"2015-07-06
+        00:33:14 UTC"}'
+    headers:
+      Accept:
+      - "*/*; q=0.5, application/xml"
+      Accept-Encoding:
+      - gzip, deflate
+      Content-Type:
+      - application/json
+      X-Auth:
+      - nCsNvmrxTpYFnJQyU16gq6R9ncOUA6UhF4wZnuf7IqkL
+      X-Auth-Hash:
+      - 7684a274dc8e01dcc26b8098399b9f1280bc572ccd9bf0460f051749291f29b4
+      Content-Length:
+      - '133'
+      User-Agent:
+      - Ruby
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Date:
+      - Mon, 06 Jul 2015 00:33:16 GMT
+      Server:
+      - Apache
+      X-Frame-Options:
+      - SAMEORIGIN
+      X-Xss-Protection:
+      - 1; mode=block
+      X-Content-Type-Options:
+      - nosniff
+      X-Powered-By:
+      - ''
+      Set-Cookie:
+      - CTXIDSCK=pna8o9aoelska2eeltndlfr9e5; path=/; HttpOnly
+      Expires:
+      - Thu, 19 Nov 1981 08:52:00 GMT
+      Cache-Control:
+      - no-store, no-cache, must-revalidate, post-check=0, pre-check=0
+      Pragma:
+      - no-cache
+      Vary:
+      - Accept-Encoding
+      Content-Encoding:
+      - gzip
+      Content-Length:
+      - '131'
+      Content-Type:
+      - application/json
+    body:
+      encoding: ASCII-8BIT
+      string: !binary |-
+        H4sIAAAAAAAAA6tWKi5NTk4tLlaySkvMKU7VUcoFchLTU5WslJxKKxX8i1JS
+        ixRci4ryi6wUPPOKS9PSMpMzU/NKFNxK81KK9RSCUnMTM/My89KtFAz0DKBA
+        QUlHKSWxJFHJqlopFaTXOT8FZKKFgZESsg0kGFhbywUAxhnDjqwAAAA=
+    http_version: 
+  recorded_at: Mon, 06 Jul 2015 00:33:17 GMT
+recorded_with: VCR 2.9.3