ib-ruby 0.5.0 → 0.5.2

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

@@ -258,7 +258,75 @@ module IB
         super opts
       end
 
-      def serialize_algo(*args)
+      # This returns an Array of data from the given order,
+      # mixed with data from associated contract. Ugly mix, indeed.
+      def serialize_with contract
+        [contract.serialize_long(:sec_id),
+         action, # main order fields
+         total_quantity,
+         order_type,
+         limit_price,
+         aux_price,
+         tif, # xtended order fields
+         oca_group,
+         account,
+         open_close,
+         origin,
+         order_ref,
+         transmit,
+         parent_id,
+         block_order,
+         sweep_to_fill,
+         display_size,
+         trigger_method,
+         outside_rth, # was: ignore_rth
+         hidden,
+         contract.serialize_combo_legs(:long),
+         '', # deprecated shares_allocation field
+         discretionary_amount,
+         good_after_time,
+         good_till_date,
+         fa_group,
+         fa_method,
+         fa_percentage,
+         fa_profile,
+         short_sale_slot, #     0 only for retail, 1 or 2 for institution  (Institutional)
+         designated_location, # only populate when short_sale_slot == 2    (Institutional)
+         oca_type,
+         rule_80a,
+         settling_firm,
+         all_or_none,
+         min_quantity || EOL,
+         percent_offset || EOL,
+         etrade_only,
+         firm_quote_only,
+         nbbo_price_cap || EOL,
+         auction_strategy || EOL,
+         starting_price || EOL,
+         stock_ref_price || EOL,
+         delta || EOL,
+         stock_range_lower || EOL,
+         stock_range_upper || EOL,
+         override_percentage_constraints,
+         volatility || EOL, #              Volatility orders
+         volatility_type || EOL, #         Volatility orders
+         delta_neutral_order_type, #       Volatility orders
+         delta_neutral_aux_price || EOL, # Volatility orders
+         continuous_update, #              Volatility orders
+         reference_price_type || EOL, #    Volatility orders
+         trail_stop_price || EOL, #        TRAIL_STOP_LIMIT stop price
+         scale_init_level_size || EOL, #   Scale Orders
+         scale_subs_level_size || EOL, #   Scale Orders
+         scale_price_increment || EOL, #   Scale Orders
+         clearing_account,
+         clearing_intent,
+         not_held,
+         contract.serialize_under_comp,
+         serialize_algo,
+         what_if]
+      end
+
+      def serialize_algo
         if algo_strategy.empty? || algo_strategy.nil?
           ['']
         else

data/lib/ib-ruby/socket.rb

@@ -9,7 +9,7 @@ module IB
     end
 
     def read_string
-      str = self.gets(EOL).chop
+      self.gets(EOL).chop
     end
 
     def read_int

data/lib/ib-ruby/symbols/options.rb

@@ -10,18 +10,18 @@ module IB
     Options =
         {:wfc20 => Models::Contract.new(:symbol => "WFC",
                                         :exchange => "SMART",
-                                        :expiry => "201110",
+                                        :expiry => "201112",
                                         :right => "CALL",
                                         :strike => 20.0,
                                         :sec_type => SECURITY_TYPES[:option],
-                                        :description => "Wells Fargo 20 Call 2011-10"),
+                                        :description => "Wells Fargo 20 Call 2011-12"),
          :z50 => Models::Contract.new(:symbol => "Z",
                                       :exchange => "LIFFE",
-                                      :expiry => "201110",
+                                      :expiry => "201112",
                                       :right => "CALL",
                                       :strike => 50.0,
                                       :sec_type => SECURITY_TYPES[:option],
-                                      :description => " FTSE-100 index 50 Call 2011-10"),
+                                      :description => " FTSE-100 index 50 Call 2011-12"),
 
         }
   end

data/spec/ib-ruby/connection_spec.rb

@@ -2,56 +2,83 @@ require File.join(File.dirname(__FILE__), %w[.. spec_helper])
 
 describe IB::Connection do
 
