ib-ruby 0.7.0 → 0.7.2

data/HISTORY

@@ -137,3 +137,11 @@
 == 0.7.0 / 2012-03-22
 
 * Support for API v.967
+
+== 0.7.1 / 2012-03-22
+
+* Starting preparation for ActiveModel compatibility
+
+== 0.7.2 / 2012-03-23
+
+* Better spec documentation

data/README.md

@@ -24,10 +24,10 @@ the same machine as TWS.
 As a rule of thumb, most recent version of ib-ruby gem only supports latest versions
 of TWS/Gateway API. Older versions of API are supported by previous gem versions:
 
-ib-ruby gem     TWS version     API version
-0.5.21          918-920         965
-0.6.1           921-923         966
-0.7.1           924+            967
+  ib-ruby gem     TWS version     API version
+  0.5.21          918-920         965
+  0.6.1           921-923         966
+  0.7.1           924+            967
 
 ## INSTALLATION:
 
@@ -92,6 +92,26 @@ The sample scripts in `bin` directory provide examples of how common tasks
 can be achieved using ib-ruby. You may also want to look into `spec/integration`
 directory for more scenarios and examples of handling IB messages.
 
+## RUNNING TESTS:
+
+The gem comes with a spec suit that may be used to test ib-ruby compatibility
+with your specific TWS/Gateway installation. The test suit should be run ONLY
+against your IB paper trading account. Running it against live account may result
+in financial losses.
+
+In order to run tests, you should set up your IB paper trading connection parameters
+in 'spec/spec_helper' file. Modify account_name, host and port under section
+'Your IB PAPER ACCOUNT'. Do not change the client_id.
+
+Before running tests, you need to start your TWS/Gateway and allow API connection.
+You should not have any open/pending orders on your IB paper trading account prior
+to running tests, otherwise some tests will fail. Use 'bin/cancel_orders' script for
+bulk cancelling of open orders before running tests as needed.
+
+You can easily create your own tests following the guide in 'spec/README'.
+Help the development! See 'spec/TODO' for the list of use cases/scenarios
+that still need to be tested.
+
 ## LICENSE:
 
 This software is available under the LGPL.

data/TODO

@@ -12,15 +12,9 @@ http://finance.groups.yahoo.com/group/TWSAPI/message/25413
 
 5. IB Connection reconnects gracefully in case if TWS disconnects/reconnects
 
-6. Compatibility check for new TWS v.966
+6. @received_at timestamp in messages
 
-7. @received_at timestamp in messages
-
-8. Collect all messages in Connection#received_messages
-
-9. Flow handlers: Connection#wait_for / Connection#received?
-
-10. Create integration tests for more use cases (spec/README)
+7. Create integration tests for more use cases (spec/README)
 
 
 Done:
@@ -29,6 +23,12 @@ Done:
 
 2. IB#subscribe should accept regexes.
 
+3. Compatibility with for API v.966, 967
+
+4. Collect all received messages in Connection#received[:type] by default
+
+5. Flow handlers: Connection#wait_for / Connection#received?
+
 Ideas for future:
 
 1. Decouple Broker-specific Adapter from universal high-level messaging layer

data/VERSION

@@ -1 +1 @@
-0.7.0
+0.7.2

data/bin/account_info

@@ -12,7 +12,7 @@ require 'bundler/setup'
 require 'ib-ruby'
 
 # First, connect to IB TWS.
-ib = IB::Connection.new :client_id => 1112 # Arbitrary id to identify your script
+ib = IB::Connection.new :client_id => 1112 #, :port => 7496 # TWS
 
 # Set log level
 log.level = Logger::FATAL

data/bin/cancel_orders

@@ -13,7 +13,7 @@ require 'bundler/setup'
 require 'ib-ruby'
 
 # First, connect to IB TWS.
-ib = IB::Connection.new :client_id => 1112 # Arbitrary id to identify your script
+ib = IB::Connection.new :client_id => 1112 #, :port => 7496 # TWS
 
 # Subscribe to TWS alerts/errors and order-related messages
 ib.subscribe(:Alert, :OpenOrder, :OrderStatus, :OpenOrderEnd) { |msg| puts msg.to_human }

data/bin/contract_details

@@ -18,7 +18,7 @@ require 'ib-ruby'
            144 => IB::Symbols::Stocks[:wrong]}
 
 # Connect to IB TWS.
-ib = IB::Connection.new :client_id => 1112 # Arbitrary id to identify your script
+ib = IB::Connection.new :client_id => 1112 #, :port => 7496 # TWS
 
 # Subscribe to TWS alerts/errors
 ib.subscribe(IB::Messages::Incoming::Alert) { |msg| puts msg.to_human }

data/bin/depth_of_market

@@ -20,7 +20,7 @@ require 'ib-ruby'
 }
 
 # First, connect to IB TWS.
-ib = IB::Connection.new :client_id => 1112 # Arbitrary id to identify your script
+ib = IB::Connection.new :client_id => 1112 #, :port => 7496 # TWS
 
 # Subscribe to TWS alerts/errors
 ib.subscribe(:Alert) { |msg| puts msg.to_human }

data/bin/historic_data

@@ -19,7 +19,7 @@ require 'ib-ruby'
 }
 
 # Connect to IB TWS.
-ib = IB::Connection.new :client_id => 1112 # Arbitrary id to identify your script
+ib = IB::Connection.new :client_id => 1112 #, :port => 7496 # TWS
 
 # Subscribe to TWS alerts/errors
 ib.subscribe(:Alert) { |msg| puts msg.to_human }

data/bin/historic_data_cli

@@ -133,7 +133,7 @@ DATE_FORMAT = (opt["dateformat"] && opt["dateformat"].to_i) || 1
 PORT = (opt["port"] && opt["port"]) || '4001'
 
 # First, connect to IB TWS.
-ib = IB::Connection.new :client_id => 1112 # Arbitrary id to identify your script
+ib = IB::Connection.new :client_id => 1112 #, :port => 7496 # TWS
 
 # Subscribe to TWS alerts/errors
 ib.subscribe(:Alert) { |msg| puts msg.to_human }

data/bin/list_orders

@@ -9,10 +9,11 @@ $LOAD_PATH.unshift LIB_DIR unless $LOAD_PATH.include?(LIB_DIR)
 
 require 'rubygems'
 require 'bundler/setup'
+require 'pp'
 require 'ib-ruby'
 
-# First, connect to IB TWS.
-ib = IB::Connection.new :client_id => 0 # All Orders, including TWS-generated ones
+# Connect to IB as 0 (TWS) to retrieve all Orders, including TWS-generated ones
+ib = IB::Connection.new :client_id => 0 #, :port => 7496 # TWS
 
 # Subscribe to TWS alerts/errors and order-related messages
 @counter = 0
@@ -22,9 +23,11 @@ ib.subscribe(:Alert, :OrderStatus, :OpenOrderEnd) { |msg| puts msg.to_human }
 ib.subscribe(:OpenOrder) do |msg|
   @counter += 1
   puts "#{@counter}: #{msg.to_human}"
+  pp msg.order
 end
 
 ib.send_message :RequestAllOpenOrders
 
 # Wait for IB to respond to our request
 ib.wait_for :OpenOrderEnd
+sleep 1 # Let printer do the job

data/bin/market_data

@@ -18,7 +18,7 @@ require 'ib-ruby'
            789 => IB::Symbols::Forex[:usdcad]}
 
 # First, connect to IB TWS.
-ib = IB::Connection.new :client_id => 1112 # Arbitrary id to identify your script
+ib = IB::Connection.new :client_id => 1112 #, :port => 7496 # TWS
 
 ## Subscribe to TWS alerts/errors
 ib.subscribe(:Alert) { |msg| puts msg.to_human }

data/bin/option_data

@@ -18,8 +18,8 @@ require 'ib-ruby'
            17 => IB::Symbols::Options[:spy75],
            19 => IB::Symbols::Options[:spy100]}
 
