trade-o-matic 0.5.7 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 93cfd0dc804c45086e43e42d3d27a73ba0a36ebd
-  data.tar.gz: 66f00afddcc8fbec1d3c1b871d5d048dcc0aa7bd
+  metadata.gz: b8d98a405fccc33b4d1a65e5edb2774c9b36a7fa
+  data.tar.gz: d25f801f15f1d5617e6c3476259f4a7863de9e4e
 SHA512:
-  metadata.gz: 73fdfb94a5fab02d95bb8f92ce0d0b10f20470c7f63d1780edb1c572abd1966af3a31ce01ecb4afbcadd3fb1053f49aa06ac6866bcfe2857908447bcf434f91b
-  data.tar.gz: 15b6a0ec1f3e54b57d719eb3474fdcb2d7b969ac43508d0fe417520445aadcd336496c15f34e418023282ac54f8115eb38aa64dc17b10d259ddebd54e95b59d6
+  metadata.gz: 00bf4f07ce88b644e0ec7fe08f733f8090c1f5d56b820e8ba9f494c8bb8a5a1859b81a693be890288fad276e583bf493dd1557480d939ea4b73030aedc114302
+  data.tar.gz: 51d6663db16fab7a59a3afa496434b65c1aa21a810eed5c0e118a2a4858a9a2a4a92f3bc10ef693772b3a32fa79235996970b4303dd635df8ac17342507db9e1

data/lib/trade-o-matic.rb

@@ -23,6 +23,7 @@ require 'trade-o-matic/core/account'
 require 'trade-o-matic/core/account_proxy'
 require 'trade-o-matic/core/account_order'
 require 'trade-o-matic/core/balance'
+require 'trade-o-matic/core/transaction_event'
 
 require 'trade-o-matic/endpoints/base_endpoint'
 require 'trade-o-matic/endpoints/bitcoin_address'

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

@@ -49,6 +49,10 @@ module Trader
       not_supported :cancel_order
     end
 
+    def listen_transactions(_pair, &_block)
+      not_supported :listen_transactions
+    end
+
     def not_supported(_feature)
       raise NotSupportedError.new name, _feature
     end

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

@@ -1,6 +1,7 @@
 require 'rest-client'
 require 'base64'
 require 'json'
+require 'websocket-client-simple'
 
 module Trader
   class BitfinexBackend < BaseBackend
@@ -110,6 +111,29 @@ module Trader
       order
     end
 
+    def listen_transactions(_pair, &_block)
+      WebSocket::Client::Simple.connect('wss://api2.bitfinex.com:3000/ws') do |ws|
+        ws.on :open do |event|
+          ws.send(JSON.dump({ event: 'subscribe', channel: 'trades', pair: 'BTCUSD' }))
+        end
+
+        ws.on :message do |event|
+          message = JSON.load(event.data)
+          next if message.is_a? Hash
+
+          if message[1] == 'te'
+            _block.call(
+              pair: _pair,
+              ts: Time.at(message[3]),
+              direction: message[5] < 0 ? Transaction::SELL : Transaction::BUY,
+              price: message[4],
+              volume: message[5].abs
+            )
+          end
+        end
+      end
+    end
+
     private
 
     attr_reader :session

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

@@ -20,6 +20,7 @@ module Trader
     }
 
     MAIN_MARKET = CurrencyPair.new(:SATOSHI, :CLP_CENT)
+    COP_MARKET = CurrencyPair.new(:SATOSHI, :COP_CENT)
 
     class SurbtcBalance < RawBalance
       attr_mapped :amount
@@ -47,7 +48,7 @@ module Trader
     end
 
     def get_available_markets
-      [MAIN_MARKET]
+      [MAIN_MARKET, COP_MARKET]
     end
 
     def get_balance(_session, _currency)
@@ -114,6 +115,7 @@ module Trader
 
     def currency_code_for(_currency)
       return 'clp' if _currency.code == :CLP_CENT
+      return 'cop' if _currency.code == :COP_CENT
       return 'btc' if _currency.code == :SATOSHI
       _currency.to_s.downcase
     end

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

@@ -23,5 +23,12 @@ module Trader
       backend.fill_book(book)
       self
     end
+
+    def on_transaction
+      backend.listen_transactions(pair) do |raw|
+        yield TransactionEvent.new raw, nil
+      end
+    end
   end
-end
+end
+

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

@@ -0,0 +1,52 @@
+module Trader
+  class TransactionEvent
+    def initialize(_raw, _forced_pair = nil)
+      @raw = _raw
+      @forced_pair = _forced_pair
+    end
+
+    def convert_to(_pair, _quote=nil)
+      forced_pair = CurrencyPair.for_code _pair, _quote
+      return self if forced_pair == pair
+      self.class.new @raw, forced_pair
+    end
+
+    def pair
+      forced_pair || original_pair
+    end
+
+    def original_pair
+      @raw[:pair]
+    end
+
+    def timestamp
+      @raw[:ts]
+    end
+
+    def direction
+      @raw[:direction]
+    end
+
+    def price
+      convert_quote original_pair.quote.pack @raw[:price]
+    end
+
+    def volume
+      convert_base original_pair.quote.pack @raw[:volume]
+    end
+
+    private
+
+    attr_reader :forced_pair
+
+    def convert_base(_price)
+      return _price if forced_pair.nil?
+      _price.convert_to forced_pair.base
+    end
+
+    def convert_quote(_price)
+      return _price if forced_pair.nil?
+      _price.convert_to forced_pair.quote
+    end
+  end
+end

data/lib/trade-o-matic/structs/transaction.rb

@@ -1,3 +1,6 @@
 module Trader
-  class Transaction < Struct.new(:price, :volume, :time); end
+  class Transaction < Struct.new(:price, :volume, :time)
+    BUY = :buy
+    SELL = :sell
+  end
 end

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

@@ -1,3 +1,3 @@
 module Trader
-  VERSION = "0.5.7"
+  VERSION = "0.6.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trade-o-matic
 version: !ruby/object:Gem::Version
-  version: 0.5.7
+  version: 0.6.0
 platform: ruby
 authors:
 - Ignacio Baixas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-14 00:00:00.000000000 Z
+date: 2016-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -66,6 +66,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.7'
+- !ruby/object:Gem::Dependency
+  name: websocket-client-simple
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -280,6 +294,7 @@ 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/core/transaction_event.rb
 - lib/trade-o-matic/endpoints/base_endpoint.rb
 - lib/trade-o-matic/endpoints/bitcoin_address.rb
 - lib/trade-o-matic/errors.rb