ib-api 972.2 → 972.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c55a18237300e1d54915e0fd71dc9a51766be578b8f25d73dd70a115961ed935
-  data.tar.gz: f9aed73cec7a0959145d384f655dfbdd9f8416e6b0ddd4e21200ef30d458e149
+  metadata.gz: b8adaf6267b470da6c3e9918f11209d0ad63797a4facb61d2f561291a5435be4
+  data.tar.gz: 90ae6945b0cfa5dfc4c18b49d4d7fc65296a1b360abbf6e22a6a360c1ecebdb0
 SHA512:
-  metadata.gz: 9a0fdbf9030c14c83b164531967ff130af078a3a1bdd6cf44697cb26887012d176ac929279eb8608b2920a2b4dd48b6434a129daf88cfdd1cb65a78014e35db9
-  data.tar.gz: 64fa9394bd0a90c6a4c8abdc0c0a798816d913f5d25fd40fa67032db459cefb5bd296a1a7827ee05817f887c1b989ada9719494dfd6f348e25c45d0f4d7f37cd
+  metadata.gz: d9000425dd681aa181d70c81f6ab02705aba623d0c20fa124fabc652d0a9061ffd655980cc7ae307a9db8412ccb795149dcca4ebcb0239c7051da979298c25e5
+  data.tar.gz: 182b84997e82f20134187f4879f3157ad744aa3dd08bc909b6b901beab5817d90d973626b7a67be3da02ee495e4562bf479de635d8ab3897a9b073d5aaa8e33a

data/VERSION

@@ -1 +1 @@
-972.2
+972.3

data/lib/ib/connection.rb

@@ -4,6 +4,11 @@ require 'ib/socket'
 require 'ib/logger'
 require 'ib/messages'
 
+module TechnicalAnalysis
+  module Signals
+  end
+end
+
 module IB
   # Encapsulates API connection to TWS or Gateway
   class Connection
@@ -100,7 +105,7 @@ module IB
 		def update_next_order_id
 			i,finish = 0, false
 			sub = self.subscribe(:NextValidID) { finish =  true }
-			connected? ?  self.send_message( :RequestIds )  : open()
+			connected? ? self.send_message( :RequestIds ) : open()
 			Timeout::timeout(1, IB::TransmissionError,"Could not get NextValidId" ) do
 				loop { sleep 0.1; break if finish  }
 			end
@@ -186,7 +191,13 @@ module IB
           when what.is_a?(Class) && what < Messages::Incoming::AbstractMessage
             [what]
           when what.is_a?(Symbol)
-            [Messages::Incoming.const_get(what)]
+            if Messages::Incoming.const_defined?(what)
+              [Messages::Incoming.const_get(what)]
+            elsif TechnicalAnalysis::Signals.const_defined?(what)
+              [TechnicalAnalysis::Signals.const_get?(what)]
+            else
+              error "#{what} is no IB::Messages or TechnicalAnalyis::Signals class"
+            end
           when what.is_a?(Regexp)
             Messages::Incoming::Classes.values.find_all { |klass| klass.to_s =~ what }
           else

data/lib/ib/messages/incoming/account_value.rb

@@ -26,7 +26,11 @@ module IB
 
 				class ReceiveFA
 					def accounts
-						xml[:ListOfAccountAliases][:AccountAlias].map{|x| Account.new x }
+						if( a= xml[:ListOfAccountAliases][:AccountAlias]).is_a? Array
+							a.map{|x| Account.new x }
+						elsif a.is_a? Hash			## only one account (soley financial advisor)
+							[ Account.new( a ) ]
+						end
 					end
 
 					def to_human

data/lib/ib/messages/incoming/historical_data.rb

@@ -41,12 +41,12 @@ module IB
             IB::Bar.new :time => buffer.read_int_date, # conversion of epoche-time-integer to Dateime
 																											 # requires format_date in request to be "2"
 																											 # (outgoing/bar_requests # RequestHistoricalData#Encoding)
-                        :open => buffer.read_decimal,
-                        :high => buffer.read_decimal,
-                        :low => buffer.read_decimal,
-                        :close => buffer.read_decimal,
+                        :open => buffer.read_float,
+                        :high => buffer.read_float,
+                        :low => buffer.read_float,
+                        :close => buffer.read_float,
                         :volume => buffer.read_int,
-                        :wap => buffer.read_decimal,   
+                        :wap => buffer.read_float,   
 #                        :has_gaps => buffer.read_string,  # only in ServerVersion  < 124
                         :trades => buffer.read_int  
           end