-# First, connect to IB TWS.
-ib = IB::Connection.new :client_id => 1112 # Arbitrary id to identify your script
+# First, connect to IB TWS. Arbitrary :client_id is used to identify your script
+ib = IB::Connection.new :client_id => 1112 #, :port => 7496 # TWS
 
 ## Subscribe to TWS alerts/errors
 ib.subscribe(:Alert) { |msg| puts msg.to_human }

data/bin/place_combo_order

@@ -39,12 +39,12 @@ def butterfly symbol, expiry, right, *strikes
 end
 
 
-# First, connect to IB TWS.
-@ib = IB::Connection.new :client_id => 1112 # Arbitrary id to identify your script
-@ib.wait_for :NextValidId
+# First, connect to IB TWS. Arbitrary :client_id is used to identify your script
+ib = IB::Connection.new :client_id => 1112 #, :port => 7496 # TWS
 
 # Subscribe to TWS alerts/errors and order-related messages
 @ib.subscribe(:Alert, :OpenOrder, :OrderStatus) { |msg| puts msg.to_human }
+@ib.wait_for :NextValidId
 
 # Create multi-legged option Combo using utility method above
 combo = butterfly 'GOOG', '201301', 'CALL', 500, 510, 520

data/bin/place_order

@@ -11,8 +11,8 @@ require 'rubygems'
 require 'bundler/setup'
 require 'ib-ruby'
 
-# First, connect to IB TWS.
-ib = IB::Connection.new :client_id => 1112 # Arbitrary id to identify your script
+# First, connect to IB TWS. Arbitrary :client_id is used to identify your script
+ib = IB::Connection.new :client_id => 1112 #, :port => 7496 # TWS
 
 # Subscribe to TWS alerts/errors and order-related messages
 ib.subscribe(:Alert, :OpenOrder, :OrderStatus) { |msg| puts msg.to_human }

data/bin/template

@@ -10,8 +10,8 @@ require 'rubygems'
 require 'bundler/setup'
 require 'ib-ruby'
 
-# Connect to IB TWS.
-ib = IB::Connection.new :client_id => 1112 # Arbitrary id to identify your script
+# First, connect to IB TWS. Arbitrary :client_id is used to identify your script
+ib = IB::Connection.new :client_id => 1112 #, :port => 7496 # TWS
 
 # Subscribe to TWS alerts/errors
 ib.subscribe(:Alert) { |msg| puts msg.to_human }

data/bin/tick_data

@@ -16,7 +16,8 @@ contract = IB::Models::Contract.new :symbol=> 'AAPL',
                                     :sec_type=> IB::SECURITY_TYPES[:stock],
                                     :description=> "Some stock"
 
-ib = IB::Connection.new :client_id => 1112 # Arbitrary id to identify your script
+# First, connect to IB TWS. Arbitrary :client_id is used to identify your script
+ib = IB::Connection.new :client_id => 1112 #, :port => 7496 # TWS
 
 ib.subscribe(:Alert) { |msg| puts msg.to_human }
 ib.subscribe(:TickGeneric, :TickString, :TickPrice, :TickSize) { |msg| puts msg.inspect }

data/bin/time_and_sales

@@ -20,14 +20,12 @@ require 'ib-ruby'
 # To determine when the timeout has passed.
 @last_msg_time = Time.now.to_i + 2
 
-# Connect to IB TWS.
-ib = IB::Connection.new :client_id => 1112 # Arbitrary id to identify your script
+# First, connect to IB TWS. Arbitrary :client_id is used to identify your script
+ib = IB::Connection.new :client_id => 1112 #, :port => 7496 # TWS
 
 # Subscribe to TWS alerts/errors
 ib.subscribe(:Alert) { |msg| puts msg.to_human }
 
-MIN_SIZE = 0
-
 # This method filters out non-:last type events, and filters out any sale < MIN_SIZE.
 # Note that we have to look the ticker id of each incoming message
 # up in local memory to figure out what it's for.

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

@@ -73,6 +73,15 @@ module IB
 
       class OpenOrder
 
+        # Accessors to make OpenOrder API-compatible with OrderStatus message
+        def order_id
+          order && order.order_id
+        end
+
+        def status
+          order && order.status
+        end
+
         def load
           super
 

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

@@ -475,7 +475,6 @@ module IB
                 aux_price == other.aux_price &&
                 outside_rth == other.outside_rth &&
                 origin == other.origin &&
-                transmit == other.transmit &&
                 designated_location == other.designated_location &&
                 exempt_code == other.exempt_code &&
                 what_if == other.what_if &&

data/spec/README.md

@@ -2,33 +2,41 @@
 
 Pattern for writing integration specs is like this:
 
-1. You define your user scenario (such as: subscribe for FOREX market data).
+1. You define your user scenario (such as: subscribe for FUTURES market data).
 
 2. You find out experimentally, what messages should be sent to IB to accomplish it,
    and what messages are sent by IB in return.
 
-3. You start writing spec, requiring 'integration_helper'.
+3. You start writing spec, requiring 'integration_helper'. Don't forget to
+   'verify_account'! Running tests against live IB account can be pretty painful.
 
-4. Indicate your interest in incoming message types by calling 'connect_and_receive'
-   in a top-level before(:all) block. All messages of given types will be caught
-   and placed into @received Hash, keyed by message type.
+4. Establish connection in a top-level before(:all) block. Wait for IB to deliver
+   initial messages/data, for example using '@ib.wait_for :NextValidId' idiom.
 
-5. All log entries produced by ib-ruby will be caught and placed into log_entries Array.
+5. Now, you set up your context and send appropriate request messages to IB. Once
+   messages are sent, you need to give the server time to respond. The proper way
+   to do it is by '@ib.wait_for' specific message type that indicates that your
+   request was answered. For example, if you send :RequestOpenOrders, then received
+   :OpenOrdersEnd will be a sign that your request was processed. Usually, you
+   wait_for in a context before(:all) block.
 
-6. You send request messages to IB and then wait for specific conditions (or timeout)
-   by calling 'wait_for' (usually, in a context before(:all) block).
+6. It is now time to examine what responses you've got from IB and see if they meet
+   your expectations. All messages received frem IB are caught and placed into
+   @ib.received Hash, keyed by message type. The Hash has following structure:
+   {:MessageType1 => [msg1, msg2, msg3...], :MessageType2 => [msg1, msg2, msg3...] }.
 
-7. Once the conditions are satisfied, your examples can test the content of @received
-   Hash to see what messages were received, or log_entries Array to see what was logged
+7. If you created @ib Connection with mock_logger, all log entries produced by IB
+   will be also caught and placed into log_entries Array.
 
-8. When done, you call 'close_connection' in a top-level  after(:all) block.
+8. Your examples can thus test the content of @ib.received Hash to see what messages
+   were received, or log_entries Array to see what was logged.
 
-TODO: Add more scenarios:
-1. RealTimeBars
-2. BondContractData
-3. RequestScannerParameters + RequestScannerSubscription
-4. RequestFundamentalData
-5. ExerciseOptions
-6. RequestMarketData + special tick list
-7. RequestNewsBulletins
-8. RequestImpliedVolatility / RequestOptionPrice
+9. When done with this context, you call 'close_connection' helper in a top-level
+   after(:all) block to get rid of your active connection.
+
+10. If you reuse the connection between contexts and requests, it is recommended to
+   call 'clean_connection' in after block to remove old content from @ib.received Hash,
+   or otherwise manually clean it to remove old/not needed messages from it.
+
+Help the development!
+See 'spec/TODO' file for list of scenarios that still need to be tested.

data/spec/TODO

@@ -0,0 +1,10 @@
+TODO: Add more scenarios:
+
+1. RealTimeBars
+2. BondContractData
+3. RequestScannerParameters + RequestScannerSubscription
+4. RequestFundamentalData
+5. ExerciseOptions
+6. RequestMarketData + special tick list
+7. RequestNewsBulletins
+8. RequestImpliedVolatility / RequestOptionPrice

