ib-ruby 0.7.3 → 0.7.4

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

@@ -53,61 +53,61 @@ module IB
     # digit month. For example, November 2011 is "201111".
     #
     def self.future(base_symbol, exchange, currency, description="", expiry=nil)
-      Models::Contract.new(:symbol => base_symbol,
-                           :expiry => expiry || next_expiry,
-                           :exchange => exchange,
-                           :currency => currency,
-                           :sec_type => SECURITY_TYPES[:future],
-                           :description => description)
+      IB::Contract.new :symbol => base_symbol,
+                       :expiry => expiry || next_expiry,
+                       :exchange => exchange,
+                       :currency => currency,
+                       :sec_type => SECURITY_TYPES[:future],
+                       :description => description
     end
 
     Futures ={
-        :ym => Models::Contract.new(:symbol => "YM",
-                                    :expiry => next_expiry,
-                                    :exchange => "ECBOT",
-                                    :currency => "USD",
-                                    :sec_type => SECURITY_TYPES[:future],
-                                    :description => "Mini Dow Jones Industrial"),
+        :ym => IB::Contract.new(:symbol => "YM",
+                                :expiry => next_expiry,
+                                :exchange => "ECBOT",
+                                :currency => "USD",
+                                :sec_type => SECURITY_TYPES[:future],
+                                :description => "Mini Dow Jones Industrial"),
 
-        :es => Models::Contract.new(:symbol => "ES",
-                                    :expiry => next_expiry,
-                                    :exchange => "GLOBEX",
-                                    :currency => "USD",
-                                    :sec_type => SECURITY_TYPES[:future],
-                                    :multiplier => 50,
-                                    :description => "E-Mini S&P 500"),
+        :es => IB::Contract.new(:symbol => "ES",
+                                :expiry => next_expiry,
+                                :exchange => "GLOBEX",
+                                :currency => "USD",
+                                :sec_type => SECURITY_TYPES[:future],
+                                :multiplier => 50,
+                                :description => "E-Mini S&P 500"),
 
-        :gbp => Models::Contract.new(:symbol => "GBP",
-                                     :expiry => next_expiry,
-                                     :exchange => "GLOBEX",
-                                     :currency => "USD",
-                                     :sec_type => SECURITY_TYPES[:future],
-                                     :multiplier => 62500,
-                                     :description => "British Pounds"),
+        :gbp => IB::Contract.new(:symbol => "GBP",
+                                 :expiry => next_expiry,
+                                 :exchange => "GLOBEX",
+                                 :currency => "USD",
+                                 :sec_type => SECURITY_TYPES[:future],
+                                 :multiplier => 62500,
+                                 :description => "British Pounds"),
 
-        :eur => Models::Contract.new(:symbol => "EUR",
-                                     :expiry => next_expiry,
-                                     :exchange => "GLOBEX",
-                                     :currency => "USD",
-                                     :sec_type => SECURITY_TYPES[:future],
-                                     :multiplier => 12500,
-                                     :description => "Euro FX"),
+        :eur => IB::Contract.new(:symbol => "EUR",
+                                 :expiry => next_expiry,
+                                 :exchange => "GLOBEX",
+                                 :currency => "USD",
+                                 :sec_type => SECURITY_TYPES[:future],
+                                 :multiplier => 12500,
+                                 :description => "Euro FX"),
 
-        :jpy => Models::Contract.new(:symbol => "JPY",
-                                     :expiry => next_expiry,
-                                     :exchange => "GLOBEX",
-                                     :currency => "USD",
-                                     :sec_type => SECURITY_TYPES[:future],
-                                     :multiplier => 12500000,
-                                     :description => "Japanese Yen"),
+        :jpy => IB::Contract.new(:symbol => "JPY",
+                                 :expiry => next_expiry,
+                                 :exchange => "GLOBEX",
+                                 :currency => "USD",
+                                 :sec_type => SECURITY_TYPES[:future],
+                                 :multiplier => 12500000,
+                                 :description => "Japanese Yen"),
 
-        :hsi => Models::Contract.new(:symbol => "HSI",
-                                     :expiry => next_expiry,
-                                     :exchange => "HKFE",
-                                     :currency => "HKD",
-                                     :sec_type => SECURITY_TYPES[:future],
-                                     :multiplier => 50,
-                                     :description => "Hang Seng Index")
+        :hsi => IB::Contract.new(:symbol => "HSI",
+                                 :expiry => next_expiry,
+                                 :exchange => "HKFE",
+                                 :currency => "HKD",
+                                 :sec_type => SECURITY_TYPES[:future],
+                                 :multiplier => 50,
+                                 :description => "Hang Seng Index")
     }
   end
 end

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

