bitfinex-rb 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 30f018e3da530a1424941a50719b8aa64b719a7a
-  data.tar.gz: 0cebfb76c4489d260f9177345dc6bada2fd972e7
+  metadata.gz: 83b15f4ee0948a7bfa5d093d22db01a31d5b950f
+  data.tar.gz: c5ba58927b2ce63f008e2d7ff3b2be183b30777b
 SHA512:
-  metadata.gz: 9bb9f05e543f01f8b69e1269af331d020e6a5408545c72926b0dc1550a350ddd06736315f8ca1aa7f267e48dfa80ab1d29a4d53fbe51dab3d46a307905586c33
-  data.tar.gz: db36a7a68b56eb1c8af63f85d1165a03013daa729f75ac99bf7393f5eb478440c32f056009d79a13dabdab3188257a4414232ac394e30b7e00ca2d385b0b6df7
+  metadata.gz: 9814f5265c77c6cdd01392324ef796cea7ab1b2ab33041d9c8e9ba8f79070a8b1a28e18ac7b1d1611dc7844cf544d6d4fffe7ce5ba2fe18e9b97cb74cd43a777
+  data.tar.gz: e3224dc050ea43d595f4f25aa7b7c803bc2101c749355e3311eb4726d6ace17c643d50dbf95dc38716c63d6b6e0338772c4b3274cdfb9c50006c8f6ded03546a

data/lib/bitfinex.rb

@@ -7,6 +7,7 @@ require 'faraday_middleware'
 require 'bitfinex/configurable'
 require 'bitfinex/errors'
 require 'bitfinex/connection'
+require 'bitfinex/websocket_connection'
 require 'bitfinex/authenticated_rest'
 require 'bitfinex/ticker'
 require 'bitfinex/trades'

data/lib/bitfinex/account_info.rb

@@ -1,7 +1,7 @@
 module Bitfinex
 
-  module AccountInfoClient 
-    
+  module AccountInfoClient
+
     # Get account information
     #
     # @return [Hash] your account information
@@ -11,6 +11,19 @@ module Bitfinex
       resp = authenticated_post("account_infos")
       resp.body
     end
+
+
+    # Call block passing all account related specific messages sent via websocket
+    #
+    # @param block [Block] The code to be executed when new message is received
+    # @example:
+    #   client.listen_account do |message|
+    #     puts message.inspect
+    #   end
+    def listen_account(&block)
+      raise BlockMissingError unless block_given?
+      ws_auth(&block)
+    end
   end
 
 end

data/lib/bitfinex/client.rb

@@ -1,6 +1,7 @@
 module Bitfinex
   class Client
     include Bitfinex::RestConnection
+    include Bitfinex::WebsocketConnection
     include Bitfinex::AuthenticatedConnection
     include Bitfinex::TickerClient
     include Bitfinex::TradesClient

data/lib/bitfinex/configurable.rb

@@ -3,7 +3,7 @@ module Bitfinex
     def self.included(base)
       base.extend(ClassMethods)
     end
-  
+
     def config
       self.class.config
     end
@@ -20,10 +20,12 @@ module Bitfinex
   end
 
   class Configuration
-     attr_accessor :api_endpoint, :debug, :debug_connection, :secret, :api_key
+     attr_accessor :api_endpoint, :debug, :debug_connection, :secret, :api_key, :websocket_api_endpoint
      def initialize
        self.api_endpoint = "https://api.bitfinex.com/v1/"
+       self.websocket_api_endpoint = "wss://api2.bitfinex.com:3000/ws"
        self.debug = false
+
        self.debug_connection = false
      end
   end

data/lib/bitfinex/connection.rb

@@ -2,7 +2,7 @@ require 'logger'
 module Bitfinex
   # Network Layer for API Rest client
   module RestConnection
-    private 
+    private
     # Make an HTTP GET request
     def get(url, options={})
       rest_connection.get do |req|

data/lib/bitfinex/deposit.rb

@@ -1,7 +1,7 @@
 module Bitfinex
   module DepositClient
     # Return your deposit address to make a new deposit.
-    # 
+    #
     # @param method [string] Method of deposit (methods accepted: “bitcoin”, “litecoin”, “darkcoin”, “mastercoin” (tethers)).
     # @param wallet_name [string] Wallet to deposit in (accepted: “trading”, “exchange”, “deposit”). Your wallet needs to already exist
     # @params renew [integer] (optional) Default is 0. If set to 1, will return a new unused deposit address
@@ -11,8 +11,8 @@ module Bitfinex
     #   client.deposit("bitcoin", "exchange")
     def deposit method, wallet_name, renew=0
       params = {
-        method: method, 
-        wallet_name: wallet_name, 
+        method: method,
+        wallet_name: wallet_name,
         renew: renew
       }
 

data/lib/bitfinex/errors.rb

@@ -2,4 +2,5 @@ module Bitfinex
   class ClientError < Exception; end
   class ParamsError < ClientError; end
   class InvalidAuthKeyError < ClientError; end
+  class BlockMissingError < ParamsError; end
 end

data/lib/bitfinex/funding_book.rb

@@ -6,9 +6,9 @@ module Bitfinex
     # @param currency [string] (optional) Speficy the currency, default "USD"
     # @param params :limit_bids [int] (optional) Limit the number of funding bids returned. May be 0 in which case the array of bids is empty.
     # @param params :limit_asks [int] (optional) Limit the number of funding offers returned. May be 0 in which case the array of asks is empty.
-    # @return [Hash] of :bids and :asks arrays 
+    # @return [Hash] of :bids and :asks arrays
     # @example:
-    #   client.funding_book 
+    #   client.funding_book
     def funding_book(currency="usd", params = {})
       check_params(params, %i{limit_bids limit_asks})
       get("lendbook/#{currency}", params).body

data/lib/bitfinex/historical_data.rb

@@ -2,7 +2,7 @@ module Bitfinex
   module HistoricalDataClient
 
     # View all of your balance ledger entries.
-    # 
+    #
     # @param currency [string] (optional) Specify the currency, default "USD"
     # @param params :since [time] (optional) Return only the history after this timestamp.
     # @param params :until [time] (optional) Return only the history before this timestamp.
@@ -12,13 +12,13 @@ module Bitfinex
     # @example:
     #   client.history
     def history(currency="usd", params = {})
-      check_params(params, %i{since until limit wallet}) 
+      check_params(params, %i{since until limit wallet})
       params.merge!({currency: currency})
-      authenticated_post("history", params).body
+      authenticated_post("history", params: params).body
     end
 
     # View your past deposits/withdrawals.
-    # 
+    #
     # @param currency [string] (optional) Specify the currency, default "USD"
     # @param params :method (optional) The method of the deposit/withdrawal (can be “bitcoin”, “litecoin”, “darkcoin”, “wire”)
     # @param params :since (optional) Return only the history after this timestamp
@@ -30,11 +30,11 @@ module Bitfinex
     def movements(currency="usd", params = {})
       check_params(params, %i{method since until limit})
       params.merge!({currency: currency})
-      authenticated_post("history/movements", params).body
+      authenticated_post("history/movements", params: params).body
     end
 
     # View your past trades.
-    # 
+    #
     # @param symbol The pair traded (BTCUSD, LTCUSD, LTCBTC)
     # @param params :until [time] (optional) Return only the history before this timestamp.
     # @param params :timestamp [time] (optional) Trades made before this timestamp won’t be returned
@@ -47,7 +47,7 @@ module Bitfinex
     def mytrades(symbol, params = {})
       check_params(params, %i{until limit_trades reverse timestamp})
       params.merge!({symbol: symbol})
-      authenticated_post("mytrades", params).body
+      authenticated_post("mytrades", params: params).body
     end
   end
 end

data/lib/bitfinex/lends.rb

@@ -1,9 +1,9 @@
 module Bitfinex
-  module LendsClient 
+  module LendsClient
 
     # Get a list of the most recent funding data for the given currency: total amount provided and Flash Return Rate (in % by 365 days) over time.
     #
-    # @param currency [string] (optional) Specify the currency, default "USD" 
+    # @param currency [string] (optional) Specify the currency, default "USD"
     # @param params :timestamp [time] (optional) Only show data at or after this timestamp
     # @param params :limit_lends [int] (optional) Limit the amount of funding data returned. Must be > 1, default 50
     # @return [Array]

data/lib/bitfinex/margin_funding.rb

@@ -12,15 +12,14 @@ module Bitfinex
     # @example:
     #   client.new_offer("btc", 10.0, 20, 365, "lend")
     def new_offer(currency, amount, rate, period, direction)
-      params = { 
+      params = {
         currency: currency,
-        amount: amount, 
-        rate: rate,
-        period: period,
+        amount: amount.to_s,
+        rate: rate.to_s,
+        period: period.to_i,
         direction: direction
       }
-
-      authenticated_post("offer/new", params).body
+      authenticated_post("offer/new", params: params).body
     end
 
     # Cancel an offer
@@ -31,7 +30,7 @@ module Bitfinex
     #   client.cancel_offer(1000)
     def cancel_offer(offer_id)
       authenticated_post("offer/cancel", {offer_id: offer_id}).body
-    end 
+    end
 
     # Get the status of an offer. Is it active? Was it cancelled? To what extent has it been executed? etc.
     #
@@ -44,7 +43,7 @@ module Bitfinex
     end
 
     # View your funds currently taken (active credits)
-    # 
+    #
     # @return [Array]
     # @example:
     #   client.credits
@@ -71,7 +70,7 @@ module Bitfinex
     end
 
     # View your funding currently borrowed and not used (available for a new margin position).
-    # 
+    #
     # @return [Array] An array of your active unused margin funds
     # @example:
     #   client.unused_taken_funds
@@ -80,7 +79,7 @@ module Bitfinex
     end
 
     # View the total of your active funding used in your position(s).
-    # 
+    #
     # @return [Array] An array of your active funding
     # @example:
     #   client.total_taken_funds
@@ -90,7 +89,7 @@ module Bitfinex
 
     # Allow you to close an unused or used taken fund
     #
-    # @param swap_id [int] The ID given by `#taken_funds` or `#unused_taken_funds 
+    # @param swap_id [int] The ID given by `#taken_funds` or `#unused_taken_funds
     # @return [Hash]
     # @example:
     #   client.close_funding(1000)

data/lib/bitfinex/orderbook.rb

@@ -14,5 +14,22 @@ module Bitfinex
       check_params(params, %i{limit_bids limit_asks group})
       get("book/#{symbol}",params).body
     end
+
+
+    # Get the order book changes using websocket
+    # 
+    # @param pair [string] 
+    # @param prec [string] Level of price aggregation (P0, P1, P2, P3). The default is P0.
+    # @param freq [string] Frequency of updates (F0, F1, F2, F3). F0=realtime / F1=2sec / F2=5sec / F3=10sec
+    # @param len [int] Number of price points (“25”, “100”) [default=“25”]
+    # @param block [Block] The code to be executed when a new order is submitted
+    # @example:
+    #    client.listen_book do |order|
+    #      puts order.inspect
+    #    end
+    def listen_book(pair="BTCUSD", prec='P0', freq='F0',len=25, &block)
+      raise BlockMissingError unless block_given?
+      register_channel pair:pair, channel: 'book', prec: prec, freq: freq, len: len, &block
+    end
   end
 end

data/lib/bitfinex/orders.rb

@@ -11,27 +11,28 @@ module Bitfinex
     # @param params :is_hidden [bool] (optional) true if the order should be hidden. Default is false
     # @param params :is_postonly [bool] (optional) true if the order should be post only. Default is false. Only relevant for limit orders
     # @param params :ocoorder [bool] Set an additional STOP OCO order that will be linked with the current order
-    # @param params :buy_price_oco [decimal] If ocoorder is true, this field represent the price of the OCO stop order to place 
+    # @param params :buy_price_oco [decimal] If ocoorder is true, this field represent the price of the OCO stop order to place
     # @return [Hash]
     # @example:
-    #   client.new_order("usdbtc", 100, "market", "sell", 0)    
-    def new_order(symbol, amount, type, side, price = nil, params = {}) 
+    #   client.new_order("usdbtc", 100, "market", "sell", 0)
+    def new_order(symbol, amount, type, side, price = nil, params = {})
       check_params(params, %i{is_hidden is_postonly ocoorder buy_price_oco})
 
       params.merge!({
-        symbol: symbol, 
-        amount: amount,
+        symbol: symbol,
+        amount: amount.to_s,
         type: type,
         side: side,
         exchange: 'bitfinex',
-        price: price})
+        price: price.to_s
+      })
 
       authenticated_post("order/new", params: params).body
     end
 
     # Submit several new orders at once
     #
-    # @param orders [Array] Array of Hash with the following elements 
+    # @param orders [Array] Array of Hash with the following elements
     # @param orders :symbol [string] The name of the symbol
     # @param orders :amount [decimal] Order size: how much to buy or sell
     # @param orders :price [decimal] Price to buy or sell at. May omit if a market order
@@ -47,7 +48,7 @@ module Bitfinex
 
     # Cancel an order
     #
-    # @param ids [Array] or [integer] or nil 
+    # @param ids [Array] or [integer] or nil
     #   if it's Array it's supposed to specify a list of IDS
     #   if it's an integer it's supposed to be a single ID
     #   if it's not specified it deletes all the orders placed
@@ -56,7 +57,7 @@ module Bitfinex
     #   client.cancel_orders([100,231,400])
     def cancel_orders(ids=nil)
       case ids
-      when Array 
+      when Array
           authenticated_post("order/cancel/multi", {order_ids: ids}).body
       when Numeric
           authenticated_post("order/cancel", {order_id: ids}).body
@@ -68,27 +69,27 @@ module Bitfinex
     end
 
     # Replace an orders with a new one
-    # 
+    #
     # @param id [int] the ID of the order to replace
     # @param symbol [string] the name of the symbol
     # @param amount [decimal] Order size: how much to buy or sell
-    # @param type [string] Either “market” / “limit” / “stop” / “trailing-stop” / “fill-or-kill” / “exchange market” / “exchange limit” / “exchange stop” / “exchange trailing-stop” / “exchange fill-or-kill”. (type starting by “exchange ” are exchange orders, others are margin trading orders)  
+    # @param type [string] Either “market” / “limit” / “stop” / “trailing-stop” / “fill-or-kill” / “exchange market” / “exchange limit” / “exchange stop” / “exchange trailing-stop” / “exchange fill-or-kill”. (type starting by “exchange ” are exchange orders, others are margin trading orders)
     # @param side [string] Either “buy” or “sell”
     # @param price [decimal] Price to buy or sell at. May omit if a market order
     # @param is_hidden [bool] (optional) true if the order should be hidden. Default is false
     # @return [Hash] the order
-    # @example: 
+    # @example:
     #   client.replace_order(100,"usdbtc", 10, "market", "buy", 0)
     def replace_order(id, symbol, amount, type, side, price, is_hidden=false)
       params = {
-        order_id: id,
-        symbol: symbol, 
-        amount: amount,
+        order_id: id.to_i,
+        symbol: symbol,
+        amount: amount.to_s,
         type: type,
         side: side,
         exchange: 'bitfinex',
         is_hidden: is_hidden,
-        price: price
+        price: price.to_s
       }
       authenticated_post("order/cancel/replace", params).body
     end
@@ -112,6 +113,6 @@ module Bitfinex
     def orders
       authenticated_post("orders").body
     end
-    
+
   end
 end

data/lib/bitfinex/ticker.rb

@@ -10,5 +10,18 @@ module Bitfinex
     def ticker(symbol = "btcusd")
       get("pubticker/#{symbol}").body
     end
+
+    # Call the specified block passing tickers, it uses websocket
+    #
+    # @param pair [string]
+    # @param block [Block] The code to be executed when a new ticker is sent by the server 
+    # @example:
+    #   client.listen_ticker do |tick|
+    #     puts tick.inspect
+    #   end
+    def listen_ticker(pair="BTCUSD", &block)
+      raise BlockMissingError unless block_given?
+      register_channel pair: pair, channel: "ticker", &block
+    end
   end
 end

data/lib/bitfinex/trades.rb

@@ -14,5 +14,18 @@ module Bitfinex
       get("trades/#{symbol}", params: params).body
     end
 
+    # Listen to the trades using websocket.
+    #
+    # @param pair [string]
+    # @param block [Block] The code to be executed when a new trade is executed
+    # @example:
+    #   client.listen_trades do |trade|
+    #     puts trade.inspect
+    #   end
+    def listen_trades(pair="BTCUSD", &block)
+      raise BlockMissingError unless block_given?
+      register_channel pair:pair, channel: 'trades', &block
+    end
+
   end
 end

data/lib/bitfinex/version.rb

@@ -1,3 +1,3 @@
 module Bitfinex
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/lib/bitfinex/websocket_connection.rb