data/spec/ib-ruby/messages/incoming_spec.rb

@@ -7,7 +7,7 @@ shared_examples_for 'Alert message' do
   its(:message_type) { should == :Alert }
   its(:message_id) { should == 4 }
   its(:version) { should == 2 }
-  its(:data) { should == {:version=>2, :error_id=>-1, :code=>2104, :message=>"Market data farm connection is OK:cashfarm"} }
+  its(:data) { should_not be_empty }
   its(:error_id) { should == -1 }
   its(:code) { should == 2104 }
   its(:message) { should =~ /Market data farm connection is OK/ }

data/spec/integration/orders/combo_spec.rb

@@ -28,7 +28,7 @@ def butterfly symbol, expiry, right, *strikes
                                 :legs => legs
 end
 
-describe "Combo Order", :connected => true, :integration => true do
+describe "Combo Order", :connected => true, :integration => true, :slow => true do
 
   before(:all) { verify_account }
 
@@ -38,14 +38,60 @@ describe "Combo Order", :connected => true, :integration => true do
       @ib.wait_for :NextValidId
       @ib.clear_received # to avoid conflict with pre-existing Orders
 
-      @combo = butterfly 'GOOG', '201301', 'CALL', 500, 510, 520
+      @contract = butterfly 'GOOG', '201301', 'CALL', 500, 510, 520
 
-      place_order @combo, :limit_price => 0.01 #, :what_if => true
-      @ib.wait_for [:OpenOrder, 3], [:OrderStatus, 2], 5
+      place_order @contract, :limit_price => 0.01 #, :what_if => true
+      @ib.wait_for :OpenOrder, :OrderStatus, 5
     end
 
     after(:all) { close_connection }
 
     it_behaves_like 'Placed Order'
   end # Limit
+
+  context "Limit with attached takeprofit" do
+    before(:all) do
+      @ib = IB::Connection.new OPTS[:connection].merge(:logger => mock_logger)
+      @ib.wait_for :NextValidId
+      @ib.clear_received # to avoid conflict with pre-existing Orders
+
+      @contract = butterfly 'GOOG', '201301', 'CALL', 500, 510, 520
+
+      place_order @contract, :limit_price => 0.01, :transmit => false
+      @ib.wait_for :OpenOrder, :OrderStatus, 2
+    end
+
+    after(:all) { close_connection }
+
+    it 'does not transmit original Order just yet' do
+      @ib.received[:OpenOrder].should have_exactly(0).order_message
+      @ib.received[:OrderStatus].should have_exactly(0).status_message
+    end
+
+    context 'Attaching takeprofit' do
+      before(:all) do
+        @attached_order = IB::Models::Order.new :total_quantity => 100,
+                                                :limit_price => 0.5,
+                                                :action => 'SELL',
+                                                :order_type => 'LMT',
+                                                :parent_id => @order_id_placed
+
+        @order_id_attached = @ib.place_order @attached_order, @contract
+        @order_id_after = @ib.next_order_id
+        @ib.wait_for :OpenOrder, :OrderStatus, 5
+      end
+
+      it_behaves_like 'Placed Order'
+    end
+
+    context 'When original Order cancels' do
+      it 'attached takeprofit is cancelled implicitely' do
+        @ib.send_message :RequestOpenOrders
+        @ib.wait_for :OpenOrderEnd
+        @ib.received[:OpenOrder].should have_exactly(0).order_message
+        @ib.received[:OrderStatus].should have_exactly(0).status_message
+      end
+    end
+  end # Attached
 end # Combo Orders
+

data/spec/integration/orders/execution_spec.rb

@@ -50,7 +50,7 @@ describe "Trades", :connected => true, :integration => true, :slow => true do
       it { @ib.received[:ExecutionDataEnd].should be_empty }
 
       it 'receives filled OpenOrder' do
-        order_should_be 'Filled', -1
+        order_should_be 'Filled'
         msg = @ib.received[:OpenOrder].last
         msg.order.commission.should == 2.5
       end
@@ -60,7 +60,7 @@ describe "Trades", :connected => true, :integration => true, :slow => true do
       end
 
       it 'receives OrderStatus with fill details' do
-        status_should_be 'Filled', -1
+        status_should_be 'Filled'
       end
     end # Placing BUY
 
@@ -92,7 +92,7 @@ describe "Trades", :connected => true, :integration => true, :slow => true do
       it { @ib.received[:ExecutionData].should have_exactly(1).execution_data }
 
       it 'receives filled OpenOrder' do
-        order_should_be 'Filled', -1
+        order_should_be 'Filled'
         msg = @ib.received[:OpenOrder].last
         msg.order.commission.should == 2.5
       end
@@ -102,7 +102,7 @@ describe "Trades", :connected => true, :integration => true, :slow => true do
       end
 
       it 'receives OrderStatus with fill details' do
-        status_should_be 'Filled', -1
+        status_should_be 'Filled'
       end
     end # Placing SELL
 

data/spec/integration/orders/open_order

@@ -77,3 +77,22 @@ This is just a dump file to compare received order messages:
     :why_held=>""},
   @socket=nil>]
 
+Original Combo:                                 Attached Auto Combo Limit:
+
+<Order: LMT DAY BUY 100 PreSubmitted 0.01       2: <Order: LMT DAY SELL 100 PreSubmitted 1.01
+id: 3/173276893 from: 1111/DU118180>>           id: 0/173276895 from: 0/DU118180>>
+#<IB::Models::Order:0xfa0                       #<IB::Models::Order:0x102c
+ @action="BUY",                                  @action="SELL",
+ @client_id=1111,                                @client_id=0,    # Attached via TWS
+ @created_at=Fri Mar 23 09:09:16 +0400 2012,     @created_at=Fri Mar 23 09:09:16 +0400 2012,
+ @limit_price=0.01,                              @limit_price=1.01,
+ @oca_group="",                                  @oca_group="173276893",
+ @oca_type=3,                                    @oca_type=3,
+ @order_id=3,                                    @order_id=0,
+ @order_type="LMT",                              @order_type="LMT",
+ @parent_id=0,                                   @parent_id=3,
+ @perm_id=173276893,                             @perm_id=173276895,
+ @status="PreSubmitted",                         @status="PreSubmitted",
+ @tif="DAY",                                     @tif="DAY",
+ @total_quantity=100,                            @total_quantity=100,
+ @what_if=false>                                 @what_if=false>

data/spec/order_helper.rb

@@ -6,7 +6,7 @@ shared_examples_for 'Placed Order' do
 
     it 'changes client`s next_order_id' do
       @order_id_placed.should == @order_id_before
-      @ib.next_order_id.should == @order_id_before + 1
+      @ib.next_order_id.should be >= @order_id_before
     end
 
     it { @ib.received[:OpenOrder].should have_at_least(1).order_message }
@@ -30,10 +30,11 @@ shared_examples_for 'Placed Order' do
       @ib.next_order_id.should == @order_id_after
     end
 
-    it { @ib.received[:OpenOrder].should have_exactly(1).order_message }
-    it { @ib.received[:OrderStatus].should have_exactly(1).status_message }
+    it { @ib.received[:OpenOrder].should have_at_least(1).order_message }
+    it { @ib.received[:OrderStatus].should have_at_least(1).status_message }
     it { @ib.received[:OpenOrderEnd].should have_exactly(1).order_end_message }
-    it { @ib.received[:Alert].should have_exactly(0).alert_messages }
+
+    #it { @ib.received[:Alert].should have_exactly(0).alert_messages }
 
     it 'receives OpenOrder and OrderStatus for placed order' do
       order_should_be /Submitted/
@@ -44,7 +45,7 @@ shared_examples_for 'Placed Order' do
   context "Cancelling placed order" do
     before(:all) do
       @ib.cancel_order @order_id_placed
