mtgox 0.7.1 → 0.7.2

data/.rspec

@@ -1,3 +1 @@
 --color
---format=nested
---backtrace

data/.travis.yml

@@ -1,7 +1,3 @@
 rvm:
-  - 1.8.7
-  - 1.9.1
   - 1.9.2
-  - jruby
-  - ree
-  - ruby-head
+  - 1.9.3

data/Gemfile

@@ -1,7 +1,7 @@
 source 'http://rubygems.org'
 
-platforms :jruby do
-  gem 'jruby-openssl', '~> 0.7'
+platforms :mri do
+  gem 'simplecov'
 end
 
 gemspec

data/README.md

@@ -1,50 +1,37 @@
 # 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.
 
-Installation
-------------
+## <a name="installation"></a>Installation
     gem install mtgox
 
-Alias
------
+## <a name="alias"></a>Alias
 After installing the gem, you can get the current price for 1 BTC in USD by
 typing `btc` in your bash shell simply by setting the following alias:
 
-    alias btc='ruby -r rubygems -r mtgox -e "puts MtGox.ticker.last"'
+    alias btc='ruby -r rubygems -r mtgox -e "puts MtGox.ticker.sell"'
 
-Documentation
--------------
-[http://rdoc.info/gems/mtgox](http://rdoc.info/gems/mtgox)
+## <a name="documentation"></a>Documentation
+[http://rdoc.info/gems/mtgox][documentation]
 
-Donate
-------
-If you find this library useful, please consider sending a donation to the
-author, which you can do using the following script:
+[documentation]: http://rdoc.info/gems/mtgox
 
-    require 'rubygems'
-    require 'mtgox'
+## <a name="ci"></a>Continuous Integration
+[![Build Status](https://secure.travis-ci.org/sferik/mtgox.png)][ci]
 
-    # Certain methods require authentication
-    MtGox.configure do |config|
-      config.name = YOUR_MTGOX_USERNAME
-      config.pass = YOUR_MTGOX_PASSWORD
-    end
+[ci]: http://travis-ci.org/sferik/mtgox
 
-    MtGox.withdraw 1.0, "1KxSo9bGBfPVFEtWNLpnUK1bfLNNT4q31L"
+## <a name="dependencies"></a>Dependency Status
+[![Dependency Status](https://gemnasium.com/sferik/mtgox.png)][gemnasium]
 
-Continuous Integration
-----------------------
-[![Build Status](https://secure.travis-ci.org/sferik/mtgox.png)](http://travis-ci.org/sferik/mtgox)
+[gemnasium]: https://gemnasium.com/sferik/mtgox
 
-Usage Examples
---------------
+## <a name="examples"></a>Usage Examples
     require 'rubygems'
     require 'mtgox'
 
     # Fetch the latest price for 1 BTC in USD
-    puts MtGox.ticker.last
+    puts MtGox.ticker.sell
 
     # Fetch open asks
     puts MtGox.asks
@@ -57,8 +44,8 @@ Usage Examples
 
     # Certain methods require authentication
     MtGox.configure do |config|
-      config.name = YOUR_MTGOX_USERNAME
-      config.pass = YOUR_MTGOX_PASSWORD
+      config.key = YOUR_MTGOX_KEY
+      config.secret = YOUR_MTGOX_SECRET
     end
 
     # Fetch your current balance
@@ -76,11 +63,11 @@ Usage Examples
     # Withdraw 1 BTC from your account
     MtGox.withdraw! 1.0, "1KxSo9bGBfPVFEtWNLpnUK1bfLNNT4q31L"
 
-Contributing
-------------
-In the spirit of [free
-software](http://www.fsf.org/licensing/essays/free-sw.html), **everyone** is
-encouraged to help improve this project.
+## <a name="contributing"></a>Contributing
+In the spirit of [free software][free-sw], **everyone** is encouraged to help
+improve this project.
+
+[free-sw]: http://www.fsf.org/licensing/essays/free-sw.html
 
 Here are some ways *you* can contribute:
 
@@ -92,48 +79,43 @@ Here are some ways *you* can contribute:
 * by writing code (**no patch is too small**: fix typos, add comments, clean up
   inconsistent whitespace)
 * by refactoring code
-* by closing [issues](https://github.com/sferik/mtgox/issues)
+* by closing [issues][]
 * by reviewing patches
-* by financially (please send bitcoin donations to
-  1KxSo9bGBfPVFEtWNLpnUK1bfLNNT4q31L)
-
-Submitting an Issue
--------------------
-We use the [GitHub issue tracker](https://github.com/sferik/mtgox/issues) to
-track bugs and features. Before submitting a bug report or feature request,
-check to make sure it hasn't already been submitted. You can indicate support
-for an existing issuse by voting it up. When submitting a bug report, please
-include a [Gist](https://gist.github.com/) that includes a stack trace and any
-details that may be necessary to reproduce the bug, including your gem version,
-Ruby version, and operating system. Ideally, a bug report should include a pull
-request with failing specs.
-
-Submitting a Pull Request
--------------------------
+
+[issues]: https://github.com/sferik/mtgox/issues
+
+## <a name="issues"></a>Submitting an Issue
+We use the [GitHub issue tracker][issues] to track bugs and features. Before
+submitting a bug report or feature request, check to make sure it hasn't
+already been submitted. You can indicate support for an existing issue by
+voting it up. When submitting a bug report, please include a [Gist][gist] that
+includes a stack trace and any details that may be necessary to reproduce the
+bug, including your gem version, Ruby version, and operating system. Ideally, a
+bug report should include a pull request with failing specs.
+
+[gist]: https://gist.github.com/
+
+## <a name="pulls"></a>Submitting a Pull Request
 1. Fork the project.
 2. Create a topic branch.
 3. Implement your feature or bug fix.
 4. Add documentation for your feature or bug fix.
-5. Run <tt>bundle exec rake doc:yard</tt>. If your changes are not 100%
-   documented, go back to step 4.
+5. Run `bundle exec rake doc:yard`. If your changes are not 100% documented, go
+   back to step 4.
 6. Add specs for your feature or bug fix.
-7. Run <tt>bundle exec rake spec</tt>. If your changes are not 100% covered, go
-   back to step 6.
+7. Run `bundle exec rake spec`. If your changes are not 100% covered, go back
+   to step 6.
 8. Commit and push your changes.
 9. Submit a pull request. Please do not include changes to the gemspec,
    version, or history file. (If you want to create your own version for some
    reason, please do so in a separate commit.)
 
-Supported Rubies
-----------------
-This library aims to support and is [tested
-against](http://travis-ci.org/sferik/mtgox) the following Ruby implementations:
+## <a name="versions"></a>Supported Ruby Versions
+This library aims to support and is [tested against][ci] the following Ruby
+implementations:
 
-* Ruby 1.8.7
-* Ruby 1.9.1
 * Ruby 1.9.2
-* Ruby Enterprise Edition 1.8.7
-* JRuby 1.6
+* Ruby 1.9.3
 
 If something doesn't work on one of these interpreters, it should be considered
 a bug.
@@ -149,7 +131,7 @@ implementation, you will be personally responsible for providing patches in a
 timely fashion. If critical issues for a particular implementation exist at the
 time of a major release, support for that Ruby version may be dropped.
 
-Copyright
----------
-Copyright (c) 2011 Erik Michaels-Ober.
-See [LICENSE](https://github.com/sferik/mtgox/blob/master/LICENSE.md) for details.
+## <a name="copyright"></a>Copyright
+Copyright (c) 2011 Erik Michaels-Ober. See [LICENSE][] for details.
+
+[license]: https://github.com/sferik/mtgox/blob/master/LICENSE.md

data/lib/mtgox/client.rb

@@ -18,6 +18,16 @@ module MtGox
 
     ORDER_TYPES = {:sell => 1, :buy => 2}
 
+    # Fetch a deposit address
+    # @authenticated true
+    # @return [String]
+    # @example
+    #   MtGox.address
+    def address
+      post('/api/0/btcAddress.php')['addr']
+    end
+
+
     # Fetch the latest ticker data
     #
     # @authenticated false
@@ -25,7 +35,7 @@ module MtGox
     # @example
     #   MtGox.ticker
     def ticker
-      ticker = get('/code/data/ticker.php')['ticker']
+      ticker = get('/api/0/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
@@ -42,7 +52,7 @@ module MtGox
     # @example
     #   MtGox.offers
     def offers
-      offers = get('/code/data/getDepth.php')
+      offers = get('/api/0/data/getDepth.php')
       asks = offers['asks'].sort_by do |ask|
         ask[0].to_f
       end.map! do |ask|
@@ -109,7 +119,7 @@ module MtGox
     # @example
     #   MtGox.trades
     def trades
-      get('/code/data/getTrades.php').sort_by{|trade| trade['date']}.map do |trade|
+      get('/api/0/data/getTrades.php').sort_by{|trade| trade['date']}.map do |trade|
         Trade.new(trade)
       end
     end
@@ -121,7 +131,7 @@ module MtGox
     # @example
     #   MtGox.balance
     def balance
-      parse_balance(post('/code/getFunds.php', pass_params))
+      parse_balance(post('/api/0/getFunds.php', {}))
     end
 
     # Fetch your open orders, both buys and sells, for network efficiency
@@ -131,7 +141,7 @@ module MtGox
     # @example
     #   MtGox.orders
     def orders
-      parse_orders(post('/code/getOrders.php', pass_params)['orders'])
+      parse_orders(post('/api/0/getOrders.php', {})['orders'])
     end
 
     # Fetch your open buys
@@ -164,7 +174,7 @@ module MtGox
     #   # Buy one bitcoin for $0.011
     #   MtGox.buy! 1.0, 0.011
     def buy!(amount, price)
-      parse_orders(post('/code/buyBTC.php', pass_params.merge({:amount => amount, :price => price}))['orders'])
+      parse_orders(post('/api/0/buyBTC.php', {:amount => amount, :price => price})['orders'])
     end
 
     # Place a limit order to sell BTC
@@ -177,7 +187,7 @@ module MtGox
     #   # Sell one bitcoin for $100
     #   MtGox.sell! 1.0, 100.0
     def sell!(amount, price)
-      parse_orders(post('/code/sellBTC.php', pass_params.merge({:amount => amount, :price => price}))['orders'])
+      parse_orders(post('/api/0/sellBTC.php', {:amount => amount, :price => price})['orders'])
     end
 
     # Cancel an open order
@@ -200,13 +210,13 @@ module MtGox
     def cancel(args)
       if args.is_a?(Hash)
         order = args.delete_if{|k, v| !['oid', 'type'].include?(k.to_s)}
-        parse_orders(post('/code/cancelOrder.php', pass_params.merge(order))['orders'])
+        parse_orders(post('/api/0/cancelOrder.php', order)['orders'])
       else
-        orders = post('/code/getOrders.php', pass_params)['orders']
+        orders = post('/api/0/getOrders.php', {})['orders']
         order = orders.find{|order| order['oid'] == args.to_s}
         if order
           order = order.delete_if{|k, v| !['oid', 'type'].include?(k.to_s)}
-          parse_orders(post('/code/cancelOrder.php', pass_params.merge(order))['orders'])
+          parse_orders(post('/api/0/cancelOrder.php', order)['orders'])
         else
           raise Faraday::Error::ResourceNotFound, {:status => 404, :headers => {}, :body => 'Order not found.'}
         end
@@ -223,7 +233,7 @@ module MtGox
     #   # Withdraw 1 BTC from your account
     #   MtGox.withdraw! 1.0, '1KxSo9bGBfPVFEtWNLpnUK1bfLNNT4q31L'
     def withdraw!(amount, btca)
-      parse_balance(post('/code/withdraw.php', pass_params.merge({:group1 => 'BTC', :amount => amount, :btca => btca})))
+      parse_balance(post('/api/0/withdraw.php', {:group1 => 'BTC', :amount => amount, :btca => btca}))
     end
 
     private
@@ -248,9 +258,5 @@ module MtGox
       end
       {:buys => buys, :sells => sells}
     end
-
-    def pass_params
-      {:name => MtGox.username, :pass => MtGox.password}
-    end
   end
 end

data/lib/mtgox/configuration.rb

@@ -5,8 +5,8 @@ module MtGox
     # An array of valid keys in the options hash when configuring a {MtGox::Client}
     VALID_OPTIONS_KEYS = [
       :commission,
-      :password,
-      :username,
+      :key,
+      :secret,
     ]
 
     DEFAULT_COMMISSION = 0.0065.freeze
@@ -33,8 +33,8 @@ module MtGox
     # Reset all configuration options to defaults
     def reset
       self.commission = DEFAULT_COMMISSION
-      self.password   = nil
-      self.username   = nil
+      self.key   = nil
+      self.secret   = nil
       self
     end
   end

data/lib/mtgox/connection.rb

@@ -14,7 +14,7 @@ module MtGox
       options = {
         :headers  => {
           :accept => 'application/json',
-          :user_agent => "mtgox gem #{MtGox::VERSION}",
+          :user_agent => "mtgox gem #{MtGox::Version}",
         },
         :ssl => {:verify => false},
         :url => 'https://mtgox.com',

data/lib/mtgox/request.rb

@@ -1,3 +1,5 @@
+require 'base64'
+
 module MtGox
   module Request
     def get(path, options={})
@@ -17,10 +19,28 @@ module MtGox
           request.url(path, options)
         when :post
           request.path = path
-          request.body = options unless options.empty?
+          request.body = body_from_options(options)
+          request.headers = headers(request.body)
         end
       end
       response.body
     end
+
+    def headers(request)
+      signature = Base64.strict_encode64(
+        OpenSSL::HMAC.digest 'sha512',
+        Base64.decode64(MtGox.secret),
+        request
+      )
+      {'Rest-Key' => MtGox.key, 'Rest-Sign' => signature}
+    end
+
+    def body_from_options(options)
+      add_nonce(options).collect{|k, v| "#{k}=#{v}"} * '&'
+    end
+
+    def add_nonce(options)
+      options.merge!({:nonce => (Time.now.to_f * 1000000).to_i})
+    end
   end
 end

data/lib/mtgox/version.rb

@@ -1,3 +1,30 @@
 module MtGox
-  VERSION = "0.7.1".freeze unless defined? ::MtGox::VERSION
+  class Version
+
+    # @return [Integer]
+    def self.major
+      0
+    end
+
+    # @return [Integer]
+    def self.minor
+      7
+    end
+
+    # @return [Integer]
+    def self.patch
+      2
+    end
+
+    # @return [String, NilClass]
+    def self.pre
+      nil
+    end
+
+    # @return [String]
+    def self.to_s
+      [major, minor, patch, pre].compact.join('.')
+    end
+
+  end
 end

data/mtgox.gemspec

@@ -1,29 +1,25 @@
-# -*- encoding: utf-8 -*-
+# encoding: utf-8
 require File.expand_path('../lib/mtgox/version', __FILE__)
 
 Gem::Specification.new do |gem|
-  gem.name        = 'mtgox'
-  gem.version     = MtGox::VERSION.dup
+  gem.add_dependency 'faraday', '~> 0.7'
+  gem.add_dependency 'faraday_middleware', '~> 0.7'
+  gem.add_dependency 'multi_json', '~> 1.0'
+  gem.add_development_dependency 'json'
+  gem.add_development_dependency 'rake'
+  gem.add_development_dependency 'rdiscount'
+  gem.add_development_dependency 'rspec'
+  gem.add_development_dependency 'webmock'
+  gem.add_development_dependency 'yard'
   gem.author      = "Erik Michaels-Ober"
+  gem.description = %q{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.}
   gem.email       = 'sferik@gmail.com'
+  gem.files       = `git ls-files`.split("\n")
   gem.homepage    = 'https://github.com/sferik/mtgox'
-  gem.summary     = %q{Ruby wrapper for the Mt. Gox Trade API}
-  gem.description = %q{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.}
-
-  gem.files         = `git ls-files`.split("\n")
-  gem.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  gem.executables   = `git ls-files -- bin/*`.split("\n").map{|f| File.basename(f)}
+  gem.name        = 'mtgox'
   gem.require_paths = ['lib']
-
-  gem.add_development_dependency 'ZenTest', '~> 4.5'
-  gem.add_development_dependency 'maruku', '~> 0.6'
-  gem.add_development_dependency 'rake', '~> 0.9'
-  gem.add_development_dependency 'rspec', '~> 2.6'
-  gem.add_development_dependency 'simplecov', '~> 0.4'
-  gem.add_development_dependency 'webmock', '~> 1.6'
-  gem.add_development_dependency 'yard', '~> 0.7'
-
-  gem.add_runtime_dependency 'faraday', '~> 0.7.4'
-  gem.add_runtime_dependency 'faraday_middleware', '~> 0.7.0'
-  gem.add_runtime_dependency 'multi_json', '~> 1.0.3'
+  gem.required_ruby_version = '>= 1.9.2'
+  gem.summary     = %q{Ruby wrapper for the Mt. Gox Trade API}
+  gem.test_files  = `git ls-files -- {test,spec,features}/*`.split("\n")
+  gem.version     = MtGox::Version.to_s
 end

data/spec/faraday/response_spec.rb

@@ -2,7 +2,7 @@ require 'helper'
 
 describe Faraday::Response do
   before do
-    stub_get('/code/data/getTrades.php').
+    stub_get('/api/0/data/getTrades.php').
       to_return(:status => 200, :body => fixture('mysql_error'))
   end
 

data/spec/fixtures/address.json

@@ -0,0 +1 @@
+{"addr": "171dH9Uum6wWLSwH2g8g2yto6SG7NEGyXG"}

data/spec/helper.rb

@@ -2,6 +2,7 @@ $:.unshift File.expand_path('..', __FILE__)
 $:.unshift File.expand_path('../../lib', __FILE__)
 require 'simplecov'
 SimpleCov.start
+require 'base64'
 require 'mtgox'
 require 'rspec'
 require 'webmock/rspec'
@@ -29,3 +30,35 @@ end
 def fixture(file)
   File.new(fixture_path + '/' + file)
 end
+
+module MtGox
+  module Request
+    private
+    def add_nonce(options)
+      options.merge!({:nonce => 1321745961249676})
+    end
+  end
+end
+
+def test_headers(body=test_body)
+  signed_headers(body).merge!(
+    {
+      'Accept' => 'application/json',
+      'Content-Type' => 'application/x-www-form-urlencoded',
+      'User-Agent' => "mtgox gem #{MtGox::Version}",
+    }
+  )
+end
+
+def signed_headers(body)
+  signature = Base64.strict_encode64(
+    OpenSSL::HMAC.digest 'sha512',
+    Base64.decode64(MtGox.secret),
+    body
+  )
+  {'Rest-Key' => MtGox.key, 'Rest-Sign' => signature}
+end
+
+def test_body(options={})
+  options.merge!({:nonce => 1321745961249676}).collect{|k, v| "#{k}=#{v}"} * '&'
+end

data/spec/mtgox/client_spec.rb

@@ -4,20 +4,34 @@ describe MtGox::Client do
   before do
     @client = MtGox::Client.new
     MtGox.configure do |config|
-      config.username = "my_name"
-      config.password = "my_password"
+      config.key = "key"
+      config.secret = "secret"
     end
   end
 
+  describe '#address' do
+    before do
+      stub_post('/api/0/btcAddress.php').
+        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
+      address.should == '171dH9Uum6wWLSwH2g8g2yto6SG7NEGyXG'
+    end
+  end
+  
   describe '#ticker' do
     before do
-      stub_get('/code/data/ticker.php').
+      stub_get('/api/0/data/ticker.php').
         to_return(:status => 200, :body => fixture('ticker.json'))
     end
 
     it "should fetch the ticker" do
       ticker = @client.ticker
-      a_get('/code/data/ticker.php').
+      a_get('/api/0/data/ticker.php').
         should have_been_made
       ticker.buy.should  == 26.4
       ticker.sell.should == 26.6099
@@ -30,14 +44,14 @@ describe MtGox::Client do
 
   describe 'depth methods' do
     before :each do
-      stub_get('/code/data/getDepth.php').
+      stub_get('/api/0/data/getDepth.php').
         to_return(:status => 200, :body => fixture('depth.json'))
     end
 
     describe '#asks' do
       it "should fetch open asks" do
         asks = @client.asks
-        a_get('/code/data/getDepth.php').
+        a_get('/api/0/data/getDepth.php').
           should have_been_made
         asks.last.price.should == 23.75
         asks.last.eprice.should == 23.905385002516354
@@ -54,7 +68,7 @@ describe MtGox::Client do
     describe "#bids" do
       it "should fetch open bids" do
         bids = @client.bids
-        a_get('/code/data/getDepth.php').
+        a_get('/api/0/data/getDepth.php').
           should have_been_made
         bids.last.price.should == 14.62101
         bids.last.eprice.should == 14.525973435000001
@@ -70,7 +84,7 @@ 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').
+        a_get('/api/0/data/getDepth.php').
           should have_been_made.once
         offers[:asks].last.price.should == 23.75
         offers[:asks].last.eprice.should == 23.905385002516354
@@ -84,7 +98,7 @@ describe MtGox::Client do
     describe '#min_ask' do
       it "should fetch the lowest priced ask" do
         min_ask = @client.min_ask
-        a_get('/code/data/getDepth.php').
+        a_get('/api/0/data/getDepth.php').
           should have_been_made.once
         min_ask.price.should == 17.00009
         min_ask.eprice.should == 17.11131353799698
@@ -95,7 +109,7 @@ 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').
+        a_get('/api/0/data/getDepth.php').
           should have_been_made.once
         max_bid.price.should == 17.0
         max_bid.eprice.should == 16.8895
@@ -107,37 +121,32 @@ describe MtGox::Client do
 
   describe '#trades' do
     before do
-      stub_get('/code/data/getTrades.php').
+      stub_get('/api/0/data/getTrades.php').
         to_return(:status => 200, :body => fixture('trades.json'))
     end
 
     it "should fetch trades" do
       trades = @client.trades
-      a_get('/code/data/getTrades.php').
+      a_get('/api/0/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.id.should == 1309199288687054
     end
-
-    it "should be sorted in chronological order" do
-      trades = @client.trades
-      trades.sort_by(&:date).should == trades
-    end
   end
 
   describe '#balance' do
     before do
-      stub_post('/code/getFunds.php').
-        with(:body => {"name" => "my_name", "pass" => "my_password"}).
+      stub_post('/api/0/getFunds.php').
+        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("/code/getFunds.php").
-        with(:body => {"name" => "my_name", "pass" => "my_password"}).
+      a_post("/api/0/getFunds.php").
+        with(:body => test_body, :headers => test_headers).
         should have_been_made
       balance.first.currency.should == "BTC"
       balance.first.amount.should == 22.0
@@ -148,16 +157,16 @@ describe MtGox::Client do
 
   describe "order methods" do
     before :each do
-      stub_post('/code/getOrders.php').
-        with(:body => {"name" => "my_name", "pass" => "my_password"}).
+      stub_post('/api/0/getOrders.php').
+        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("/code/getOrders.php").
-          with(:body => {"name" => "my_name", "pass" => "my_password"}).
+        a_post("/api/0/getOrders.php").
+          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)
@@ -167,8 +176,8 @@ describe MtGox::Client do
     describe "#sells" do
       it "should fetch sells" do
         sells = @client.sells
-        a_post("/code/getOrders.php").
-          with(:body => {"name" => "my_name", "pass" => "my_password"}).
+        a_post("/api/0/getOrders.php").
+          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)
@@ -178,8 +187,8 @@ describe MtGox::Client do
     describe "#orders" do
       it "should fetch both buys and sells, with only one call" do
         orders = @client.orders
-        a_post("/code/getOrders.php").
-          with(:body => {"name" => "my_name", "pass" => "my_password"}).
+        a_post("/api/0/getOrders.php").
+          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)
@@ -191,15 +200,17 @@ describe MtGox::Client do
 
   describe "#buy!" do
     before do
-      stub_post('/code/buyBTC.php').
-        with(:body => {"name" => "my_name", "pass" => "my_password", "amount" => "0.88", "price" => "0.89"}).
+      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'))
     end
 
     it "should place a bid" do
       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"}).
+      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
       buy[:buys].last.price.should == 2.0
       buy[:buys].last.date.should == Time.utc(2011, 6, 27, 18, 26, 21)
@@ -210,15 +221,17 @@ describe MtGox::Client do
 
   describe "#sell!" do
     before do
-      stub_post('/code/sellBTC.php').
-        with(:body => {"name" => "my_name", "pass" => "my_password", "amount" => "0.88", "price" => "89.0"}).
+      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'))
     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("/code/sellBTC.php").
-        with(:body => {"name" => "my_name", "pass" => "my_password", "amount" => "0.88", "price" => "89.0"}).
+      a_post("/api/0/sellBTC.php").
+        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)
@@ -229,22 +242,24 @@ describe MtGox::Client do
 
   describe "#cancel" do
     before do
-      stub_post('/code/getOrders.php').
-        with(:body => {"name" => "my_name", "pass" => "my_password"}).
+      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'))
-      stub_post('/code/cancelOrder.php').
-        with(:body => {"name" => "my_name", "pass" => "my_password", "oid" => "bddd042c-e837-4a88-a92e-3b7c05e483df", "type" => "2"}).
+      stub_post('/api/0/cancelOrder.php').
+        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
       it "should cancel an order" do
         cancel = @client.cancel("bddd042c-e837-4a88-a92e-3b7c05e483df")
-        a_post("/code/getOrders.php").
-          with(:body => {"name" => "my_name", "pass" => "my_password"}).
+        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
-        a_post('/code/cancelOrder.php').
-          with(:body => {"name" => "my_name", "pass" => "my_password", "oid" => "bddd042c-e837-4a88-a92e-3b7c05e483df", "type" => "2"}).
+        a_post('/api/0/cancelOrder.php').
+          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)
@@ -264,8 +279,9 @@ describe MtGox::Client do
     context "with an order passed" do
       it "should cancel an order" do
         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"}).
+        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
         cancel[:buys].last.price.should == 7.0
         cancel[:buys].last.date.should == Time.utc(2011, 6, 27, 18, 20, 38)
@@ -277,15 +293,17 @@ describe MtGox::Client do
 
   describe "#withdraw!" do
     before do
-      stub_post('/code/withdraw.php').
-        with(:body => {"name" => "my_name", "pass" => "my_password", "group1" => "BTC", "amount" => "1.0", "btca" => "1KxSo9bGBfPVFEtWNLpnUK1bfLNNT4q31L"}).
+      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'))
     end
 
     it "should withdraw funds" do
       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"}).
+      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
       withdraw.first.currency.should == "BTC"
       withdraw.first.amount.should == 9.0

data/spec/mtgox_spec.rb

@@ -8,14 +8,14 @@ describe MtGox do
   end
 
   describe ".configure" do
-    it "should set 'username' and 'password'" do
+    it "should set 'key' and 'secret'" do
       MtGox.configure do |config|
-        config.username = "username"
-        config.password = "password"
+        config.key = "key"
+        config.secret = "secret"
       end
 
-      MtGox.username.should == "username"
-      MtGox.password.should == "password"
+      MtGox.key.should == "key"
+      MtGox.secret.should == "secret"
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mtgox
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,119 +9,107 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-07-30 00:00:00.000000000 -07:00
-default_executable: 
+date: 2011-12-02 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: ZenTest
-  requirement: &70114478671140 !ruby/object:Gem::Requirement
+  name: faraday
+  requirement: &70341100916500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '4.5'
-  type: :development
+        version: '0.7'
+  type: :runtime
   prerelease: false
-  version_requirements: *70114478671140
+  version_requirements: *70341100916500
 - !ruby/object:Gem::Dependency
-  name: maruku
-  requirement: &70114478670600 !ruby/object:Gem::Requirement
+  name: faraday_middleware
+  requirement: &70341100915580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.6'
-  type: :development
+        version: '0.7'
+  type: :runtime
   prerelease: false
-  version_requirements: *70114478670600
+  version_requirements: *70341100915580
 - !ruby/object:Gem::Dependency
-  name: rake
-  requirement: &70114478665140 !ruby/object:Gem::Requirement
+  name: multi_json
+  requirement: &70341100914960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.9'
-  type: :development
+        version: '1.0'
+  type: :runtime
   prerelease: false
-  version_requirements: *70114478665140
+  version_requirements: *70341100914960
 - !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: &70114478664560 !ruby/object:Gem::Requirement
+  name: json
+  requirement: &70341100914260 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70114478664560
+  version_requirements: *70341100914260
 - !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: &70114478664000 !ruby/object:Gem::Requirement
+  name: rake
+  requirement: &70341100913100 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70114478664000
+  version_requirements: *70341100913100
 - !ruby/object:Gem::Dependency
-  name: webmock
-  requirement: &70114478663420 !ruby/object:Gem::Requirement
+  name: rdiscount
+  requirement: &70341100911140 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70114478663420
+  version_requirements: *70341100911140
 - !ruby/object:Gem::Dependency
-  name: yard
-  requirement: &70114478662860 !ruby/object:Gem::Requirement
+  name: rspec
+  requirement: &70341100910600 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70114478662860
-- !ruby/object:Gem::Dependency
-  name: faraday
-  requirement: &70114478662280 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.7.4
-  type: :runtime
-  prerelease: false
-  version_requirements: *70114478662280
+  version_requirements: *70341100910600
 - !ruby/object:Gem::Dependency
-  name: faraday_middleware
-  requirement: &70114478661700 !ruby/object:Gem::Requirement
+  name: webmock
+  requirement: &70341100910040 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.7.0
-  type: :runtime
+        version: '0'
+  type: :development
   prerelease: false
-  version_requirements: *70114478661700
+  version_requirements: *70341100910040
 - !ruby/object:Gem::Dependency
-  name: multi_json
-  requirement: &70114478661120 !ruby/object:Gem::Requirement
+  name: yard
+  requirement: &70341100909260 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.3
-  type: :runtime
+        version: '0'
+  type: :development
   prerelease: false
-  version_requirements: *70114478661120
+  version_requirements: *70341100909260
 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
@@ -129,7 +117,6 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .autotest
 - .gemtest
 - .gitignore
 - .rspec
@@ -161,6 +148,7 @@ files:
 - lib/mtgox/version.rb
 - mtgox.gemspec
 - spec/faraday/response_spec.rb
+- spec/fixtures/address.json
 - spec/fixtures/balance.json
 - spec/fixtures/buy.json
 - spec/fixtures/cancel.json
@@ -175,7 +163,6 @@ files:
 - spec/helper.rb
 - spec/mtgox/client_spec.rb
 - spec/mtgox_spec.rb
-has_rdoc: true
 homepage: https://github.com/sferik/mtgox
 licenses: []
 post_install_message: 
@@ -187,7 +174,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -196,12 +183,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Ruby wrapper for the Mt. Gox Trade API
 test_files:
 - spec/faraday/response_spec.rb
+- spec/fixtures/address.json
 - spec/fixtures/balance.json
 - spec/fixtures/buy.json
 - spec/fixtures/cancel.json
@@ -216,3 +204,4 @@ test_files:
 - spec/helper.rb
 - spec/mtgox/client_spec.rb
 - spec/mtgox_spec.rb
+has_rdoc: 

data/.autotest

@@ -1 +0,0 @@
-require 'autotest/bundler'