ib-ruby 0.7.2 → 0.7.3

data/HISTORY

@@ -145,3 +145,7 @@
 == 0.7.2 / 2012-03-23
 
 * Better spec documentation
+
+== 0.7.3 / 2012-03-23
+
+* Connection API extended

data/README.md

@@ -24,10 +24,11 @@ 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:
 

data/TODO

@@ -23,12 +23,13 @@ Done:
 
 2. IB#subscribe should accept regexes.
 
-3. Compatibility with for API v.966, 967
+3. Compatibility with 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.2
+0.7.3

data/lib/ib-ruby/connection.rb

@@ -155,16 +155,6 @@ module IB
 
     ### Working with received messages Hash
 
-    # Hash of received messages, keyed by message type
-    def received
-      @received ||= Hash.new { |hash, message_type| hash[message_type] = Array.new }
-    end
-
-    # Check if messages of given type were received at_least n times
-    def received? message_type, times=1
-      received[message_type].size >= times
-    end
-
     # Clear received messages Hash
     def clear_received *message_types
       if message_types.empty?
@@ -174,15 +164,19 @@ module IB
       end
     end
 
-    # Wait for specific condition(s) - given as callable/block, or
-    # message type(s) - given as Symbol or [Symbol, times] pair.
-    # Timeout after given time or 1 second.
-    def wait_for *args, &block
-      timeout = args.find { |arg| arg.is_a? Numeric } # extract timeout from args
-      end_time = Time.now + (timeout || 1) # default timeout 1 sec
-      conditions = args.delete_if { |arg| arg.is_a? Numeric }.push(block).compact
+    # Hash of received messages, keyed by message type
+    def received
+      @received ||= Hash.new { |hash, message_type| hash[message_type] = Array.new }
+    end
+
+    # Check if messages of given type were received at_least n times
+    def received? message_type, times=1
+      received[message_type].size >= times
+    end
 
-      sleep 0.1 until end_time < Time.now || !conditions.empty? &&
+    # Check if all given conditions are satisfied
+    def satisfied? *conditions
+      !conditions.empty? &&
           conditions.inject(true) do |result, condition|
             result && if condition.is_a?(Symbol)
                         received?(condition)
@@ -196,6 +190,23 @@ module IB
           end
     end
 
+    # Wait for specific condition(s) - given as callable/block, or
+    # message type(s) - given as Symbol or [Symbol, times] pair.
+    # Timeout after given time or 1 second.
+    def wait_for *args, &block
+      timeout = args.find { |arg| arg.is_a? Numeric } # extract timeout from args
+      end_time = Time.now + (timeout || 1) # default timeout 1 sec
+      conditions = args.delete_if { |arg| arg.is_a? Numeric }.push(block).compact
+
+      until end_time < Time.now || satisfied?(*conditions)
+        if server[:reader]
+          sleep 0.05
+        else
+          process_messages 50
+        end
+      end
+    end
+
     ### Working with Incoming messages from IB
 
     # Start reader thread that continuously reads messages from server in background.

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

@@ -358,6 +358,7 @@ module IB
                        :scale_auto_reset => false,
                        :scale_random_percent => false,
                        :opt_out_smart_routing => false,
+                       :status => 'New' # Starting new Orders with this statu
       }
 
       def initialize opts = {}

data/spec/README.md

@@ -21,7 +21,7 @@ Pattern for writing integration specs is like this:
    wait_for 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
+   your expectations. All messages received from 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...] }.
 

data/spec/integration/orders/combo_spec.rb

@@ -41,7 +41,7 @@ describe "Combo Order", :connected => true, :integration => true, :slow => true
       @contract = butterfly 'GOOG', '201301', 'CALL', 500, 510, 520
 
       place_order @contract, :limit_price => 0.01 #, :what_if => true
-      @ib.wait_for :OpenOrder, :OrderStatus, 5
+      @ib.wait_for :OpenOrder, :OrderStatus, 8
     end
 
     after(:all) { close_connection }
@@ -78,7 +78,7 @@ describe "Combo Order", :connected => true, :integration => true, :slow => true
 
         @order_id_attached = @ib.place_order @attached_order, @contract
         @order_id_after = @ib.next_order_id
-        @ib.wait_for :OpenOrder, :OrderStatus, 5
+        @ib.wait_for [:OpenOrder, 2], [:OrderStatus, 2], 8
       end
 
       it_behaves_like 'Placed Order'

metadata

@@ -2,7 +2,7 @@
 name: ib-ruby
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.7.2
+  version: 0.7.3
 platform: ruby
 authors: 
   - Paul Legato