-      @ib.wait_for :OrderStatus, :Alert
+      @ib.wait_for [:OrderStatus, 2], :Alert
     end
 
     after(:all) { clean_connection } # Clear logs and message collector
@@ -57,8 +58,8 @@ shared_examples_for 'Placed Order' do
       @ib.received?(:OpenOrder).should be_false
     end
 
-    it { @ib.received[:OrderStatus].should have_exactly(1).status_message }
-    it { @ib.received[:Alert].should have_exactly(1).alert_message }
+    it { @ib.received[:OrderStatus].should have_at_least(1).status_message }
+    it { @ib.received[:Alert].should have_at_least(1).alert_message }
 
     it 'receives cancellation Order Status' do
       status_should_be /Cancel/ # Cancelled / PendingCancel
@@ -86,24 +87,18 @@ def place_order contract, opts
   @order_id_after = @ib.next_order_id
 end
 
-def check_status item, status
-  case status
-    when Regexp
-      item.status.should =~ status
-    when String
-      item.status.should == status
+def status_should_be status
+  msg = @ib.received[:OrderStatus].find do |msg|
+    msg.order_id == @order_id_placed &&
+        status.is_a?(Regexp) ? msg.status =~ status : msg.status == status
   end
-end
-
-def status_should_be status, index=0
-  msg = @ib.received[:OrderStatus][index]
+  msg.should_not be_nil
   msg.should be_an IB::Messages::Incoming::OrderStatus
   msg.order_id.should == @order_id_placed
   msg.perm_id.should be_an Integer
   msg.client_id.should == OPTS[:connection][:client_id]
   msg.parent_id.should == 0
   msg.why_held.should == ''
-  check_status msg, status
 
   if @contract == IB::Symbols::Forex[:eurusd]
     msg.filled.should == 20000
@@ -119,13 +114,16 @@ def status_should_be status, index=0
   end
 end
 
-def order_should_be status, index=0
-  msg = @ib.received[:OpenOrder][index]
+def order_should_be status
+  msg = @ib.received[:OpenOrder].find do |msg|
+    msg.order_id == @order_id_placed &&
+        status.is_a?(Regexp) ? msg.status =~ status : msg.status == status
+  end
+  msg.should_not be_nil
   msg.should be_an IB::Messages::Incoming::OpenOrder
   msg.order.should == @order
   msg.contract.should == @contract
   msg.order.order_id.should == @order_id_placed
-  check_status msg.order, status
 end
 
 def execution_should_be side, opts={}

data/spec/spec_helper.rb

@@ -41,6 +41,6 @@ else
       {:account_name => 'DU118180', # Your IB PAPER ACCOUNT, tests will only run against it
        :client_id => 1111, # Just an arbitrary id
        :host => '10.211.55.2', #  Where your TWS/gateway is located, likely 'localhost'
-       :port=> 4001 #             4001 for Gateway, 7496 for TWS GUI
+       :port => 4001 #             4001 for Gateway, 7496 for TWS GUI
       }
 end

metadata

@@ -2,7 +2,7 @@
 name: ib-ruby
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.7.0
+  version: 0.7.2
 platform: ruby
 authors: 
   - Paul Legato
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-22 00:00:00 Z
+date: 2012-03-23 00:00:00 Z
 dependencies: 
   - !ruby/object:Gem::Dependency 
     name: bundler
@@ -119,6 +119,7 @@ files:
   - spec/order_helper.rb
   - spec/README.md
   - spec/spec_helper.rb
+  - spec/TODO
   - spec/ib-ruby/connection_spec.rb
   - spec/ib-ruby/messages/incoming_spec.rb
   - spec/ib-ruby/messages/outgoing_spec.rb
@@ -184,6 +185,7 @@ test_files:
   - spec/order_helper.rb
   - spec/README.md
   - spec/spec_helper.rb
+  - spec/TODO
   - spec/ib-ruby/connection_spec.rb
   - spec/ib-ruby/messages/incoming_spec.rb
   - spec/ib-ruby/messages/outgoing_spec.rb