@@ -8,29 +8,29 @@ module IB
   module Symbols
 
     Options =
-        {:wfc20 => Models::Contract::Option.new(:symbol => "WFC",
-                                                :expiry => "201207",
-                                                :right => "CALL",
-                                                :strike => 20.0,
-                                                :description => "Wells Fargo 20 Call 2012-07"),
-         :aapl500 => Models::Contract::Option.new(:symbol => "AAPL",
-                                                  :expiry => "201301",
-                                                  :right => "CALL",
-                                                  :strike => 500,
-                                                  :description => "Apple 500 Call 2013-01"),
-         :z50 => Models::Contract::Option.new(:symbol => "Z",
-                                              :exchange => "LIFFE",
-                                              :expiry => "201206",
-                                              :right => "CALL",
-                                              :strike => 50.0,
-                                              :description => " FTSE-100 index 50 Call 2012-06"),
-         :spy75 => Models::Contract::Option.new(:symbol => 'SPY',
-                                                :expiry => "20120615",
-                                                :right => "P",
-                                                :currency => "USD",
-                                                :strike => 75.0,
-                                                :description => "SPY 75.0 Put 2012-06-16"),
-         :spy100 => Models::Contract::Option.new(:osi => 'SPY 121222P00100000'),
+        {:wfc20 => IB::Option.new(:symbol => "WFC",
+                                  :expiry => "201207",
+                                  :right => "CALL",
+                                  :strike => 20.0,
+                                  :description => "Wells Fargo 20 Call 2012-07"),
+         :aapl500 => IB::Option.new(:symbol => "AAPL",
+                                    :expiry => "201301",
+                                    :right => "CALL",
+                                    :strike => 500,
+                                    :description => "Apple 500 Call 2013-01"),
+         :z50 => IB::Option.new(:symbol => "Z",
+                                :exchange => "LIFFE",
+                                :expiry => "201206",
+                                :right => "CALL",
+                                :strike => 50.0,
+                                :description => " FTSE-100 index 50 Call 2012-06"),
+         :spy75 => IB::Option.new(:symbol => 'SPY',
+                                  :expiry => "20120615",
+                                  :right => "P",
+                                  :currency => "USD",
+                                  :strike => 75.0,
+                                  :description => "SPY 75.0 Put 2012-06-16"),
+         :spy100 => IB::Option.new(:osi => 'SPY 121222P00100000'),
         }
   end
 end

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

@@ -8,22 +8,22 @@ module IB
   module Symbols
 
     Stocks =
-        {:wfc => Models::Contract.new(:symbol => "WFC",
-                                      :exchange => "NYSE",
-                                      :currency => "USD",
-                                      :sec_type => SECURITY_TYPES[:stock],
-                                      :description => "Wells Fargo"),
+        {:wfc => IB::Contract.new(:symbol => "WFC",
+                                  :exchange => "NYSE",
+                                  :currency => "USD",
+                                  :sec_type => SECURITY_TYPES[:stock],
+                                  :description => "Wells Fargo"),
 
-         :aapl => Models::Contract.new(:symbol => "AAPL",
-                                       :currency => "USD",
-                                       :sec_type => SECURITY_TYPES[:stock],
-                                       :description => "Apple Inc."),
+         :aapl => IB::Contract.new(:symbol => "AAPL",
+                                   :currency => "USD",
+                                   :sec_type => SECURITY_TYPES[:stock],
+                                   :description => "Apple Inc."),
 
-         :wrong => Models::Contract.new(:symbol => "QEEUUE",
-                                        :exchange => "NYSE",
-                                        :currency => "USD",
-                                        :sec_type => SECURITY_TYPES[:stock],
-                                        :description => "Non-existent stock"),
+         :wrong => IB::Contract.new(:symbol => "QEEUUE",
+                                    :exchange => "NYSE",
+                                    :currency => "USD",
+                                    :sec_type => SECURITY_TYPES[:stock],
+                                    :description => "Non-existent stock"),
         }
   end
 end

data/lib/ib-ruby.rb

@@ -1,12 +1,20 @@
 module IB
-end # module IB
+
+  require 'ib-ruby/version'
+  require 'ib-ruby/extensions'
+  require 'ib-ruby/errors'
+  require 'ib-ruby/constants'
+  require 'ib-ruby/connection'
+
+  require 'ib-ruby/models'
+  Datatypes = Models # Flatten namespace (IB::Contract instead of IB::Models::Contract)
+  include Models # Legacy alias
+
+  require 'ib-ruby/messages'
+  IncomingMessages = Messages::Incoming # Legacy alias
+  OutgoingMessages = Messages::Outgoing # Legacy alias
+
+  require 'ib-ruby/symbols'
+end
 IbRuby = IB
 
-require 'ib-ruby/version'
-require 'ib-ruby/extensions'
-require 'ib-ruby/errors'
-require 'ib-ruby/constants'
-require 'ib-ruby/connection'
-require 'ib-ruby/models'
-require 'ib-ruby/messages'
-require 'ib-ruby/symbols'

data/spec/README.md

@@ -38,5 +38,11 @@ Pattern for writing integration specs is like this:
    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.
 
+11. If you want to see exactly what's going on inside ib-ruby while your examples are
+    running, set OPTS[:silent] = false in your context, and you'll see all the
+    messages received and log entries made as as result of your examples. Be warned,
+    output is very verbose, so don't forget to switch OPTS[:silent] = true after
+    you've done debugging your examples.
+
 Help the development!
 See 'spec/TODO' file for list of scenarios that still need to be tested.

data/spec/account_helper.rb

@@ -57,7 +57,7 @@ shared_examples_for 'Valid account data request' do
     subject { @ib.received[:PortfolioValue].first }
 
     it { should be_an IB::Messages::Incoming::PortfolioValue }
-    its(:contract) { should be_a IB::Models::Contract }
+    its(:contract) { should be_a IB::Contract }
     its(:data) { should be_a Hash }
     its(:position) { should be_a Integer }
     its(:market_price) { should be_a Float }

data/spec/combo_helper.rb

@@ -0,0 +1,31 @@
+require 'integration_helper'
+
+# Define butterfly
+def butterfly symbol, expiry, right, *strikes
+  unless @ib && @ib.connected?
+    @ib = IB::Connection.new OPTS[:connection].merge(:logger => mock_logger)
+  end
+
+  legs = strikes.zip([1, -2, 1]).map do |strike, weight|
+    # Create contract
+    contract = IB::Option.new :symbol => symbol,
+                              :expiry => expiry,
+                              :right => right,
+                              :strike => strike
+    # Find out contract's con_id
+    @ib.clear_received :ContractData, :ContractDataEnd
+    @ib.send_message :RequestContractData, :id => strike, :contract => contract
+    @ib.wait_for :ContractDataEnd, 3
+    con_id = @ib.received[:ContractData].last.contract.con_id
+
+    # Create Comboleg from con_id and weight
+    IB::ComboLeg.new :con_id => con_id, :weight => weight
+  end
+
+  # Create new Combo contract
+  IB::Bag.new :symbol => symbol,
+              :currency => "USD", # Only US options in combo Contracts
+              :exchange => "SMART",
+              :legs => legs
+end
+

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

@@ -7,7 +7,7 @@ describe IB::Models::ComboLeg do
      :ratio=> 1234,
      :action => 'BUY',
      :exchange => 'BLAH',
-     :open_close => IB::Models::ComboLeg::OPEN,
+     :open_close => IB::ComboLeg::OPEN,
      :short_sale_slot => 1,
      :designated_location => 'BLEH',
      :exempt_code => 12}
@@ -15,7 +15,7 @@ describe IB::Models::ComboLeg do
 
   context "instantiation" do
     context 'empty without properties' do
-      subject { IB::Models::ComboLeg.new }
+      subject { IB::ComboLeg.new }
 
       it { should_not be_nil }
       its(:con_id) {should == 0}
@@ -28,7 +28,7 @@ describe IB::Models::ComboLeg do
     end
 
     context 'with properties' do
-      subject { IB::Models::ComboLeg.new properties }
+      subject { IB::ComboLeg.new properties }
 
       it 'sets properties right' do
         properties.each do |name, value|
@@ -43,7 +43,7 @@ describe IB::Models::ComboLeg do
 
     it 'allows setting attributes' do
       expect {
-        x = IB::Models::ComboLeg.new
+        x = IB::ComboLeg.new
         properties.each do |name, value|
           subject.send("#{name}=", value)
           subject.send(name).should == value

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

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe IB::Models::Contract do
+describe IB::Models::Contracts::Contract do # AKA IB::Contract
 
   let(:properties) do
     {:symbol => "TEST",
@@ -15,7 +15,7 @@ describe IB::Models::Contract do
   end
 
   context "instantiation" do
-    context 'empty without properties' do
+    context 'using fully qualified class name without properties' do
       subject { IB::Models::Contract.new }
 
       it { should_not be_nil }
@@ -26,8 +26,19 @@ describe IB::Models::Contract do
       its(:include_expired) { should == false }
     end
 
+    context 'using short class name without properties' do
+      subject { IB::Contract.new }
+
+      it { should_not be_nil }
+      its(:con_id) { should == 0 }
+      its(:strike) { should == 0 }
+      its(:sec_type) { should be_nil }
+      its(:created_at) { should be_a Time }
+      its(:include_expired) { should == false }
+    end
+
     context 'with properties' do
-      subject { IB::Models::Contract.new properties }
+      subject { IB::Contract.new properties }
 
       it 'sets properties right' do
         properties.each do |name, value|
@@ -54,7 +65,7 @@ describe IB::Models::Contract do
       end
 
       context 'empty without properties' do
-        subject { IB::Models::Contract.new }
+        subject { IB::Contract.new }
 
         its(:summary) { should == subject }
         its(:under_con_id) { should == 0 }
@@ -68,7 +79,7 @@ describe IB::Models::Contract do
       end
 
       context 'with properties' do
-        subject { IB::Models::Contract.new detailed_properties }
+        subject { IB::Contract.new detailed_properties }
 
         its(:summary) { should == subject }
         its(:created_at) { should be_a Time }
@@ -83,7 +94,7 @@ describe IB::Models::Contract do
 
     it 'allows setting attributes' do
       expect {
-        x = IB::Models::Contract.new
+        x = IB::Contract.new
         properties.each do |name, value|
           subject.send("#{name}=", value)
           subject.send(name).should == value
@@ -94,7 +105,7 @@ describe IB::Models::Contract do
     end
 
     it 'allows setting ContractDetails attributes' do
-      x = IB::Models::Contract.new
+      x = IB::Contract.new
       expect {
         x.callable = true
         x.puttable = true
@@ -113,53 +124,53 @@ describe IB::Models::Contract do
     end
 
     it 'converts multiplier to int' do
-      expect { @contract = IB::Models::Contract.new(:multiplier => '123') }.to_not raise_error
+      expect { @contract = IB::Contract.new(:multiplier => '123') }.to_not raise_error
       expect { @contract.multiplier = '123' }.to_not raise_error
       @contract.multiplier.should == 123
     end
 
     it 'raises on wrong security type' do
-      expect { IB::Models::Contract.new(:sec_type => "asdf") }.to raise_error ArgumentError
+      expect { IB::Contract.new(:sec_type => "asdf") }.to raise_error ArgumentError
 
-      expect { IB::Models::Contract.new.sec_type = "asdf" }.to raise_error ArgumentError
+      expect { IB::Contract.new.sec_type = "asdf" }.to raise_error ArgumentError
     end
 
     it 'accepts pre-determined security types' do
       IB::SECURITY_TYPES.values.each do |type|
-        expect { IB::Models::Contract.new(:sec_type => type) }.to_not raise_error
+        expect { IB::Contract.new(:sec_type => type) }.to_not raise_error
 
-        expect { IB::Models::Contract.new.sec_type = type }.to_not raise_error
+        expect { IB::Contract.new.sec_type = type }.to_not raise_error
       end
     end
 
     it 'raises on wrong expiry' do
-      expect { IB::Models::Contract.new(:expiry => "foo") }.to raise_error ArgumentError
+      expect { IB::Contract.new(:expiry => "foo") }.to raise_error ArgumentError
 
-      expect { IB::Models::Contract.new.expiry = "foo" }.to raise_error ArgumentError
+      expect { IB::Contract.new.expiry = "foo" }.to raise_error ArgumentError
     end
 
     it 'accepts correct expiry' do
-      expect { IB::Models::Contract.new(:expiry => "200607") }.to_not raise_error
+      expect { IB::Contract.new(:expiry => "200607") }.to_not raise_error
 
-      expect { IB::Models::Contract.new.expiry = "200607" }.to_not raise_error
+      expect { IB::Contract.new.expiry = "200607" }.to_not raise_error
 
-      expect { IB::Models::Contract.new(:expiry => 200607) }.to_not raise_error
+      expect { IB::Contract.new(:expiry => 200607) }.to_not raise_error
 
       expect {
-        x = IB::Models::Contract.new
+        x = IB::Contract.new
         x.expiry = 200607
         x.expiry.should == "200607" # converted to a string
       }.to_not raise_error
     end
 
     it 'raises on incorrect right (option type)' do
-      expect { IB::Models::Contract.new(:right => "foo") }.to raise_error ArgumentError
-      expect { IB::Models::Contract.new.right = "foo" }.to raise_error ArgumentError
+      expect { IB::Contract.new(:right => "foo") }.to raise_error ArgumentError
+      expect { IB::Contract.new.right = "foo" }.to raise_error ArgumentError
     end
 
     it 'accepts all correct values for right (option type)' do
       ["PUT", "put", "P", "p"].each do |right|
-        expect { @contract = IB::Models::Contract.new(:right => right) }.to_not raise_error
+        expect { @contract = IB::Contract.new(:right => right) }.to_not raise_error
         @contract.right.should == "PUT"
 
         expect { @contract.right = right }.to_not raise_error
@@ -167,7 +178,7 @@ describe IB::Models::Contract do
       end
 
       ["CALL", "call", "C", "c"].each do |right|
-        expect { @contract = IB::Models::Contract.new(:right => right) }.to_not raise_error
+        expect { @contract = IB::Contract.new(:right => right) }.to_not raise_error
         @contract.right.should == "CALL"
 
         expect { @contract.right = right }.to_not raise_error
@@ -177,7 +188,7 @@ describe IB::Models::Contract do
   end #instantiation
 
   context "serialization" do
-    subject { IB::Models::Contract.new properties }
+    subject { IB::Contract.new properties }
 
     it "serializes long" do
       subject.serialize_long.should ==
@@ -191,15 +202,15 @@ describe IB::Models::Contract do
   end #serialization
 
   context 'equality' do
-    subject { IB::Models::Contract.new properties }
+    subject { IB::Contract.new properties }
 
     it 'be self-equal ' do
       should == subject
     end
 
     it 'be equal to object with the same properties' do
-      should == IB::Models::Contract.new(properties)
+      should == IB::Contract.new(properties)
     end
   end
 
-end # describe IB::Models::Contract
+end # describe IB::Contract

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

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe IB::Models::Execution do
+describe IB::Models::Execution do # AKA IB::Execution
 
   let(:properties) do
     {:account_name => "DU111110",
@@ -21,7 +21,7 @@ describe IB::Models::Execution do
 
   context "instantiation" do
     context 'empty without properties' do
-      subject { IB::Models::Execution.new }
+      subject { IB::Execution.new }
 
       it { should_not be_nil }
       its(:order_id) { should == 0 }
@@ -34,7 +34,7 @@ describe IB::Models::Execution do
     end
 
     context 'with properties' do
-      subject { IB::Models::Execution.new properties }
+      subject { IB::Execution.new properties }
 
       it 'sets properties right' do
         properties.each do |name, value|
@@ -48,7 +48,7 @@ describe IB::Models::Execution do
 
     it 'allows setting properties' do
       expect {
-        x = IB::Models::Execution.new
+        x = IB::Execution.new
         properties.each do |name, value|
           subject.send("#{name}=", value)
           subject.send(name).should == value
@@ -57,7 +57,7 @@ describe IB::Models::Execution do
     end
 
     it 'sets side as directed by its setter' do
-      @x = IB::Models::Execution.new
+      @x = IB::Execution.new
       ['BOT', 'BUY', 'Buy', 'buy', :BUY, :BOT, :Buy, :buy, 'B', :b].each do |val|
         expect { @x.side = val }.to_not raise_error
         @x.side.should == :buy

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

@@ -5,7 +5,7 @@ describe IB::Models::Order do
   let(:properties) do
     {:outside_rth => true,
      :open_close => 'C',
-     :origin => IB::Models::Order::Origin_Firm,
+     :origin => IB::Order::Origin_Firm,
      :transmit => false,
      :designated_location => "WHATEVER",
      :exempt_code => 123,
@@ -16,12 +16,12 @@ describe IB::Models::Order do
 
   context "instantiation" do
     context 'empty without properties' do
-      subject { IB::Models::Order.new }
+      subject { IB::Order.new }
 
       it { should_not be_nil }
       its(:outside_rth) { should == false }
       its(:open_close) { should == "O" }
-      its(:origin) { should == IB::Models::Order::Origin_Customer }
+      its(:origin) { should == IB::Order::Origin_Customer }
       its(:transmit) { should == true }
       its(:designated_location) { should == '' }
       its(:exempt_code) { should == -1 }
@@ -32,7 +32,7 @@ describe IB::Models::Order do
     end
 
     context 'with properties' do
-      subject { IB::Models::Order.new properties }
+      subject { IB::Order.new properties }
 
       it 'sets properties right' do
         properties.each do |name, value|
@@ -46,7 +46,7 @@ describe IB::Models::Order do
     end
 
     it 'allows setting attributes' do
-      x = IB::Models::Order.new
+      x = IB::Order.new
       properties.each do |name, value|
         subject.send("#{name}=", value)
         subject.send(name).should == value
@@ -55,22 +55,22 @@ describe IB::Models::Order do
   end #instantiation
 
   context 'equality' do
-    subject { IB::Models::Order.new properties }
+    subject { IB::Order.new properties }
 
     it 'is  self-equal ' do
       should == subject
     end
 
     it 'is equal to Order with the same properties' do
-      should == IB::Models::Order.new(properties)
+      should == IB::Order.new(properties)
     end
 
     it 'is not equal for Orders with different limit price' do
-      order1 = IB::Models::Order.new :total_quantity => 100,
+      order1 = IB::Order.new :total_quantity => 100,
                                      :limit_price => 1,
                                      :action => 'BUY'
 
-      order2 = IB::Models::Order.new :total_quantity => 100,
+      order2 = IB::Order.new :total_quantity => 100,
                                      :limit_price => 2,
                                      :action => 'BUY'
       order1.should_not == order2
@@ -78,11 +78,11 @@ describe IB::Models::Order do
     end
 
     it 'is not equal for Orders with different total_quantity' do
-      order1 = IB::Models::Order.new :total_quantity => 20000,
+      order1 = IB::Order.new :total_quantity => 20000,
                                      :limit_price => 1,
                                      :action => 'BUY'
 
-      order2 = IB::Models::Order.new :total_quantity => 100,
+      order2 = IB::Order.new :total_quantity => 100,
                                      :action => 'BUY',
                                      :limit_price => 1
       order1.should_not == order2
@@ -90,11 +90,11 @@ describe IB::Models::Order do
     end
 
     it 'is not equal for Orders with different action/side' do
-      order1 = IB::Models::Order.new :total_quantity => 100,
+      order1 = IB::Order.new :total_quantity => 100,
                                      :limit_price => 1,
                                      :action => 'SELL'
 
-      order2 = IB::Models::Order.new :total_quantity => 100,
+      order2 = IB::Order.new :total_quantity => 100,
                                      :action => 'BUY',
                                      :limit_price => 1
       order1.should_not == order2
@@ -102,12 +102,12 @@ describe IB::Models::Order do
     end
 
     it 'is not equal for Orders with different order_type' do
-      order1 = IB::Models::Order.new :total_quantity => 100,
+      order1 = IB::Order.new :total_quantity => 100,
                                      :limit_price => 1,
                                      :action => 'BUY',
                                      :order_type => 'LMT'
 
-      order2 = IB::Models::Order.new :total_quantity => 100,
+      order2 = IB::Order.new :total_quantity => 100,
                                      :action => 'BUY',
                                      :limit_price => 1,
                                      :order_type => 'MKT'
@@ -116,4 +116,4 @@ describe IB::Models::Order do
     end
   end
 
-end # describe IB::Models::Order
+end # describe IB::Order