mt_gox 0.7.3 → 0.7.5

data/HISTORY

@@ -0,0 +1,8 @@
+
+== 0.7.4 / 2012-01-16
+
+* Models hacked in
+
+== 0.7.5 / 2012-01-17
+
+* Model now has attributes / properties

data/README.md

@@ -1,6 +1,5 @@
 # Ruby wrapper for the Mt. Gox Trade API.
 
-
 ## <a name="fork"></a>This Fork
 This is a fork of https://github.com/sferik/mtgox. This fork features a rework of the
 original business domain entities into new Models, with an intent to make these Models

data/VERSION

@@ -1 +1 @@
-0.7.3
+0.7.5

data/lib/mtgox.rb

@@ -1,6 +1,6 @@
+require 'mtgox/models'
 require 'mtgox/client'
 require 'mtgox/configuration'
-require 'mtgox/error'
 
 module MtGox
   extend Configuration
@@ -22,4 +22,11 @@ module MtGox
       new.respond_to?(method, include_private) || super(method, include_private)
     end
   end
+
+  # Custom error class for rescuing from all MtGox errors
+  class Error < StandardError
+  end
+
+  class MysqlError < Error
+  end
 end

data/lib/mtgox/client.rb

@@ -1,20 +1,12 @@
 require 'faraday/error'
-require 'mtgox/ask'
-require 'mtgox/balance'
-require 'mtgox/bid'
-require 'mtgox/buy'
 require 'mtgox/connection'
-require 'mtgox/max_bid'
-require 'mtgox/min_ask'
 require 'mtgox/request'
-require 'mtgox/sell'
-require 'mtgox/ticker'
-require 'mtgox/trade'
 
 module MtGox
   class Client
     include MtGox::Connection
     include MtGox::Request
+    include MtGox::Models
 
     ORDER_TYPES = {:sell => 1, :buy => 2}
 
@@ -36,13 +28,7 @@ module MtGox
     #   MtGox.ticker
     def 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
-      Ticker.instance.low    = ticker['low'].to_f
-      Ticker.instance.sell   = ticker['sell'].to_f
-      Ticker.instance.volume = ticker['vol'].to_f
-      Ticker.instance.vwap   = ticker['vwap'].to_f
+      Ticker.instance.set_attributes ticker
       Ticker.instance
     end
 
@@ -94,9 +80,7 @@ module MtGox
     # @example
     #   MtGox.min_ask
     def min_ask
-      min_ask = asks.first
-      MinAsk.instance.price = min_ask.price
-      MinAsk.instance.amount = min_ask.amount
+      MinAsk.instance.set_attributes asks.first.attributes
       MinAsk.instance
     end
 
@@ -107,9 +91,7 @@ module MtGox
     # @example
     #   MtGox.max_bid
     def max_bid
-      max_bid = bids.first
-      MaxBid.instance.price = max_bid.price
-      MaxBid.instance.amount = max_bid.amount
+      MaxBid.instance.set_attributes bids.first.attributes
       MaxBid.instance
     end
 
@@ -120,7 +102,7 @@ module MtGox
     # @example
     #   MtGox.trades
     def trades