@@ -79,6 +79,26 @@ module IB
 				end
 			end
 
+      HistoricalDataUpdate = def_message [90, 0] ,
+                             [:request_id, :int] ,
+                             [:count, :int],
+                             [:bar, :bar]  # defined in support.rb
+
+      class HistoricalDataUpdate
+        attr_accessor :results
+				using IBSupport  # extended Array-Class  from abstract_message
+
+        def bar
+            @bar = IB::Bar.new @data[:bar]
+          end
+
+        def to_human
+          "<HistDataUpdate #{request_id} #{bar}>"
+        end
+      end
+
+
+
     end # module Incoming
   end # module Messages
 end # module IB

data/lib/ib/messages/outgoing/bar_requests.rb

@@ -18,11 +18,10 @@ module IB
           # unless  BAR_SIZES.keys.include?(bar_size)
             # error ":bar_size must be one of #{BAR_SIZES.inspect}", :args
           # end
-
-          contract = data[:contract].is_a?(IB::Contract) ?
-              data[:contract] : IB::Contract.from_ib_ruby(data[:contract])
-
-          [data_type, nil, contract]
+          unless data[:contract].is_a? IB::Contract
+            error "contract must be a valid IB::Contract" , :args
+          end
+          [data_type, nil, data[:contract]]
         end
       end
 

data/lib/ib/support.rb

@@ -62,7 +62,7 @@ module IBSupport
 
 		def read_int_date
 			t= read_int
-				s= Time.at(t)
+      s= Time.at(t.to_i)
 	#			s.year == 1970  --> data is most likely a date-string
 				s.year == 1970 ? Date.parse(t.to_s) : s
 		end
@@ -139,20 +139,35 @@ module IBSupport
 		end
 		#
 
-		def read_contract  # read a standard contract and return als hash
-			{	 con_id: read_int,
-				 symbol: read_string,
-				 sec_type: read_string,
-				 expiry: read_string,
-				 strike: read_decimal,
-				 right: read_string,
-				 multiplier: read_int,		
-				 exchange: read_string,
-				 currency: read_string,
-				 local_symbol: read_string,
-				 trading_class: read_string }  # new Version 8
-
-		end
+    def read_contract  # read a standard contract and return als hash
+      {	 con_id: read_int,
+         symbol: read_string,
+         sec_type: read_string,
+         expiry: read_string,
+         strike: read_decimal,
+         right: read_string,
+         multiplier: read_int,		
+         exchange: read_string,
+         currency: read_string,
+         local_symbol: read_string,
+         trading_class: read_string }  # new Version 8
+    end
+
+
+    def read_bar  # read a standard bar (Historical data bars)
+      { :time => read_int_date, # conversion of epoche-time-integer to Dateime
+                                # requires format_date in request to be "2"
+                                # (outgoing/bar_requests # RequestHistoricalData#Encoding)
+        :open => read_float,
+        :high => read_float,
+        :low => read_float,
+        :close => read_float,
+        :wap => read_float,   
+        :volume => read_int,
+        #  :has_gaps => read_string,  # only in ServerVersion  < 124
+        :trades => read_int  }
+
+    end
 
 
 		alias read_bool read_boolean

data/lib/models/ib/bag.rb

@@ -2,6 +2,12 @@
 
 module IB
 
+  if defined?(Bag) 
+		puts "Bag already a #{defined?(Bag)}"
+
+#		puts Bag.ancestors
+		IB.send(:remove_const, 'Bag')
+	end
   # "BAG" is not really a contract, but a combination (combo) of securities.
   # AKA basket or bag of securities. Individual securities in combo are represented
   # by ComboLeg objects.

data/lib/models/ib/bar.rb

@@ -22,7 +22,7 @@ module IB
       validates_numericality_of :open, :high, :low, :close, :volume
 
    def to_human
-      "<Bar: #{time} wap #{wap} OHLC #{open} #{high} #{low} #{close} " +
+     "<Bar: #{time.strftime("(%d.%m.%y)%X")} wap #{wap.round(3)} OHLC #{open} #{high} #{low} #{close} " +
         (trades ? "trades #{trades}" : "") + " vol #{volume}>"
     end
 

data/lib/models/ib/combo_leg.rb

@@ -83,6 +83,28 @@ module IB
        ].flatten
     end
 
+    
+     # fields are generated by serialize(:extended)
+    # i.e.
+# z=  Strangle.build from: Symbols::Index.stoxx, p: 3700, c: 4000, expiry: 202106
+# zc= z.combo_legs.serialize :extended
+# => [[321584786, 1, "BUY", "DTB", 0, 0, "", -1], [321584637, 1, "BUY", "DTB", 0, 0, "", -1]] 
+# nz = zc.map{|o| ComboLeg.build *o }
+# zc.map{|o| ComboLeg.build o }     =>    #  is equivalent
+# => [#<IB::ComboLeg:0x0000000001c36bc0 @attributes={:con_id=>321584786, :ratio=>1, :side=>"B", :exchange=>"DTB", ... 
+# nz.first == z.combo_legs.first    => true 
+# 
+    def self.build *fields
+      self.new Hash[[:con_id,
+                 :ratio,
+                 :side,    #  reverse to_sup?
+                 :exchange,
+                 :open_close,
+                 :short_sale_slot,
+                 :designated_location,
+                 :exempt_code].zip fields]
+    end
+
     def to_human
       "<ComboLeg: #{side} #{ratio} con_id #{con_id} at #{exchange}>"
     end

data/lib/models/ib/contract.rb

@@ -6,7 +6,8 @@ require 'models/ib/underlying'
 module IB
 
   if defined?(Contract) 
-		puts "Contract already a #{defined?(Contract)}"
+		#Connection.current.logger.warn "Contract already a #{defined?(Contract)}"
+
 #		puts Contract.ancestors
 #		IB.send(:remove_const, 'Contract')
 	end
@@ -119,7 +120,7 @@ module IB
 
     def default_attributes  # :nodoc:
       super.merge :con_id => 0,
-        :strike => 0.0,
+        :strike => "",
         :right => :none, # Not an option
        # :exchange => 'SMART',
         :include_expired => false
@@ -136,15 +137,13 @@ module IB
 
     def serialize *fields  # :nodoc:
       print_default = ->(field, default="") { field.blank? ? default : field }
