mexbt 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2fd935693905edbab1bda0eec07c1dc337446288
-  data.tar.gz: 8e19ba7bccb2585c3805a7df905ad845590d28ae
+  metadata.gz: cc4cf3db2a64b534ef332ab4838e09ed1b8be033
+  data.tar.gz: 30035ad68d18845431c9341c32b202f66dae5fe6
 SHA512:
-  metadata.gz: a689255dbe126cba0dac1228e8eac535ea3a3f68dea148a1ec35638e701bf82467abdba516bb6e7f3492d695c6a54a6415117a0b2c262e0a78faabff8f67dff2
-  data.tar.gz: 74cc762b1724b3da51f8e8669522de45495644d1d2f65e1a4f629044b2f7e671661da7e1a1d313def0932c47eab2c59ab1608a7777b8ac6aab9932878c8e8f7a
+  metadata.gz: b56b257027bcddb33b227df3a2be160235d970a37560744516a3eae29e494ac3abaa9678d47ad8be60f511da715936d2cdfca2c5d7797b437077d188a51a3eaa
+  data.tar.gz: 9f88151bbb4e0e432c0051886daf2cc82397c91a02dde0cacd0973bde0eb60bebcb734d916ca360344c88d7ee5b6fd278fe147d395adf3ab6c48ce901fe6b8b0

data/CHANGELOG.md

@@ -0,0 +1,5 @@
+## 0.0.6
+
+* BREAKING CHANGES: removed Mexbt::Account and Mexbt::Orders module, you should instantiate an instance of Mexbt::Account class, see README for examples
+
+

data/Gemfile.lock

@@ -1,21 +1,21 @@
 PATH
   remote: .
   specs:
-    mexbt (0.0.4)
+    mexbt (0.0.6)
       activesupport (>= 4.1.8)
       rest_client (= 1.8.2)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (4.1.8)
-      i18n (~> 0.6, >= 0.6.9)
+    activesupport (4.2.0)
+      i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
-      thread_safe (~> 0.1)
+      thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
     diff-lcs (1.2.5)
-    i18n (0.6.11)
+    i18n (0.7.0)
     json (1.8.1)
     minitest (5.5.0)
     netrc (0.7.9)

data/README.md

@@ -19,50 +19,81 @@ You need to be using Ruby 2.1 or higher.
 
 You can access all the Public API functions with zero configuration. By default they will use the 'BTCMXN' currency pair.
 
-    Mexbt.ticker
-    Mexbt.order_book
-    Mexbt.trades(start_index: -1, count: 20)
-    Mexbt.trades_by_date(from: Date.civil(2014, 11, 1).to_time.to_i, to: Date.today.to_time.to_i)
-    Mexbt.simulate_market_order(side: :buy, second_currency: 1000, currency_pair: 'btcmxn') # Simulates a market order, which will estimate how many btc you will receive for 1000 mxn
-    Mexbt.simulate_market_order(side: :buy, first_currency: 1, currency_pair: 'btcmxn') # Simulates a market order, which will estimate how many mxn you will spend for 1 btc
+```ruby
+Mexbt.ticker
+Mexbt.order_book
+Mexbt.trades(start_index: -1, count: 20)
+Mexbt.trades_by_date(from: Date.civil(2014, 11, 1).to_time.to_i, to: Date.today.to_time.to_i)
+Mexbt.simulate_market_order(side: :buy, second_currency: 1000, currency_pair: 'btcmxn') # Simulates a market order, which will estimate how many btc you will receive for 1000 mxn
+Mexbt.simulate_market_order(side: :buy, first_currency: 1, currency_pair: 'btcmxn') # Simulates a market order, which will estimate how many mxn you will spend for 1 btc
+```
 
 If you want to choose another currency pair, you can configure it for all calls:
 
-    Mexbt.configure { |c| c.currency_pair: 'BTCUSD' }
+```ruby
+Mexbt.configure { |c| c.currency_pair: 'BTCUSD' }
+```
 
 Or alternatively you can set it per call:
 
-    Mexbt.ticker(currency_pair: 'BTCUSD')
+```ruby
+Mexbt.ticker(currency_pair: 'BTCUSD')
+```
 
 ## Private API
 
-
-### Configuration
+### API Keys
 
 You need to generate an API key pair at https://mexbt.com/api/keys. However if you want to get started quickly we recommend having a play in the sandbox first, see the 'Sandbox' section below.
 
-    Mexbt.configure do |c|
-        mexbt.public_key = "xxx"
-        mexbt.private_key = "yyy"
-        mexbt.user_id = "email@test.com" # Your registered email address
-        mexbt.sandbox = true # Set this to true to use the sandbox
-    end
+### Static configuration
+
+If you will only be using one account in your application, it's easier to configure statically:
+
+```ruby
+Mexbt.configure do |c|
+    mexbt.public_key = "xxx"
+    mexbt.private_key = "yyy"
+    mexbt.user_id = "email@test.com" # Your registered email address
+    mexbt.sandbox = true # Set this to true to use the sandbox
+end
+```
+
+Then to access private functions just instantiate an instance of Mexbt::Account:
+
+```ruby
+Mexbt::Account.new.info
+```
+
+### Per-instance configuration
+
+If you need to manage multiple meXBT accounts you should configure per each instance of Mexbt::Account:
+
+```ruby
+account = Mexbt::Account.new(public_key: 'xxx', private_key: 'yyy', user_id: 'email@test.com', sandbox: true)
+account.balance
+```
 
 ## Order functions
 
-    Mexbt::Orders.create(amount: 0.1, currency_pair: 'btcmxn') # Create a market buy order for 0.1 BTC for Pesos
-    Mexbt::Orders.create(amount: 2, side: :sell, currency_pair: 'btcusd') # Create a market order to sell 2 BTC for USD
-    Mexbt::Orders.create(amount: 2, price: 1, side: :buy, type: :limit, currency_pair: 'ltcmxn') # Create a limit order to buy 2 LTC for 1 peso
-    Mexbt::Orders.cancel(id: 123, currency_pair: 'btcmxn')
-    Mexbt::Orders.cancel_all() # Cancel all orders for the default currency pair
+```ruby
+account.create_order(amount: 0.1, currency_pair: 'btcmxn') # Create a market buy order for 0.1 BTC for Pesos
+account.create_order(amount: 2, side: :sell, currency_pair: 'btcusd') # Create a market order to sell 2 BTC for USD
+account.create_order(amount: 2, price: 1, side: :buy, type: :limit, currency_pair: 'ltcmxn') # Create a limit order to buy 2 LTC for 1 peso
+account.cancel_order(id: 123, currency_pair: 'btcmxn')
+account.cancel_all_orders() # Cancel all orders for the default currency pair
+```
 
 ### Account functions
 
-    Mexbt::Account.balance
-    Mexbt::Account.trades
-    Mexbt::Account.orders
-    Mexbt::Account.deposit_addresses
-    Mexbt::Account.withdraw(amount: 1, currency: :btc, address: 'xxx')  Mexbt::Account.info # Fetches your user info
+```ruby
+account.balance
+account.trades
+account.orders
+account.deposit_addresses
+account.withdraw(amount: 1, currency: :btc, address: 'xxx')
+account.info # Fetches your user info
+```
 
 ### Sandbox
 
@@ -80,7 +111,6 @@ API docs for the Private API are at http://docs.mexbtprivateapi.apiary.io
 
 There are also docs for the Private API sandbox at http://docs.mexbtprivateapisandbox.apiary.io
 
-
 ## TODO
 
 Mock out web calls with WebMock so that specs don't break everytime sandbox db is cleaned.

data/lib/mexbt/account.rb

@@ -1,10 +1,29 @@
-require 'mexbt/private'
 require 'mexbt/common'
 
 module Mexbt
-  module Account
-    include Mexbt::Private
+  class Account
     include Mexbt::Common
+    include Mexbt::Client
+
+    def initialize(credentials={})
+      recognized_credentials = [:public_key, :private_key, :user_id, :currency_pair, :sandbox]
+      recognized_credentials.each do |k|
+        credential = credentials[k] || Mexbt.send(k)
+        instance_variable_set(:"@#{k}", credentials[k])
+      end
+    end
+
+    def private?
+      true
+    end
+
+    def sandbox
+      @sandbox || Mexbt.sandbox
+    end
+
+    def endpoint
+      "https://private-api#{sandbox ? '-sandbox' : nil}.mexbt.com"
+    end
 
     %w{info balance orders deposit_addresses}.each do |m|
       define_method(m) do
@@ -15,5 +34,50 @@ module Mexbt
     def withdraw(amount:, address:, currency: :btc)
       call("withdraw", { ins: currency, amount: amount, sentToAddress: address })
     end
+
+    def create_order(amount:, price: nil, currency_pair: Mexbt.currency_pair, side: :buy, type: :market)
+      # Horribly hack because sandbox only accepts 6 decimal places thanks to AP
+      if Mexbt.sandbox
+        amount = BigDecimal.new(amount, 15).round(6).to_f
+      end
+      type =
+        case type
+        when :market, 1
+          1
+        when :limit, 0
+          0
+        else
+          raise "Unknown order type '#{type}'"
+        end
+      params = {
+        ins: currency_pair,
+        side: side,
+        orderType: type,
+        qty: amount
+      }
+      params[:px] = price if price
+      call("orders/create", params)
+    end
+
+    def cancel_order(id:, currency_pair: Mexbt.currency_pair)
+      call("orders/cancel", { ins: currency_pair, serverOrderId: id })
+    end
+
+    def cancel_all_orders(currency_pair: Mexbt.currency_pair)
+      call("orders/cancel-all", { ins: currency_pair } )
+    end
+
+    def modify_order(id:, action:, currency_pair: Mexbt.currency_pair)
+      action =
+        case action
+        when :move_to_top, 0
+          0
+        when :execute_now, 1
+          1
+        else
+          raise "Action must be one of: :move_to_top, :execute_now"
+        end
+      call("orders/modify", { ins: currency_pair, serverOrderId: id, modifyAction: action } )
+    end
   end
 end

data/lib/mexbt/client.rb

@@ -10,18 +10,30 @@ module Mexbt
       "#{endpoint()}/v1/#{path}"
     end
 
+    def public_key
+      @public_key || Mexbt.public_key
+    end
+
+    def private_key
+      @private_key || Mexbt.private_key
+    end
+
+    def user_id
+      @user_id || Mexbt.user_id
+    end
+
     def auth_params
-      if Mexbt.public_key.nil? || Mexbt.private_key.nil?
+      if public_key.nil? || private_key.nil?
         raise "You must configure your API keys!"
       end
-      if Mexbt.user_id.nil?
+      if user_id.nil?
         raise "You must configure your user_id!"
       end
       nonce = (Time.now.to_f*10000).to_i
       {
-        apiKey: Mexbt.public_key,
+        apiKey: public_key,
         apiNonce: nonce,
-        apiSig: OpenSSL::HMAC.hexdigest('sha256', Mexbt.private_key, "#{nonce}#{Mexbt.user_id}#{Mexbt.public_key}").upcase
+        apiSig: OpenSSL::HMAC.hexdigest('sha256', private_key, "#{nonce}#{user_id}#{public_key}").upcase
       }
     end
 

data/lib/mexbt/version.rb

@@ -1,3 +1,3 @@
 module Mexbt
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/lib/mexbt.rb

@@ -1,8 +1,8 @@
+require 'active_support'
 require 'active_support/core_ext'
 require 'active_support/inflector'
 require 'mexbt/public'
 require 'mexbt/account'
-require 'mexbt/orders'
 
 module Mexbt
   mattr_accessor :public_key
@@ -19,12 +19,6 @@ module Mexbt
 
   extend Mexbt::Public
 
-  module Account
-    extend Mexbt::Account
-  end
+end
 
-  module Orders
-    extend Mexbt::Orders
-  end
 
-end

data/spec/private_api_spec.rb

@@ -1,9 +1,11 @@
 require 'spec_helper'
 
-describe Mexbt::Private do
+describe Mexbt::Account do
 
   context "without authentication" do
 
+    subject(:account) { Mexbt::Account.new }
+
     after do
       Mexbt.configure do |c|
          c.public_key = nil
@@ -12,7 +14,7 @@ describe Mexbt::Private do
     end
 
     it "should raise a friendly error if no keys are configured" do
-      expect { Mexbt::Account.balance }.to raise_error("You must configure your API keys!")
+      expect { account.balance }.to raise_error("You must configure your API keys!")
     end
 
     it "should raise a friendly error if no user_id is configured" do
@@ -20,17 +22,29 @@ describe Mexbt::Private do
         c.public_key = "foo"
         c.private_key = "bar"
       end
-      expect { Mexbt::Account.balance }.to raise_error("You must configure your user_id!")
+      expect { account.balance }.to raise_error("You must configure your user_id!")
+    end
+
+  end
+
+  context "with per-instance authentication" do
+
+    subject(:account) { Mexbt::Account.new(public_key: "fa4ed1ce8040f66b1bf8708aedff3c16", private_key: "09c4aa0a971eb453378768e7d2d4147e", user_id: "test@mexbt.com", sandbox: true) }
+
+    it "still works" do
+      expect(account.info[:isAccepted]).to be true
     end
 
   end
 
   context "with authentication" do
 
+    subject(:account) { Mexbt::Account.new }
+
     before do
       Mexbt.configure do |c|
-        c.public_key = "56dd4872e23f9e326c0184552791f6f7"
-        c.private_key = "23a9814d6cf3cbb641bc41eb0b2115de"
+        c.public_key = "fa4ed1ce8040f66b1bf8708aedff3c16"
+        c.private_key = "09c4aa0a971eb453378768e7d2d4147e"
         c.user_id = "test@mexbt.com"
         c.sandbox = true
       end
@@ -43,82 +57,74 @@ describe Mexbt::Private do
       end
     end
 
-    context Mexbt::Account do
-
-      it "gives a valid response to all public api functions that require no args" do
-        %w{info balance orders deposit_addresses trades}.each do |f|
-          res = Mexbt::Account.send(f)
-          expect(res["isAccepted"]).to be true
-        end
+    it "gives a valid response to all api functions that require no args" do
+      %w{info balance orders deposit_addresses trades}.each do |f|
+        res = account.send(f)
+        expect(res[:isAccepted]).to be true
       end
-
     end
 
-    context Mexbt::Orders do
-
-      it "allows creating market orders" do
-        res = Mexbt::Orders.create(amount: 0.1, currency_pair: "BTCUSD")
-        expect(res["isAccepted"]).to be true
-        expect(res["serverOrderId"]).to be_a(Fixnum)
-      end
+    it "allows creating market orders" do
+      res = account.create_order(amount: 0.1, currency_pair: "BTCUSD")
+      expect(res[:isAccepted]).to be true
+      expect(res[:serverOrderId]).to be_a(Fixnum)
+    end
 
-      it "allows creating orders with 8 decimal places" do
-        res = Mexbt::Orders.create(amount: 0.12345678, currency_pair: "BTCUSD")
-        expect(res["isAccepted"]).to be true
-        expect(res["serverOrderId"]).to be_a(Fixnum)
-      end
+    it "allows creating orders with 8 decimal places" do
+      res = account.create_order(amount: 0.12345678, currency_pair: "BTCUSD")
+      expect(res[:isAccepted]).to be true
+      expect(res[:serverOrderId]).to be_a(Fixnum)
+    end
 
-      it "allows creating limit orders" do
-        res = Mexbt::Orders.create(type: :limit, price: 100, amount: 0.1234, currency_pair: "BTCUSD")
-        expect(res["isAccepted"]).to be true
-        expect(res["serverOrderId"]).to be_a(Fixnum)
-      end
+    it "allows creating limit orders" do
+      res = account.create_order(type: :limit, price: 100, amount: 0.1234, currency_pair: "BTCUSD")
+      expect(res[:isAccepted]).to be true
+      expect(res[:serverOrderId]).to be_a(Fixnum)
+    end
 
-      it "raises an exception if order type not recognised" do
-        expect { Mexbt::Orders.create(type: :boom, amount: 0.2) }.to raise_error("Unknown order type 'boom'")
-      end
+    it "raises an exception if order type not recognised" do
+      expect { account.create_order(type: :boom, amount: 0.2) }.to raise_error("Unknown order type 'boom'")
+    end
 
-      context "modifying and cancelling orders" do
+    context "modifying and cancelling orders" do
 
-        let(:order_id) {Mexbt::Orders.create(type: :limit, price: 100, amount: 0.1, currency_pair: "BTCUSD")["serverOrderId"]}
+      let(:order_id) {account.create_order(type: :limit, price: 100, amount: 0.1, currency_pair: "BTCUSD")[:serverOrderId]}
 
-        it "allows converting limit orders to market orders" do
-          res = Mexbt::Orders.modify(id: order_id, currency_pair: "BTCUSD", action: :execute_now)
-          expect(res["isAccepted"]).to be true
-        end
+      it "allows converting limit orders to market orders" do
+        res = account.modify_order(id: order_id, currency_pair: "BTCUSD", action: :execute_now)
+        expect(res[:isAccepted]).to be true
+      end
 
-        it "allows moving orders to the top of the book" do
-          res = Mexbt::Orders.modify(id: order_id, currency_pair: "BTCUSD", action: :move_to_top)
-          expect(res["isAccepted"]).to be true
-        end
+      it "allows moving orders to the top of the book" do
+        res = account.modify_order(id: order_id, currency_pair: "BTCUSD", action: :move_to_top)
+        expect(res[:isAccepted]).to be true
+      end
 
-        it "allows cancelling individual orders" do
-          res = Mexbt::Orders.cancel(id: order_id, currency_pair: "BTCUSD")
-          expect(res["isAccepted"]).to be true
-          orders = Mexbt::Account.orders["openOrdersInfo"]
-          orders.each do |open_orders|
-            if open_orders["ins"] === "BTCUSD"
-              open_orders["openOrders"].each do |usd_order|
-                if usd_order["ServerOrderId"] === order_id
-                  fail("Order was cancelled but still open")
-                end
+      it "allows cancelling individual orders" do
+        res = account.cancel_order(id: order_id, currency_pair: "BTCUSD")
+        expect(res[:isAccepted]).to be true
+        orders = account.orders[:openOrdersInfo]
+        orders.each do |open_orders|
+          if open_orders[:ins] === "BTCUSD"
+            open_orders[:openOrders].each do |usd_order|
+              if usd_order[:ServerOrderId] === order_id
+                fail("Order was cancelled but still open")
               end
             end
           end
         end
+      end
 
-        it "allows cancelling all orders" do
-          res = Mexbt::Orders.cancel_all(currency_pair: "BTCUSD")
-          expect(res["isAccepted"]).to be true
-          orders = Mexbt::Account.orders["openOrdersInfo"]
-          orders.each do |open_orders|
-            if open_orders["ins"] === "BTCUSD"
-              expect(open_orders["openOrders"]).to eql([])
-            end
+      it "allows cancelling all orders" do
+        res = account.cancel_all_orders(currency_pair: "BTCUSD")
+        expect(res[:isAccepted]).to be true
+        orders = account.orders[:openOrdersInfo]
+        orders.each do |open_orders|
+          if open_orders[:ins] === "BTCUSD"
+            expect(open_orders[:openOrders]).to eql([])
           end
         end
       end
-
     end
 
   end

data/spec/public_api_spec.rb

@@ -5,35 +5,35 @@ describe Mexbt do
   it "gives a valid response to all public api functions that require no args" do
     %w{ticker trades currency_pairs product_pairs orders order_book}.each do |f|
       res = Mexbt.send(f)
-      expect(res["isAccepted"]).to be true
+      expect(res[:isAccepted]).to be true
     end
   end
 
   it "allows passing a custom currency pair to functions that accept it" do
     %w{ticker trades orders order_book}.each do |f|
       res = Mexbt.send(f, currency_pair: 'BTCUSD')
-      expect(res["isAccepted"]).to be true
+      expect(res[:isAccepted]).to be true
     end
   end
 
   it "allows you to fetch trades by date range" do
     res = Mexbt.trades_by_date(from: Time.now.to_i, to: Time.now.to_i)
-    expect(res["isAccepted"]).to be true
-    expect(res["trades"]).to eql([])
+    expect(res[:isAccepted]).to be true
+    expect(res[:trades]).to eql([])
   end
 
   it "fetches btcmxn order book data from data API if AP API down" do
-    expect(Mexbt).to receive(:call).with("order-book", { productPair: :btcmxn }).and_raise("Boom")
+    expect(Mexbt).to receive(:call).with("order-book", { productPair: :btcmxn }).and_raise(RestClient::RequestFailed)
     order_book = Mexbt.order_book
-    expect(order_book["asks"].first["px"]).to be_a_kind_of(Numeric)
-    expect(order_book["asks"].first["qty"]).to be_a_kind_of(Numeric)
-    expect(order_book["bids"].first["px"]).to be_a_kind_of(Numeric)
-    expect(order_book["bids"].first["qty"]).to be_a_kind_of(Numeric)
+    expect(order_book[:asks].first[:px]).to be_a_kind_of(Numeric)
+    expect(order_book[:asks].first[:qty]).to be_a_kind_of(Numeric)
+    expect(order_book[:bids].first[:px]).to be_a_kind_of(Numeric)
+    expect(order_book[:bids].first[:qty]).to be_a_kind_of(Numeric)
   end
 
   it "simulates market order using data api data if AP API down" do
-    expect(Mexbt).to receive(:call).with("order-book", { productPair: :btcmxn }).and_raise("Boom")
-    expect(Mexbt.simulate_market_order(second_currency: 100)["first_amount"]).to be_a_kind_of(Numeric)
+    expect(Mexbt).to receive(:call).with("order-book", { productPair: :btcmxn }).and_raise(RestClient::RequestFailed)
+    expect(Mexbt.simulate_market_order(second_currency: 100)[:first_amount]).to be_a_kind_of(Numeric)
   end
 
   context "simulating market orders" do
@@ -48,33 +48,33 @@ describe Mexbt do
     end
 
     it "calculates correctly buy orders with second_currency as the target currency" do
-      expect(Mexbt.simulate_market_order(second_currency: 100)["first_amount"]).to eql(0.1)
-      expect(Mexbt.simulate_market_order(second_currency: 500)["first_amount"]).to eql(0.5)
-      expect(Mexbt.simulate_market_order(second_currency: 600)["first_amount"]).to eql(0.55)
-      expect(Mexbt.simulate_market_order(second_currency: 1500)["first_amount"]).to eql(1.0)
-      expect(Mexbt.simulate_market_order(second_currency: 2500)["first_amount"]).to eql(1.5)
+      expect(Mexbt.simulate_market_order(second_currency: 100)[:first_amount]).to eql(0.1)
+      expect(Mexbt.simulate_market_order(second_currency: 500)[:first_amount]).to eql(0.5)
+      expect(Mexbt.simulate_market_order(second_currency: 600)[:first_amount]).to eql(0.55)
+      expect(Mexbt.simulate_market_order(second_currency: 1500)[:first_amount]).to eql(1.0)
+      expect(Mexbt.simulate_market_order(second_currency: 2500)[:first_amount]).to eql(1.5)
       expect { Mexbt.simulate_market_order(second_currency: 2501)}.to raise_error("Order book does not contain enough orders to satify simulated order!")
     end
 
     it "calculates correctly buy orders with first_currency as the target currency" do
-      expect(Mexbt.simulate_market_order(first_currency: 0.5)["second_amount"]).to eql(500.0)
-      expect(Mexbt.simulate_market_order(first_currency: 1.5)["second_amount"]).to eql(2500.0)
-      expect(Mexbt.simulate_market_order(first_currency: 0.1)["second_amount"]).to eql(100.0)
-      expect(Mexbt.simulate_market_order(first_currency: 0.6)["second_amount"]).to eql(700.0)
+      expect(Mexbt.simulate_market_order(first_currency: 0.5)[:second_amount]).to eql(500.0)
+      expect(Mexbt.simulate_market_order(first_currency: 1.5)[:second_amount]).to eql(2500.0)
+      expect(Mexbt.simulate_market_order(first_currency: 0.1)[:second_amount]).to eql(100.0)
+      expect(Mexbt.simulate_market_order(first_currency: 0.6)[:second_amount]).to eql(700.0)
     end
 
     it "calculates correctly sell orders with first_currency as the target currency" do
-      expect(Mexbt.simulate_market_order(side: :sell, first_currency: 0.01)["second_amount"]).to eql(20.0)
-      expect(Mexbt.simulate_market_order(side: :sell, first_currency: 0.1)["second_amount"]).to eql(200.0)
-      expect(Mexbt.simulate_market_order(side: :sell, first_currency: 1)["second_amount"]).to eql(2000.0)
-      expect(Mexbt.simulate_market_order(side: :sell, first_currency: 1.1)["second_amount"]).to eql(2100.0)
-      expect(Mexbt.simulate_market_order(side: :sell, first_currency: 1.4)["second_amount"]).to eql(2400.0)
+      expect(Mexbt.simulate_market_order(side: :sell, first_currency: 0.01)[:second_amount]).to eql(20.0)
+      expect(Mexbt.simulate_market_order(side: :sell, first_currency: 0.1)[:second_amount]).to eql(200.0)
+      expect(Mexbt.simulate_market_order(side: :sell, first_currency: 1)[:second_amount]).to eql(2000.0)
+      expect(Mexbt.simulate_market_order(side: :sell, first_currency: 1.1)[:second_amount]).to eql(2100.0)
+      expect(Mexbt.simulate_market_order(side: :sell, first_currency: 1.4)[:second_amount]).to eql(2400.0)
     end
 
     it "calculates correctly sell orders with second_currency as the target currency" do
-      expect(Mexbt.simulate_market_order(side: :sell, second_currency: 1000)["first_amount"]).to eql(0.5)
-      expect(Mexbt.simulate_market_order(side: :sell, second_currency: 2001)["first_amount"]).to eql(1.001)
-      expect(Mexbt.simulate_market_order(side: :sell, second_currency: 2500)["first_amount"]).to eql(1.5)
+      expect(Mexbt.simulate_market_order(side: :sell, second_currency: 1000)[:first_amount]).to eql(0.5)
+      expect(Mexbt.simulate_market_order(side: :sell, second_currency: 2001)[:first_amount]).to eql(1.001)
+      expect(Mexbt.simulate_market_order(side: :sell, second_currency: 2500)[:first_amount]).to eql(1.5)
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mexbt
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - williamcoates
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-21 00:00:00.000000000 Z
+date: 2015-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -89,6 +89,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- CHANGELOG.md
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -98,8 +99,6 @@ files:
 - lib/mexbt/account.rb
 - lib/mexbt/client.rb
 - lib/mexbt/common.rb
-- lib/mexbt/orders.rb
-- lib/mexbt/private.rb
 - lib/mexbt/public.rb
 - lib/mexbt/version.rb
 - mexbt.gemspec

data/lib/mexbt/orders.rb

@@ -1,53 +0,0 @@
-require 'mexbt/private'
-
-module Mexbt
-  module Orders
-    include Mexbt::Private
-
-    def create(amount:, price: nil, currency_pair: Mexbt.currency_pair, side: :buy, type: :market)
-      # Horribly hack because sandbox only accepts 6 decimal places thanks to AP
-      if Mexbt.sandbox
-        amount = BigDecimal.new(amount, 15).round(6).to_f
-      end
-      type =
-        case type
-        when :market, 1
-          1
-        when :limit, 0
-          0
-        else
-          raise "Unknown order type '#{type}'"
-        end
-      params = {
-        ins: currency_pair,
-        side: side,
-        orderType: type,
-        qty: amount
-      }
-      params[:px] = price if price
-      call("orders/create", params)
-    end
-
-    def cancel(id:, currency_pair: Mexbt.currency_pair)
-      call("orders/cancel", { ins: currency_pair, serverOrderId: id })
-    end
-
-    def cancel_all(currency_pair: Mexbt.currency_pair)
-      call("orders/cancel-all", { ins: currency_pair } )
-    end
-
-    def modify(id:, action:, currency_pair: Mexbt.currency_pair)
-      action =
-        case action
-        when :move_to_top, 0
-          0
-        when :execute_now, 1
-          1
-        else
-          raise "Action must be one of: :move_to_top, :execute_now"
-        end
-      call("orders/modify", { ins: currency_pair, serverOrderId: id, modifyAction: action } )
-    end
-
-  end
-end

data/lib/mexbt/private.rb

@@ -1,16 +0,0 @@
-require 'mexbt/client'
-
-
-module Mexbt
-  module Private
-    include Mexbt::Client
-
-    def private?
-      true
-    end
-
-    def endpoint
-      "https://private-api#{Mexbt.sandbox ? '-sandbox' : nil}.mexbt.com"
-    end
-  end
-end