-      get('/api/0/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
@@ -133,6 +115,10 @@ module MtGox
     #   MtGox.balance
     def balance
       parse_balance(post('/api/0/getFunds.php', {}))
+      #info = post('/code/info.php', pass_params)
+      #info['Wallets'].values.map { |v| v['Balance'] }.map do |balance_info|
+      #  Balance.new(balance_info['currency'], balance_info['value'])
+      #end
     end
 
     # Fetch your open orders, both buys and sells, for network efficiency
@@ -210,13 +196,13 @@ module MtGox
     #     MtGox.cancel {'oid' => '1234567890', 'type' => 2}
     def cancel(args)
       if args.is_a?(Hash)
-        order = args.delete_if{|k, v| !['oid', 'type'].include?(k.to_s)}
+        order = args.delete_if { |k, v| !['oid', 'type'].include?(k.to_s) }
         parse_orders(post('/api/0/cancelOrder.php', order)['orders'])
       else
         orders = post('/api/0/getOrders.php', {})['orders']
-        order = orders.find{|order| order['oid'] == args.to_s}
+        order = orders.find { |order| order['oid'] == args.to_s }
         if order
-          order = order.delete_if{|k, v| !['oid', 'type'].include?(k.to_s)}
+          order = order.delete_if { |k, v| !['oid', 'type'].include?(k.to_s) }
           parse_orders(post('/api/0/cancelOrder.php', order)['orders'])
         else
           raise Faraday::Error::ResourceNotFound, {:status => 404, :headers => {}, :body => 'Order not found.'}
@@ -241,20 +227,20 @@ module MtGox
 
     def parse_balance(balance)
       balances = []
-      balances << Balance.new('BTC', balance['btcs'])
-      balances << Balance.new('USD', balance['usds'])
+      balances << Balance.new(:currency => 'BTC', :amount => balance['btcs'])
+      balances << Balance.new(:currency => 'USD', :amount => balance['usds'])
       balances
     end
 
     def parse_orders(orders)
       buys = []
       sells = []
-      orders.sort_by{|order| order['date']}.each do |order|
+      orders.sort_by { |order| order['date'] }.each do |order|
         case order['type']
-        when ORDER_TYPES[:sell]
-          sells << Sell.new(order)
-        when ORDER_TYPES[:buy]
-          buys << Buy.new(order)
+          when ORDER_TYPES[:sell]
+            sells << Sell.new(order)
+          when ORDER_TYPES[:buy]
+            buys << Buy.new(order)
         end
       end
       {:buys => buys, :sells => sells}

data/lib/mtgox/models.rb

@@ -0,0 +1,14 @@
+module MtGox
+  module Models
+  end # module Models
+end
+
+require 'mtgox/models/ask'
+require 'mtgox/models/balance'
+require 'mtgox/models/bid'
+require 'mtgox/models/buy'
+require 'mtgox/models/max_bid'
+require 'mtgox/models/min_ask'
+require 'mtgox/models/sell'
+require 'mtgox/models/ticker'
+require 'mtgox/models/trade'

data/lib/mtgox/models/ask.rb

@@ -0,0 +1,17 @@
+require 'mtgox/models/offer'
+
+module MtGox
+  module Models
+    class Ask < Offer
+
+      def initialize(price=nil, amount=nil)
+        super :price => price, :amount => amount
+      end
+
+      def eprice
+        price / (1 - MtGox.commission)
+      end
+
+    end
+  end
+end

data/lib/mtgox/models/balance.rb

@@ -0,0 +1,10 @@
+require 'mtgox/models/model'
+
+module MtGox
+  module Models
+    class Balance < Model
+      prop :amount => :f,
+           :currency => proc { |val| val.to_s.upcase }
+    end
+  end
+end

data/lib/mtgox/models/bid.rb

@@ -0,0 +1,17 @@
+require 'mtgox/models/offer'
+
+module MtGox
+  module Models
+    class Bid < Offer
+
+      def initialize(price=nil, amount=nil)
+        super :price => price, :amount => amount
+      end
+
+      def eprice
+        price * (1 - MtGox.commission)
+      end
+
+    end
+  end
+end

data/lib/mtgox/models/buy.rb

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

data/lib/mtgox/models/max_bid.rb

@@ -0,0 +1,12 @@
+require 'mtgox/models/bid'
+require 'mtgox/price_ticker'
+require 'singleton'
+
+module MtGox
+  module Models
+    class MaxBid < Bid
+      include Singleton
+      include PriceTicker
+    end
+  end
+end

data/lib/mtgox/models/min_ask.rb

@@ -0,0 +1,12 @@
+require 'mtgox/models/ask'
+require 'mtgox/price_ticker'
+require 'singleton'
+
+module MtGox
+  module Models
+    class MinAsk < Ask
+      include Singleton
+      include PriceTicker
+    end
+  end
+end

data/lib/mtgox/models/model.rb

@@ -0,0 +1,57 @@
+module MtGox
+  module Models
+
+    # Base data Model class, in future it will be developed into ActiveModel
+    class Model
+
+      def self.prop *properties
+        prop_hash = properties.last.is_a?(Hash) ? properties.pop : {}
+
+        properties.each { |names| define_property names, '' }
+        prop_hash.each { |names, type| define_property names, type }
+      end
+
+      def self.define_property names, type
+        aliases = [names].flatten
+        name = aliases.shift
+        instance_eval do
+
+          define_method(name) do
+            @attributes[name]
+          end
+
+          case type
+            when ''
+              define_method("#{name}=") do |value|
+                @attributes[name] = value
+              end
+            when Proc
+              define_method("#{name}=") do |value|
+                @attributes[name] = type.call(value)
+              end
+            else
+              define_method("#{name}=") do |value|
+                @attributes[name] = value.send "to_#{type}"
+              end
+          end
+
+          aliases.each do |ali|
+            alias_method "#{ali}", name
+            alias_method "#{ali}=", "#{name}="
+          end
+        end
+      end
+
+      attr_reader :attributes
+
+      def initialize attrs={}
+        @attributes = {}
+        set_attributes attrs
+      end
+
+      def set_attributes attrs={}
+        attrs.keys.each { |key| self.send("#{key}=", attrs[key]) }
+      end
+    end # class Model
+  end # module Models
+end

data/lib/mtgox/models/offer.rb

@@ -0,0 +1,11 @@
+require 'mtgox/models/model'
+
+module MtGox
+  module Models
+    class Offer < Model
+
+      prop :amount => :f,
+           :price => :f
+    end
+  end
+end

data/lib/mtgox/models/order.rb

@@ -0,0 +1,17 @@
+require 'mtgox/models/offer'
+
+module MtGox
+  module Models
+    class Order < Offer
+      prop :currency,
+           :item,
+           :type, #    1 for sell order or 2 for buy order
+           :status, #  1 for active, 2 for not enough funds
+           :dark,
+           :priority,
+           [:id, :oid] => :i, # Order ID
+           :date => proc { |val| Time.at val } # 1326655184
+
+    end
+  end
+end

data/lib/mtgox/models/sell.rb

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

data/lib/mtgox/models/ticker.rb

@@ -0,0 +1,21 @@
+require 'mtgox/models/model'
+require 'mtgox/price_ticker'
+require 'singleton'
+
+module MtGox
+  module Models
+    class Ticker < Model
+      include Singleton
+      include PriceTicker
+      prop :buy,
+           :sell,
+           :high,
+           :low,
+           [:vol, :volume],
+           [:last, :price],
+           :avg,
+           :vwap
+
+    end
+  end
+end

data/lib/mtgox/models/trade.rb

@@ -0,0 +1,31 @@
+require 'mtgox/models/offer'
+
+module MtGox
+  module Models
+    class Trade < Offer
+
+      prop :type, #        "trade"
+           :item, #        "BTC"
+           :price_currency, # "USD"
+           :trade_type, #     "ask", "
+           :primary, # "Y" or "N", the primary currency is always the buyers currency
+           :properties, #  "limit,mixed_currency"
+           :amount_int, # "1067215400"
+           :price_int, #   681526"
+           :amount => :f, #  10.672154
+           :price => :f, #   6.81526
+           [:id, :tid] => :i, #  "tid"=>"1326655184087854"
+           :date => 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 } >"
+      end
+
+    end
+  end
+end

data/mt_gox.gemspec

@@ -0,0 +1,29 @@
+# encoding: utf-8
+require File.expand_path('../lib/mtgox/version', __FILE__)
+
+Gem::Specification.new do |gem|
+  gem.name        = 'mt_gox'
+  gem.version     = File.open('VERSION').read.strip
+  gem.authors      = ["Erik Michaels-Ober", "arvicco"]
+  gem.summary     = "Ruby wrapper for the Mt. Gox Trade API."
+  gem.description = "Ruby wrapper for the Mt. Gox Trade API. Extended with Models."
+  gem.email       = 'arvicco@gmail.com'
+  gem.files       = `git ls-files`.split("\n")
+  gem.homepage    = 'https://github.com/arvicco/mtgox'
+
+  gem.require_paths = ['lib']
+  gem.required_ruby_version = '>= 1.9.2'
+  gem.test_files  = `git ls-files -- {test,spec,features}/*`.split("\n")
+
+  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 'simplecov'
+  gem.add_development_dependency 'webmock'
+  gem.add_development_dependency 'yard'
+
+end

data/spec/mtgox/client_spec.rb

@@ -22,7 +22,7 @@ describe MtGox::Client do
       address.should == '171dH9Uum6wWLSwH2g8g2yto6SG7NEGyXG'
     end
   end
-  
+
   describe '#ticker' do
     before do
       stub_get('/api/0/data/ticker.php').

data/tasks/doc.rake

@@ -0,0 +1,14 @@
+desc 'Alias to doc:rdoc'
+task :doc => 'doc:rdoc'
+
+namespace :doc do
+  require 'rake/rdoctask'
+  Rake::RDocTask.new do |rdoc|
+#    Rake::RDocTask.new(:rdoc => "rdoc", :clobber_rdoc => "clobber", :rerdoc => "rerdoc") do |rdoc|
+    rdoc.rdoc_dir = DOC_PATH.basename.to_s
+    rdoc.title = "#{NAME} #{CLASS_NAME::VERSION} Documentation"
+    rdoc.main = "README.doc"
+    rdoc.rdoc_files.include('README*')
+    rdoc.rdoc_files.include('lib/**/*.rb')
+  end
+end

data/tasks/gem.rake

@@ -0,0 +1,40 @@
+desc "Alias to gem:release"
+task :release => 'gem:release'
+
+desc "Alias to gem:install"
+task :install => 'gem:install'
+
+desc "Alias to gem:build"
+task :gem => 'gem:build'
+
+namespace :gem do
+  p gem_file = "#{NAME}-#{CLASS_NAME::VERSION}.gem"
+
+  desc "(Re-)Build gem"
+  task :build do
+    puts "Remove existing gem package"
+    rm_rf PKG_PATH
+    puts "Build new gem package"
+    system "gem build #{NAME}.gemspec"
+    puts "Move built gem to package dir"
+    mkdir_p PKG_PATH
+    mv gem_file, PKG_PATH
+  end
+
+  desc "Cleanup already installed gem(s)"
+  task :cleanup do
+    puts "Cleaning up installed gem(s)"
+    system "gem cleanup #{NAME}"
+  end
+
+  desc "Build and install gem"
+  task :install => :build do
+    system "gem install #{PKG_PATH}/#{gem_file}"
+  end
+
+  desc "Build and push gem to Gemcutter"
+  task :release => [:build, 'git:tag'] do
+    puts "Pushing gem to Gemcutter"
+    system "gem push #{PKG_PATH}/#{gem_file}"
+  end
+end

data/tasks/git.rake

@@ -0,0 +1,34 @@
+desc "Alias to git:commit"
+task :git => 'git:commit'
+
+namespace :git do
+
+  desc "Stage and commit your work [with message]"
+  task :commit, [:message] do |t, args|
+    puts "Staging new (unversioned) files"
+    system "git add --all"
+    if args.message
+      puts "Committing with message: #{args.message}"
+      system %Q[git commit -a -m "#{args.message}" --author arvicco]
+    else
+      puts "Committing"
+      system %Q[git commit -a -m "No message" --author arvicco]
+    end
+  end
+
+  desc "Push local changes to Github"
+  task :push => :commit do
+    puts "Pushing local changes to remote"
+    system "git push"
+  end
+
+  desc "Create (release) tag on Github"
+  task :tag => :push do
+    tag = CLASS_NAME::VERSION
+    puts "Creating git tag: #{tag}"
+    system %Q{git tag -a -m "Release tag #{tag}" #{tag}}
+    puts "Pushing #{tag} to remote"
+    system "git push origin #{tag}"
+  end
+
+end

data/tasks/spec.rake

@@ -0,0 +1,16 @@
+desc 'Alias to spec:spec'
+task :spec => 'spec:spec'
+
+namespace :spec do
+#  require 'spec/rake/spectask'
+  require 'rspec/core/rake_task'
+
+  desc "Run all specs"
+  RSpec::Core::RakeTask.new(:spec){|task|}
+
+  desc "Run specs with RCov"
+  RSpec::Core::RakeTask.new(:rcov) do |task|
+    task.rcov = true
+    task.rcov_opts = ['--exclude', 'spec']
+  end
+end

data/tasks/version.rake

@@ -0,0 +1,71 @@
+class Version
+  attr_accessor :major, :minor, :patch, :build
+
+  def initialize(version_string)
+    raise "Invalid version #{version_string}" unless version_string =~ /^(\d+)\.(\d+)\.(\d+)(?:\.(.*?))?$/
+    @major = $1.to_i
+    @minor = $2.to_i
+    @patch = $3.to_i
+    @build = $4
+  end
+
+  def bump_major(x)
+    @major += x.to_i
+    @minor = 0
+    @patch = 0
+    @build = nil
+  end
+
+  def bump_minor(x)
+    @minor += x.to_i
+    @patch = 0
+    @build = nil
+  end
+
+  def bump_patch(x)
+    @patch += x.to_i
+    @build = nil
+  end
+
+  def update(major, minor, patch, build=nil)
+    @major = major
+    @minor = minor
+    @patch = patch
+    @build = build
+  end
+
+  def write(desc = nil)
+    CLASS_NAME::VERSION_FILE.open('w') {|file| file.puts to_s }
+    (BASE_PATH + 'HISTORY').open('a') do |file|
+      file.puts "\n== #{to_s} / #{Time.now.strftime '%Y-%m-%d'}\n"
+      file.puts "\n* #{desc}\n" if desc
+    end
+  end
+
+  def to_s
+    [major, minor, patch, build].compact.join('.')
+  end
+end
+
+desc 'Set version: [x.y.z] - explicitly, [1/10/100] - bump major/minor/patch, [.build] - build'
+task :version, [:command, :desc] do |t, args|
+  version = Version.new(CLASS_NAME::VERSION)
+  case args.command
+    when /^(\d+)\.(\d+)\.(\d+)(?:\.(.*?))?$/  # Set version explicitly
+      version.update($1, $2, $3, $4)
+    when /^\.(.*?)$/                        # Set build
+      version.build = $1
+    when /^(\d{1})$/                          # Bump patch
+      version.bump_patch $1
+    when /^(\d{1})0$/                         # Bump minor
+      version.bump_minor $1
+    when /^(\d{1})00$/                        # Bump major
+      version.bump_major $1
+    else                                      # Unknown command, just display VERSION
+      puts "#{NAME} #{version}"
+      next
+  end
+
+  puts "Writing version #{version} to VERSION file"
+  version.write args.desc
+end

metadata

@@ -2,7 +2,7 @@
 name: mt_gox
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.7.3
+  version: 0.7.5
 platform: ruby
 authors: 
 - Erik Michaels-Ober
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-16 00:00:00 +03:00
+date: 2012-01-17 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -139,30 +139,33 @@ files:
 - .travis.yml
 - .yardopts
 - Gemfile
+- HISTORY
 - LICENSE.md
 - README.md
 - Rakefile
 - VERSION
 - lib/faraday/response/raise_mtgox_error.rb
 - lib/mtgox.rb
-- lib/mtgox/ask.rb
-- lib/mtgox/balance.rb
-- lib/mtgox/bid.rb
-- lib/mtgox/buy.rb
 - lib/mtgox/client.rb
 - lib/mtgox/configuration.rb
 - lib/mtgox/connection.rb
-- lib/mtgox/error.rb
-- lib/mtgox/max_bid.rb
-- lib/mtgox/min_ask.rb
-- lib/mtgox/offer.rb
-- lib/mtgox/order.rb
+- lib/mtgox/models.rb
+- lib/mtgox/models/ask.rb
+- lib/mtgox/models/balance.rb
+- lib/mtgox/models/bid.rb
+- lib/mtgox/models/buy.rb
+- lib/mtgox/models/max_bid.rb
+- lib/mtgox/models/min_ask.rb
+- lib/mtgox/models/model.rb
+- lib/mtgox/models/offer.rb
+- lib/mtgox/models/order.rb
+- lib/mtgox/models/sell.rb
+- lib/mtgox/models/ticker.rb
+- lib/mtgox/models/trade.rb
 - lib/mtgox/price_ticker.rb
 - lib/mtgox/request.rb
-- lib/mtgox/sell.rb
-- lib/mtgox/ticker.rb
-- lib/mtgox/trade.rb
 - lib/mtgox/version.rb
+- mt_gox.gemspec
 - spec/faraday/response_spec.rb
 - spec/fixtures/address.json
 - spec/fixtures/balance.json
@@ -179,6 +182,11 @@ files:
 - spec/helper.rb
 - spec/mtgox/client_spec.rb
 - spec/mtgox_spec.rb
+- tasks/doc.rake
+- tasks/gem.rake
+- tasks/git.rake
+- tasks/spec.rake
+- tasks/version.rake
 has_rdoc: true
 homepage: https://github.com/arvicco/mtgox
 licenses: []

data/lib/mtgox/ask.rb

@@ -1,16 +0,0 @@
-require 'mtgox/offer'
-
-module MtGox
-  class Ask < Offer
-
-    def initialize(price=nil, amount=nil)
-      self.price = price.to_f
-      self.amount = amount.to_f
-    end
-
-    def eprice
-      price / (1 - MtGox.commission)
-    end
-
-  end
-end

data/lib/mtgox/balance.rb

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

data/lib/mtgox/bid.rb

@@ -1,16 +0,0 @@
-require 'mtgox/offer'
-
-module MtGox
-  class Bid < Offer
-
-    def initialize(price=nil, amount=nil)
-      self.price = price.to_f
-      self.amount = amount.to_f
-    end
-
-    def eprice
-      price * (1 - MtGox.commission)
-    end
-
-  end
-end

data/lib/mtgox/buy.rb

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

data/lib/mtgox/error.rb

@@ -1,7 +0,0 @@
-module MtGox
-  # Custom error class for rescuing from all MtGox errors
-  class Error < StandardError; end
-
-  class MysqlError < Error; end
-end
-

data/lib/mtgox/max_bid.rb

@@ -1,10 +0,0 @@
-require 'mtgox/bid'
-require 'mtgox/price_ticker'
-require 'singleton'
-
-module MtGox
-  class MaxBid < Bid
-    include Singleton
-    include PriceTicker
-  end
-end

data/lib/mtgox/min_ask.rb

@@ -1,10 +0,0 @@
-require 'mtgox/ask'
-require 'mtgox/price_ticker'
-require 'singleton'
-
-module MtGox
-  class MinAsk < Ask
-    include Singleton
-    include PriceTicker
-  end
-end

data/lib/mtgox/offer.rb

@@ -1,5 +0,0 @@
-module MtGox
-  class Offer
-    attr_accessor :amount, :price
-  end
-end

data/lib/mtgox/order.rb

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

data/lib/mtgox/sell.rb

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

data/lib/mtgox/ticker.rb

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

data/lib/mtgox/trade.rb

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