cointrader.net 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b4be1caf9abcc585a8e78bd1040188ec6a812844
-  data.tar.gz: 9154e351394208d06b8163609084c9fef8bd3bb5
+  metadata.gz: c04efa6cfe08064cb0a38a0a0833cd0c381e7c1f
+  data.tar.gz: 3ff238c3c11eddece8093c43a0dd36c94f2135d9
 SHA512:
-  metadata.gz: a4541aeb1921d6f8e64c45c26c587ca38a51d9479708814edd220c00b46edd8151471f3edffdd4a0db7460438c55cd98a15fa9ff5874ce4853092d3ec3b3fa3c
-  data.tar.gz: 2f835f35d16a212c35503835ccb38d8f13d6d3723486de49947d57d1fba50eefb550532aef5b6b35812e5cd9ed58d45877c1aeb44dde6843933a9a3eb616a9ed
+  metadata.gz: 174fa7f56e4f7c47e43a560eec5bca74b7f39646151b1e5c49025155e753bc17f52356019052a4cd61883ebc0e67ed9072c749fd401335509dc949c3aa458c8a
+  data.tar.gz: 8c8f63407026fdf073e2daf634fdaa68b2286148e2cabc6583f825990c5736303153897aef0a5fdd6cb08df90e5bd59160fd28f4ec9da027e0392c867ab6cd47

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

@@ -12,12 +12,22 @@ module Cointrader
 
     def cancel params={}
       params = get_defaults(params)
-      request(:post, "/order/#{params[:currency_pair]}/cancel")
+      request(:post, "/order/#{params[:currency_pair]}/cancel", order_id: params[:order_id])
     end
 
     def list params={}
       params = get_defaults(params)
       request(:post, "/order/#{params[:currency_pair]}/list")
     end
+
+    def market_buy params={}
+      params = get_defaults(params)
+      request(:post, "/order/#{params[:currency_pair]}/marketbuy", total_amount: params[:total_amount])
+    end
+
+    def market_sell params={}
+      params = get_defaults(params)
+      request(:post, "/order/#{params[:currency_pair]}/marketsell", total_amount: params[:total_amount])
+    end
   end
 end

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

@@ -14,11 +14,28 @@ module Cointrader
       names.map { |name| params[name] }.compact.join('/')
     end
 
+    def convert_values params
+      pairs = params.map do |k, v|
+        new_value =
+          if k.match(/price|total_amount/)
+            "%04.2f" % v
+          elsif k.match(/amount|quantity/)
+            "%04.8f" % v
+          else
+            v
+          end
+
+        [k, new_value]
+      end
+
+      Hash[pairs]
+    end
+
     def get_defaults params
       defaults = {
         currency_pair: Client::DEFAULT_CURRENCY_PAIR
       }
-      defaults.merge(params)
+      defaults.merge(convert_values(params))
     end
 
     def request(method, path, body={})
@@ -39,10 +56,9 @@ module Cointrader
 
         raise 'API key and API secret are required!' unless api_key && api_secret
 
-        nonce   = DateTime.now.strftime('%Q')
         payload = body.merge({
           secret: api_secret,
-          t: nonce,
+          t: Time.now.utc.to_s
         })
 
         digest    = OpenSSL::Digest.new('sha256')

data/lib/cointrader.net/version.rb

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

data/spec/client_spec.rb

@@ -9,6 +9,14 @@ describe Cointrader::Client do
     subject.limit_sell(total_quantity: 1, price: 10)
   end
 
+  def market_buy
+    subject.market_buy(total_amount: 1)
+  end
+
+  def market_sell
+    subject.market_sell(total_amount: 1)
+  end
+
   def safe_limit_buy
     VCR.use_cassette('limit_buy', &method(:limit_buy))
   end
@@ -17,44 +25,48 @@ describe Cointrader::Client do
     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(response).not_to be_nil
+          expect_success(response)
           expect(response['data'][0]['name']).to eq 'Bitcoin (BTC)'
         end
       end
     end
 
-    # TODO(maros): Add more detailed tests.
     describe '#stats_24h' do
       it 'returns 24 hour sliding statistics' do
         VCR.use_cassette('stats_24h') do
           response = subject.stats_24h
-          expect(response).not_to be_nil
+          expect_success(response)
         end
       end
     end
 
-    # TODO(maros): Add more detailed tests.
     describe '#stats_7d' do
       it 'returns 7 day sliding statistics' do
         VCR.use_cassette('stats_7d') do
           response = subject.stats_7d
-          expect(response).not_to be_nil
+          expect_success(response)
         end
       end
     end
 
-    # TODO(maros): Add more detailed tests.
     describe '#orders' do
       it 'returns open orders' do
         VCR.use_cassette('orders') do
           response = subject.orders
-          expect(response).not_to be_nil
+          expect_success(response)
         end
       end
     end
@@ -66,7 +78,7 @@ describe Cointrader::Client do
         VCR.use_cassette('balance') do
           response = subject.balance
 
