mtgox 0.6.0 → 0.7.0

data/README.md

@@ -61,7 +61,7 @@ Usage Examples
       config.pass = YOUR_MTGOX_PASSWORD
     end
 
-    # Get your current balance
+    # Fetch your current balance
     puts MtGox.balance
 
     # Place a limit order to buy one bitcoin for $0.011

data/lib/mtgox/balance.rb

@@ -0,0 +1,10 @@
+module MtGox
+  class Balance
+    attr_accessor :currency, :amount
+
+    def initialize(currency=nil, amount=nil)
+      self.currency = currency.to_s.upcase
+      self.amount = amount.to_f
+    end
+  end
+end

data/lib/mtgox/buy.rb

@@ -0,0 +1,6 @@
+require 'mtgox/order'
+
+module MtGox
+  class Buy < Order
+  end
+end

data/lib/mtgox/client.rb

@@ -1,10 +1,15 @@
 require 'faraday/error'
 require 'mtgox/ask'
+require 'mtgox/balance'
 require 'mtgox/bid'
+require 'mtgox/buy'
 require 'mtgox/connection'
 require 'mtgox/max_bid'
 require 'mtgox/min_ask'
 require 'mtgox/request'
+require 'mtgox/sell'
+require 'mtgox/ticker'
+require 'mtgox/trade'
 
 module MtGox
   class Client
@@ -16,60 +21,65 @@ module MtGox
     # Fetch the latest ticker data
     #
     # @authenticated false
-    # @return [Hashie::Rash] with keys `buy` - current highest bid price, `sell` - current lowest ask price, `high` - highest price trade for the day, `low` - lowest price trade for the day, `last` - price of most recent trade, and `vol`
+    # @return [MtGox::Ticker]
     # @example
-    #   MtGox.ticker #=> <#Hashie::Rash buy=19.29 high=19.96 last=19.36 low=19.01 sell=19.375 vol=29470>
+    #   MtGox.ticker
     def ticker
-      get('/code/data/ticker.php')['ticker']
+      ticker = get('/code/data/ticker.php')['ticker']
+      Ticker.instance.buy    = ticker['buy'].to_f
+      Ticker.instance.high   = ticker['high'].to_f
+      Ticker.instance.price  = ticker['last'].to_f
+      Ticker.instance.low    = ticker['low'].to_f
+      Ticker.instance.sell   = ticker['sell'].to_f
+      Ticker.instance.volume = ticker['vol'].to_f
+      Ticker.instance
     end
 
     # Fetch both bids and asks in one call, for network efficiency
     #
     # @authenticated false
-    # @return [Hashie::Rash] a hash with keys :asks and :bids, which contain arrays as described in #asks and #bids.
+    # @return [Hash] with keys :asks and :asks, which contain arrays as described in {MtGox::Client#asks} and {MtGox::Clients#bids}
     # @example
-    #   offers = MtGox.offers
-    #   offers.asks[0, 3]
-    #   offers.bids[0, 3]
+    #   MtGox.offers
     def offers
       offers = get('/code/data/getDepth.php')
-      offers['asks'] = offers['asks'].sort_by do |ask|
+      asks = offers['asks'].sort_by do |ask|
         ask[0].to_f
       end.map! do |ask|
         Ask.new(*ask)
       end
-      offers['bids'] = offers['bids'].sort_by do |bid|
+      bids = offers['bids'].sort_by do |bid|
         -bid[0].to_f
       end.map! do |bid|
         Bid.new(*bid)
       end
-      offers
+      {:asks => asks, :bids => bids}
     end
 
     # Fetch open asks
     #
     # @authenticated false
-    # @return [Array<Ask>] in the form `[price, amount]`, sorted in price ascending order
+    # @return [Array<MtGox::Ask>] an array of open asks, sorted in price ascending order
     # @example
-    #   MtGox.asks[0, 3]
+    #   MtGox.asks
     def asks
-      offers['asks']
+      offers[:asks]
     end
 
     # Fetch open bids
     #
     # @authenticated false
-    # @return [Array<Bid>] in the form `[price, amount]`, sorted in price descending order
+    # @return [Array<MtGox::Bid>] an array of open bids, sorted in price descending order
     # @example
