mtgox 0.9.1 → 1.0.0

data/lib/faraday/response/raise_mtgox_error.rb

@@ -1,14 +1,15 @@
 require 'faraday'
+require 'json'
 
 module Faraday
   class Response::RaiseMtGoxError < Response::Middleware
     def on_complete(env)
       if 200 == env[:status] && 'MySQL error, please retry later' == env[:body]
         raise MtGox::MysqlError, "MySQL error, please retry later"
-      elsif 403 == env[:status] && MultiJson.load(env[:body])["result"] == "error"
-        raise MtGox::UnauthorizedError, MultiJson.load(env[:body])["error"]
-      elsif 404 != env[:status] && MultiJson.load(env[:body])["result"] == "error"
-        raise MtGox::Error, MultiJson.load(env[:body])["error"]
+      elsif 403 == env[:status] && JSON.load(env[:body])["result"] == "error"
+        raise MtGox::UnauthorizedError, JSON.load(env[:body])["error"]
+      elsif 404 != env[:status] && JSON.load(env[:body])["result"] == "error"
+        raise MtGox::Error, JSON.load(env[:body])["error"]
       end
     end
   end

data/lib/mtgox/balance.rb

@@ -1,10 +1,12 @@
+require 'bigdecimal'
+
 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
+      self.amount = BigDecimal(amount.to_s)
     end
   end
 end

data/lib/mtgox/client.rb

@@ -267,7 +267,7 @@ module MtGox
         orders.delete_if{|o| o['oid'] == res['oid']}
         parse_orders(orders)
       else
-        raise Faraday::Error::ResourceNotFound, {status: 404, headers: {}, body: 'Order not found.'}
+        raise MtGox::OrderNotFoundError
       end
     end
     alias cancel_order cancel

data/lib/mtgox/configuration.rb

@@ -1,4 +1,5 @@
 require 'mtgox/version'
+require 'bigdecimal'
 
 module MtGox
   module Configuration
@@ -9,7 +10,7 @@ module MtGox
       :secret,
     ]
 
-    DEFAULT_COMMISSION = 0.0065.freeze
+    DEFAULT_COMMISSION = BigDecimal('0.0065').freeze
 
     attr_accessor *VALID_OPTIONS_KEYS
 

data/lib/mtgox/error.rb

@@ -4,5 +4,6 @@ module MtGox
   class MysqlError < Error; end
   class UnauthorizedError < Error; end
   class FilthyRichError < Error; end
+  class OrderNotFoundError < Error; end
 end
 

data/lib/mtgox/lag.rb

@@ -1,10 +1,12 @@
+require 'bigdecimal'
+
 module MtGox
   class Lag
     attr_accessor :microseconds, :seconds, :text, :length
 
     def initialize(lag=nil, lag_secs=nil, lag_text=nil, length=nil)
       self.microseconds = lag.to_i
-      self.seconds = lag_secs.to_f
+      self.seconds = BigDecimal(lag_secs.to_s)
       self.text = lag_text
       self.length = length.to_i
     end

data/lib/mtgox/order.rb

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

data/lib/mtgox/price_ticker.rb

@@ -1,3 +1,5 @@
+require 'bigdecimal'
+
 module MtGox
   module PriceTicker
     attr_reader :previous_price, :price
@@ -8,15 +10,15 @@ module MtGox
     end
 
     def up?
-      price.to_f > previous_price.to_f
+      BigDecimal(price.to_s) > BigDecimal(previous_price.to_s)
     end
 
     def down?
-      price.to_f < previous_price.to_f
+      BigDecimal(price.to_s) < BigDecimal(previous_price.to_s)
     end
 
     def changed?
-      price.to_f != previous_price.to_f
+      BigDecimal(price.to_s) != BigDecimal(previous_price.to_s)
     end
 
     def unchanged?

data/lib/mtgox/response/parse_json.rb

@@ -1,5 +1,5 @@
 require 'faraday'
-require 'multi_json'
+require 'json'
 
 module MtGox
   module Response
@@ -10,7 +10,7 @@ module MtGox
         when /\A^\s*$\z/, nil
           nil
         else