-          expect(response).not_to be_nil
+          expect_success(response)
           expect(response['data']['BTC']['available']).not_to be_nil
         end
       end
@@ -76,9 +88,7 @@ describe Cointrader::Client do
       it 'returns trade history' do
         VCR.use_cassette('tradehistory') do
           response = subject.tradehistory
-
-          expect(response).not_to be_nil
-          expect(response['data'][0]['fee']).not_to be_nil
+          expect_success(response)
         end
       end
     end
@@ -89,8 +99,7 @@ describe Cointrader::Client do
       it 'returns an order' do
         VCR.use_cassette('limit_buy') do
           response = limit_buy
-
-          expect(response).not_to be_nil
+          expect_success(response)
           expect(response['data']['id']).not_to be_nil
         end
       end
@@ -100,8 +109,7 @@ describe Cointrader::Client do
       it 'returns an order' do
         VCR.use_cassette('limit_sell') do
           response = limit_sell
-
-          expect(response).not_to be_nil
+          expect_success(response)
           expect(response['data']['id']).not_to be_nil
         end
       end
@@ -112,11 +120,10 @@ describe Cointrader::Client do
 
       it 'cancels and order' do
         VCR.use_cassette('cancel') do
-          response = subject.cancel(id: order['data']['id'])
-
-          expect(response).not_to be_nil
-          expect(response['data']['id']).not_to be_nil
-          expect(response['data']['currency_pair']).not_to be_nil
+          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
       end
     end
@@ -125,9 +132,28 @@ describe Cointrader::Client do
       it 'lists open limit orders' do
         VCR.use_cassette('list') do
           response = subject.list
+          expect_success(response)
+          # expect(response['data'][0]['type'])
+        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
+      end
+    end
 
-          expect(response).not_to be_nil
-          expect(response['data'][0]['type'])
+    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
       end
     end
@@ -136,9 +162,8 @@ describe Cointrader::Client do
       it 'lists recent trades executed' do
         VCR.use_cassette('trades') do
           response = subject.trades
-
-          expect(response).not_to be_nil
-          expect(response['data'][0]['price'])
+          expect_success(response)
+          # expect(response['data'][0]['price'])
         end
       end
     end

data/spec/fixtures/vcr_cassettes/balance.yml

@@ -2,10 +2,11 @@
 http_interactions:
 - request:
     method: post
-    uri: https://private-anon-e01e290b7-cointrader.apiary-mock.com/api4/account/balance
+    uri: https://sandbox.cointrader.net/api4/account/balance
     body:
       encoding: UTF-8
-      string: '{"secret":"5zyeBRp8XnXzPEeMkPZJ4tm4Pjqejw6ovnRuazBit1Eo","t":"1433057422031"}'
+      string: '{"secret":"2MlxW8mUU9MG4bvq7C6M4PSd5J8SaauW4H2dXnyJyAcN","t":"2015-06-13
+        23:00:21 UTC"}'
     headers:
       Accept:
       - "*/*; q=0.5, application/xml"
@@ -14,11 +15,11 @@ http_interactions:
       Content-Type:
       - application/json
       X-Auth:
-      - oo2GEmR7GX7gw3weoz57kKsR21k8VgJFEfEaoUYOCIRf
+      - nCsNvmrxTpYFnJQyU16gq6R9ncOUA6UhF4wZnuf7IqkL
       X-Auth-Hash:
-      - 26adeee0c16462e30cfcdba245ab5927ae4d5d167b971773e22bb644e2fa720f
+      - 149ab2f07d5f872b8244e00a63e7978aa961760215f523c46869aba6c69b41a9
       Content-Length:
-      - '77'
+      - '87'
       User-Agent:
       - Ruby
   response:
@@ -26,56 +27,40 @@ http_interactions:
       code: 200
       message: OK
     headers:
-      Server:
-      - Cowboy
-      Connection:
-      - keep-alive
-      X-Apiary-Ratelimit-Limit:
-      - '120'
-      X-Apiary-Ratelimit-Remaining:
-      - '115'
-      Access-Control-Allow-Origin:
-      - "*"
-      Access-Control-Allow-Methods:
-      - OPTIONS,GET,HEAD,POST,PUT,DELETE,TRACE,CONNECT
-      Access-Control-Max-Age:
-      - '10'
-      X-Apiary-Transaction-Id:
-      - 556ab7d01197a90300fefd03
       Date:
