bitex 0.0.7 → 0.0.8

data/lib/bitex/order.rb

@@ -7,6 +7,7 @@ module Bitex
     attr_accessor :specie
     attr_accessor :price
     attr_accessor :status
+    attr_accessor :reason
 
     # Returns an array with all your active orders
     # of this type, and any other order of this type that was active in the
@@ -24,7 +25,7 @@ module Bitex
     # Find an order in your list of active orders.
     # Uses {Order.active} under the hood.
     def self.find(id)
-      active.select{|o| o.id == id}.first
+      from_json(Api.private(:get, "/private#{base_path}/#{id}"))
     end
 
     # @visibility private
@@ -37,7 +38,7 @@ module Bitex
       order = from_json(Api.private(:post, "/private#{base_path}", params))
       retries = 0
       while wait && order.status == :received
-        new_order = all.select{|o| o.id == order.id}.first
+        new_order = find(order.id)
         if new_order.nil?
           raise StandardError.new(
             "Order #{base_path} ##{order.id} not found in list")
@@ -67,9 +68,16 @@ module Bitex
         4 => :cancelled,
         5 => :completed,
       }
+      reason_lookup = {
+        0 => :not_cancelled,
+        1 => :not_enough_funds,
+        2 => :user_cancelled,
+        3 => :system_cancelled,
+      }
       Api.from_json(order || new, json, true) do |thing|
         thing.price = BigDecimal.new(json[6].to_s)
         thing.status = status_lookup[json[7]]
+        thing.reason = reason_lookup[json[8]]
       end   
     end
   end
@@ -105,6 +113,13 @@ module Bitex
     #  * :cancelled no further executed. May have some Remaining Amount.
     #  * :completed Fully executed, Remaining Amount should be 0.
 
+    # @!attribute reason
+    #  The cancellation reason for this Bid, if any.
+    #  * :not_cancelled Has not been cancelled.
+    #  * :not_enough_funds Not enough funds to place this order.
+    #  * :user_cancelled Cancelled per user's request
+    #  * :system_cancelled Bitex cancelled this order, for a good reason.
+
     # @visibility private
     def self.base_path
       '/bids'
@@ -162,6 +177,13 @@ module Bitex
     #  * :cancelled no further executed. May have some Remaining Quantity.
     #  * :completed Fully executed, Remaining Quantity should be 0.
 
+    # @!attribute reason
+    #  The cancellation reason of this Ask.
+    #  * :not_cancelled Has not been cancelled.
+    #  * :not_enough_funds Not enough funds to place this order.
+    #  * :user_cancelled Cancelled per user's request
+    #  * :system_cancelled Bitex cancelled this order, for a good reason.
+
     # @visibility private
     def self.base_path
       '/asks'

data/lib/bitex/version.rb

@@ -1,3 +1,3 @@
 module Bitex
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

data/spec/fixtures/asks_show.json

@@ -0,0 +1 @@
+[1,12345678,946685400,1,100.00000000,100.00000000,1000.00000000,2,0]

data/spec/fixtures/bids_show.json

@@ -0,0 +1 @@
+[1,12345678,946685400,1,100.00000000,100.00000000,1000.00000000,2,0]

data/spec/order_spec.rb

@@ -12,12 +12,4 @@ describe Bitex::Order do
     ask.should be_a Bitex::Ask
     empty.should be_nil
   end
-
-  it 'gets active orders' do
-    stub_private(:get, "/private/orders/active", 'orders')
-    bid, ask, empty = Bitex::Order.active
-    bid.should be_a Bitex::Bid
-    ask.should be_a Bitex::Ask
-    empty.should be_nil
-  end
 end

data/spec/support/from_json_shared_examples.rb

@@ -49,4 +49,15 @@ shared_examples_for 'JSON deserializable order' do
       subject.class.from_json(as_json).status.should == symbol
     end
   end
+
+  { 0 => :not_cancelled,
+    1 => :not_enough_funds,
+    2 => :user_cancelled,
+    3 => :system_cancelled,
+  }.each do |code, symbol|
+    it "sets reason #{code} to #{symbol}" do
+      as_json[8] = code
+      subject.class.from_json(as_json).reason.should == symbol
+    end
+  end
 end

data/spec/support/order_shared_examples.rb

@@ -6,15 +6,8 @@ shared_examples_for 'Order' do |api_path|
     empty.should be_nil
   end
   
-  it 'lists all active' do
-    stub_private(:get, "/private/orders/active", 'orders')
-    order, empty = subject.class.active
-    order.should be_a subject.class
-    empty.should be_nil
-  end
-  
   it 'gets one' do
-    stub_private(:get, "/private/orders/active", 'orders')
+    stub_private(:get, "/private/#{api_path}/12345678", "#{api_path}_show")
     order = subject.class.find(12345678)
     order.should be_a subject.class
     order.id.should == 12345678
@@ -39,7 +32,7 @@ shared_examples_for 'Order' do |api_path|
   it 'places for btc and waits until processed by our matching engine' do
     stub_private(:post, "/private/#{api_path}", "#{api_path}_create",
       {amount: 100.50, price: 1000.00, specie: 1})
-    stub_private(:get, "/private/orders", 'orders')
+    stub_private(:get, "/private/#{api_path}/12345678", "#{api_path}_show")
     order = subject.class.create!(:btc, 100.50, 1000.00, true)
     order.should be_a subject.class
     order.status.should == :executing

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bitex
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-14 00:00:00.000000000 Z
+date: 2014-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -192,8 +192,10 @@ files:
 - spec/fixtures/aggregated_data.json
 - spec/fixtures/asks_cancel.json
 - spec/fixtures/asks_create.json
+- spec/fixtures/asks_show.json
 - spec/fixtures/bids_cancel.json
 - spec/fixtures/bids_create.json
+- spec/fixtures/bids_show.json
 - spec/fixtures/market_ticker.json
 - spec/fixtures/order_book.json
 - spec/fixtures/orders.json
@@ -245,8 +247,10 @@ test_files:
 - spec/fixtures/aggregated_data.json
 - spec/fixtures/asks_cancel.json
 - spec/fixtures/asks_create.json
+- spec/fixtures/asks_show.json
 - spec/fixtures/bids_cancel.json
 - spec/fixtures/bids_create.json
+- spec/fixtures/bids_show.json
 - spec/fixtures/market_ticker.json
 - spec/fixtures/order_book.json
 - spec/fixtures/orders.json