cexio 0.0.5 → 0.0.6

data/README.md

@@ -24,7 +24,7 @@ Or install it yourself as:
 
 ###2. Add "require 'cexio'")
 
-###3. Create class 
+###3. Create class
 ```ruby
   api = CEX::API(username, api_key, api_secret)
 ```
@@ -39,12 +39,12 @@ api_secret - your API secret code
 ```
 1. couple = ("GHS\BTC" | "BF1\BTC") currency pair
 2. since = integer  return trades with tid >= since
-3. order_id = integer 
+3. order_id = integer
 4. ptype = ("sell" | "buy") type of order
-5. amount = float 
+5. amount = float
 6. price = float
 ```
-      
+
 ####b) API methods
 ```
 1. ticker(couple = 'GHS/BTC') - get ticker
@@ -55,9 +55,9 @@ api_secret - your API secret code
 6. cancel_order(order_id) - cancel order №order_id
 7. place_order(ptype = 'buy', amount = 1, price = 1, couple = 'GHS/BTC') - create order
 ```
-     
+
 ####c) Full API documentation: https://cex.io/api
-    
+
 ###5. Examples
 
 ####Connect and get balance:
@@ -71,15 +71,15 @@ puts cex.balance
 
 ```
 ```json
-{'timestamp': '1383379054', 'BTC': {'available': '0.04614310', 'orders': '0.00170000'}, 'GHS': {'available': '0.02000000'}}
+{"timestamp": "1383379054", "BTC": {"available": "0.04614310", "orders": "0.00170000"}, "GHS": {"available": "0.02000000"}}
 ```
 
 ####Get balance:
-```ruby     
+```ruby
 puts cex.balance
 ```
 ```json
-{'timestamp': '1383379054', 'BTC': {'available': '0.04614310', 'orders': '0.00170000'}, 'GHS': {'available': '0.02000000'}}
+{"timestamp": "1383379054", "BTC": {"available": "0.04614310", "orders": "0.00170000"}, "GHS": {"available": "0.02000000"}}
 ```
 
 ####Get API ticker:
@@ -87,39 +87,48 @@ puts cex.balance
 puts cex.ticker('GHS/BTC')
 ```
 ```json
-{u'volume': '7154.78339022', 'last': '0.1078', 'timestamp': '1383379041', 'bid': '0.10778', 'high': '0.10799999', 'low': '0.10670076', 'ask': '0.10780000000000001'}
+{"volume": "7154.78339022", "last": "0.1078", "timestamp": "1383379041", "bid": "0.10778", "high": "0.10799999", "low": "0.10670076", "ask": "0.10780000000000001"}
 ```
 
 ####Get order book:
 ```ruby
-puts cex.order_book('BF1/BTC')
+puts cex.order_book("BF1/BTC")
 ```
 ```json
-{'timestamp': '1383378967', 'bids': [['1.7', '0.30100000'], ['1.67', '0.00011000'], ['0.8', '0.02070000'], ['0.1002', '0.27748002'], ['0.1', '0.10000000'], ['0.011', '0.30500000'], ['0.009', '1.00000000'], ['0.00171', '0.00100000'], ['0.0012', '1.00000000'], ['0.00116819', '0.50000000'], ['0.001002', '33.00000000'], ['0.001001', '53.00000000'], ['0.001', '3.00000000'], ['0.00097626', '36.00000000'], ['0.0006', '85.00000000'], ['0.00058409', '0.50000000'], ['0.0004889', '0.06823960'], ['0.0003', '1.00000000'], ['0.00029204', '0.90000000'], ['0.0001', '101.00000000']], 'asks': []}
+{"timestamp": "1383378967", "bids": [["1.7", "0.30100000"], ["1.67", "0.00011000"], ["0.8", "0.02070000"], ["0.1002", "0.27748002"], ["0.1", "0.10000000"], ["0.011", "0.30500000"], ["0.009", "1.00000000"], ["0.00171", "0.00100000"], ["0.0012", "1.00000000"], ["0.00116819", "0.50000000"], ["0.001002", "33.00000000"], ["0.001001", "53.00000000"], ["0.001", "3.00000000"], ["0.00097626", "36.00000000"], ["0.0006", "85.00000000"], ["0.00058409", "0.50000000"], ["0.0004889", "0.06823960"], ["0.0003", "1.00000000"], ["0.00029204", "0.90000000"], ["0.0001", "101.00000000"]], "asks": []}
 ```
 
+####Trade history:
+```ruby
+puts cex.trade_history(1,'BTC/GHS')
+```
+```json
+[{"amount": "0.00000010", "price": "0.00849979", "date": "1398221957", "tid": 3628072}, {"amount": "0.00000010", "price": "0.00849979", "date": "1398221957", "tid": 3628072}]
+```
+Note: The first parameter is the `since` and is not optional, you will get a 5xx if you do not include it.  
 ####Get your current active orders:
 ```ruby