-          MultiJson.decode(body)
+          JSON.load(body)
         end
       end
 

data/lib/mtgox/trade.rb

@@ -6,8 +6,8 @@ module MtGox
     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
+      self.amount = BigDecimal(trade['amount'])
+      self.price  = BigDecimal(trade['price'])
     end
   end
 end

data/lib/mtgox/value.rb

@@ -1,3 +1,5 @@
+require 'bigdecimal'
+
 # In the "old API", currency- and amount-values (price, volume,...)
 # were given as float. These values are likely being deprecated and
 # replaced by fields of the same name with "_int" as suffix. These are
@@ -18,7 +20,7 @@ module MtGox
     # @authenticated false
     # @return [Float]
     def value_currency(value, key = 'value_int')
-      floatify(value[key].to_i, :usd)
+      decimalify(value[key].to_i, :usd)
     end
 
     # Takes a hash return by the API and convert some value_int to
@@ -29,25 +31,25 @@ module MtGox
     # @authenticated false
     # @return [Float] a float BTC value
     def value_bitcoin(value, key = 'value_int')
-      floatify(value[key], :btc)
+      decimalify(value[key], :btc)
     end
 
-    # Convert a float value to an int using the MtGox conversion rules.
+    # Convert a BigDecimal value to an int using the MtGox conversion rules.
     #
-    # param float [Float] to convert
+    # param decimal [BigDecimal] to convert
     # param currency [Symbol] currency conversion rule to use amongst [:btc, :usd, :jpy]
     # return an int
-    def intify(float, currency)
-      (float * INT_MULTIPLIERS[currency]).to_i
+    def intify(decimal, currency)
+      (decimal * INT_MULTIPLIERS[currency]).to_i
     end
 
-    # Convert an int value to a float using the MtGox conversion rules.
+    # Convert an int value to a decimal using the MtGox conversion rules.
     #
     # param int [Fixnum] to convert
     # param currency [Symbol] currency conversion rule to use amongst [:btc, :usd, :jpy]
-    # return a [Float]
-    def floatify(int, currency)
-      (int.to_f / INT_MULTIPLIERS[currency])
+    # return a [BigDecimal]
+    def decimalify(int, currency)
+      (BigDecimal(int.to_s) / INT_MULTIPLIERS[currency])
     end
   end
 end

data/lib/mtgox/version.rb

@@ -1,30 +1,32 @@
 module MtGox
   class Version
+    class << self
 
-    # @return [Integer]
-    def self.major
-      0
-    end
+      # @return [Integer]
+      def major
+        1
+      end
 
-    # @return [Integer]
-    def self.minor
-      9
-    end
+      # @return [Integer]
+      def minor
+        0
+      end
 
-    # @return [Integer]
-    def self.patch
-      1
-    end
+      # @return [Integer]
+      def patch
+        0
+      end
 
-    # @return [String, NilClass]
-    def self.pre
-      nil
-    end
+      # @return [String, NilClass]
+      def pre
+        nil
+      end
 
-    # @return [String]
-    def self.to_s
-      [major, minor, patch, pre].compact.join('.')
-    end
+      # @return [String]
+      def to_s
+        [major, minor, patch, pre].compact.join('.')
+      end
 
+    end
   end
 end

data/mtgox.gemspec

@@ -5,7 +5,7 @@ require 'mtgox/version'
 
 Gem::Specification.new do |spec|
   spec.add_dependency 'faraday', ['~> 0.8', '< 0.10']
-  spec.add_dependency 'multi_json', '~> 1.0'
+  spec.add_dependency 'json', ['~> 1.7', '>= 1.7.7']
   spec.add_development_dependency 'bundler', '~> 1.0'
   spec.author      = "Erik Michaels-Ober"
   spec.bindir      = 'bin'

data/spec/faraday/response_spec.rb

@@ -7,8 +7,10 @@ describe Faraday::Response do
         to_return(status: 200, body: fixture('mysql_error'))
     end
 