@@ -0,0 +1,190 @@
+require 'eventmachine'
+require 'faye/websocket'
+require 'json'
+
+module Bitfinex
+  module WebsocketConnection
+
+    def listen!
+      subscribe_to_channels
+      listen
+      ws_client.run!
+    end
+  
+    def ws_send(msg)
+      ws_client.send msg
+    end
+
+    def ws_close_all
+      ws_client.close!
+      @ws_open = false
+      ws_reset_channels
+    end
+
+    def ws_auth(&block)
+      unless @ws_auth
+        payload = 'AUTH' + (Time.now.to_f * 10_000).to_i.to_s
+        signature = sign(payload)
+        add_callback(:auth, &block)
+        save_channel_id(:auth, 0)
+        ws_safe_send({
+          apiKey: config.api_key, 
+          authSig: sign(payload),
+          authPayload: payload,
+          event: 'auth'
+        })
+        @ws_auth = true
+      end
+    end
+
+    def ws_unauth
+      ws_safe_send({event: 'unauth'})
+    end
+  
+    private 
+
+    def ws_reset_channels
+      @chan_ids = []
+      @ws_registration_messages = []
+      @callbacks = {}
+    end
+
+    def ws_client
+      @ws_client ||= WSClient.new(url:config.websocket_api_endpoint)
+    end
+  
+    def chan_ids
+      @chan_ids ||= []
+    end 
+  
+    def ws_open
+      @ws_open ||= false
+    end
+  
+    def ws_registration_messages
+      @ws_registration_messages ||= []
+    end
+  
+    def callbacks
+      @callbacks ||= {}
+    end
+  
+    def add_callback(channel, &block)
+      callbacks[channel] = { block: block, chan_id: nil }
+    end
+
+    def register_authenticated_channel(msg, &block)
+      add_callback(fingerprint(msg),&block)
+      ws_safe_send(msg.merge(event:'subscribe'))
+    end
+
+    def ws_safe_send(msg)
+      if ws_open
+        ws_client.send msg
+      else
+        ws_registration_messages.push msg
+      end
+    end 
+
+    def register_channel(msg, &block)
+      add_callback(fingerprint(msg),&block)
+      if ws_open
+        ws_client.send msg.merge(event: 'subscribe')
+      else
+        ws_registration_messages.push msg.merge(event: 'subscribe')
+      end
+    end
+  
+    def fingerprint(msg)
+      msg.reject{|k,v| [:event,'chanId','event'].include?(k) }.
+          inject({}){|h, (k,v)| h[k.to_sym]=v.to_s; h}
+    end
+  
+    def listen
+      ws_client.on(:message) do |rmsg|
+         msg = JSON.parse(rmsg)
+         if msg.kind_of?(Hash) && msg["event"] == "subscribed"
+           save_channel_id(fingerprint(msg), msg["chanId"]) 
+         elsif msg.kind_of?(Array)
+           exec_callback_for(msg)
+         end
+      end
+    end
+  
+    def save_channel_id(chan,id)
+      callbacks[chan][:chan_id] = id
+      chan_ids[id.to_i] = chan
+    end
+  
+    def exec_callback_for(msg)
+      return if msg[1] == 'hb' #ignore heartbeat
+      id = msg[0]
+      callbacks[chan_ids[id.to_i]][:block].call(msg)
+    end
+  
+    def subscribe_to_channels
+      ws_client.on(:open) do 
+        @ws_open = true
+        ws_registration_messages.each do |msg| 
+          ws_client.send(msg)
+        end
+      end
+    end
+
+    class WSClient
+      def initialize(options = {})
+        # set some defaults
+        @url = options[:url] || 'ws://dev2.bitfinex.com:3001/ws'
+        @reconnect = options[:reconenct] || false
+      end
+    
+      def on(msg, &blk)
+        ivar = "@#{msg}_cb"
+        instance_variable_set(ivar.to_sym, blk)
+      end
+    
+      def run!
+        if EventMachine.reactor_running?
+          connect!
+        else
+          EM.run { connect! }
+        end
+      end
+    
+      def stop!
+        @ws.close
+      end
+    
+      def connect!
+        @ws = Faye::WebSocket::Client.new(@url)
+        @ws.onopen = method(:ws_opened)
+        @ws.onmessage = method(:ws_receive)
+        @ws.onclose = method(:ws_closed)
+        @ws.onerror = method(:ws_error)
+      end
+    
+      def send(msg)
+        msg = msg.is_a?(Hash) ? msg.to_json : msg
+        @ws.send(msg)
+      end
+    
+      private
+    
+      def ws_opened(event)
+        @open_cb.call(event) if @open_cb
+      end
+    
+      def ws_receive(event)
+        @message_cb.call(event.data) if @message_cb
+      end
+    
+      def ws_closed(_event)
+        EM.stop
+          end
+    
+      def ws_error(event)
+        fail event
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bitfinex-rb
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Bitfinex
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-05 00:00:00.000000000 Z
+date: 2016-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -30,6 +30,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.2
+- !ruby/object:Gem::Dependency
+  name: eventmachine
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.9.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.9.1
 - !ruby/object:Gem::Dependency
   name: faraday-detailed_logger
   requirement: !ruby/object:Gem::Requirement
@@ -50,6 +70,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
+- !ruby/object:Gem::Dependency
+  name: faye-websocket
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.10.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.10.3
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -138,8 +172,7 @@ files:
 - lib/bitfinex/trades.rb
 - lib/bitfinex/version.rb
 - lib/bitfinex/wallet.rb
-- lib/bitfinex/websocket.rb
-- lib/bitfinex/websocket/em_client.rb
+- lib/bitfinex/websocket_connection.rb
 homepage: https://www.bitfinex.com/
 licenses:
 - MIT

data/lib/bitfinex/websocket.rb

@@ -1,64 +0,0 @@
-require 'eventmachine'
-require 'faye/websocket'
-require 'json'
-
-module Bitfinex
-  module Websocket
-
-    class EMClient
-      def initialize(options = {})
-        # set some defaults
-        @url = options[:url] || 'wss://api2.bitfinex.com:3000/ws'
-        @reconnect = options[:reconenct] || false
-      end
-
-      def on(msg, &blk)
-        ivar = "@#{msg}_cb"
-        instance_variable_set(ivar.to_sym, blk)
-      end
-
-      def run!
-        if EventMachine.reactor_running?
-          connect!
-        else
-          EM.run { connect! }
-        end
-      end
-
-      def stop!
-        @ws.close
-      end
-
-      def connect!
-        @ws = Faye::WebSocket::Client.new(@url)
-        @ws.onopen = method(:ws_opened)
-        @ws.onmessage = method(:ws_receive)
-        @ws.onclose = method(:ws_closed)
-        @ws.onerror = method(:ws_error)
-      end
-
-      def send(msg)
-        msg = msg.is_a?(Hash) ? msg.to_json : msg
-        @ws.send(msg)
-      end
-
-      private
-
-      def ws_opened(event)
-        @open_cb.call(event) if @open_cb
-      end
-
-      def ws_receive(event)
-        @message_cb.call(event.data) if @message_cb
-      end
-
-      def ws_closed(_event)
-        EM.stop
-      end
-
-      def ws_error(event)
-        fail event
-      end
-    end
-  end
-end

data/lib/bitfinex/websocket/em_client.rb

@@ -1,60 +0,0 @@
-module Bitfinex
-  module Websocket
- 
-    class EMClient
-      def initialize(options = {})
-        # set some defaults
-        @url = options[:url] || 'wss://api2.bitfinex.com:3000/ws'
-        @reconnect = options[:reconenct] || false
-      end
-
-      def on(msg, &blk)
-        ivar = "@#{msg}_cb"
-        instance_variable_set(ivar.to_sym, blk)
-      end
-
-      def run!
-        if EventMachine.reactor_running?
-          connect!
-        else
-          EM.run { connect! }
-        end
-      end
-
-      def stop!
-        @ws.close
-      end
-
-      def connect!
-        @ws = Faye::WebSocket::Client.new(@url)
-        @ws.onopen = method(:ws_opened)
-        @ws.onmessage = method(:ws_receive)
-        @ws.onclose = method(:ws_closed)
-        @ws.onerror = method(:ws_error)
-      end
-
-      def send(msg)
-        msg = msg.is_a?(Hash) ? msg.to_json : msg
-        @ws.send(msg)
-      end
-
-      private
-
-      def ws_opened(event)
-        @open_cb.call(event) if @open_cb
-      end
-
-      def ws_receive(event)
-        @message_cb.call(event.data) if @message_cb
-      end
-
-      def ws_closed(_event)
-        EM.stop
-      end
-
-      def ws_error(event)
-        fail event
-      end
-    end
-  end
-end