-puts cex.current_orders('BF1/BTC')
+puts cex.current_orders("BF1/BTC")
 ```
 ```json
-[{'price': '1.7', 'amount': '0.00100000', 'time': '1383378514737', 'type': 'buy', 'id': '6219104', 'pending': '0.00100000'}]
+[{"price": "1.7", "amount": "0.00100000", "time": "1383378514737", "type": "buy", "id": "6219104", "pending": "0.00100000"}]
 ```
+Note: you can use either `current_orders` or `open_orders`.
 
 ####Place new order:
 ```ruby
-puts cex.place_order('buy', 0.001, 1.7, 'BF1/BTC')
+puts cex.place_order("buy", 0.001, 1.7, "BF1/BTC")
 ```
 ```json
-{'price': '1.7', 'amount': '0.00100000', 'time': 1383378987622, 'type': 'buy', 'id': '6219145', 'pending': '0.00100000'}
+{"price": "1.7", "amount": "0.00100000", "time": 1383378987622, "type": "buy", "id": "6219145", "pending": "0.00100000"}
 ```
 
 ####Place another order (GHS/BTC):
 ```ruby
-puts cex.place_order('buy', 0.01, 0.10789, 'GHS/BTC')
+puts cex.place_order("buy", 0.01, 0.10789, "GHS/BTC")
 ```
 ```json
-{'price': '0.10789', 'amount': '0.01000000', 'time': 1383379024072, 'type': 'buy', 'id': '6219150', 'pending': '0.00000000'}
+{"price": "0.10789", "amount": "0.01000000", "time": 1383379024072, "type": "buy", "id": "6219150", "pending": "0.00000000"}
 ```
 
 ####Cancel order:

data/cexio.gemspec

@@ -6,7 +6,7 @@ require 'cexio/version'
 Gem::Specification.new do |spec|
   spec.name          = "cexio"
   spec.version       = Cexio::VERSION
-  spec.authors       = ["t0pep0"]
+  spec.authors       = ["t0pep0","fernandohur"]
   spec.email         = ["t0pep0.gentoo@gmail.com"]
   spec.description   = "Gem for acsess to api cex.io"
   spec.summary       = "Cex.io api library"

data/lib/cexio.rb

@@ -9,6 +9,7 @@ require "addressable/uri"
 
 module CEX
 
+
 class API
   attr_accessor :api_key, :api_secret, :username, :nonce_v
 
@@ -18,15 +19,21 @@ class API
     self.api_secret = api_secret
   end
 
-  def api_call(method, param = {}, priv = false, couple = '')
-    url = 'https://cex.io/api/'+method+'/'
-    url = url + couple + '/' if couple != ''
+  def api_call(method, param = {}, priv = false, action = '', is_json = true)
+    url = "https://cex.io/api/#{ method }/#{ action }"
     if priv
       self.nonce
       param.merge!(:key => self.api_key, :signature => self.signature.to_s, :nonce => self.nonce_v)
     end
     answer = self.post(url, param)
-    JSON.parse(answer)
+
+    # unfortunately, the API does not always respond with JSON, so we must only
+    # parse as JSON if is_json is true.
+    if is_json
+      JSON.parse(answer)
+    else
+      answer
+    end
   end
 
   def ticker(couple = 'GHS/BTC')
@@ -50,7 +57,7 @@ class API
   end
 
   def cancel_order(order_id)
-    self.api_call('cancel_order', {:id => order_id.to_s}, true)
+    self.api_call('cancel_order', {:id => order_id.to_s}, true, '',false)
   end
 
   def place_order(ptype = 'buy', amount = 1, price =1, couple = 'GHS/BTC')
@@ -58,17 +65,15 @@ class API
   end
 
   def hashrate
-    self.api_call('ghash.io/hashrate', {}, true)
+    self.api_call('ghash.io', {}, true, 'hashrate')
   end
 
   def workers_hashrate
-    self.api_call('ghash.io/workers', {}, true)
+    self.api_call('ghash.io', {}, true, 'workers')
   end
 
-
-
   def nonce
-    self.nonce_v = Time.now.to_i.to_s
+    self.nonce_v = (Time.now.to_f * 1000000).to_i.to_s
   end
 
   def signature

data/lib/cexio/version.rb

@@ -1,3 +1,3 @@
 module Cexio
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

metadata

@@ -1,15 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: cexio
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
 - t0pep0
+- fernandohur
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-03 00:00:00.000000000 Z
+date: 2014-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler