ib-ruby 0.5.16 → 0.5.17

data/HISTORY

@@ -109,3 +109,7 @@
 == 0.5.16 / 2012-02-08
 
 * Message specs refactored
+
+== 0.5.17 / 2012-02-12
+
+* Connection#send_message bugfix

data/VERSION

@@ -1 +1 @@
-0.5.16
+0.5.17

data/lib/ib-ruby/connection.rb

@@ -19,7 +19,7 @@ module IB
 
     CLIENT_VERSION = 48 # Was 27 in original Ruby code
     SERVER_VERSION = 53 # Minimal server version. Latest, was 38 in current Java code.
-    DEFAULT_OPTIONS = {:host =>"127.0.0.1",
+    DEFAULT_OPTIONS = {:host =>'127.0.0.1',
                        :port => '4001', # IB Gateway connection (default)
                        #:port => '7496', # TWS connection, with annoying pop-ups
                        :client_id => nil, # Will be randomly assigned
@@ -45,7 +45,6 @@ module IB
       @server = Hash.new
 
       connect if @options[:connect]
-      start_reader if @options[:reader]
       Connection.current = self
     end
 
@@ -58,7 +57,7 @@ module IB
     end
 
     def connect
-      raise Exception.new("Already connected!") if @connected
+      raise "Already connected!" if connected?
 
       # TWS always sends NextValidID message at connect - save this id
       self.subscribe(:NextValidID) do |msg|
@@ -71,7 +70,7 @@ module IB
       # Secret handshake
       @server[:socket].send(CLIENT_VERSION)
       @server[:version] = @server[:socket].read_int
-      raise(Exception.new("TWS version >= #{SERVER_VERSION} required.")) if @server[:version] < SERVER_VERSION
+      raise "TWS version >= #{SERVER_VERSION} required." if @server[:version] < SERVER_VERSION
 
       @server[:local_connect_time] = Time.now()
       @server[:remote_connect_time] = @server[:socket].read_string
@@ -86,6 +85,8 @@ module IB
       log.info "Connected to server, version: #{@server[:version]}, connection time: " +
                    "#{@server[:local_connect_time]} local, " +
                    "#{@server[:remote_connect_time]} remote."
+
+      start_reader if @options[:reader] # Allows reconnect
     end
 
     alias open connect # Legacy alias
@@ -95,9 +96,11 @@ module IB
         @reader_running = false
         @server[:reader].join
       end
-      @server[:socket].close
-      @server = Hash.new
-      @connected = false
+      if connected?
+        @server[:socket].close
+        @server = Hash.new
+        @connected = false
+      end
     end
 
     alias close disconnect # Legacy alias
@@ -152,6 +155,7 @@ module IB
             else
               raise ArgumentError.new "Only able to send outgoing IB messages"
           end
+      raise "Not able to send messages, IB not connected!" unless connected?
       message.send_to(@server)
     end
 

data/lib/ib-ruby/messages/incoming.rb

@@ -55,8 +55,14 @@ module IB
           @data.has_key?(:id) ? @data[:id] : super
         end
 
+        def respond_to? method
+          getter = method.to_s.sub(/=$/, '').to_sym
+          @data.has_key?(method) || @data.has_key?(getter) || super
+        end
+
         protected
 
+        # TODO: method compilation instead of method_missing
         def method_missing method, *args
           getter = method.to_s.sub(/=$/, '').to_sym
           if @data.has_key? method
@@ -68,11 +74,6 @@ module IB
           end
         end
 
-        def respond_to? method
-          getter = method.to_s.sub(/=$/, '').to_sym
-          @data.has_key?(method) || @data.has_key?(getter) || super
-        end
-
         # Every message loads received message version first
         def load
           @data[:version] = @socket.read_int
@@ -156,11 +157,11 @@ module IB
                                 [:last_fill_price, :decimal],
                                 [:client_id, :int],
                                 [:why_held, :string] do
-        "<OrderStatus: #{@data[:status]} filled: #{@data[:filled]}/#{@data[:remaining]+@data[:filled]}" +
-            " @ last/avg: #{@data[:last_fill_price]}/#{@data[:average_fill_price]}" +
-            (@data[:parent_id] > 0 ? "parent_id: #{@data[:parent_id]}" : "") +
-            (@data[:why_held] != "" ? "why_held: #{@data[:why_held]}" : "") +
-            " id/perm: #{@data[:id]}/#{@data[:perm_id]}>"
+        "<OrderStatus: #{status} filled: #{filled}/#{remaining + filled}" +
+            " @ last/avg: #{last_fill_price}/#{average_fill_price}" +
+            (parent_id > 0 ? "parent_id: #{parent_id}" : "") +
+            (why_held != "" ? "why_held: #{why_held}" : "") +
+            " id/perm: #{id}/#{perm_id}>"
       end
 
 
@@ -168,17 +169,17 @@ module IB
                                  [:value, :string],
                                  [:currency, :string],
                                  [:account_name, :string]) do
-        "<AccountValue: #{@data[:account_name]}, #{@data[:key]}=#{@data[:value]} #{@data[:currency]}>"
+        "<AccountValue: #{account_name}, #{key}=#{value} #{currency}>"
       end
 
       AccountUpdateTime = def_message(8, [:time_stamp, :string]) do
-        "<AccountUpdateTime: #{@data[:time_stamp]}>"
+        "<AccountUpdateTime: #{time_stamp}>"
       end
 
       # This message is always sent by TWS automatically at connect.
       # The IB::Connection class subscribes to it automatically and stores
       # the order id in its @next_order_id attribute.
-      NextValidID = def_message(9, [:id, :int]) { "<NextValidID: #{@data[:id]}>" }
+      NextValidID = def_message(9, [:id, :int]) { "<NextValidID: #{id}>" }
 
       NewsBulletins =
           def_message 14, [:id, :int], # unique incrementing bulletin ID.
@@ -214,18 +215,18 @@ module IB
       FundamentalData = def_message 50, [:id, :int], # request_id
                                     [:data, :string]
 
-      ContractDataEnd = def_message(52, [:id, :int]) { "<ContractDataEnd: #{@data[:id]}>" } # request_id
+      ContractDataEnd = def_message(52, [:id, :int]) { "<ContractDataEnd: #{id}>" } # request_id
 
       OpenOrderEnd = def_message(53) { "<OpenOrderEnd>" }
 
       AccountDownloadEnd = def_message(54, [:account_name, :string]) do
-        "<AccountDownloadEnd: #{@data[:account_name]}}>"
+        "<AccountDownloadEnd: #{account_name}}>"
       end # request_id
 
 
-      ExecutionDataEnd = def_message 55, [:id, :int] # request_id
+      ExecutionDataEnd = def_message(55, [:id, :int]) { "<ExecutionDataEnd: #{id}>" } # request_id
 
-      TickSnapshotEnd = def_message 57, [:id, :int] # request_id
+      TickSnapshotEnd = def_message(57, [:id, :int]) { "<TickSnapshotEnd: #{id}>" } # request_id
 
       ### Actual message classes (long definitions):
 
@@ -344,10 +345,9 @@ module IB
         end
 
         def to_human
-          "<TickOption #{type} for #{@data[:id]}: underlying @ #{@data[:under_price]}, "+
-              "option @ #{@data[:option_price]}, IV #{@data[:implied_volatility]}%, " +
-              "delta #{@data[:delta]}, gamma #{@data[:gamma]}, vega #{@data[:vega]}, " +
-              "theta #{@data[:theta]}, pv_dividend #{@data[:pv_dividend]}>"
+          "<TickOption #{type} for #{:id}: underlying @ #{under_price}, "+
+              "option @ #{option_price}, IV #{implied_volatility}%, delta #{delta}, " +
+              "gamma #{gamma}, vega #{vega}, theta #{theta}, pv_dividend #{pv_dividend}>"
         end
       end # TickOption
       TickOptionComputation = TickOption
@@ -373,8 +373,8 @@ module IB
         end
 
         def to_human
-          "<#{self.class.to_s.split('::').last}: #{operation} #{side} @ "+
-              "#{@data[:position]} = #{@data[:price]} x #{@data[:size]}>"
+          "<#{self.class.to_s.split(/::/).last}: #{operation} #{side} @ "+
+              "#{position} = #{price} x #{size}>"
         end
       end
 
@@ -415,13 +415,14 @@ module IB
           "TWS #{ error? ? 'Error' : system? ? 'System' : 'Warning'
           } Message #{code}: #{message}"
         end
-      end # class ErrorMessage
+      end # class Alert
       Error = Alert
       ErrorMessage = Alert
 
       class OpenOrder < AbstractMessage
         @message_id = 5
 
+        # TODO: Add id accessor to unify with OrderStatus message
         attr_accessor :order, :contract
 
         def load
@@ -657,6 +658,10 @@ module IB
                                     :cumulative_quantity => @socket.read_int,
                                     :average_price => @socket.read_decimal
         end
+
+        def to_human
+          "<HistoricalData: req: #{id}, #{item_count} items, #{start_date} to #{end_date}>"
+        end
       end # ExecutionData
 
       # HistoricalData contains following @data:
@@ -702,8 +707,7 @@ module IB
         end
 
         def to_human
-          "<HistoricalData: req id #{@data[:id]}, #{@data[:item_count]
-          } items, from #{@data[:start_date_str]} to #{@data[:end_date_str]}>"
+          "<HistoricalData: req: #{id}, #{item_count} items, #{start_date} to #{end_date}>"
         end
       end # HistoricalData
 
@@ -818,7 +822,7 @@ module IB
         end
 
         def to_human
-          "<RealTimeBar: req id #{@data[:id]}, #{@bar}>"
+          "<RealTimeBar: req: #{id}, #{bar}>"
         end
       end # RealTimeBar
       RealTimeBars = RealTimeBar

data/lib/ib-ruby/models/order.rb

@@ -430,7 +430,7 @@ module IB
       end
 
       def serialize_algo
-        if algo_strategy.empty? || algo_strategy.nil?
+        if algo_strategy.nil? || algo_strategy.empty?
           ['']
         else
           [algo_strategy,

data/spec/spec_helper.rb

@@ -17,4 +17,7 @@ CONNECTION_OPTS = BROKERTRON ?
      :host => 'free.brokertron.com',
      :port=> 10501
     } :
-    {:client_id => 1111}
+    {:client_id => 1111,
+     :host => '127.0.0.1',
+     :port=> 4001
+    }

metadata

@@ -2,7 +2,7 @@
 name: ib-ruby
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.5.16
+  version: 0.5.17
 platform: ruby
 authors: 
   - Paul Legato
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-09 00:00:00 Z
+date: 2012-02-12 00:00:00 Z
 dependencies: 
   - !ruby/object:Gem::Dependency 
     name: bundler