-      - Sun, 31 May 2015 07:27:12 GMT
-      Transfer-Encoding:
-      - chunked
-      Via:
-      - 1.1 vegur
+      - Sat, 13 Jun 2015 23:00:26 GMT
+      Server:
+      - Apache
+      X-Frame-Options:
+      - SAMEORIGIN
+      X-Xss-Protection:
+      - 1; mode=block
+      X-Content-Type-Options:
+      - nosniff
+      X-Powered-By:
+      - ''
+      Set-Cookie:
+      - CTXIDSCK=rumaii5548fj7n7g95sjggu251; 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: UTF-8
-      string: |2-
-            {
-                "success":true,
-                "message":"Account Balances",
-                "data":
-                {
-                    "BTC":
-                        {
-                            "available":"5.26240216",
-                            "on_hold":"0.00000000",
-                            "total":"5.26240216"
-                        },
-                    "USD":
-                        {
-                            "available":"0.35",
-                            "on_hold":"0.00",
-                            "total":"0.35"
-                        },
-                    "CAD":
-                        {
-                            "available":"1.41",
-                            "on_hold":"0.00",
-                            "total":"1.41"
-                        }
-                    }
-                }
+      encoding: ASCII-8BIT
+      string: !binary |-
+        H4sIAAAAAAAAA6tWKi5NTk4tLlayKikqTdVRygWyE9NTlayUHJOT80vzShSc
+        EnMS84BKlHSUUhJLEpWsqpWcQpxBVGJZYmZOYlIOSLWBngEUANXl58Vn5Oek
+        oAuX5Jck5qAK1uoohQa7YDMMwxg0A0BanR3J1FpbywUAkRGfN/oAAAA=
     http_version: 
-  recorded_at: Sun, 31 May 2015 07:30:22 GMT
+  recorded_at: Sat, 13 Jun 2015 23:00:26 GMT
 recorded_with: VCR 2.9.3

data/spec/fixtures/vcr_cassettes/cancel.yml

@@ -2,10 +2,11 @@
 http_interactions:
 - request:
     method: post
-    uri: https://private-anon-e01e290b7-cointrader.apiary-mock.com/api4/order/BTCUSD/cancel
+    uri: https://sandbox.cointrader.net/api4/order/BTCUSD/cancel
     body:
       encoding: UTF-8
-      string: '{"secret":"5zyeBRp8XnXzPEeMkPZJ4tm4Pjqejw6ovnRuazBit1Eo","t":"1433057425310"}'
+      string: '{"order_id":"2222321","secret":"2MlxW8mUU9MG4bvq7C6M4PSd5J8SaauW4H2dXnyJyAcN","t":"2015-06-13
+        23:01:51 UTC"}'
     headers:
       Accept:
       - "*/*; q=0.5, application/xml"
@@ -14,11 +15,11 @@ http_interactions:
       Content-Type:
       - application/json
       X-Auth:
-      - oo2GEmR7GX7gw3weoz57kKsR21k8VgJFEfEaoUYOCIRf
+      - nCsNvmrxTpYFnJQyU16gq6R9ncOUA6UhF4wZnuf7IqkL
       X-Auth-Hash:
-      - 8e749f76f59ae36b3ad63c488f0f4e7c09a37aacef445bc38cc9f49049e80a84
+      - f6f960802d0ec32112a9b5c659ceac1a46cbe62ad22bdc38070451fa0c09ae50
       Content-Length:
-      - '77'
+      - '108'
       User-Agent:
       - Ruby
   response:
@@ -26,40 +27,40 @@ http_interactions:
       code: 200
       message: OK
     headers:
-      Server:
-      - Cowboy
-      Connection:
-      - keep-alive
-      X-Apiary-Ratelimit-Limit:
-      - '120'
-      X-Apiary-Ratelimit-Remaining:
-      - '111'
-      Access-Control-Allow-Origin:
-      - "*"
-      Access-Control-Allow-Methods:
-      - OPTIONS,GET,HEAD,POST,PUT,DELETE,TRACE,CONNECT
-      Access-Control-Max-Age:
-      - '10'
-      X-Apiary-Transaction-Id:
-      - 556ab7d42e7cbc030044b280
       Date:
-      - Sun, 31 May 2015 07:27:16 GMT
-      Transfer-Encoding:
-      - chunked
-      Via:
-      - 1.1 vegur
+      - Sat, 13 Jun 2015 23:01:53 GMT
+      Server:
+      - Apache
+      X-Frame-Options:
+      - SAMEORIGIN
+      X-Xss-Protection:
+      - 1; mode=block
+      X-Content-Type-Options:
+      - nosniff
+      X-Powered-By:
+      - ''
+      Set-Cookie:
+      - CTXIDSCK=pmv8crr36dojr43dlq3784r1d1; 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:
+      - '114'
+      Content-Type:
+      - application/json
     body:
-      encoding: UTF-8
-      string: |-
-        {
-            "success":true,
-            "message":"BTCCAD Order Canceled",
-            "data":
-            {
-                "id":"85",
-                "currency_pair":"BTCAD"
-            }
-        }
+      encoding: ASCII-8BIT
+      string: !binary |-
+        H4sIAAAAAAAAA6tWKi5NTk4tLlaySkvMKU7VUcoFchLTU5WslPyLUlKLFPzy
+        SxTc8kvzUpR0lFISSxKVrKqVUouK8ouc81NAqiwMDJSQdYVkpCrkg3Wm5KcW
+        56mXKKRWZBaX6CnV1nIBAHEGK69uAAAA
     http_version: 
-  recorded_at: Sun, 31 May 2015 07:30:26 GMT
+  recorded_at: Sat, 13 Jun 2015 23:01:55 GMT
 recorded_with: VCR 2.9.3