Including test-suite

Author: Hartmut Bischoff

Rakefile

@@ -1,6 +1,11 @@
 require "bundler/gem_tasks"
-require "rspec/api/rake_task"
 
-RSpec::Api::RakeTask.new(:spec)
+require "rake"
+require "rspec/core/rake_task"
 
-task :default => :spec
+RSpec::Core::RakeTask.new(:spec) do |t|
+  t.pattern = Dir.glob("spec/**/*_spec.rb")
+  t.rspec_opts = "--format documentation"
+end
+
+task default: :spec

lib/api/version.rb

@@ -20,6 +20,7 @@ def version # Per message, received messages may have the different versions
 
 				def check_version actual, expected
 					unless actual == expected || expected.is_a?(Array) && expected.include?(actual)
+						puts self.class.name
 						error "Unsupported version #{actual} received, expected #{expected}"
 					end
 				end
@@ -34,7 +35,7 @@ def initialize source
 						@buffer = source
 			### DEBUG  DEBUG  DEBUG  RAW STREAM                            ###############
 			#  if uncommented, the raw-input from the tws is included in the logging
-			#		  puts "BUFFER :> #{buffer.inspect} "
+		  #		  puts "BUFFER :> #{buffer.inspect} "
 			### DEBUG  DEBUG  DEBUG  RAW STREAM                            ###############
 						@data = Hash.new
 						self.load

lib/extensions/contract.rb

@@ -7,7 +7,7 @@ module ContractAccessors
 
       ContractDetails = ContractData =
         def_message([10, [6, 8]],
-                    [:request_id, :int], # request id 
+                    [:request_id, :int],                          ## request id 
                     [:contract, :symbol, :string],								## next the major contract-fields
                     [:contract, :sec_type, :string],							## are transmitted
                     [:contract, :last_trading_day, :date],				## difference to the array.get_contract
@@ -16,8 +16,8 @@ module ContractAccessors
                     [:contract, :exchange, :string],							##
                     [:contract, :currency, :string],							## thus we have to read the fields separately
                     [:contract, :local_symbol, :string],
-                    [:contract_detail, :market_name, :string], # extended
-										[:contract, :trading_class, :string],  # new Version 8
+                    [:contract_detail, :market_name, :string],    ## extended
+										[:contract, :trading_class, :string],         ## new Version 8
                     [:contract, :con_id, :int],
                     [:contract_detail, :min_tick, :decimal],
                     [:contract_detail, :md_size_multiplier, :int],

lib/ib/messages/incoming/abstract_message.rb

@@ -26,7 +26,7 @@ def initialize data={}
         def send_to socket
 	  ### debugging of outgoing Messages
 	 # puts "------sendto ---------(debugging output in outgoing/abstract_message)" 
-	 # puts socket.prepare_message( self.preprocess).inspect.split('\x00')[3..-1].inspect
+	 #  puts socket.prepare_message( self.preprocess).inspect.split('\x00')[3..-1].inspect
 	 # puts "------sendto ---------"
           socket.send_messages self.preprocess #.each {|data| socket.write_data data}
         end

lib/ib/messages/incoming/contract_data.rb

@@ -89,16 +89,16 @@ module Outgoing
 					# accounts and/or models. The account and model parameters are
 					# optional if there are not multiple accounts or models available. 
 					RequestPositionsMulti = def_message( 74,  :request_id, # autogenerated
-						 :account,
+						 [ :account, 'ALL' ],
 						 [:model_code, nil ] )
 
-					CancelPositionsMulti = def_message 75 #  :request_id required
+					CancelPositionsMulti = def_message( 75, :request_id ) # required
 
 					RequestAccountUpdatesMulti = def_message( 76, :request_id, # autogenerated
-						 :account,																# account or account-group	
+						 [ :account, 'ALL'],													# account or account-group	
 						 [:model_code, nil],
-						 [ :leger_and_nlv, nil ])
-					CancelAccountUpdatesMulti = def_message 77 #    :request_id  required
+						 [:leger_and_nlv, nil ])
+					CancelAccountUpdatesMulti = def_message 77, :request_id  #  required
 		end # module outgoing
 	end # module messages 
 end # module ib

lib/ib/messages/outgoing/abstract_message.rb

@@ -371,13 +371,6 @@ def order_requirements
   require 'models/ib/future'
   require 'models/ib/stock'
   require 'models/ib/index'
-	require 'models/ib/spread'
-#	require 'models/ib/straddle'
-#  require 'models/ib/strangle'
-#  require 'models/ib/calendar'
-#  require 'models/ib/vertical'
-#  require 'models/ib/butterfly'
-#  require 'models/ib/stock_spread'
 
   class Contract
     # Contract subclasses representing specialized security types.
@@ -389,17 +382,11 @@ class Contract
     Subclasses[:stock] = IB::Stock
     Subclasses[:forex] =  IB::Forex
     Subclasses[:index] = IB::Index
-    Subclasses[:Spread] = IB::Spread
-#    Subclasses[:strangle] = IB::Strangle
-#    Subclasses[:calendar] = IB::Calendar
-#    Subclasses[:vertical] = IB::Vertical
 
 
     # This builds an appropriate Contract subclass based on its type
 		#
-		# does NOT work with Straddle,Strangle,Calendar,Vertical and other spread-types
-		# 
-		# is used to copy Contracts by value
+		# the method is also used to copy Contract.values to new instances
     def self.build opts = {}
       subclass =( VALUES[:sec_type][opts[:sec_type]] || opts['sec_type'] || opts[:sec_type]).to_sym
       Contract::Subclasses[subclass].new opts

lib/ib/messages/outgoing/account_requests.rb

@@ -29,10 +29,10 @@
   context "received :AccountUpdateTime message" do
     subject { IB::Connection.current.received[:AccountUpdateTime].first }
 
-    it { should be_an IB::Messages::Incoming::AccountUpdateTime }
-    its(:data) { should be_a Hash }
-    its(:time_stamp) { should =~ /\d\d:\d\d/ }
-    its(:to_human) { should =~ /AccountUpdateTime/ }
+    it { is_expected.to be_an IB::Messages::Incoming::AccountUpdateTime }
+    its(:data) { is_expected.to be_a Hash }
+    its(:time_stamp) { is_expected.to  match /\d\d:\d\d/ }
+    its(:to_human) { is_expected.to match /AccountUpdateTime/ }
   end
 
   context "received :AccountValue message" do
@@ -52,8 +52,8 @@
     subject { IB::Connection.current.received[:PortfolioValue].first }
 
     it { is_expected.to  be_an IB::Messages::Incoming::PortfolioValue }
-    its( :contract ) { should be_a IB::Contract }
-    its( :data ) { should be_a Hash }
+    its( :contract ) { is_expected.to  be_a IB::Contract }
+    its( :data ) { is_expected.to be_a Hash }
 		its( :portfolio_value ){is_expected.to be_a IB::PortfolioValue }
     its( :account ) {  is_expected.to match /\w\d/ }
 
@@ -77,3 +77,17 @@
     its(:to_human) { should =~ /AccountDownloadEnd/ }
   end
 end
+
+shared_examples_for 'ReceiveFA message' do
+  it { is_expected.to be_an IB::Messages::Incoming::ReceiveFA }
+  its(:message_type) { is_expected.to eq :ReceiveFA }
+  its(:message_id) { is_expected.to eq 16 }
+	its(:accounts) {is_expected.to be_an Array}
+	its( :buffer  ){ is_expected.to be_empty }
+
+  it 'has class accessors as well' do
+    expect( subject.class.message_id).to eq  16 
+    expect( subject.class.message_type).to eq :ReceiveFA
+  end
+end
+

lib/models/ib/contract.rb

@@ -6,13 +6,19 @@
 After calling the helper-function, the fetched ContractDetail-Messages are still present in received-buffer 
 =end
 
-def request_con_id  contract: SAMPLE
+def request_con_id  sample: SAMPLE
+
 
 		ib =  IB::Connection.current
+		while ib.nil?
+			establish_connection unless ib.is_a? IB::Connection
+			ib =  IB::Connection.current
+		end 
+		
 		ib.clear_received
 		raise 'Unable to verify contract, no connection' unless ib && ib.connected?
 
-		ib.send_message :RequestContractDetails, contract: contract
+		ib.send_message :RequestContractDetails, contract: sample
 		ib.wait_for :ContractDetailsEnd
 
 		ib.received[:ContractData].contract.map &:con_id  # return an array of con_id's
@@ -27,7 +33,7 @@ def request_con_id  contract: SAMPLE
 	its( :primary_exchange){ is_expected.to be_a String }
 end
 RSpec.shared_examples 'a valid Contract Object' do 
-	subject{ the_contract }
+#	subject{ the_contract }
   it { is_expected.to be_an IB::Contract }
 	its( :con_id          ){ is_expected.to be_empty.or be_a(Numeric) }
 	its( :contract_detail ){ is_expected.to be_nil.or be_a(IB::ContractDetail) }
@@ -39,3 +45,17 @@ def request_con_id  contract: SAMPLE
 	its( :exchange        ){ is_expected.to be_a String }
 	its( :primary_exchange){ is_expected.to be_nil.or be_a(String) }
 end
+RSpec.shared_examples 'ContractData Message' do 
+	subject{ the_message }
+  it { is_expected.to be_an IB::Messages::Incoming::ContractData }
+	its( :contract         ){ is_expected.to be_a  IB::Contract }
+	its( :contract_details ){ is_expected.to be_a  IB::ContractDetail }
+  its( :message_id       ){ is_expected.to eq 10 }
+  its( :version          ){ is_expected.to eq 8 }
+	its( :buffer           ){ is_expected.to be_empty }
+
+  it 'has class accessors as well' do
+    expect( subject.class.message_id).to eq 10
+    expect( subject.class.message_type).to eq :ContractData
+  end
+end