-			## Non numeric entries are passed untouched, only 0 is converted to the default value
-			## Thus: a Zero-Strike-Option  has to be defined with  «strike: "0"»
-      print_not_zero = ->(field, default="") { field.is_a?(Numeric) && field.zero? ? default : field }
       [(con_id.present? && !con_id.is_a?(Symbol) && con_id.to_i > 0 ? con_id : ""),
        print_default[symbol],
        print_default[self[:sec_type]],
        ( fields.include?(:option) ?
        [ print_default[expiry], 
-				 print_default[strike], 
+			##  a Zero-Strike-Option  has to be defined with  «strike: -1 »
+				 strike.present? && ( strike.is_a?(Numeric) && !strike.zero? && strike > 0 )  ?  strike : strike<0 ?  0 : "",
 				 print_default[self[:right]], 
 				 print_default[multiplier]] : nil ),
        print_default[exchange],
@@ -219,20 +218,18 @@ module IB
 		# the link to contract-details is __not__ maintained.
 		def  essential
 
-			self_attributes = [ :sec_type]
-			the_attributes = [ :symbol , :con_id,   :exchange, :right, 
+			the_attributes = [ :sec_type, :symbol , :con_id,   :exchange, :right, 
 									  :currency, :expiry,  :strike,   :local_symbol, :last_trading_day,
-								:multiplier,  :primary_exchange, :trading_class ]
-			the_hash= the_attributes.map{|x| y= self.send(x);  [x,y] if y.present? }.compact.to_h
-			the_hash[:description] = 
-				 if @description.present? 
-					  @description 
-				 elsif contract_detail.present?
-					 contract_detail.long_name
-				 else 
-					 ""
-				 end
-			self.class.new   the_hash.merge( self_attributes.map{|x| y = self.send(x);  [x,y] unless y == :none }.compact.to_h )
+								:multiplier,  :primary_exchange, :trading_class, :description ]
+			new_contract= self.class.new invariant_attributes.select{|k,_| the_attributes.include? k }.compact
+      new_contract[:description] = if @description.present? 
+                                     @description 
+                                   elsif contract_detail.present?
+                                     contract_detail.long_name
+                                   else 
+                                     ""
+                                   end
+      new_contract # return contract
 		end
 
 
@@ -383,6 +380,7 @@ In places where these terms are used to indicate a concept, we have left them as
 
 
   ### Now let's deal with Contract subclasses
+	begin
 
   require_relative 'option'
   require 'models/ib/bag'
@@ -390,9 +388,20 @@ In places where these terms are used to indicate a concept, we have left them as
   require 'models/ib/future'
   require 'models/ib/stock'
   require 'models/ib/index'
+	### walkaraound to enable spreads with orientdb 
+	if IB::const_defined? :Spread
+		IB::send(:remove_const, :Spread)
+		#puts "Spread already defined"
+		#puts "erasing"
+  end
+  require 'models/ib/spread.rb'
+	end
+
+
 
   class Contract
     # Contract subclasses representing specialized security types.
+    using IBSupport
 
     Subclasses = Hash.new(Contract)
     Subclasses[:bag] = IB::Bag
@@ -405,31 +414,14 @@ In places where these terms are used to indicate a concept, we have left them as
 
 
     # This builds an appropriate Contract subclass based on its type
-		#
-		# the method is also used to copy Contract.values to new instances
+    #
+    # 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
     end
 
-    # This returns a Contract initialized from the serialize_ib_ruby format string.
-    def self.from_ib_ruby 
-      keys = [:con_id, :symbol, :sec_type, :expiry, :strike, :right, :multiplier,
-              :exchange, :primary_exchange, :currency, :local_symbol]
-      props = Hash[keys.zip(string.split(":"))]
-      props.delete_if { |k, v| v.nil? || v.empty? }
-      Contract.build props
-    end
+
   end # class Contract
 end # module IB
 
-class String
-	def to_contract
-      keys = [:con_id, :symbol, :sec_type, :expiry, :strike, :right, :multiplier,
-              :exchange, :primary_exchange, :currency, :local_symbol]
-      props = Hash[keys.zip(split(":"))]
-      props.delete_if { |k, v| v.nil? || v.empty? }
-      IB::Contract.build props
-
-	end
-end

data/lib/models/ib/spread.rb

@@ -1,6 +1,12 @@
-#require 'ib/verify'
+# require 'ib/verify'
 module IB
-	class Spread  < Bag
+  if defined?(Spread) 
+		puts "Bag already a #{defined?(Spread)}"
+
+#		puts Spread.ancestors
+		IB.send(:remove_const, 'Spread')
+	end
+  class Spread  < Bag
 		has_many :legs
 
 		using IBSupport
@@ -63,14 +69,6 @@ Adds (or substracts) relative (back) measures to the front month, just passes ab
 		end
 
 
-
-		def serialize_rabbit
-			{ "Spread" => serialize( :option, :trading_class ),
-				'legs' => legs.map{ |y| y.serialize :option, :trading_class }, 'combo_legs' => combo_legs.map(&:serialize),
-				'misc' => [description]
-			}	
-		end
-
 		# adds a leg to any spread
 		#
 		# Parameter: 
@@ -90,7 +88,7 @@ Adds (or substracts) relative (back) measures to the front month, just passes ab
 					the_leg= ComboLeg.new( nc.attributes.slice( :con_id, :exchange )
 																					.merge( leg_params ))
 					self.combo_legs << the_leg 
-					self.description = description + " added #{nc.to_human}" rescue "Spread: #{nc.to_human}"
+					self.description = "#{description.nil? ? "": description} added #{nc.to_human}" rescue "Spread: #{nc.to_human}"
 					self.legs << nc
 			end
 			self  # return value to enable chaining
@@ -109,9 +107,15 @@ Adds (or substracts) relative (back) measures to the front month, just passes ab
 			self
 		end
 
-
+# essentail
+# effectivley clones the object
+# 
 		def essential
-				invariant_attributes
+      the_es = self.class.new invariant_attributes
+      the_es.legs = legs.map{|y| IB::Contract.build y.invariant_attributes}
+      the_es.combo_legs = combo_legs.map{|y| IB::ComboLeg.new y.invariant_attributes }
+      the_es.description = description
+      the_es  # return
 		end
 
 		def  multiplier
@@ -150,13 +154,14 @@ Adds (or substracts) relative (back) measures to the front month, just passes ab
                            :exchange => a.read_string
 
 			end
-			object= self.new  container['Spread'].read_contract
-			object.legs = container['legs'].map{|x| IB::Contract.build x.read_contract}
-			object.combo_legs = container['combo_legs'].map{ |x| read_leg[ x ] } 
-			object.description = container['misc'].read_string
+      object= self.new  container['Spread'].clone.read_contract
+      object.legs = container['legs'].map{|x| IB::Contract.build x.clone.read_contract}
+      object.combo_legs = container['combo_legs'].map{ |x| read_leg[ x.clone ] } 
+      object.description = container['misc'].clone.read_string
 			object
 
 		end
+
 	end