-  context "new" do
-    context 'connected by default' do
-      # THIS depends on TWS|Gateway connectivity
-      before(:all) { @ib = IB::Connection.new }
-      after(:all) { @ib.close if @ib}
+  context 'when connected to IB Gateway', :connected => true do
+    # THIS depends on TWS|Gateway connectivity
+    before(:all) { @ib = IB::Connection.new }
+    after(:all) { @ib.close if @ib }
+
+    context 'instantiation with default options' do
       subject { @ib }
 
       it { should_not be_nil }
       it { should be_connected }
       its (:server) {should be_a Hash}
-      its (:subscribers) {should have_at_least(1).hash} # :NextValidID and empty Hashes
+      its (:server) {should have_key :reader}
+      its (:subscribers) {should have_at_least(1).item} # :NextValidID and empty Hashes
       its (:next_order_id) {should be_a Fixnum} # Not before :NextValidID arrives
     end
 
-    context 'passing :open => false' do
-      subject { IB::Connection.new :open => false }
+    describe '#send_message', 'sending messages' do
+      it 'allows 3 signatures representing IB::Messages::Outgoing' do
+        expect {
+          @ib.send_message :RequestOpenOrders, :subscribe => true
+        }.to_not raise_error
 
-      it { should_not be_nil }
-      it { should_not be_connected }
-      its (:server) {should be_a Hash}
-      its (:subscribers) {should be_empty}
-      its (:next_order_id) {should be_nil}
+        expect {
+          @ib.send_message IB::Messages::Outgoing::RequestOpenOrders, :subscribe => true
+        }.to_not raise_error
+
+        expect {
+          @ib.send_message IB::Messages::Outgoing::RequestOpenOrders.new(:subscribe => true)
+        }.to_not raise_error
+      end
+
+      it 'has legacy #dispatch alias' do
+        expect { @ib.dispatch :RequestOpenOrders, :subscribe => true
+        }.to_not raise_error
+      end
     end
-  end # instantiation
 
-  context "subscriptions" do
-    before(:all) { @ib = IB::Connection.new :open => false}
+    context "subscriptions" do
+
+      it '#subscribe, adds (multiple) subscribers' do
+        @subscriber_id = @ib.subscribe(IB::Messages::Incoming::Alert, :AccountValue) do
+          puts "oooooooooo"
+        end
+
+        @subscriber_id.should be_a Fixnum
 
-    it '#subscribe, adds (multiple) subscribers' do
-      @subscriber_id = @ib.subscribe(IB::Messages::Incoming::Alert, :AccountValue) do
-        puts "oooooooooo"
+        @ib.subscribers.should have_key(IB::Messages::Incoming::Alert)
+        @ib.subscribers.should have_key(IB::Messages::Incoming::AccountValue)
+        @ib.subscribers[IB::Messages::Incoming::Alert].should have_key(@subscriber_id)
+        @ib.subscribers[IB::Messages::Incoming::AccountValue].should have_key(@subscriber_id)
+        @ib.subscribers[IB::Messages::Incoming::Alert][@subscriber_id].should be_a Proc
+        @ib.subscribers[IB::Messages::Incoming::AccountValue][@subscriber_id].should be_a Proc
       end
 
-      @subscriber_id.should be_a Fixnum
+      it '#unsubscribe, removes all subscribers at this id' do
+        @ib.unsubscribe(@subscriber_id)
 
-      @ib.subscribers.should have_key(IB::Messages::Incoming::Alert)
-      @ib.subscribers.should have_key(IB::Messages::Incoming::AccountValue)
-      @ib.subscribers[IB::Messages::Incoming::Alert].should have_key(@subscriber_id)
-      @ib.subscribers[IB::Messages::Incoming::AccountValue].should have_key(@subscriber_id)
-      @ib.subscribers[IB::Messages::Incoming::Alert][@subscriber_id].should be_a Proc
-      @ib.subscribers[IB::Messages::Incoming::AccountValue][@subscriber_id].should be_a Proc
-    end
+        @ib.subscribers[IB::Messages::Incoming::Alert].should_not have_key(@subscriber_id)
+        @ib.subscribers[IB::Messages::Incoming::AccountValue].should_not have_key(@subscriber_id)
+      end
 
