mt_gox 0.7.5 → 0.7.6

data/HISTORY

@@ -6,3 +6,7 @@
 == 0.7.5 / 2012-01-17
 
 * Model now has attributes / properties
+
+== 0.7.6 / 2012-01-17
+
+* Multi-currency ticker and Depth streaming Models added

data/VERSION

@@ -1 +1 @@
-0.7.5
+0.7.6

data/lib/mtgox/models/depth.rb

@@ -0,0 +1,19 @@
+require 'mtgox/models/model'
+
+module MtGox
+  module Models
+    class Depth < Model
+      prop :buy,
+           :sell,
+           :currency,
+           :item,
+           [:vol, :volume] => :f,
+           :volume_int => :i,
+           :total_volume_int => :i,
+           :price  => :f,
+           :price_int  => :i,
+           [:id, :now] => :i,
+           [:type, :type_str]  => proc {|val| val == 1 || val == 'bid' ? :bid : :ask}
+    end
+  end
+end

data/lib/mtgox/models/multi_ticker.rb

@@ -0,0 +1,23 @@
+require 'mtgox/models/model'
+require 'mtgox/price_ticker'
+
+module MtGox
+  module Models
+    # Multi-currency Ticker
+    class MultiTicker < Model
+      include PriceTicker
+      prop :currency,
+           [:vol, :volume] => proc { |val| val['value'].to_f },
+           [:last, :price] => proc { |val| val['value'].to_f },
+           :last_local => proc { |val| val['value'].to_f },
+           :last_orig => proc { |val| val['value'].to_f },
+           :last_all => proc { |val| val['value'].to_f },
+           :buy => proc { |val| val['value'].to_f },
+           :sell => proc { |val| val['value'].to_f },
+           :high => proc { |val| val['value'].to_f },
+           :low => proc { |val| val['value'].to_f },
+           :avg => proc { |val| val['value'].to_f },
+           :vwap => proc { |val| val['value'].to_f }
+    end
+  end
+end

data/lib/mtgox/models/order.rb

@@ -10,7 +10,7 @@ module MtGox
            :dark,
            :priority,
            [:id, :oid] => :i, # Order ID
-           :date => proc { |val| Time.at val } # 1326655184
+           [:date, :time] => proc { |val| Time.at val } # 1326655184
 
     end
   end

data/lib/mtgox/models/trade.rb

@@ -15,15 +15,12 @@ module MtGox
            :amount => :f, #  10.672154
            :price => :f, #   6.81526
            [:id, :tid] => :i, #  "tid"=>"1326655184087854"
-           :date => proc { |val| Time.at val } # 1326655184
+           [:date, :time] => proc { |val| Time.at val } # 1326655184
 
-      def to_s
-        "<Trade: #{@date.strftime('%H:%M:%S')} #{ amount.round(3) } at #{ price.round(3) }"
-      end
-
-      def to_s
-        "<Trade: #{ amount.round(3) } at #{ price.round(3) }"+
-            " #{price_currency}/#{item} (#{trade_type}) - #{ properties } #{ primary } >"
+      def to_s with_date=nil
+        (with_date ? "#{@date.strftime('%H:%M:%S')} " : '') +
+            "<Trade: #{ amount.round(3) } at #{ price.round(3) }"+
+            " #{price_currency}/#{item} (#{trade_type}) #{ properties } #{ primary } >"
       end
 
     end

data/lib/mtgox/models.rb

@@ -12,3 +12,7 @@ require 'mtgox/models/min_ask'
 require 'mtgox/models/sell'
 require 'mtgox/models/ticker'
 require 'mtgox/models/trade'
+
+# Streaming API
+require 'mtgox/models/depth'
+require 'mtgox/models/multi_ticker'

data/spec/fixtures/io-depth.json

@@ -0,0 +1 @@
+{"channel":"24e67e0d-1cad-4cc0-9e7a-f8523ef460fe", "op":"private", "origin":"broadcast", "private":"depth", "depth":{"price":"6.77763", "type":2, "type_str":"bid", "volume":"0.0533162", "price_int":"677763", "volume_int":"5331620", "item":"BTC", "currency":"USD", "now":"1326807285171878", "total_volume_int":"5331620"}}

data/spec/fixtures/io-ticker.json

@@ -0,0 +1 @@
+{"channel":"d5f06780-30a8-4a48-a2f8-7ed181b4a13f", "op":"private", "origin":"broadcast", "private":"ticker", "ticker":{"high":{"value":"7.09000", "value_int":"709000", "display":"$7.09000", "currency":"USD"}, "low":{"value":"6.51100", "value_int":"651100", "display":"$6.51100", "currency":"USD"}, "avg":{"value":"6.72804", "value_int":"672804", "display":"$6.72804", "currency":"USD"}, "vwap":{"value":"6.71887", "value_int":"671887", "display":"$6.71887", "currency":"USD"}, "vol":{"value":"107798.84280561", "value_int":"10779884280561", "display":"107,798.84280561�BTC", "currency":"BTC"}, "last_local":{"value":"6.78799", "value_int":"678799", "display":"$6.78799", "currency":"USD"}, "last":{"value":"6.78799", "value_int":"678799", "display":"$6.78799", "currency":"USD"}, "last_orig":{"value":"6.78799", "value_int":"678799", "display":"$6.78799", "currency":"USD"}, "last_all":{"value":"6.78799", "value_int":"678799", "display":"$6.78799", "currency":"USD"}, "buy":{"value":"6.76722", "value_int":"676722", "display":"$6.76722", "currency":"USD"}, "sell":{"value":"6.77000", "value_int":"677000", "display":"$6.77000", "currency":"USD"}}}

data/spec/mtgox/streaming_spec.rb

@@ -0,0 +1,50 @@
+require 'helper'
+require 'json'
+
+describe 'Models as used by MtGox streaming (String.io) API' do
+
+  describe MtGox::Models::Depth do
+    before do
+      @data = JSON.parse(fixture('io-depth.json').read)['depth']
+    end
+
+    it "should create Depth change model from data Hash" do
+      depth = MtGox::Models::Depth.new @data
+
+      depth.price.should == 6.77763
+      depth.price_int.should == 677763
+      depth.volume.should == 0.0533162
+      depth.volume_int.should == 5331620
+      depth.type.should == :bid
+      depth.item.should == 'BTC'
+      depth.currency.should == 'USD'
+      depth.total_volume_int.should == 5331620
+      depth.id.should == 1326807285171878
+      depth.now.should == 1326807285171878
+    end
+  end
+
+  describe MtGox::Models::MultiTicker do
+    before do
+      @data = JSON.parse(fixture('io-ticker.json').read)['ticker']
+    end
+
+    it "should create MultiTicker from data Hash" do
+      ticker = MtGox::Models::MultiTicker.new @data
+
+      ticker.price.should == 6.78799
+      ticker.last.should == 6.78799
+      ticker.last_local.should == 6.78799
+      ticker.last_orig.should == 6.78799
+      ticker.last_all.should == 6.78799
+      ticker.high.should == 7.09000
+      ticker.low.should == 6.511
+      ticker.avg.should == 6.72804
+      ticker.vwap.should == 6.71887
+      ticker.buy.should == 6.76722
+      ticker.sell.should == 6.77000
+      ticker.volume.should == 107798.84280561
+      #ticker.currency.should == 'USD'
+    end
+  end
+end

metadata

@@ -2,7 +2,7 @@
 name: mt_gox
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.7.5
+  version: 0.7.6
 platform: ruby
 authors: 
 - Erik Michaels-Ober
@@ -154,9 +154,11 @@ files:
 - lib/mtgox/models/balance.rb
 - lib/mtgox/models/bid.rb
 - lib/mtgox/models/buy.rb
+- lib/mtgox/models/depth.rb
 - lib/mtgox/models/max_bid.rb
 - lib/mtgox/models/min_ask.rb
 - lib/mtgox/models/model.rb
+- lib/mtgox/models/multi_ticker.rb
 - lib/mtgox/models/offer.rb
 - lib/mtgox/models/order.rb
 - lib/mtgox/models/sell.rb
@@ -173,6 +175,8 @@ files:
 - spec/fixtures/cancel.json
 - spec/fixtures/depth.json
 - spec/fixtures/error.json
+- spec/fixtures/io-depth.json
+- spec/fixtures/io-ticker.json
 - spec/fixtures/mysql_error
 - spec/fixtures/orders.json
 - spec/fixtures/sell.json
@@ -181,6 +185,7 @@ files:
 - spec/fixtures/withdraw.json
 - spec/helper.rb
 - spec/mtgox/client_spec.rb
+- spec/mtgox/streaming_spec.rb
 - spec/mtgox_spec.rb
 - tasks/doc.rake
 - tasks/gem.rake
@@ -223,6 +228,8 @@ test_files:
 - spec/fixtures/cancel.json
 - spec/fixtures/depth.json
 - spec/fixtures/error.json
+- spec/fixtures/io-depth.json
+- spec/fixtures/io-ticker.json
 - spec/fixtures/mysql_error
 - spec/fixtures/orders.json
 - spec/fixtures/sell.json
@@ -231,4 +238,5 @@ test_files:
 - spec/fixtures/withdraw.json
 - spec/helper.rb
 - spec/mtgox/client_spec.rb
+- spec/mtgox/streaming_spec.rb
 - spec/mtgox_spec.rb