-    it "should raise MtGox::MysqlError" do
-      expect { MtGox.trades }.to raise_error(MtGox::MysqlError)
+    it "raises MtGox::MysqlError" do
+      expect {
+        MtGox.trades
+      }.to raise_error(MtGox::MysqlError)
     end
   end
 
@@ -18,8 +20,10 @@ describe Faraday::Response do
         to_return(status: 200, body: fixture('unknown_error.json'))
     end
 
-    it "should raise MtGox::Error" do
-      expect { MtGox.trades }.to raise_error(MtGox::Error)
+    it "raises MtGox::Error" do
+      expect {
+        MtGox.trades
+      }.to raise_error(MtGox::Error)
     end
 
     describe "UnauthorizedError" do
@@ -28,8 +32,10 @@ describe Faraday::Response do
           to_return(status: 403, body: fixture('error.json'))
       end
 
-      it "should raise MtGox::UnauthorizedError" do
-        expect { MtGox.trades }.to raise_error(MtGox::UnauthorizedError)
+      it "raises MtGox::UnauthorizedError" do
+        expect {
+          MtGox.trades
+        }.to raise_error(MtGox::UnauthorizedError)
       end
     end
 

data/spec/helper.rb

@@ -7,11 +7,18 @@ SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
 ]
 SimpleCov.start
 
-require 'base64'
 require 'mtgox'
+require 'base64'
+require 'json'
 require 'rspec'
 require 'webmock/rspec'
 
+RSpec.configure do |config|
+  config.expect_with :rspec do |c|
+    c.syntax = :expect
+  end
+end
+
 WebMock.disable_net_connect!(:allow => 'coveralls.io')
 
 def a_get(path)

data/spec/mtgox/client_spec.rb

@@ -15,11 +15,10 @@ describe MtGox::Client do
         to_return(body: fixture('address.json'))
     end
 
-    it "should fetch a deposit address" do
+    it "fetchs a deposit address" do
       address = @client.address
-      a_post('/api/1/generic/bitcoin/address').
-        should have_been_made
-      address.should == '17A1vbzQ39o8cGNnpqx8UvXNrhqwAEP8wY'
+      expect(a_post('/api/1/generic/bitcoin/address')).to have_been_made
+      expect(address).to eq '17A1vbzQ39o8cGNnpqx8UvXNrhqwAEP8wY'
     end
   end
 
@@ -29,11 +28,10 @@ describe MtGox::Client do
         to_return(body: fixture('idkey.json'))
     end
 
-    it "should fetch an idkey suitable to WS Api usage" do
+    it "fetches an idkey suitable to WS Api usage" do
       key = @client.idkey
-      a_post('/api/1/generic/idkey').
-        should have_been_made
-      key.should == 'YCKvmyU4QsaHEqM/AvKlqAAAAABRbR5y0vCn1roteQx/Ux/lyLF27X8Em1e4AN/2etPECzIT6dU'
+      expect(a_post('/api/1/generic/idkey')).to have_been_made
+      expect(key).to eq 'YCKvmyU4QsaHEqM/AvKlqAAAAABRbR5y0vCn1roteQx/Ux/lyLF27X8Em1e4AN/2etPECzIT6dU'
     end
   end
 
@@ -43,29 +41,27 @@ describe MtGox::Client do
         to_return(body: fixture('ticker.json'))
     end
 
-    it "should fetch the ticker" do
+    it "fetches the ticker" do
       ticker = @client.ticker
-      a_get('/api/1/BTCUSD/ticker').
-        should have_been_made
-      ticker.buy.should  == 5.53587
-      ticker.sell.should == 5.56031
-      ticker.high.should == 5.70653
-      ticker.low.should == 5.4145
-      ticker.price.should == 5.5594
-      ticker.volume.should  == 55829.58960346
-      ticker.vwap.should == 5.61048
-      ticker.avg.should == 5.56112
-    end
-
-    it "should fetch the ticker and keep previous price" do
+      expect(a_get('/api/1/BTCUSD/ticker')).to have_been_made
+      expect(ticker.buy).to eq BigDecimal('5.53587')
+      expect(ticker.sell).to eq BigDecimal('5.56031')
+      expect(ticker.high).to eq BigDecimal('5.70653')
+      expect(ticker.low).to eq BigDecimal('5.4145')
+      expect(ticker.price).to eq BigDecimal('5.5594')
+      expect(ticker.volume).to eq BigDecimal('55829.58960346')
+      expect(ticker.vwap).to eq BigDecimal('5.61048')
+      expect(ticker.avg).to eq BigDecimal('5.56112')
+    end
+
+    it "fetches the ticker and keep previous price" do
       ticker = @client.ticker
       ticker = @client.ticker
