mt_gox 0.7.6 → 0.7.7

data/HISTORY

@@ -10,3 +10,7 @@
 == 0.7.6 / 2012-01-17
 
 * Multi-currency ticker and Depth streaming Models added
+
+== 0.7.7 / 2012-01-17
+
+* Multi-currency ticker and Depth string coercion /to_s/ added

data/VERSION

@@ -1 +1 @@
-0.7.6
+0.7.7

data/lib/mtgox/client.rb

@@ -10,6 +10,8 @@ module MtGox
 
     ORDER_TYPES = {:sell => 1, :buy => 2}
 
+    @@ticker = {}
+
     # Fetch a deposit address
     # @authenticated true
     # @return [String]
@@ -26,10 +28,18 @@ module MtGox
     # @return [MtGox::Ticker]
     # @example
     #   MtGox.ticker
-    def ticker
-      ticker = get('/api/0/data/ticker.php')['ticker']
-      Ticker.instance.set_attributes ticker
-      Ticker.instance
+    #   MtGox.ticker('EUR')
+    def ticker(currency=nil)
+      if currency
+        ticker = get("/api/1/BTC#{currency}/public/ticker")['return']
+        @@ticker[currency] ||= MultiTicker.new :currency => currency
+        @@ticker[currency].set_attributes ticker
+        @@ticker[currency]
+      else
+        ticker = get('/api/0/data/ticker.php')['ticker']
+        Ticker.instance.set_attributes ticker
+        Ticker.instance
+      end
     end
 
     # Fetch both bids and asks in one call, for network efficiency

data/lib/mtgox/models/depth.rb

@@ -3,9 +3,7 @@ require 'mtgox/models/model'
 module MtGox
   module Models
     class Depth < Model
-      prop :buy,
-           :sell,
-           :currency,
+      prop :currency,
            :item,
            [:vol, :volume] => :f,
            :volume_int => :i,
@@ -14,6 +12,12 @@ module MtGox
            :price_int  => :i,
            [:id, :now] => :i,
            [:type, :type_str]  => proc {|val| val == 1 || val == 'bid' ? :bid : :ask}
+
+      def to_s
+        "<Depth: vol change #{ vol.round(2) } at #{ price.round(3) }"+
+            "(#{type}) #{currency}/#{item} >"
+      end
+
     end
   end
 end

data/lib/mtgox/models/multi_ticker.rb

@@ -18,6 +18,12 @@ module MtGox
            :low => proc { |val| val['value'].to_f },
            :avg => proc { |val| val['value'].to_f },
            :vwap => proc { |val| val['value'].to_f }
+
+      def to_s
+        "<MultiTicker: #{currency} vol #{ vol.round(2) } last #{ last.round(3) }"+
+            " buy #{ buy.round(3) } sell #{ sell.round(3) } low #{ low.round(3) }"+
+            " high #{ high.round(3) } avg #{ avg.round(3) } vwap #{ vwap.round(3) } >"
+      end
     end
   end
 end

data/lib/mtgox/models/ticker.rb

@@ -13,6 +13,8 @@ module MtGox
            :low,
            [:vol, :volume],
            [:last, :price],
+           :last_all,
+           :last_local,
            :avg,
            :vwap
 

data/spec/fixtures/multi-ticker.json

@@ -0,0 +1 @@
+{"result":"success", "return":{"high":{"value":"5.50000", "value_int":"550000", "display":"5.50000��", "currency":"EUR"}, "low":{"value":"5.12541", "value_int":"512541", "display":"5.12541��", "currency":"EUR"}, "avg":{"value":"5.31551", "value_int":"531551", "display":"5.31551��", "currency":"EUR"}, "vwap":{"value":"5.29709", "value_int":"529709", "display":"5.29709��", "currency":"EUR"}, "vol":{"value":"1277.68857150", "value_int":"127768857150", "display":"1,277.68857150�BTC", "currency":"BTC"}, "last_local":{"value":"5.34000", "value_int":"534000", "display":"5.34000��", "currency":"EUR"}, "last":{"value":"5.34000", "value_int":"534000", "display":"5.34000��", "currency":"EUR"}, "last_orig":{"value":"6.65001", "value_int":"665001", "display":"$6.65001", "currency":"USD"}, "last_all":{"value":"5.24904", "value_int":"524904", "display":"5.24904��", "currency":"EUR"}, "buy":{"value":"5.34000", "value_int":"534000", "display":"5.34000��", "currency":"EUR"}, "sell":{"value":"5.35000", "value_int":"535000", "display":"5.35000��", "currency":"EUR"}}}

data/spec/fixtures/ticker.json

@@ -1 +1 @@
-{"ticker":{"high":28.678,"low":18.4,"vol":80531,"buy":26.4,"sell":26.6099,"last":26.5,"vwap":3.81561}}
+{"ticker":{"high":6.95, "low":6.4501, "avg":6.691234882, "vwap":6.668617425, "vol":113312, "last_all":6.69, "last_local":6.69, "last":6.69, "buy":6.6809, "sell":6.69803}}

data/spec/mtgox/client_spec.rb

@@ -12,48 +12,73 @@ describe MtGox::Client do
   describe '#address' do
     before do
       stub_post('/api/0/btcAddress.php').
-        to_return(:status => 200, :body => fixture('address.json'))
+          to_return(:status => 200, :body => fixture('address.json'))
     end
 
     it "should fetch a deposit address" do
       address = @client.address
       a_post('/api/0/btcAddress.php').
-        should have_been_made
+          should have_been_made
       address.should == '171dH9Uum6wWLSwH2g8g2yto6SG7NEGyXG'
     end
   end
 
   describe '#ticker' do
     before do
+      #WebMock.allow_net_connect!
       stub_get('/api/0/data/ticker.php').
-        to_return(:status => 200, :body => fixture('ticker.json'))
+          to_return(:status => 200, :body => fixture('ticker.json'))
+      stub_get('/api/1/BTCEUR/public/ticker').
+          to_return(:status => 200, :body => fixture('multi-ticker.json'))
     end
 
     it "should fetch the ticker" do
       ticker = @client.ticker
       a_get('/api/0/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
-      ticker.vwap.should == 3.81561
+          should have_been_made
+      ticker.buy.should == 6.6809
+      ticker.sell.should == 6.69803
+      ticker.high.should == 6.95
+      ticker.low.should == 6.4501
+      ticker.price.should == 6.69
+      ticker.last_all.should == 6.69
+      ticker.last_local.should == 6.69
+      ticker.volume.should == 113312
+      ticker.avg.should == 6.691234882
+      ticker.vwap.should == 6.668617425
+    end
+
+    it "should fetch the multi-currency ticker" do
+      ticker = @client.ticker('EUR')
+      a_get('/api/1/BTCEUR/public/ticker').
+          should have_been_made
+      ticker.buy.should == 5.340
+      ticker.sell.should == 5.350
+      ticker.high.should == 5.500
+      ticker.low.should == 5.12541
+      ticker.price.should == 5.340
+      ticker.last.should == 5.340
+      ticker.last_local.should == 5.340
+      ticker.last_orig.should == 6.65001 # "currency":"USD"
+      ticker.last_all.should == 5.24904 # ?
+      ticker.volume.should == 1277.68857150
+      ticker.avg.should == 5.31551
+      ticker.vwap.should == 5.29709
+      ticker.currency.should == 'EUR'
     end
   end
 
   describe 'depth methods' do
     before :each do
       stub_get('/api/0/data/getDepth.php').
-        to_return(:status => 200, :body => fixture('depth.json'))
+          to_return(:status => 200, :body => fixture('depth.json'))
     end
 
     describe '#asks' do
       it "should fetch open asks" do
         asks = @client.asks
         a_get('/api/0/data/getDepth.php').
-          should have_been_made
+            should have_been_made
         asks.last.price.should == 23.75
         asks.last.eprice.should == 23.905385002516354
         asks.last.amount.should == 50
@@ -61,7 +86,7 @@ describe MtGox::Client do
 
       it "should be sorted in price-ascending order" do
         asks = @client.asks
-        asks.sort_by{|ask| ask.price}.should == asks
+        asks.sort_by { |ask| ask.price }.should == asks
       end
 
     end
@@ -70,7 +95,7 @@ describe MtGox::Client do
       it "should fetch open bids" do
         bids = @client.bids
         a_get('/api/0/data/getDepth.php').
-          should have_been_made
+            should have_been_made
         bids.last.price.should == 14.62101
         bids.last.eprice.should == 14.525973435000001
         bids.last.amount.should == 5
@@ -78,7 +103,7 @@ describe MtGox::Client do
 
       it "should be sorted in price-descending order" do
         bids = @client.bids
-        bids.sort_by{|bid| bid.price}.reverse.should == bids
+        bids.sort_by { |bid| bid.price }.reverse.should == bids
       end
     end
 
@@ -86,7 +111,7 @@ describe MtGox::Client do
       it "should fetch both bids and asks, with only one call" do
         offers = @client.offers
         a_get('/api/0/data/getDepth.php').
-          should have_been_made.once
+            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
@@ -100,7 +125,7 @@ describe MtGox::Client do
       it "should fetch the lowest priced ask" do
         min_ask = @client.min_ask
         a_get('/api/0/data/getDepth.php').
-          should have_been_made.once
+            should have_been_made.once
         min_ask.price.should == 17.00009
         min_ask.eprice.should == 17.11131353799698
         min_ask.amount.should == 36.22894353
@@ -111,7 +136,7 @@ describe MtGox::Client do
       it "should fetch the highest priced bid" do
         max_bid = @client.max_bid
         a_get('/api/0/data/getDepth.php').
-          should have_been_made.once
+            should have_been_made.once
         max_bid.price.should == 17.0
         max_bid.eprice.should == 16.8895
         max_bid.amount.should == 82.53875035
@@ -123,13 +148,13 @@ describe MtGox::Client do
   describe '#trades' do
     before do
       stub_get('/api/0/data/getTrades.php').
-        to_return(:status => 200, :body => fixture('trades.json'))
+          to_return(:status => 200, :body => fixture('trades.json'))
     end
 
     it "should fetch trades" do
       trades = @client.trades
       a_get('/api/0/data/getTrades.php').
-        should have_been_made
+          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
@@ -140,15 +165,15 @@ describe MtGox::Client do
   describe '#balance' do
     before do
       stub_post('/api/0/getFunds.php').
-        with(:body => test_body, :headers => test_headers).
-        to_return(:status => 200, :body => fixture('balance.json'))
+          with(:body => test_body, :headers => test_headers).
+          to_return(:status => 200, :body => fixture('balance.json'))
     end
 
     it "should fetch balance" do
       balance = @client.balance
       a_post("/api/0/getFunds.php").
-        with(:body => test_body, :headers => test_headers).
-        should have_been_made
+          with(:body => test_body, :headers => test_headers).
+          should have_been_made
       balance.first.currency.should == "BTC"
       balance.first.amount.should == 22.0
       balance.last.currency.should == "USD"
@@ -159,16 +184,16 @@ describe MtGox::Client do
   describe "order methods" do
     before :each do
       stub_post('/api/0/getOrders.php').
-        with(:body => test_body, :headers => test_headers).
-        to_return(:status => 200, :body => fixture('orders.json'))
+          with(:body => test_body, :headers => test_headers).
+          to_return(:status => 200, :body => fixture('orders.json'))
     end
 
     describe "#buys" do
       it "should fetch orders" do
         buys = @client.buys
         a_post("/api/0/getOrders.php").
-          with(:body => test_body, :headers => test_headers).
-          should have_been_made
+            with(:body => test_body, :headers => test_headers).
+            should have_been_made
         buys.last.price.should == 7
         buys.last.date.should == Time.utc(2011, 6, 27, 18, 20, 38)
       end
@@ -178,8 +203,8 @@ describe MtGox::Client do
       it "should fetch sells" do
         sells = @client.sells
         a_post("/api/0/getOrders.php").
-          with(:body => test_body, :headers => test_headers).
-          should have_been_made
+            with(:body => test_body, :headers => test_headers).
+            should have_been_made
         sells.last.price.should == 99.0
         sells.last.date.should == Time.utc(2011, 6, 27, 18, 20, 20)
       end
@@ -189,8 +214,8 @@ describe MtGox::Client do
       it "should fetch both buys and sells, with only one call" do
         orders = @client.orders
         a_post("/api/0/getOrders.php").
-          with(:body => test_body, :headers => test_headers).
-          should have_been_made
+            with(:body => test_body, :headers => test_headers).
+            should have_been_made
         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
@@ -203,16 +228,16 @@ describe MtGox::Client do
     before do
       body = test_body({"amount" => "0.88", "price" => "0.89"})
       stub_post('/api/0/buyBTC.php').
-        with(:body => body, :headers => test_headers(body)).
-        to_return(:status => 200, :body => fixture('buy.json'))
+          with(:body => body, :headers => test_headers(body)).
+          to_return(:status => 200, :body => fixture('buy.json'))
     end
 
     it "should place a bid" do
       buy = @client.buy!(0.88, 0.89)
       body = test_body({"amount" => "0.88", "price" => "0.89"})
       a_post("/api/0/buyBTC.php").
-        with(:body => body, :headers => test_headers(body)).
-        should have_been_made
+          with(:body => body, :headers => test_headers(body)).
+          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
@@ -224,16 +249,16 @@ describe MtGox::Client do
     before do
       body = test_body({"amount" => "0.88", "price" => "89.0"})
       stub_post('/api/0/sellBTC.php').
-        with(:body => body, :headers => test_headers(body)).
-        to_return(:status => 200, :body => fixture('sell.json'))
+          with(:body => body, :headers => test_headers(body)).
+          to_return(:status => 200, :body => fixture('sell.json'))
     end
 
     it "should place an ask" do
       body = test_body({"amount" => "0.88", "price" => "89.0"})
       sell = @client.sell!(0.88, 89.0)
       a_post("/api/0/sellBTC.php").
-        with(:body => body, :headers => test_headers(body)).
-        should have_been_made
+          with(:body => body, :headers => test_headers(body)).
+          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
@@ -245,11 +270,11 @@ describe MtGox::Client do
     before do
       cancel_body = test_body({"oid" => "bddd042c-e837-4a88-a92e-3b7c05e483df", "type" => "2"})
       stub_post('/api/0/getOrders.php').
-        with(:body => test_body, :headers => test_headers).
-        to_return(:status => 200, :body => fixture('orders.json'))
+          with(:body => test_body, :headers => test_headers).
+          to_return(:status => 200, :body => fixture('orders.json'))
       stub_post('/api/0/cancelOrder.php').
-        with(:body => cancel_body, :headers => test_headers(cancel_body)).
-        to_return(:status => 200, :body => fixture('cancel.json'))
+          with(:body => cancel_body, :headers => test_headers(cancel_body)).
+          to_return(:status => 200, :body => fixture('cancel.json'))
     end
 
     context "with a valid oid passed" do
@@ -257,11 +282,11 @@ describe MtGox::Client do
         cancel = @client.cancel("bddd042c-e837-4a88-a92e-3b7c05e483df")
         cancel_body = test_body({"oid" => "bddd042c-e837-4a88-a92e-3b7c05e483df", "type" => "2"})
         a_post("/api/0/getOrders.php").
-          with(:body => test_body, :headers => test_headers).
-          should have_been_made.once
+            with(:body => test_body, :headers => test_headers).
+            should have_been_made.once
         a_post('/api/0/cancelOrder.php').
-          with(:body => cancel_body, :headers => test_headers(cancel_body)).
-          should have_been_made
+            with(:body => cancel_body, :headers => test_headers(cancel_body)).
+            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
@@ -282,8 +307,8 @@ describe MtGox::Client do
         cancel = @client.cancel({'oid' => "bddd042c-e837-4a88-a92e-3b7c05e483df", 'type' => 2})
         body = test_body({"oid" => "bddd042c-e837-4a88-a92e-3b7c05e483df", "type" => "2"})
         a_post('/api/0/cancelOrder.php').
-          with(:body => body, :headers => test_headers(body)).
-          should have_been_made
+            with(:body => body, :headers => test_headers(body)).
+            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
@@ -296,16 +321,16 @@ describe MtGox::Client do
     before do
       body = test_body({"group1" => "BTC", "amount" => "1.0", "btca" => "1KxSo9bGBfPVFEtWNLpnUK1bfLNNT4q31L"})
       stub_post('/api/0/withdraw.php').
-        with(:body => body, :headers => test_headers(body)).
-        to_return(:status => 200, :body => fixture('withdraw.json'))
+          with(:body => body, :headers => test_headers(body)).
+          to_return(:status => 200, :body => fixture('withdraw.json'))
     end
 
     it "should withdraw funds" do
       withdraw = @client.withdraw!(1.0, "1KxSo9bGBfPVFEtWNLpnUK1bfLNNT4q31L")
       body = test_body({"group1" => "BTC", "amount" => "1.0", "btca" => "1KxSo9bGBfPVFEtWNLpnUK1bfLNNT4q31L"})
       a_post("/api/0/withdraw.php").
-        with(:body => body, :headers => test_headers(body)).
-        should have_been_made
+          with(:body => body, :headers => test_headers(body)).
+          should have_been_made
       withdraw.first.currency.should == "BTC"
       withdraw.first.amount.should == 9.0
       withdraw.last.currency.should == "USD"

metadata

@@ -2,7 +2,7 @@
 name: mt_gox
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.7.6
+  version: 0.7.7
 platform: ruby
 authors: 
 - Erik Michaels-Ober
@@ -177,6 +177,7 @@ files:
 - spec/fixtures/error.json
 - spec/fixtures/io-depth.json
 - spec/fixtures/io-ticker.json
+- spec/fixtures/multi-ticker.json
 - spec/fixtures/mysql_error
 - spec/fixtures/orders.json
 - spec/fixtures/sell.json
@@ -230,6 +231,7 @@ test_files:
 - spec/fixtures/error.json
 - spec/fixtures/io-depth.json
 - spec/fixtures/io-ticker.json
+- spec/fixtures/multi-ticker.json
 - spec/fixtures/mysql_error
 - spec/fixtures/orders.json
 - spec/fixtures/sell.json