-    #   MtGox.bids[0, 3]
+    #   MtGox.bids
     def bids
-      offers['bids']
+      offers[:bids]
     end
 
     # Fetch the lowest priced ask
     #
     # @authenticated false
-    # @return [MinAsk]
+    # @return [MtGox::MinAsk]
     # @example
     #   MtGox.min_ask
     def min_ask
@@ -82,7 +92,7 @@ module MtGox
     # Fetch the highest priced bid
     #
     # @authenticated false
-    # @return [MinBid]
+    # @return [MtGox::MinBid]
     # @example
     #   MtGox.max_bid
     def max_bid
@@ -95,33 +105,31 @@ module MtGox
     # Fetch recent trades
     #
     # @authenticated false
-    # @return [Array<Hashie::Rash>] an array of trades, sorted in chronological order. Each trade is a `Hashie::Rash` with keys `amount` - number of bitcoins traded, `price` - price they were traded at in US dollars, `date` - time and date of the trade (a `Time` object), and `tid` - the trade ID.
+    # @return [Array<MtGox::Trade>] an array of trades, sorted in chronological order
     # @example
-    #   MtGox.trades[0, 3] #=> [<#Hashie::Rash amount=41 date=2011-06-14 11:26:32 -0700 price=18.5 tid="183747">, <#Hashie::Rash amount=5 date=2011-06-14 11:26:44 -0700 price=18.5 tid="183748">, <#Hashie::Rash amount=5 date=2011-06-14 11:27:00 -0700 price=18.42 tid="183749">]
+    #   MtGox.trades
     def trades
-      get('/code/data/getTrades.php').each do |trade|
-        trade['amount'] = trade['amount'].to_f
-        trade['date'] = Time.at(trade['date'])
-        trade['price'] = trade['price'].to_f
+      get('/code/data/getTrades.php').sort_by{|trade| trade['date']}.map do |trade|
+        Trade.new(trade)
       end
     end
 
-    # Fetch your balance
+    # Fetch your current balance
     #
     # @authenticated true
-    # @return [Hashie::Rash] with keys `btcs` - amount of bitcoins in your account and `usds` - amount of US dollars in your account
+    # @return [Array<MtGox::Balance>]
     # @example
-    #   MtGox.balance #=> <#Hashie::Rash btcs=3.7 usds=12>
+    #   MtGox.balance
     def balance
-      post('/code/getFunds.php', pass_params)
+      parse_balance(post('/code/getFunds.php', pass_params))
     end
 
     # Fetch your open orders, both buys and sells, for network efficiency
     #
     # @authenticated true
-    # @return [<Hashie::Rash>] with keys `buy` and `sell`, which contain arrays as described in {MtGox::Client#buys} and {MtGox::Client#sells}
+    # @return [Hash] with keys :buys and :sells, which contain arrays as described in {MtGox::Client#buys} and {MtGox::Clients#sells}
     # @example
-    #   MtGox.orders[0, 3] #=> [<#Hashie::Rash amount=0.73 dark="0" date=2011-06-13 00:13:16 -0700 oid="929284" price=2 status=:active type=2>, <#Hashie::Rash amount=0.36 dark="0" date=2011-06-13 00:13:21 -0700 oid="929288" price=4 status=:active type=2>, <#Hashie::Rash amount=0.24 dark="0" date=2011-06-13 00:13:32 -0700 oid="929292" price=6 status=:active type=2>]
+    #   MtGox.orders
     def orders
       parse_orders(post('/code/getOrders.php', pass_params)['orders'])
     end
@@ -129,25 +137,21 @@ module MtGox
     # Fetch your open buys
     #
     # @authenticated true
-    # @return [Array<Hashie::Rash>] an array of your open bids, sorted in price ascending order with the keys `amount`, `dark`, `date`, `oid`, `price`, `status`, and `type`
+    # @return [Array<MtGox::Buy>] an array of your open bids, sorted by date
     # @example
-    #   MtGox.buys[0, 3] #=> [<#Hashie::Rash amount=0.73 dark="0" date=2011-06-13 00:13:16 -0700 oid="929284" price=2 status=:active type=2>, <#Hashie::Rash amount=0.36 dark="0" date=2011-06-13 00:13:21 -0700 oid="929288" price=4 status=:active type=2>, <#Hashie::Rash amount=0.24 dark="0" date=2011-06-13 00:13:32 -0700 oid="929292" price=6 status=:active type=2>]
+    #   MtGox.buys
     def buys
-      orders.select do |o|
-        o['type'] == ORDER_TYPES[:buy]
-      end
+      orders[:buys]
     end
 
     # Fetch your open sells
     #
     # @authenticated true
-    # @return [Array<Hashie::Rash>] an array of your open asks, sorted in price ascending order with the keys `amount`, `dark`, `date`, `oid`, `price`, `status`, and `type`
+    # @return [Array<MtGox::Sell>] an array of your open asks, sorted by date
     # @example
-    #   MtGox.sells[0, 3] #=> [<#Hashie::Rash amount=0.1 dark="0" date=2011-06-13 00:16:24 -0700 oid="663465" price=24.92 status=nil type=1>, <#Hashie::Rash amount=0.12 dark="0" date=2011-06-13 00:16:31 -0700 oid="663468" price=25.65 status=nil type=1>, <#Hashie::Rash amount=0.15 dark="0" date=2011-06-13 00:16:36 -0700 oid="663470" price=26.38 status=nil type=1>]
+    #   MtGox.sells
     def sells
-      orders.select do |o|
-        o['type'] == ORDER_TYPES[:sell]
-      end
+      orders[:sells]
     end
 
     # Place a limit order to buy BTC
@@ -155,7 +159,7 @@ module MtGox
     # @authenticated true
     # @param amount [Numeric] the number of bitcoins to purchase
     # @param price [Numeric] the bid price in US dollars
-    # @return [Array<Hashie::Rash>]
+    # @return [Hash] with keys :buys and :sells, which contain arrays as described in {MtGox::Client#buys} and {MtGox::Clients#sells}
     # @example
     #   # Buy one bitcoin for $0.011
     #   MtGox.buy! 1.0, 0.011
@@ -168,7 +172,7 @@ module MtGox
     # @authenticated true
     # @param amount [Numeric] the number of bitcoins to sell
     # @param price [Numeric] the ask price in US dollars
-    # @return [Array<Hashie::Rash>]
+    # @return [Hash] with keys :buys and :sells, which contain arrays as described in {MtGox::Client#buys} and {MtGox::Clients#sells}
     # @example
     #   # Sell one bitcoin for $100
     #   MtGox.sell! 1.0, 100.0
@@ -181,29 +185,30 @@ module MtGox
     # @authenticated true
     # @overload cancel(oid)
     #   @param oid [String] an order ID
-    #   @return Array<Hashie::Rash>
+    #   @return [Hash] with keys :buys and :sells, which contain arrays as described in {MtGox::Client#buys} and {MtGox::Clients#sells}
     #   @example
     #     my_order = MtGox.orders.first
     #     MtGox.cancel my_order.oid
     #     MtGox.cancel 1234567890
     # @overload cancel(order)
     #   @param order [Hash] a hash-like object, with keys `oid` - the order ID of the transaction to cancel and `type` - the type of order to cancel (`1` for sell or `2` for buy)
-    #   @return Array<Hashie::Rash>
+    #   @return [Hash] with keys :buys and :sells, which contain arrays as described in {MtGox::Client#buys} and {MtGox::Clients#sells}
     #   @example
     #     my_order = MtGox.orders.first
     #     MtGox.cancel my_order
-    #     MtGox.cancel {"oid" => "1234567890", "type" => 2}
+    #     MtGox.cancel {'oid' => '1234567890', 'type' => 2}
     def cancel(args)
       if args.is_a?(Hash)
         order = args.delete_if{|k, v| !['oid', 'type'].include?(k.to_s)}
-        post('/code/cancelOrder.php', pass_params.merge(order))
+        parse_orders(post('/code/cancelOrder.php', pass_params.merge(order))['orders'])
       else
-        order = orders.select{|o| o['oid'] == args.to_s}.first
+        orders = post('/code/getOrders.php', pass_params)['orders']
+        order = orders.find{|order| order['oid'] == args.to_s}
         if order
           order = order.delete_if{|k, v| !['oid', 'type'].include?(k.to_s)}
-          post('/code/cancelOrder.php', pass_params.merge(order))
+          parse_orders(post('/code/cancelOrder.php', pass_params.merge(order))['orders'])
         else
-          raise Faraday::Error::ResourceNotFound, {:status => 404, :headers => {}, :body => "Order not found."}
+          raise Faraday::Error::ResourceNotFound, {:status => 404, :headers => {}, :body => 'Order not found.'}
         end
       end
     end
@@ -213,22 +218,35 @@ module MtGox
     # @authenticated true
     # @param amount [Numeric] the number of bitcoins to withdraw
     # @param btca [String] the bitcoin address to send to
-    # @return [Array<Hashie::Rash>]
+    # @return [Array<MtGox::Balance>]
     # @example
     #   # Withdraw 1 BTC from your account
-    #   MtGox.withdraw! 1.0, "1KxSo9bGBfPVFEtWNLpnUK1bfLNNT4q31L"
+    #   MtGox.withdraw! 1.0, '1KxSo9bGBfPVFEtWNLpnUK1bfLNNT4q31L'
     def withdraw!(amount, btca)
-      post('/code/withdraw.php', pass_params.merge({:group1 => "BTC", :amount => amount, :btca => btca}))
+      parse_balance(post('/code/withdraw.php', pass_params.merge({:group1 => 'BTC', :amount => amount, :btca => btca})))
     end
 
     private
 
+    def parse_balance(balance)
+      balances = []
+      balances << Balance.new('BTC', balance['btcs'])
+      balances << Balance.new('USD', balance['usds'])
+      balances
+    end
+
     def parse_orders(orders)
-      orders.each do |order|
-        order['amount'] = order['amount'].to_f
-        order['date']   = Time.at(order['date'])
-        order['price']  = order['price'].to_f
+      buys = []
+      sells = []
+      orders.sort_by{|order| order['date']}.each do |order|
+        case order['type']
+        when ORDER_TYPES[:sell]
+          sells << Sell.new(order)
+        when ORDER_TYPES[:buy]
+          buys << Buy.new(order)
+        end
       end
+      {:buys => buys, :sells => sells}
     end
 
     def pass_params

data/lib/mtgox/connection.rb

@@ -1,7 +1,6 @@
 require 'faraday'
 require 'faraday/request/url_encoded'
 require 'faraday/response/raise_error'
-require 'faraday/response/rashify'
 require 'faraday/response/parse_json'
 require 'faraday/response/raise_mtgox_error'
 require 'faraday_middleware'
@@ -24,7 +23,6 @@ module MtGox
       Faraday.new(options) do |connection|
         connection.use Faraday::Request::UrlEncoded
         connection.use Faraday::Response::RaiseError
-        connection.use Faraday::Response::Rashify
         connection.use Faraday::Response::ParseJson
         connection.use Faraday::Response::RaiseMtGoxError
         connection.adapter(Faraday.default_adapter)

data/lib/mtgox/max_bid.rb

@@ -1,32 +1,10 @@
 require 'mtgox/bid'
+require 'mtgox/price_ticker'
 require 'singleton'
 
 module MtGox
   class MaxBid < Bid
     include Singleton
-    attr_accessor :previous_price
-
-    def price=(price)
-      @previous_price = @price
-      @price = price
-    end
-
-    def up?
-      price.to_f > previous_price.to_f
-    end
-
-    def down?
-      price.to_f < previous_price.to_f
-    end
-
-    def changed?
-      price.to_f != previous_price.to_f
-    end
-
-    def unchanged?
-      !changed?
-    end
-    alias :unch? :unchanged?
-
+    include PriceTicker
   end
 end

data/lib/mtgox/min_ask.rb

@@ -1,32 +1,10 @@
 require 'mtgox/ask'
+require 'mtgox/price_ticker'
 require 'singleton'
 
 module MtGox
   class MinAsk < Ask
     include Singleton
-    attr_accessor :previous_price
-
-    def price=(price)
-      @previous_price = @price
-      @price = price
-    end
-
-    def up?
-      price.to_f > previous_price.to_f
-    end
-
-    def down?
-      price.to_f < previous_price.to_f
-    end
-
-    def changed?
-      price.to_f != previous_price.to_f
-    end
-
-    def unchanged?
-      !changed?
-    end
-    alias :unch? :unchanged?
-
+    include PriceTicker
   end
 end

data/lib/mtgox/order.rb

@@ -0,0 +1,14 @@
+require 'mtgox/offer'
+
+module MtGox
+  class Order < Offer
+    attr_accessor :id, :date
+
+    def initialize(order={})
+      self.id     = order['oid']
+      self.date   = Time.at(order['date'].to_i)
+      self.amount = order['amount'].to_f
+      self.price  = order['price'].to_f
+    end
+  end
+end

data/lib/mtgox/price_ticker.rb

@@ -0,0 +1,27 @@
+module MtGox
+  module PriceTicker
+    attr_reader :previous_price, :price
+
+    def price=(price)
+      @previous_price = @price
+      @price = price
+    end
+
+    def up?
+      price.to_f > previous_price.to_f
+    end
+
+    def down?
+      price.to_f < previous_price.to_f
+    end
+
+    def changed?
+      price.to_f != previous_price.to_f
+    end
+
+    def unchanged?
+      !changed?
+    end
+    alias :unch? :unchanged?
+  end
+end

data/lib/mtgox/sell.rb

@@ -0,0 +1,6 @@
+require 'mtgox/order'
+
+module MtGox
+  class Sell < Order
+  end
+end

data/lib/mtgox/ticker.rb

@@ -0,0 +1,10 @@
+require 'mtgox/price_ticker'
+require 'singleton'
+
+module MtGox
+  class Ticker
+    include Singleton
+    include PriceTicker
+    attr_accessor :buy, :sell, :high, :low, :volume
+  end
+end

data/lib/mtgox/trade.rb

@@ -0,0 +1,13 @@
+require 'mtgox/order'
+
+module MtGox
+  class Trade < Order
+
+    def initialize(trade={})
+      self.id     = trade['tid'].to_i
+      self.date   = Time.at(trade['date'].to_i)
+      self.amount = trade['amount'].to_f
+      self.price  = trade['price'].to_f
+    end
+  end
+end

data/lib/mtgox/version.rb

@@ -1,3 +1,3 @@
 module MtGox
-  VERSION = "0.6.0".freeze unless defined? ::MtGox::VERSION
+  VERSION = "0.7.0".freeze unless defined? ::MtGox::VERSION
 end

data/mtgox.gemspec

@@ -25,7 +25,5 @@ Gem::Specification.new do |gem|
 
   gem.add_runtime_dependency 'faraday', '~> 0.6.1'
   gem.add_runtime_dependency 'faraday_middleware', '~> 0.6.3'
-  gem.add_runtime_dependency 'hashie', '~> 1.0.0'
   gem.add_runtime_dependency 'multi_json', '~> 1.0.3'
-  gem.add_runtime_dependency 'rash', '~> 0.3.0'
 end

data/spec/mtgox/client_spec.rb

@@ -17,8 +17,14 @@ describe MtGox::Client do
 
     it "should fetch the ticker" do
       ticker = @client.ticker
-      a_get('/code/data/ticker.php').should have_been_made
-      ticker.last.should == 26.5
+      a_get('/code/data/ticker.php').
+        should have_been_made
+      ticker.buy.should  == 26.4
+      ticker.sell.should == 26.6099
+      ticker.high.should == 28.678
+      ticker.low.should  == 18.4
+      ticker.price.should == 26.5
+      ticker.volume.should  == 80531.0
     end
   end
 
@@ -31,7 +37,8 @@ describe MtGox::Client do
     describe '#asks' do
       it "should fetch open asks" do
         asks = @client.asks
-        a_get('/code/data/getDepth.php').should have_been_made
+        a_get('/code/data/getDepth.php').
+          should have_been_made
         asks.last.price.should == 23.75
         asks.last.eprice.should == 23.905385002516354
         asks.last.amount.should == 50
@@ -47,7 +54,8 @@ describe MtGox::Client do
     describe "#bids" do
       it "should fetch open bids" do
         bids = @client.bids
-        a_get('/code/data/getDepth.php').should have_been_made
+        a_get('/code/data/getDepth.php').
+          should have_been_made
         bids.last.price.should == 14.62101
         bids.last.eprice.should == 14.525973435000001
         bids.last.amount.should == 5
@@ -62,20 +70,22 @@ describe MtGox::Client do
     describe "#offers" do
       it "should fetch both bids and asks, with only one call" do
         offers = @client.offers
-        a_get('/code/data/getDepth.php').should have_been_made.once
-        offers.asks.last.price.should == 23.75
-        offers.asks.last.eprice.should == 23.905385002516354
-        offers.asks.last.amount.should == 50
-        offers.bids.last.price.should == 14.62101
-        offers.bids.last.eprice.should == 14.525973435000001
-        offers.bids.last.amount.should == 5
+        a_get('/code/data/getDepth.php').
+          should have_been_made.once
+        offers[:asks].last.price.should == 23.75
+        offers[:asks].last.eprice.should == 23.905385002516354
+        offers[:asks].last.amount.should == 50
+        offers[:bids].last.price.should == 14.62101
+        offers[:bids].last.eprice.should == 14.525973435000001
+        offers[:bids].last.amount.should == 5
       end
     end
 
     describe '#min_ask' do
       it "should fetch the lowest priced ask" do
         min_ask = @client.min_ask
-        a_get('/code/data/getDepth.php').should have_been_made.once
+        a_get('/code/data/getDepth.php').
+          should have_been_made.once
         min_ask.price.should == 17.00009
         min_ask.eprice.should == 17.11131353799698
         min_ask.amount.should == 36.22894353
@@ -85,7 +95,8 @@ describe MtGox::Client do
     describe '#max_bid' do
       it "should fetch the highest priced bid" do
         max_bid = @client.max_bid
-        a_get('/code/data/getDepth.php').should have_been_made.once
+        a_get('/code/data/getDepth.php').
+          should have_been_made.once
         max_bid.price.should == 17.0
         max_bid.eprice.should == 16.8895
         max_bid.amount.should == 82.53875035
@@ -102,11 +113,12 @@ describe MtGox::Client do
 
     it "should fetch trades" do
       trades = @client.trades
-      a_get('/code/data/getTrades.php').should have_been_made
+      a_get('/code/data/getTrades.php').
+        should have_been_made
       trades.last.date.should == Time.utc(2011, 6, 27, 18, 28, 8)
       trades.last.price.should == 17.00009
       trades.last.amount.should == 0.5
-      trades.last.tid.should == "1309199288687054"
+      trades.last.id.should == 1309199288687054
     end
 
     it "should be sorted in chronological order" do
@@ -127,8 +139,10 @@ describe MtGox::Client do
       a_post("/code/getFunds.php").
         with(:body => {"name" => "my_name", "pass" => "my_password"}).
         should have_been_made
-      balance.usds.should == 3.7
-      balance.btcs.should == 22.0
+      balance.first.currency.should == "BTC"
+      balance.first.amount.should == 22.0
+      balance.last.currency.should == "USD"
+      balance.last.amount.should == 3.7
     end
   end
 
@@ -156,8 +170,8 @@ describe MtGox::Client do
         a_post("/code/getOrders.php").
           with(:body => {"name" => "my_name", "pass" => "my_password"}).
           should have_been_made
-        sells.last.price.should == 101
-        sells.last.date.should == Time.utc(2011, 6, 27, 18, 20, 7)
+        sells.last.price.should == 99.0
+        sells.last.date.should == Time.utc(2011, 6, 27, 18, 20, 20)
       end
     end
 
@@ -167,8 +181,10 @@ describe MtGox::Client do
         a_post("/code/getOrders.php").
           with(:body => {"name" => "my_name", "pass" => "my_password"}).
           should have_been_made
-        orders.last.price.should == 101
-        orders.last.date.should == Time.utc(2011, 6, 27, 18, 20, 7)
+        orders[:buys].last.price.should == 7.0
+        orders[:buys].last.date.should == Time.utc(2011, 6, 27, 18, 20, 38)
+        orders[:sells].last.price.should == 99.0
+        orders[:sells].last.date.should == Time.utc(2011, 6, 27, 18, 20, 20)
       end
     end
   end
@@ -181,10 +197,14 @@ describe MtGox::Client do
     end
 
     it "should place a bid" do
-      @client.buy!(0.88, 0.89)
+      buy = @client.buy!(0.88, 0.89)
       a_post("/code/buyBTC.php").
         with(:body => {"name" => "my_name", "pass" => "my_password", "amount" => "0.88", "price" => "0.89"}).
         should have_been_made
+      buy[:buys].last.price.should == 2.0
+      buy[:buys].last.date.should == Time.utc(2011, 6, 27, 18, 26, 21)
+      buy[:sells].last.price.should == 99.0
+      buy[:sells].last.date.should == Time.utc(2011, 6, 27, 18, 20, 20)
     end
   end
 
@@ -196,10 +216,14 @@ describe MtGox::Client do
     end
 
     it "should place an ask" do
-      @client.sell!(0.88, 89.0)
+      sell = @client.sell!(0.88, 89.0)
       a_post("/code/sellBTC.php").
         with(:body => {"name" => "my_name", "pass" => "my_password", "amount" => "0.88", "price" => "89.0"}).
         should have_been_made
+      sell[:buys].last.price.should == 2.0
+      sell[:buys].last.date.should == Time.utc(2011, 6, 27, 18, 26, 21)
+      sell[:sells].last.price.should == 200
+      sell[:sells].last.date.should == Time.utc(2011, 6, 27, 18, 27, 54)
     end
   end
 
@@ -215,13 +239,17 @@ describe MtGox::Client do
 
     context "with a valid oid passed" do
       it "should cancel an order" do
-        @client.cancel("bddd042c-e837-4a88-a92e-3b7c05e483df")
+        cancel = @client.cancel("bddd042c-e837-4a88-a92e-3b7c05e483df")
         a_post("/code/getOrders.php").
           with(:body => {"name" => "my_name", "pass" => "my_password"}).
           should have_been_made.once
         a_post('/code/cancelOrder.php').
           with(:body => {"name" => "my_name", "pass" => "my_password", "oid" => "bddd042c-e837-4a88-a92e-3b7c05e483df", "type" => "2"}).
           should have_been_made
+        cancel[:buys].last.price.should == 7.0
+        cancel[:buys].last.date.should == Time.utc(2011, 6, 27, 18, 20, 38)
+        cancel[:sells].last.price.should == 99.0
+        cancel[:sells].last.date.should == Time.utc(2011, 6, 27, 18, 20, 20)
       end
     end
 
@@ -235,10 +263,14 @@ describe MtGox::Client do
 
     context "with an order passed" do
       it "should cancel an order" do
-        @client.cancel({'oid' => "bddd042c-e837-4a88-a92e-3b7c05e483df", 'type' => 2})
+        cancel = @client.cancel({'oid' => "bddd042c-e837-4a88-a92e-3b7c05e483df", 'type' => 2})
         a_post('/code/cancelOrder.php').
           with(:body => {"name" => "my_name", "pass" => "my_password", "oid" => "bddd042c-e837-4a88-a92e-3b7c05e483df", "type" => "2"}).
           should have_been_made
+        cancel[:buys].last.price.should == 7.0
+        cancel[:buys].last.date.should == Time.utc(2011, 6, 27, 18, 20, 38)
+        cancel[:sells].last.price.should == 99.0
+        cancel[:sells].last.date.should == Time.utc(2011, 6, 27, 18, 20, 20)
       end
     end
   end
@@ -251,10 +283,14 @@ describe MtGox::Client do
     end
 
     it "should withdraw funds" do
-      @client.withdraw!(1.0, "1KxSo9bGBfPVFEtWNLpnUK1bfLNNT4q31L")
+      withdraw = @client.withdraw!(1.0, "1KxSo9bGBfPVFEtWNLpnUK1bfLNNT4q31L")
       a_post("/code/withdraw.php").
         with(:body => {"name" => "my_name", "pass" => "my_password", "group1" => "BTC", "amount" => "1.0", "btca" => "1KxSo9bGBfPVFEtWNLpnUK1bfLNNT4q31L"}).
         should have_been_made
+      withdraw.first.currency.should == "BTC"
+      withdraw.first.amount.should == 9.0
+      withdraw.last.currency.should == "USD"
+      withdraw.last.amount.should == 64.59
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mtgox
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-07-12 00:00:00.000000000 -07:00
+date: 2011-07-14 00:00:00.000000000 -07:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ZenTest
-  requirement: &70226142918300 !ruby/object:Gem::Requirement
+  requirement: &70132543720480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: '4.5'
   type: :development
   prerelease: false
-  version_requirements: *70226142918300
+  version_requirements: *70132543720480
 - !ruby/object:Gem::Dependency
   name: maruku
-  requirement: &70226142917500 !ruby/object:Gem::Requirement
+  requirement: &70132543701720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: '0.6'
   type: :development
   prerelease: false
-  version_requirements: *70226142917500
+  version_requirements: *70132543701720
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70226142916860 !ruby/object:Gem::Requirement
+  requirement: &70132543700940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: '0.9'
   type: :development
   prerelease: false
-  version_requirements: *70226142916860
+  version_requirements: *70132543700940
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70226142916160 !ruby/object:Gem::Requirement
+  requirement: &70132543698220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +55,10 @@ dependencies:
         version: '2.6'
   type: :development
   prerelease: false
-  version_requirements: *70226142916160
+  version_requirements: *70132543698220
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70226142915420 !ruby/object:Gem::Requirement
+  requirement: &70132543697720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +66,10 @@ dependencies:
         version: '0.4'
   type: :development
   prerelease: false
-  version_requirements: *70226142915420
+  version_requirements: *70132543697720
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &70226142914740 !ruby/object:Gem::Requirement
+  requirement: &70132543697000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,10 +77,10 @@ dependencies:
         version: '1.6'
   type: :development
   prerelease: false
-  version_requirements: *70226142914740
+  version_requirements: *70132543697000
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70226142914080 !ruby/object:Gem::Requirement
+  requirement: &70132543696260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -88,10 +88,10 @@ dependencies:
         version: '0.7'
   type: :development
   prerelease: false
-  version_requirements: *70226142914080
+  version_requirements: *70132543696260
 - !ruby/object:Gem::Dependency
   name: faraday
-  requirement: &70226142913360 !ruby/object:Gem::Requirement
+  requirement: &70132543695520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -99,10 +99,10 @@ dependencies:
         version: 0.6.1
   type: :runtime
   prerelease: false
-  version_requirements: *70226142913360
+  version_requirements: *70132543695520
 - !ruby/object:Gem::Dependency
   name: faraday_middleware
-  requirement: &70226142911920 !ruby/object:Gem::Requirement
+  requirement: &70132543694360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -110,21 +110,10 @@ dependencies:
         version: 0.6.3
   type: :runtime
   prerelease: false
-  version_requirements: *70226142911920
-- !ruby/object:Gem::Dependency
-  name: hashie
-  requirement: &70226142926600 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: *70226142926600
+  version_requirements: *70132543694360
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &70226142926000 !ruby/object:Gem::Requirement
+  requirement: &70132543693700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -132,18 +121,7 @@ dependencies:
         version: 1.0.3
   type: :runtime
   prerelease: false
-  version_requirements: *70226142926000
-- !ruby/object:Gem::Dependency
-  name: rash
-  requirement: &70226142925380 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.3.0
-  type: :runtime
-  prerelease: false
-  version_requirements: *70226142925380
+  version_requirements: *70132543693700
 description: Ruby wrapper for the Mt. Gox Trade API. Mt. Gox allows you to trade US
   Dollars (USD) for Bitcoins (BTC) or Bitcoins for US Dollars.
 email: sferik@gmail.com
@@ -164,7 +142,9 @@ files:
 - lib/faraday/response/raise_mtgox_error.rb
 - lib/mtgox.rb
 - lib/mtgox/ask.rb
+- lib/mtgox/balance.rb
 - lib/mtgox/bid.rb
+- lib/mtgox/buy.rb
 - lib/mtgox/client.rb
 - lib/mtgox/configuration.rb
 - lib/mtgox/connection.rb
@@ -172,7 +152,12 @@ files:
 - lib/mtgox/max_bid.rb
 - lib/mtgox/min_ask.rb
 - lib/mtgox/offer.rb
+- lib/mtgox/order.rb
+- lib/mtgox/price_ticker.rb
 - lib/mtgox/request.rb
+- lib/mtgox/sell.rb
+- lib/mtgox/ticker.rb
+- lib/mtgox/trade.rb
 - lib/mtgox/version.rb
 - mtgox.gemspec
 - spec/faraday/response_spec.rb