Merge pull request #7 from ib-ruby/specs

Specs

Author: topofocus

lib/ib/connection.rb

@@ -339,12 +339,26 @@ def send_message what, *args
     # Place Order (convenience wrapper for send_message :PlaceOrder).
     # Assigns client_id and order_id fields to placed order. Returns assigned order_id.
     def place_order order, contract
-      order.place contract, self
+     # order.place contract, self  ## old
+      error "Unable to place order, next_local_id not known" unless next_local_id
+			error "local_id present. Order is already placed.  Do might use  modify insteed"  unless  order.local_id.nil?
+      order.client_id = client_id
+      order.local_id = next_local_id
+      self.next_local_id += 1
+      order.placed_at = Time.now
+			modify_order order, contract
     end
 
     # Modify Order (convenience wrapper for send_message :PlaceOrder). Returns order_id.
     def modify_order order, contract
-      order.modify contract, self
+ #      order.modify contract, self    ## old
+			error "Unable to modify order; local_id not specified" if order.local_id.nil?
+      order.modified_at = Time.now
+      send_message :PlaceOrder,
+        :order => order,
+        :contract => contract,
+        :local_id => order.local_id
+      order.local_id  # return value
     end
 
     # Cancel Orders by their local ids (convenience wrapper for send_message :CancelOrder).

lib/ib/model.rb

@@ -1,20 +1,4 @@
-## Connection to Orientdb is established if the oriendb-client is
-# present upon require if ib-ruby
-# If ActiveOrient is not connected (ActiveOrient::Init.connect has not been called)
 # lightweigth tables are used
 require 'ib/base_properties'
-#require 'active-orient'
-#if ActiveOrient::Model.orientdb.nil?
 require 'ib/base'
 	IB::Model = IB::Base
-#else
-#	require 'ib/orientdb'
-#	IB::Model =  V #ActiveOrient::Base
-#	IB::DB.connect
-#	puts " IB-Ruby is run in OrientDB-Mode"
-#end
-#module IB
-  # IB Models can be either lightweight (tableless) or database-backed.
-  # require 'ib/db' - to make all IB models database-backed
-#  Model =  IB.db_backed? ? ActiveRecord::Base : IB::Base
-#end

lib/models/ib/butterfly.rb

@@ -215,6 +215,11 @@ def  essential
 		end
 
 
+		# creates a new Contract substituting attributes by the provied key-value pairs
+		def merge **new_attributes
+			self.class.new attributes.merge new_attributes
+		end
+
     # Contract comparison
 
     def == other  # :nodoc: