trade-o-matic 0.3.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ffa9eaa9a1e1e4a7ae37faf694d4882fb95a356c
-  data.tar.gz: c184b0499a3414f1155ef69ddd22717456093075
+  metadata.gz: 10edb6d47a3ca071570ab17ed6559306c6a3f1c3
+  data.tar.gz: 0fd5ae2dec38031376ec526f6dcd9050c012eb63
 SHA512:
-  metadata.gz: 5f8ba8f453091a648e7f953f9f7375e55c1c223ea15508867122371786b414aa0c03c1c2b467aba83f5136a37dfdffa17c201b172b2d25012d12be8a67939ede
-  data.tar.gz: c4caec6d3f480b81e0f81bc2e692cb63d4c8e0af80bc2883247ad826bbc8f5e35cb9ffe4fbcc294a9e1a1097e0ba8a40bf7ad2084dbb746d8815bd90bbf60371
+  metadata.gz: 7b6fdc892965766b66919c22e237fdb944fc1d81b6693c273e3d9e8b4644c556a1b317f46596e376b6b713dd2a4e581c97311ce64280a90001be91c506a44ad9
+  data.tar.gz: 27ebedede4d516d9c33b5e88a32854790adee9d66f7cf7a295518b73394646631760949ab5358917ae6ca8f3360a1532dce5fedd3cd7942cb7207d342582f7f6

data/lib/trade-o-matic/adapters/base/raw_resource.rb

@@ -1,6 +1,5 @@
 module Trader
   class RawResource
-
     def self.enforce_attr(*_attrs)
       _attrs.each do |att|
         define_method(att) do
@@ -26,6 +25,5 @@ module Trader
     def initialize(_raw)
       @raw = _raw
     end
-
   end
 end

data/lib/trade-o-matic/adapters/base_backend.rb

@@ -0,0 +1,62 @@
+require 'trade-o-matic/adapters/base/raw_account_order'
+require 'trade-o-matic/adapters/base/raw_balance'
+
+module Trader
+  class BaseBackend
+    attr_reader :name
+
+    def initialize(_name)
+      @name = _name
+    end
+
+    def get_available_markets
+      []
+    end
+
+    def fill_book(_book)
+      not_supported :book
+    end
+
+    def get_session(_credentials)
+      _credentials
+    end
+
+    def get_balance(_session, _currency)
+      not_supported :get_balance
+    end
+
+    def generate_endpoint(_session, _currency)
+      not_supported :deposit
+    end
+
+    def withdraw_to_endpoint(_session, _currency, _amount, _endpoint)
+      not_supported :withdraw
+    end
+
+    def get_orders(_session, _pair)
+      not_supported :list_orders
+    end
+
+    def create_order(_session, _pair, _volume, _price, _type)
+      not_supported :create_order
+    end
+
+    def fetch_order(_session, _id)
+      not_supported :fetch_order
+    end
+
+    def cancel_order(_session, _id)
+      not_supported :cancel_order
+    end
+
+    def not_supported(_feature)
+      raise NotSupportedError.new name, _feature
+    end
+
+    private
+
+    def error(_messsage)
+      raise BackendError.new name, _messsage
+    end
+  end
+end

data/lib/trade-o-matic/adapters/bitfinex_backend.rb

@@ -1,11 +1,9 @@
 require 'rest-client'
 require 'base64'
 require 'json'
-require 'trade-o-matic/adapters/base/raw_account_order'
-require 'trade-o-matic/adapters/base/raw_balance'
 
 module Trader
-  class BitfinexBackend
+  class BitfinexBackend < BaseBackend
     BASE_CUR = Currency.for_code(:BTC)
     QUOTE_CUR = Currency.for_code(:BITFINEX_USD)
     MAIN_MARKET = CurrencyPair.new BASE_CUR, QUOTE_CUR
@@ -42,8 +40,8 @@ module Trader
       end
     end
 
-    def initialize(_session=nil)
-      @session = _session
+    def initialize
+      super :bitfinex
     end
 
     def get_available_markets
@@ -65,28 +63,29 @@ module Trader
       end
     end
 
-    def get_session(_credentials)
-      _credentials
+    def get_session(_cred)
+      raise AssertError, 'missing credentials' if !_cred.key?(:api_key) || !_cred.key?(:secret)
+      _cred
     end
 
     def get_balance(_session, _currency)
-      raise "#{_currency} not supported" unless _currency == BASE_CUR || _currency == QUOTE_CUR
-
       raw = auth_post(_session, 'balances')
       wrap_balance raw, _currency
     end
 
-    def get_orders(_session, _pair)
-      raise 'market not supported' unless _pair == MAIN_MARKET
+    def withdraw_to_endpoint(_session, _currency, _amount, _endpoint)
+      not_supported "usd withdrawals" if _currency == QUOTE_CUR
+      execute_btc_withdraw(_session, _amount, _endpoint)
+    end
 
+    def get_orders(_session, _pair)
       raw = auth_post(_session, 'orders')
       raw = raw.select { |o| o['type'].include? 'limit' }
       raw.map { |o| wrap_order o }
     end
 
     def create_order(_session, _pair, _volume, _price, _type)
-      raise 'market not supported' unless _pair == MAIN_MARKET
-      raise 'market orders not supported' if _price.nil?
+      not_supported "market orders" if _price.nil?
 
       wrap_order auth_post(_session, 'order/new', {
         exchange: "bitfinex",
@@ -118,8 +117,6 @@ module Trader
     end
 
     def auth_post(_creds, _url, _data = {})
-      raise ArgumentError if !_creds.key?(:api_key) or !_creds.key?(:secret)
-
       payload = build_payload("/v1/#{_url}", _data)
       headers = {
         'Content-Type' => 'application/json',
@@ -158,5 +155,23 @@ module Trader
     def wrap_order(_raw)
       OrderAdaptor.new _raw
     end
+
+    def execute_btc_withdraw(_session, _amount, _endpoint)
+      case _endpoint
+      when BitcoinAddress
+        auth_post(_session, 'withdraw', {
+          withdraw_type: 'bitcoin',
+          walletselected: 'exchange',
+          amount: _amount.to_s('F'),
+          address: _endpoint.address
+        })
+      else
+        not_supported "endpoint not supported"
+      end
+    end
+
+    def process_withdraw(_raw)
+      error _raw['message'] if _raw['status'] == 'error'
+    end
   end
 end

data/lib/trade-o-matic/adapters/bitstamp_backend.rb

@@ -1,10 +1,8 @@
 require 'rest-client'
 require 'json'
-require 'trade-o-matic/adapters/base/raw_account_order'
-require 'trade-o-matic/adapters/base/raw_balance'
 
 module Trader
-  class BitstampBackend
+  class BitstampBackend < BaseBackend
     BASE_CUR = Currency.for_code(:BTC)
     QUOTE_CUR = Currency.for_code(:BITSTAMP_USD)
     MAIN_MARKET = CurrencyPair.new BASE_CUR, QUOTE_CUR
@@ -42,8 +40,8 @@ module Trader
       end
     end
 
-    def initialize(_session=nil)
-      @session = _session
+    def initialize
+      super :bitstamp
     end
 
     def get_available_markets
@@ -65,13 +63,7 @@ module Trader
       end
     end
 
-    def get_session(_credentials)
-      _credentials
-    end
-
     def get_balance(_session, _currency)
-      raise "#{_currency} not supported" unless _currency == BASE_CUR || _currency == QUOTE_CUR
-
       raw = execute_request(_session || session, 'balance')
 
       if _currency == BASE_CUR
@@ -82,15 +74,12 @@ module Trader
     end
 
     def get_orders(_session, _pair)
-      raise 'market not supported' unless _pair == MAIN_MARKET
-
       raw_orders = execute_request(_session || session, 'open_orders')
       raw_orders.map { |o| normalize_raw_order o }
     end
 
     def create_order(_session, _pair, _volume, _price, _type)
-      raise 'market not supported' unless _pair == MAIN_MARKET
-      raise 'market orders not supported' if _price.nil?
+      not_supported('market orders') if _price.nil?
 
       normalize_raw_order execute_request(
         _session || session,
@@ -107,10 +96,6 @@ module Trader
       )
     end
 
-    def cancel_order(_session, _id)
-      # TODO
-    end
-
     private
 
     attr_reader :session

data/lib/trade-o-matic/adapters/fake_backend.rb

@@ -1,11 +1,10 @@
 require 'rest-client'
 require 'json'
-require 'trade-o-matic/adapters/base/raw_account_order'
 require 'rainbow'
 require 'rainbow/ext/string'
 
 module Trader
-  class FakeBackend
+  class FakeBackend < BaseBackend
     class FakeBalance < Struct.new(:amount, :available_amount);
     end
 
@@ -46,6 +45,7 @@ module Trader
     end
 
     def initialize(_config=nil)
+      super :fake
       get_session(_config) unless _config.nil?
     end
 

data/lib/trade-o-matic/adapters/game_backend.rb

@@ -1,8 +1,12 @@
 require 'json'
 require 'rainbow'
 require 'rainbow/ext/string'
-require 'trade-o-matic/adapters/base/raw_account_order'
-require 'trade-o-matic/adapters/base/raw_balance'
+
+module Trader
+  # This is needed to prevent one of the subclass files from defining
+  # the class without the superclass.
+  class GameBackend < BaseBackend; end
+end
 
 require 'trade-o-matic/adapters/game_backend/configuration'
 require 'trade-o-matic/adapters/game_backend/sfm'
@@ -40,6 +44,7 @@ module Trader
     attr_reader :verbose, :state
 
     def initialize
+      super :game
       @state = State.new
     end
 
@@ -81,7 +86,7 @@ module Trader
     end
 
     def get_session(_config)
-      raise ArgumentError, 'must provide login information' if _config.nil? or _config[:name].nil?
+      raise AssertError, 'must provide login information' if _config.nil? or _config[:name].nil?
       _config[:name]
     end
 

data/lib/trade-o-matic/adapters/itbit_backend.rb

@@ -3,7 +3,7 @@ require 'json'
 require 'time'
 
 module Trader
-  class ItbitBackend
+  class ItbitBackend < BaseBackend
     def fill_book(_book)
       # TODO: consider book pair
 

data/lib/trade-o-matic/adapters/surbtc_backend.rb

@@ -1,10 +1,8 @@
 require 'rest-client'
 require 'json'
-require 'trade-o-matic/adapters/base/raw_account_order'
-require 'trade-o-matic/adapters/base/raw_balance'
 
 module Trader
-  class SurbtcBackend
+  class SurbtcBackend < BaseBackend
     API_PREFIX = 'https://www.surbtc.com/api/v1'
 
     TYPE_MAP = {
@@ -43,16 +41,12 @@ module Trader
       attr_mapped(:limit?) { |r| r['price_type'] == 'limit' }
     end
 
-    def get_available_markets
-      [MAIN_MARKET]
-    end
-
-    def fill_book(_book)
-      # TODO
+    def initialize
+      super :surbtc
     end
 
-    def get_session(_credentials)
-      _credentials
+    def get_available_markets
+      [MAIN_MARKET]
     end
 
     def get_balance(_session, _currency)
@@ -74,8 +68,6 @@ module Trader
     end
 
     def create_order(_session, _pair, _volume, _price, _instruction)
-      raise 'market not supported' unless _pair == MAIN_MARKET
-
       res = resource_for "markets/#{market_code_for(_pair)}/orders", _session
 
       raw_order = postprocess res.post({

data/lib/trade-o-matic/core/account.rb

@@ -14,7 +14,7 @@ module Trader
 
       proxy_market = find_exact_market _pair
       proxy_market = find_compatible_market _pair if proxy_market.nil?
-      raise StandardError, 'market not supported' if proxy_market.nil?
+      backend.not_supported _pair if proxy_market.nil?
 
       proxy = AccountProxy.new self, proxy_market, _pair
 
@@ -59,7 +59,7 @@ module Trader
       # TODO.
     end
 
-  private
+    private
 
     attr_reader :session
 
@@ -70,6 +70,5 @@ module Trader
     def find_compatible_market(_pair)
       available_markets.find { |p| p.compatible_with? _pair }
     end
-
   end
 end

data/lib/trade-o-matic/core/account_order.rb

@@ -1,6 +1,5 @@
 module Trader
   class AccountOrder
-
     PENDING = :pending
     OPEN = :open
     CLOSED = :closed
@@ -81,7 +80,7 @@ module Trader
       status == CLOSED or status == CANCELED
     end
 
-  private
+    private
 
     attr_reader :backend, :session, :forced_pair
 
@@ -94,6 +93,5 @@ module Trader
       return _price if forced_pair.nil?
       _price.convert_to forced_pair.quote
     end
-
   end
 end

data/lib/trade-o-matic/core/account_proxy.rb

@@ -1,6 +1,5 @@
 module Trader
   class AccountProxy
-
     attr_reader :account, :proxy, :pair
 
     def initialize(_account, _proxy, _pair)

data/lib/trade-o-matic/core/balance.rb

@@ -1,6 +1,5 @@
 module Trader
   class Balance
-
     def initialize(_backend, _session, _currency, _forced_currency=nil)
       @backend = _backend
       @session = _session
@@ -37,15 +36,31 @@ module Trader
     end
 
     def refresh!
-      self.raw = backend.get_balance(session, currency)
+      self.raw = backend.get_balance session, currency
       self
     end
 
-  protected
+    def new_deposit_endpoint
+      backend.generate_endpoint session, original_currency
+    end
+
+    def withdraw(_amount, to: nil)
+      _amount = currency.pack _amount
+      _amount = _amount.convert_to original_currency
+
+      backend.withdraw_to_endpoint session, currency, _amount.amount, to
+      self
+    end
+
+    def transfer(_amount, to: nil)
+      withdraw _amount, to: to.new_deposit_endpoint
+    end
+
+    protected
 
     attr_accessor :raw
 
-  private
+    private
 
     attr_reader :backend, :session, :forced_currency
 

data/lib/trade-o-matic/core/exchange.rb

@@ -11,9 +11,8 @@ module Trader
       Account.new backend, session
     end
 
-  private
+    private
 
     attr_reader :backend
-
   end
 end

data/lib/trade-o-matic/core/market.rb

@@ -1,6 +1,5 @@
 module Trader
   class Market < Book
-
     attr_reader :backend
 
     def initialize(_backend, _pair)
@@ -24,6 +23,5 @@ module Trader
       backend.fill_book(book)
       self
     end
-
   end
 end

data/lib/trade-o-matic/core/market_loader.rb

@@ -15,15 +15,16 @@ module Trader
       @markets ||= backend.get_available_markets
     end
 
-  private
+    private
 
     def ensure_supported_market(_pair)
-      raise ArgumentError, 'market not supported' unless has_market_for? _pair
+      backend.not_supported _pair unless has_market_for? _pair
     end
 
     def ensure_supported_currency(_currency)
-      raise ArgumentError, 'currency not supported' unless available_markets.any? { |m| m.quote == _currency || m.base == _currency }
+      unless available_markets.any? { |m| m.quote == _currency || m.base == _currency }
+        backend.not_supported _currency
+      end
     end
-
   end
 end

data/lib/trade-o-matic/endpoints/base_endpoint.rb

@@ -0,0 +1,5 @@
+module Trader
+  class BaseEndpoint
+    # nothing for now.
+  end
+end

data/lib/trade-o-matic/endpoints/bitcoin_address.rb

@@ -0,0 +1,9 @@
+module Trader
+  class BitcoinAddress < BaseEndpoint
+    attr_accessor :address
+
+    def initialize(_address)
+      @address = _address
+    end
+  end
+end

data/lib/trade-o-matic/errors.rb

@@ -0,0 +1,23 @@
+module Trader
+  class Error < StandardError; end
+
+  class AssertError < Error; end
+
+  class BackendError < Error
+    attr_reader :backend
+
+    def initialize(_backend, _message)
+      super "#{_backend}: #{_message}"
+      @backend = _backend
+    end
+  end
+
+  class NotSupportedError < BackendError
+    attr_reader :feature
+
+    def initialize(_backend, _feature)
+      super _backend, "#{_feature} not supported"
+      @feature = _feature
+    end
+  end
+end

data/lib/trade-o-matic/version.rb

@@ -1,3 +1,3 @@
 module Trader
-  VERSION = "0.3.2"
+  VERSION = "0.4.0"
 end

data/lib/trade-o-matic.rb

@@ -1,6 +1,7 @@
 require "trade-o-matic/version"
 require 'trade-o-matic/standard'
 require 'trade-o-matic/command'
+require 'trade-o-matic/errors'
 
 require 'trade-o-matic/structs/currency'
 require 'trade-o-matic/structs/currency_pair'
@@ -23,6 +24,11 @@ require 'trade-o-matic/core/account_proxy'
 require 'trade-o-matic/core/account_order'
 require 'trade-o-matic/core/balance'
 
+require 'trade-o-matic/endpoints/base_endpoint'
+require 'trade-o-matic/endpoints/bitcoin_address'
+
+require 'trade-o-matic/adapters/base_backend'
+
 require 'trade-o-matic/converters/fixed_converter'
 require 'trade-o-matic/converters/sync_converter'
 require 'trade-o-matic/converters/inverse_converter'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trade-o-matic
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
 platform: ruby
 authors:
 - Ignacio Baixas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-29 00:00:00.000000000 Z
+date: 2016-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -253,6 +253,7 @@ files:
 - lib/trade-o-matic/adapters/base/raw_account_order.rb
 - lib/trade-o-matic/adapters/base/raw_balance.rb
 - lib/trade-o-matic/adapters/base/raw_resource.rb
+- lib/trade-o-matic/adapters/base_backend.rb
 - lib/trade-o-matic/adapters/bitfinex_backend.rb
 - lib/trade-o-matic/adapters/bitstamp_backend.rb
 - lib/trade-o-matic/adapters/fake_backend.rb
@@ -279,6 +280,9 @@ files:
 - lib/trade-o-matic/core/exchange.rb
 - lib/trade-o-matic/core/market.rb
 - lib/trade-o-matic/core/market_loader.rb
+- lib/trade-o-matic/endpoints/base_endpoint.rb
+- lib/trade-o-matic/endpoints/bitcoin_address.rb
+- lib/trade-o-matic/errors.rb
 - lib/trade-o-matic/services/backend_factory.rb
 - lib/trade-o-matic/standard.rb
 - lib/trade-o-matic/structs/ask_slope.rb