-      a_get('/api/1/BTCUSD/ticker').
-        should have_been_made.twice
-      ticker.up?.should == false
-      ticker.down?.should == false
-      ticker.changed?.should == false
-      ticker.unchanged?.should == true
+      expect(a_get('/api/1/BTCUSD/ticker')).to have_been_made.twice
+      expect(ticker.up?).to be_false
+      expect(ticker.down?).to be_false
+      expect(ticker.changed?).to be_false
+      expect(ticker.unchanged?).to be_true
     end
   end
 
@@ -75,14 +71,13 @@ describe MtGox::Client do
         to_return(status:200, body: fixture('lag.json'))
     end
 
-    it "should fetch the lag" do
+    it "fetches the lag" do
       lag = @client.lag
-      a_get('/api/1/generic/order/lag').
-        should have_been_made
-      lag.microseconds.should == 535998
-      lag.seconds.should == 0.535998
-      lag.text.should == "0.535998 seconds"
-      lag.length.should == 3
+      expect(a_get('/api/1/generic/order/lag')).to have_been_made
+      expect(lag.microseconds).to eq 535998
+      expect(lag.seconds).to eq BigDecimal('0.535998')
+      expect(lag.text).to eq "0.535998 seconds"
+      expect(lag.length).to eq 3
     end
   end
 
@@ -93,71 +88,66 @@ describe MtGox::Client do
     end
 
     describe '#asks' do
-      it "should fetch open asks" do
+      it "fetches open asks" do
         asks = @client.asks
-        a_get('/api/1/BTCUSD/depth/fetch').
-          should have_been_made
-        asks.first.price.should == 114
-        asks.first.eprice.should == 114.74584801207851
-        asks.first.amount.should == 0.43936758
+        expect(a_get('/api/1/BTCUSD/depth/fetch')).to have_been_made
+        expect(asks.first.price).to eq 114
+        expect(asks.first.eprice).to eq BigDecimal('114.745848012')
+        expect(asks.first.amount).to eq BigDecimal('0.43936758')
       end
 
       it "should be sorted in price-ascending order" do
         asks = @client.asks
-        asks.sort_by{|ask| ask.price}.should == asks
+        expect(asks.sort_by(&:price)).to eq asks
       end
 
     end
 
     describe "#bids" do
-      it "should fetch open bids" do
+      it "fetches open bids" do
         bids = @client.bids
-        a_get('/api/1/BTCUSD/depth/fetch').
-          should have_been_made
-        bids.first.price.should == 113.0
-        bids.first.eprice.should == 112.2655
-        bids.first.amount.should == 124.69802063
+        expect(a_get('/api/1/BTCUSD/depth/fetch')).to have_been_made
+        expect(bids.first.price).to eq BigDecimal('113.0')
+        expect(bids.first.eprice).to eq BigDecimal('112.2655')
+        expect(bids.first.amount).to eq BigDecimal('124.69802063')
       end
 
       it "should be sorted in price-descending order" do
         bids = @client.bids
-        bids.sort_by{|bid| bid.price}.reverse.should == bids
+        expect(bids.sort_by(&:price).reverse).to eq bids
       end
     end
 
     describe "#offers" do
-      it "should fetch both bids and asks, with only one call" do
+      it "fetches both bids and asks, with only one call" do
         offers = @client.offers