-    it '#unsubscribe, removes all subscribers at this id' do
-      @ib.unsubscribe(@subscriber_id)
+    end # subscriptions
+  end # connected
 
-      @ib.subscribers[IB::Messages::Incoming::Alert].should_not have_key(@subscriber_id)
-      @ib.subscribers[IB::Messages::Incoming::AccountValue].should_not have_key(@subscriber_id)
-    end
+  context 'not connected to IB Gateway' do
+    before(:all) { @ib = IB::Connection.new :connect => false, :reader => false }
 
-  end # subscriptions
+    context 'instantiation passing :connect => false' do
+      subject { @ib }
+
+      it { should_not be_nil }
+      it { should_not be_connected }
+      its (:server) {should be_a Hash}
+      its (:server) {should_not have_key :reader}
+      its (:subscribers) {should be_empty}
+      its (:next_order_id) {should be_nil}
+    end
 
+  end # not connected
 end # describe IB::Connection

data/spec/ib-ruby/models/contract_spec.rb

@@ -194,12 +194,12 @@ describe IB::Models::Contract do
     subject { stock = IB::Models::Contract.new properties }
 
     it "serializes long" do
-      subject.serialize(:long).should ==
+      subject.serialize_long.should ==
           ["TEST", IB::SECURITY_TYPES[:stock], "200609", 1234, "PUT", 123, "SMART", nil, "USD", "baz"]
     end
 
     it "serializes short" do
-      subject.serialize(:short).should ==
+      subject.serialize_short.should ==
           ["TEST", IB::SECURITY_TYPES[:stock], "200609", 1234, "PUT", 123, "SMART", "USD", "baz"]
     end
   end #serialization

metadata

@@ -2,139 +2,139 @@
 name: ib-ruby
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.5.0
+  version: 0.5.2
 platform: ruby
 authors: 
-  - arvicco
+- arvicco
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-10-29 00:00:00 +04:00
+date: 2011-12-12 00:00:00 -08:00
 default_executable: 
 dependencies: 
-  - !ruby/object:Gem::Dependency 
-    name: bundler
-    prerelease: false
-    requirement: &id001 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - ">="
-          - !ruby/object:Gem::Version 
-            version: 1.0.13
-    type: :runtime
-    version_requirements: *id001
-  - !ruby/object:Gem::Dependency 
-    name: rspec
-    prerelease: false
-    requirement: &id002 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - ">="
-          - !ruby/object:Gem::Version 
-            version: 2.5.0
-    type: :development
-    version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: bundler
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.0.13
+  type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 2.5.0
+  type: :development
+  version_requirements: *id002
 description: Ruby Implementation of the Interactive Broker' TWS API
 email: arvitallian@gmail.com
 executables: 
-  - account_info
-  - contract_details
-  - depth_of_market
-  - historic_data
-  - historic_data_cli
-  - market_data
-  - option_data
-  - template
-  - time_and_sales
+- account_info
+- contract_details
+- depth_of_market
+- historic_data
+- historic_data_cli
+- market_data
+- option_data
+- template
+- time_and_sales
 extensions: []
 
 extra_rdoc_files: 
-  - LICENSE
-  - HISTORY
-  - README.rdoc
+- LICENSE
+- HISTORY
+- README.rdoc
 files: 
-  - bin/account_info
-  - bin/contract_details
-  - bin/depth_of_market
-  - bin/historic_data
-  - bin/historic_data_cli
-  - bin/market_data
-  - bin/option_data
-  - bin/template
-  - bin/time_and_sales
-  - lib/ib-ruby.rb
-  - lib/version.rb
-  - lib/ib-ruby/connection.rb
-  - lib/ib-ruby/constants.rb
-  - lib/ib-ruby/messages.rb
-  - lib/ib-ruby/models.rb
-  - lib/ib-ruby/socket.rb
-  - lib/ib-ruby/symbols.rb
-  - lib/ib-ruby/messages/incoming.rb
-  - lib/ib-ruby/messages/outgoing.rb
-  - lib/ib-ruby/models/bar.rb
-  - lib/ib-ruby/models/contract.rb
-  - lib/ib-ruby/models/execution.rb
-  - lib/ib-ruby/models/model.rb
-  - lib/ib-ruby/models/order.rb
-  - lib/ib-ruby/symbols/forex.rb
-  - lib/ib-ruby/symbols/futures.rb
-  - lib/ib-ruby/symbols/options.rb
-  - lib/ib-ruby/symbols/stocks.rb
-  - spec/ib-ruby_spec.rb
-  - spec/spec_helper.rb
-  - spec/ib-ruby/connection_spec.rb
-  - spec/ib-ruby/models/contract_spec.rb
-  - spec/ib-ruby/models/order_spec.rb
-  - tasks/common.rake
-  - tasks/doc.rake
-  - tasks/gem.rake
-  - tasks/git.rake
-  - tasks/spec.rake
-  - tasks/version.rake
-  - Rakefile
-  - README.rdoc
-  - LICENSE
-  - VERSION
-  - HISTORY
-  - .gitignore
+- bin/account_info
+- bin/contract_details
+- bin/depth_of_market
+- bin/historic_data
+- bin/historic_data_cli
+- bin/market_data
+- bin/option_data
+- bin/template
+- bin/time_and_sales
+- lib/ib-ruby/connection.rb
+- lib/ib-ruby/constants.rb
+- lib/ib-ruby/messages/incoming.rb
+- lib/ib-ruby/messages/outgoing.rb
+- lib/ib-ruby/messages.rb
+- lib/ib-ruby/models/bar.rb
+- lib/ib-ruby/models/contract.rb
+- lib/ib-ruby/models/execution.rb
+- lib/ib-ruby/models/model.rb
+- lib/ib-ruby/models/order.rb
+- lib/ib-ruby/models.rb
+- lib/ib-ruby/socket.rb
+- lib/ib-ruby/symbols/forex.rb
+- lib/ib-ruby/symbols/futures.rb
+- lib/ib-ruby/symbols/options.rb
+- lib/ib-ruby/symbols/stocks.rb
+- lib/ib-ruby/symbols.rb
+- lib/ib-ruby.rb
+- lib/version.rb
+- spec/ib-ruby/connection_spec.rb
+- spec/ib-ruby/models/contract_spec.rb
+- spec/ib-ruby/models/order_spec.rb
+- spec/ib-ruby_spec.rb
+- spec/spec_helper.rb
+- tasks/common.rake
+- tasks/doc.rake
+- tasks/gem.rake
+- tasks/git.rake
+- tasks/spec.rake
+- tasks/version.rake
+- Rakefile
+- README.rdoc
+- LICENSE
+- VERSION
+- HISTORY
+- .gitignore
 has_rdoc: true
 homepage: http://github.com/arvicco/ib-ruby
 licenses: []
 
 post_install_message: 
 rdoc_options: 
-  - --charset
-  - UTF-8
-  - --main
-  - README.rdoc
-  - --title
-  - mix
+- --charset
+- UTF-8
+- --main
+- README.rdoc
+- --title
+- mix
 require_paths: 
-  - lib
+- lib
 required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.1
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Ruby Implementation of the Interactive Broker' TWS API
 test_files: 
-  - spec/ib-ruby_spec.rb
-  - spec/spec_helper.rb
-  - spec/ib-ruby/connection_spec.rb
-  - spec/ib-ruby/models/contract_spec.rb
-  - spec/ib-ruby/models/order_spec.rb
+- spec/ib-ruby/connection_spec.rb
+- spec/ib-ruby/models/contract_spec.rb
+- spec/ib-ruby/models/order_spec.rb
+- spec/ib-ruby_spec.rb
+- spec/spec_helper.rb