-        a_get('/api/1/BTCUSD/depth/fetch').
-          should have_been_made.once
-        offers[:asks].first.price.should == 114
-        offers[:asks].first.eprice.should == 114.74584801207851
-        offers[:asks].first.amount.should == 0.43936758
-        offers[:bids].first.price.should == 113.0
-        offers[:bids].first.eprice.should == 112.2655
-        offers[:bids].first.amount.should == 124.69802063
+        expect(a_get('/api/1/BTCUSD/depth/fetch')).to have_been_made.once
+        expect(offers[:asks].first.price).to eq 114
+        expect(offers[:asks].first.eprice).to eq BigDecimal('114.745848012')
+        expect(offers[:asks].first.amount).to eq BigDecimal('0.43936758')
+        expect(offers[:bids].first.price).to eq BigDecimal('113.0')
+        expect(offers[:bids].first.eprice).to eq BigDecimal('112.2655')
+        expect(offers[:bids].first.amount).to eq BigDecimal('124.69802063')
       end
     end
 
     describe '#min_ask' do
-      it "should fetch the lowest priced ask" do
+      it "fetches the lowest priced ask" do
         min_ask = @client.min_ask
-        a_get('/api/1/BTCUSD/depth/fetch').
-          should have_been_made.once
-        min_ask.price.should == 114
-        min_ask.eprice.should == 114.74584801207851
-        min_ask.amount.should == 0.43936758
+        expect(a_get('/api/1/BTCUSD/depth/fetch')).to have_been_made.once
+        expect(min_ask.price).to eq 114
+        expect(min_ask.eprice).to eq BigDecimal('114.745848012')
+        expect(min_ask.amount).to eq BigDecimal('0.43936758')
       end
     end
 
     describe '#max_bid' do
-      it "should fetch the highest priced bid" do
+      it "fetches the highest priced bid" do
         max_bid = @client.max_bid
-        a_get('/api/1/BTCUSD/depth/fetch').
-          should have_been_made.once
-        max_bid.price.should == 113
-        max_bid.eprice.should == 112.2655
-        max_bid.amount.should == 124.69802063
+        expect(a_get('/api/1/BTCUSD/depth/fetch')).to have_been_made.once
+        expect(max_bid.price).to eq 113
+        expect(max_bid.eprice).to eq BigDecimal('112.2655')
+        expect(max_bid.amount).to eq BigDecimal('124.69802063')
       end
     end
 
@@ -169,32 +159,29 @@ describe MtGox::Client do
         to_return(body: fixture('trades.json'))
     end
 
-    it "should fetch trades" do
+    it "fetches trades" do
       trades = @client.trades
-      a_get('/api/1/BTCUSD/trades/fetch').
-        should have_been_made
-      trades.last.date.should == Time.utc(2013, 4, 12, 15, 20, 3)
-      trades.last.price.should == 73.19258
-      trades.last.amount.should == 0.94043572
-      trades.last.id.should == 1365780003374123
+      expect(a_get('/api/1/BTCUSD/trades/fetch')).to have_been_made
+      expect(trades.last.date).to eq Time.utc(2013, 4, 12, 15, 20, 3)
+      expect(trades.last.price).to eq BigDecimal('73.19258')
+      expect(trades.last.amount).to eq BigDecimal('0.94043572')
+      expect(trades.last.id).to eq 1365780003374123
     end
   end
 
   describe '#trades :since' do
     before do
-      trades = MultiJson.load(fixture('trades.json'))
+      trades = JSON.load(fixture('trades.json'))
       stub_get('/api/1/BTCUSD/trades/fetch?since=1365780002144150').
-        to_return(body: MultiJson.dump({result: 'success', return: trades['return'].select{|t| t['tid'] >= '1365780002144150'}}))
+        to_return(body: JSON.dump({result: 'success', return: trades['return'].select{|t| t['tid'] >= '1365780002144150'}}))
     end
 
-    it "should fetch trades since an id" do
+    it "fetches trades since an id" do
       trades = @client.trades :since => 1365780002144150
-      #puts trades.inspect
-      a_get('/api/1/BTCUSD/trades/fetch?since=1365780002144150').
-        should have_been_made
-      trades.first.price.should == 72.98274
-      trades.first.amount.should == 11.76583944
-      trades.first.id.should == 1365780002144150
+      expect(a_get('/api/1/BTCUSD/trades/fetch?since=1365780002144150')).to have_been_made
+      expect(trades.first.price).to eq BigDecimal('72.98274')
+      expect(trades.first.amount).to eq BigDecimal('11.76583944')
+      expect(trades.first.id).to eq 1365780002144150
     end
   end
 
@@ -205,15 +192,13 @@ describe MtGox::Client do
         to_return(body: fixture('info.json'))
     end
 
-    it "should fetch balance" do
+    it "fetches balance" do
       balance = @client.balance
-      a_post("/api/1/generic/info").
-        with(body: test_body, headers: test_headers(@client)).
-        should have_been_made
-      balance.first.currency.should == "BTC"
-      balance.first.amount.should == 42.0
-      balance.last.currency.should == "EUR"
-      balance.last.amount.should == 23.0
+      expect(a_post("/api/1/generic/info").with(body: test_body, headers: test_headers(@client))).to have_been_made
+      expect(balance.first.currency).to eq "BTC"
+      expect(balance.first.amount).to eq BigDecimal('42.0')
+      expect(balance.last.currency).to eq "EUR"
+      expect(balance.last.amount).to eq BigDecimal('23.0')
     end
   end
 
@@ -225,37 +210,35 @@ describe MtGox::Client do
     end
 
     describe "#buys" do
-      it "should fetch orders" do
+      it "fetches orders" do
         buys = @client.buys
-        a_post("/api/1/generic/orders").
-          with(body: test_body, headers: test_headers(@client)).
-          should have_been_made
-        buys.last.price.should == 7
-        buys.last.date.should == Time.utc(2011, 6, 27, 18, 20, 38)
+        expect(a_post("/api/1/generic/orders").with(body: test_body, headers: test_headers(@client))).to have_been_made
+        expect(buys.last.price).to eq 7
+        expect(buys.last.date).to eq Time.utc(2011, 6, 27, 18, 20, 38)
+        expect(buys.last.amount).to eq BigDecimal("0.2")
+        expect(buys.last.status).to eq "open"
+        expect(buys.last.currency).to eq "USD"
+        expect(buys.last.item).to eq "BTC"
       end
     end
 
     describe "#sells" do
-      it "should fetch sells" do
+      it "fetches sells" do
         sells = @client.sells
-        a_post("/api/1/generic/orders").
-          with(body: test_body, headers: test_headers(@client)).
-          should have_been_made
-        sells.last.price.should == 99.0
-        sells.last.date.should == Time.utc(2011, 6, 27, 18, 20, 20)
+        expect(a_post("/api/1/generic/orders").with(body: test_body, headers: test_headers(@client))).to have_been_made
+        expect(sells.last.price).to eq BigDecimal('99.0')
+        expect(sells.last.date).to eq Time.utc(2011, 6, 27, 18, 20, 20)
       end
     end
 
     describe "#orders" do
-      it "should fetch both buys and sells, with only one call" do
+      it "fetches both buys and sells, with only one call" do
         orders = @client.orders
-        a_post("/api/1/generic/orders").
-          with(body: test_body, headers: test_headers(@client)).
-          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
-        orders[:sells].last.date.should == Time.utc(2011, 6, 27, 18, 20, 20)
+        expect(a_post("/api/1/generic/orders").with(body: test_body, headers: test_headers(@client))).to have_been_made
+        expect(orders[:buys].last.price).to eq BigDecimal('7.0')
+        expect(orders[:buys].last.date).to eq Time.utc(2011, 6, 27, 18, 20, 38)
+        expect(orders[:sells].last.price).to eq BigDecimal('99.0')
+        expect(orders[:sells].last.date).to eq Time.utc(2011, 6, 27, 18, 20, 20)
       end
     end
   end
@@ -264,7 +247,6 @@ describe MtGox::Client do
     before do
       body = test_body({"type" => "bid", "amount_int" => "88000000", "price_int" => "89000"})
       body_market = test_body({"type" => "bid", "amount_int" => "88000000"})
-
       stub_post('/api/1/BTCUSD/order/add').
         with(body: body, headers: test_headers(@client, body)).
         to_return(body: fixture('buy.json'))
@@ -276,19 +258,15 @@ describe MtGox::Client do
     it "should place a bid" do
       buy = @client.buy!(0.88, 0.89)
       body = test_body({"type" => "bid", "amount_int" => "88000000", "price_int" => "89000"})
-      a_post("/api/1/BTCUSD/order/add").
-        with(body: body, headers: test_headers(@client, body)).
-        should have_been_made
-      buy.should == "490a214f-9a30-449f-acb8-780f9046502f"
+      expect(a_post("/api/1/BTCUSD/order/add").with(body: body, headers: test_headers(@client, body))).to have_been_made
+      expect(buy).to eq "490a214f-9a30-449f-acb8-780f9046502f"
     end
 
     it "should place a market bid" do
       buy = @client.buy!(0.88, :market)
       body_market = test_body({"type" => "bid", "amount_int" => "88000000"})
-      a_post("/api/1/BTCUSD/order/add").
-        with(body: body_market, headers: test_headers(@client, body_market)).
-        should have_been_made
-      buy.should == "490a214f-9a30-449f-acb8-780f9046502f"
+      expect(a_post("/api/1/BTCUSD/order/add").with(body: body_market, headers: test_headers(@client, body_market))).to have_been_made
+      expect(buy).to eq "490a214f-9a30-449f-acb8-780f9046502f"
     end
   end
 
@@ -308,19 +286,15 @@ describe MtGox::Client do
     it "should place an ask" do
       body = test_body({"type" => "ask", "amount_int" => "88000000", "price_int" => "8900000"})
       sell = @client.sell!(0.88, 89.0)
-      a_post("/api/1/BTCUSD/order/add").
-        with(body: body, headers: test_headers(@client, body)).
-        should have_been_made
-      sell.should == "a20329fe-c0d5-4378-b204-79a7800d41e7"
+      expect(a_post("/api/1/BTCUSD/order/add").with(body: body, headers: test_headers(@client, body))).to have_been_made
+      expect(sell).to eq "a20329fe-c0d5-4378-b204-79a7800d41e7"
     end
 
     it "should place a market ask" do
       body_market = test_body({"type" => "ask", "amount_int" => "88000000"})
       sell = @client.sell!(0.88, :market)
-      a_post("/api/1/BTCUSD/order/add").
-        with(body: body_market, headers: test_headers(@client, body_market)).
-        should have_been_made
-      sell.should == "a20329fe-c0d5-4378-b204-79a7800d41e7"
+      expect(a_post("/api/1/BTCUSD/order/add").with(body: body_market, headers: test_headers(@client, body_market))).to have_been_made
+      expect(sell).to eq "a20329fe-c0d5-4378-b204-79a7800d41e7"
     end
   end
 
@@ -339,19 +313,15 @@ describe MtGox::Client do
       it "should cancel an order" do
         cancel = @client.cancel("fda8917a-63d3-4415-b827-758408013690")
         cancel_body = test_body({"oid" => "fda8917a-63d3-4415-b827-758408013690"})
-        a_post("/api/1/generic/orders").
-          with(body: test_body, headers: test_headers(@client)).
-          should have_been_made.once
-        a_post('/api/1/BTCUSD/order/cancel').
-          with(body: cancel_body, headers: test_headers(@client, cancel_body)).
-          should have_been_made
-        cancel[:buys].length.should == 0
+        expect(a_post("/api/1/generic/orders").with(body: test_body, headers: test_headers(@client))).to have_been_made.once
+        expect(a_post('/api/1/BTCUSD/order/cancel').with(body: cancel_body, headers: test_headers(@client, cancel_body))).to have_been_made
+        expect(cancel[:buys].length).to eq 0
       end
     end
 
     context "with an invalid oid passed" do
       it "should raise an error" do
-        expect { @client.cancel(1234567890) }.to raise_error(Faraday::Error::ResourceNotFound)
+        expect { @client.cancel(1234567890) }.to raise_error(MtGox::OrderNotFoundError)
       end
     end
 
@@ -359,12 +329,10 @@ describe MtGox::Client do
       it "should cancel an order" do
         cancel = @client.cancel({'oid' => "fda8917a-63d3-4415-b827-758408013690", 'type' => 2})
         body = test_body({"oid" => "fda8917a-63d3-4415-b827-758408013690"})
-        a_post('/api/1/BTCUSD/order/cancel').
-          with(body: body, headers: test_headers(@client, body)).
-          should have_been_made
-        cancel[:buys].length.should == 0
-        cancel[:sells].last.price.should == 99.0
-        cancel[:sells].last.date.should == Time.utc(2011, 6, 27, 18, 20, 20)
+        expect(a_post('/api/1/BTCUSD/order/cancel').with(body: body, headers: test_headers(@client, body))).to have_been_made
+        expect(cancel[:buys].length).to eq 0
+        expect(cancel[:sells].last.price).to eq BigDecimal('99.0')
+        expect(cancel[:sells].last.date).to eq Time.utc(2011, 6, 27, 18, 20, 20)
       end
     end
   end
@@ -380,15 +348,14 @@ describe MtGox::Client do
     it "should withdraw funds" do
       withdraw = @client.withdraw!(1.0, "1KxSo9bGBfPVFEtWNLpnUK1bfLNNT4q31L")
       body = test_body({"amount_int" => "100000000", "address" => "1KxSo9bGBfPVFEtWNLpnUK1bfLNNT4q31L"})
-      a_post("/api/1/generic/bitcoin/send_simple").
-        with(body: body, headers: test_headers(@client, body)).
-        should have_been_made
-      withdraw.should == "311295deadbeef390a13c038e2b8ba77feebdaed2c1a59e6e0bdf001656e1314"
+      expect(a_post("/api/1/generic/bitcoin/send_simple").with(body: body, headers: test_headers(@client, body))).to have_been_made
+      expect(withdraw).to eq "311295deadbeef390a13c038e2b8ba77feebdaed2c1a59e6e0bdf001656e1314"
     end
 
     it "pays attention to too big withdrawals" do
-      lambda { @client.withdraw!(10000, "1KxSo9bGBfPVFEtWNLpnUK1bfLNNT4q31L") }.
-        should raise_error(MtGox::FilthyRichError)
+      expect {
+        @client.withdraw!(10000, "1KxSo9bGBfPVFEtWNLpnUK1bfLNNT4q31L")
+      }.to raise_error(MtGox::FilthyRichError)
     end
   end
 end

data/spec/mtgox_spec.rb

@@ -2,20 +2,20 @@ require 'helper'
 
 describe MtGox do
   describe ".new" do
-    it "should return a MtGox::Client" do
-      MtGox.new.should be_a MtGox::Client
+    it "returns a MtGox::Client" do
+      expect(MtGox.new).to be_a MtGox::Client
     end
   end
 
   describe ".configure" do
-    it "should set 'key' and 'secret'" do
+    it "sets key and secret" do
       MtGox.configure do |config|
         config.key = "key"
         config.secret = "secret"
       end
 
-      MtGox.key.should == "key"
-      MtGox.secret.should == "secret"
+      expect(MtGox.key).to eq "key"
+      expect(MtGox.secret).to eq "secret"
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mtgox
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 1.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -36,7 +36,7 @@ cert_chain:
   U0xxV3ZRUnNCbHlwSGZoczZKSnVMbHlaUEdoVTNSL3YKU2YzbFZLcEJDV2dS
   cEdUdnk0NVhWcEIrNTl5MzNQSm1FdVExUFRFT1l2UXlhbzlVS01BQWFBTi83
   cVdRdGpsMApobHc9Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K
-date: 2013-05-06 00:00:00.000000000 Z
+date: 2013-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -61,13 +61,16 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.10'
 - !ruby/object:Gem::Dependency
-  name: multi_json
+  name: json
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.7'
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.7.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -75,7 +78,10 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.7'
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.7.7
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement