fin 0.1.0 → 0.1.2

data/spec/fin/models/instrument_spec.rb

@@ -2,45 +2,16 @@ require 'spec_helper'
 require 'fin/models/shared_examples'
 
 describe Fin::Instrument do
+  let(:model_class_id) { 12 }
 
-  it_behaves_like 'model'
-
-  describe '#new with empty initializer' do
-    subject { Fin::Instrument.new }
-
-    its (:id) {should == nil} # replId
-    its (:rev) {should == nil} # replRev
-    its (:isin_id) {should == nil}
-    its (:isin) {should == nil}
-    its (:short_isin) {should == nil}
-    its (:sess_id) {should == nil}
-    its (:session) {should == nil}
-  end
+  shared_examples_for 'instrument_with_set_properties' do
 
+    its (:session_id) {should == 1213}
+    it_behaves_like 'model'
 
-  describe '#new with opts' do
-    subject { Fin::Instrument.new :id => 12,
-                                     :rev => 123,
-                                     :isin_id => 1234567,
-                                     :isin => 'symbolic isin',
-                                     :short_isin => 'short isin',
-                                     :name => 'name',
-                                     :sess_id => 1213,
-    }
-
-    its (:isin_id) {should == 1234567}
-    its (:isin) {should == 'symbolic isin'}
-    its (:short_isin) {should == 'short isin'}
-    its (:name) {should == 'name'}
-    its (:id) {should == 12}
-    its (:rev) {should == 123}
-    its (:sess_id) {should == 1213}
-    its (:sess) {should == 1213}
-
-    describe '#to_s, #inspect' do
+    describe '#to_s' do
       it 'is just right' do
         subject.to_s.should == "name:short isin[symbolic isin]"
-        subject.inspect.should == "name:short isin[symbolic isin]"
       end
     end
 
@@ -50,5 +21,32 @@ describe Fin::Instrument do
       end
     end
   end
+
+  describe '#new with empty initializer' do
+    let(:property_hash) { {} }
+    subject { Fin::Instrument.new }
+
+    it_behaves_like 'model'
+
+    it 'has all nil properties' do
+      subject.class.attribute_types.each { |prop, _| subject.send(prop).should == nil }
+    end
+  end
+
+  describe '#new with opts' do
+    let(:property_hash) do
+      {:repl_id => 12,
+       :rev => 123,
+       :isin_id => 1234567,
+       :isin => 'symbolic isin',
+       :short_isin => 'short isin',
+       :name => 'name',
+       :sess_id => 1213,
+      }
+    end
+    subject { Fin::Instrument.new property_hash }
+    it_behaves_like 'instrument_with_set_properties'
+
+  end
 end
 

data/spec/fin/models/model_spec.rb

@@ -2,108 +2,248 @@ require 'spec_helper'
 require 'fin/models/shared_examples'
 
 describe Fin::Model do
+  let(:model_class_id) { 0 }
+  let(:property_hash) { {} }
+
   it_behaves_like 'model'
 end
 
 describe Fin::Model, "as a base class for BD models" do
   let(:model_class) { Class.new(Fin::Model) }
-  let(:model_item) {model_class.new}
-  describe 'class macros' do
+  let(:model_item) { model_class.new }
+
+  describe 'Class inheriting from Model' do
+    it 'has pre-defined replID, replRev, replAct properties' do
+      expect do
+        model_item.replID
+        model_item.repl_id
+        model_item.replRev
+        model_item.repl_rev
+        model_item.rev
+        model_item.replAct
+        model_item.repl_act
+      end.to_not raise_error
+    end
+  end
+
+  describe '.property' do
+    it 'creates attr_accessor in a model class, given a String or Symbol' do
+      model_class.instance_eval do
+        property :foo => :i4, 'bar' => :i4
+      end
+      model_item.should respond_to :foo
+      model_item.should respond_to :foo=
+      model_item.should respond_to :bar
+      model_item.should respond_to :bar=
+    end
+
+    it 'creates attr_accessor with aliases in a model class, given an Array' do
+      model_class.instance_eval do
+        property [:foo, 'bar', :baz] => :i4
+      end
+      model_item.should respond_to :foo=
+      model_item.should respond_to :bar=
+      model_item.should respond_to :baz=
+      model_item.should respond_to :foo
+      model_item.should respond_to :bar
+      model_item.should respond_to :baz
+      model_item.foo = 1313
+      model_item.foo.should == 1313
+      model_item.bar.should == 1313
+      model_item.baz.should == 1313
+    end
+
+    it 'accepts a mix of Symbols and Arrays' do
+      model_class.instance_eval do
+        property :foo => :i4, ['bar', :baz] => :i4
+      end
+      model_item.should respond_to :foo=
+      model_item.should respond_to :bar=
+      model_item.should respond_to :baz=
+      model_item.should respond_to :foo
+      model_item.should respond_to :bar
+      model_item.should respond_to :baz
+      model_item.foo = 1313
+      model_item.foo.should == 1313
+      model_item.bar.should_not == 1313
+      model_item.baz.should_not == 1313
+      model_item.bar = 42
+      model_item.foo.should == 1313
+      model_item.bar.should == 42
+      model_item.baz.should == 42
+    end
+  end # describe '.property'
 
-    describe '.prop_reader' do
-      it 'creates attr_reader in a model class, given a String or Symbol' do
+  describe ' model subclasses tracking' do
+    describe '.model_class_id' do
+      it 'sets/accesses uniform class identifier for this class' do
+        model_class.model_class_id.should be_nil
         model_class.instance_eval do
-          prop_reader :foo, 'bar'
+          model_class_id 1313
         end
-        model_item.should respond_to :foo
-        model_item.should_not respond_to :foo=
-        model_item.should respond_to :bar
-        model_item.should_not respond_to :bar=
+        model_class.model_class_id.should == 1313
+        model_class.model_class_id.should == 1313
       end
 
-      it 'creates attr_reader with aliases in a model class, given an Array' do
+      it 'adds class identifier to list of model classes' do
         model_class.instance_eval do
-          prop_reader [:foo, 'bar', :baz]
+          model_class_id 1313
+        end
+        Fin::Model.model_classes[1313].should == model_class
+      end
+
+      it 'is 0 for Fin::Model itself' do
+        Fin::Model.model_class_id.should == 0
+      end
+    end
+
+    describe '.model_classes' do
+      it 'contains at least a reference to Fin::Model itself' do
+        Fin::Model.model_classes.should have_value Fin::Model
+      end
+
+    end
+
+  end
+
+  context 'with mock record' do
+    let(:rec) do # Mocks raw OLE record received through P2ClientGate callback
+      mock('record').tap do |mock|
+        mock.stub(:GetValAsString) do |field|
+          case field
+            when 'replID'
+              '11'
+            when 'replRev'
+              '12'
+            when 'replAct'
+              '13'
+            when 'longint'
+              '1322222222455664'
+            when 'name'
+              'rec_name'
+            when 'time'
+              'rec_time'
+            when 'price'
+              '16.7'
+            when 'net'
+              '89.89'
+          end
+        end
+        mock.stub(:GetValAsLong) do |field|
+          case field
+            when 'foo'
+              14
+            when 'bar'
+              15
+          end
         end
-        model_item.should_not respond_to :foo=
-        model_item.should_not respond_to :bar=
-        model_item.should_not respond_to :baz=
-        model_item.should respond_to :foo
-        model_item.should respond_to :bar
-        model_item.should respond_to :baz
-        model_item.instance_variable_set(:@foo, 1313)
-        model_item.foo.should == 1313
-        model_item.bar.should == 1313
-        model_item.baz.should == 1313
+      end
+    end
+
+    describe '.from_record' do
+      it 'creates new model object' do
+        object = model_class.from_record(rec)
+        object.should be_a_kind_of model_class
+      end
+
+      it ' extracts attributes from raw (OLE) record' do
+        object = model_class.from_record(rec)
+        object.replID.should == 11
+        object.repl_id.should == 11
+        object.replRev.should == 12
+        object.repl_rev.should == 12
+        object.replAct.should == 13
+        object.repl_act.should == 13
       end
 
-      it 'accepts a mix of Symbols and Arrays' do
+      it 'is created by property macro based on defined properties' do
         model_class.instance_eval do
-          prop_reader :foo, ['bar', :baz]
+          property :foo => :i4, ['bar', :baz] => :i1
         end
-        model_item.should_not respond_to :foo=
-        model_item.should_not respond_to :bar=
-        model_item.should_not respond_to :baz=
-        model_item.should respond_to :foo
-        model_item.should respond_to :bar
-        model_item.should respond_to :baz
-        model_item.instance_variable_set(:@foo, 1313)
-        model_item.foo.should == 1313
-        model_item.bar.should_not == 1313
-        model_item.baz.should_not == 1313
-        model_item.instance_variable_set(:@bar, 42)
-        model_item.foo.should == 1313
-        model_item.bar.should == 42
-        model_item.baz.should == 42
+        rec.should_receive(:GetValAsLong).with('foo').and_return(14)
+        rec.should_receive(:GetValAsLong).with('bar').and_return(15)
+        object = model_class.from_record(rec)
+        object.foo.should == 14
+        object.bar.should == 15
+        object.baz.should == 15
       end
-    end # describe '.prop_reader'
 
-    describe '.prop_accessor' do
-      it 'creates attr_accessor in a model class, given a String or Symbol' do
+      it 'calling property macro twice still generates a valid extractor' do
         model_class.instance_eval do
-          prop_accessor :foo, 'bar'
+          property :foo => :i4
+          property ['bar', :baz] => :i1
         end
-        model_item.should respond_to :foo
-        model_item.should respond_to :foo=
-        model_item.should respond_to :bar
-        model_item.should respond_to :bar=
+        object = model_class.from_record(rec)
+        object.repl_id.should == 11
+        object.repl_rev.should == 12
+        object.repl_act.should == 13
+        object.foo.should == 14
+        object.bar.should == 15
+        object.baz.should == 15
       end
 
-      it 'creates attr_accessor with aliases in a model class, given an Array' do
+      it 'extracts properties of all types correctly' do
         model_class.instance_eval do
-          prop_accessor [:foo, 'bar', :baz]
+          property :foo => :i4, :bar => :i1, :longint => :i8,
+                   :name => :c4, :time => :t,
+                   :price => :'d3.1', :net => :f
         end
-        model_item.should respond_to :foo=
-        model_item.should respond_to :bar=
-        model_item.should respond_to :baz=
-        model_item.should respond_to :foo
-        model_item.should respond_to :bar
-        model_item.should respond_to :baz
-        model_item.foo = 1313
-        model_item.foo.should == 1313
-        model_item.bar.should == 1313
-        model_item.baz.should == 1313
+        object = model_class.from_record(rec)
+        object.repl_id.should == 11
+        object.repl_rev.should == 12
+        object.repl_act.should == 13
+        object.foo.should == 14
+        object.bar.should == 15
+        object.longint.should == 1322222222455664
+        object.name.should == 'rec_name'
+        object.time.should == 'rec_time'
+        object.price.should be_within(0.0001).of(16.7)
+        object.net.should be_within(0.0001).of(89.89)
       end
+    end # from_record
 
-      it 'accepts a mix of Symbols and Arrays' do
+    context 'serialization' do
+      before do
         model_class.instance_eval do
-          prop_accessor :foo, ['bar', :baz]
+          model_class_id 1313
+          property :foo => :i4, :bar => :i1, :longint => :i8,
+                   :name => :c4, :time => :t,
+                   :price => :'d3.1', :net => :f
         end
-        model_item.should respond_to :foo=
-        model_item.should respond_to :bar=
-        model_item.should respond_to :baz=
-        model_item.should respond_to :foo
-        model_item.should respond_to :bar
-        model_item.should respond_to :baz
-        model_item.foo = 1313
-        model_item.foo.should == 1313
-        model_item.bar.should_not == 1313
-        model_item.baz.should_not == 1313
-        model_item.bar = 42
-        model_item.foo.should == 1313
-        model_item.bar.should == 42
-        model_item.baz.should == 42
       end
-    end # describe '.prop_accessor'
-  end
+
+      describe '.from_msg' do
+        it 'allows restoration of original object from serializable data' do
+          msg = model_class.to_msg(rec)
+          object = model_class.from_msg(msg)
+          object.repl_id.should == 11
+          object.repl_rev.should == 12
+          object.repl_act.should == 13
+          object.foo.should == 14
+          object.bar.should == 15
+          object.longint.should == 1322222222455664
+          object.name.should == 'rec_name'
+          object.time.should == 'rec_time'
+          object.price.should be_within(0.0001).of(16.7)
+          object.net.should be_within(0.0001).of(89.89)
+        end
+      end # from_msg
+
+      describe '.to_msg', 'Class method!' do
+        it 'converts RECORD into serializable representation' do
+          model_class.to_msg(rec).should ==
+              [1313, 11, 12, 13, 14, 15, 1322222222455664, "rec_name", "rec_time", 16.7, 89.89]
+        end
+      end # to_msg
+
+      describe '#to_msg', 'Instance method!' do
+        it 'converts OBJECT into serializable representation' do
+          object = model_class.from_record(rec)
+          object.to_msg.should ==
+              [1313, 11, 12, 13, 14, 15, 1322222222455664, "rec_name", "rec_time", 16.7, 89.89]
+        end
+      end # to_msg
+
+    end #serialization
+  end # with mock record
 end

data/spec/fin/models/money_limit_spec.rb

@@ -2,134 +2,19 @@ require 'spec_helper'
 require 'fin/models/shared_examples'
 
 describe Fin::MoneyLimit do
+  let(:model_class_id) { 13 }
 
-  it_behaves_like 'model'
+  shared_examples_for 'limit_with_set_properties' do
 
-  describe '#new with empty initializer' do
-    subject { Fin::MoneyLimit.new }
-
-    its (:repl_id) {should == nil} # replId
-    its (:repl_rev) {should == nil} # replRev
-    its (:client_code) {should == nil}
-    its (:money_old) {should == nil}
-    its (:money_amount) {should == nil}
-    its (:money_free) {should == nil}
-    its (:money_blocked) {should == nil}
-    its (:pledge_old) {should == nil}
-    its (:pledge_amount) {should == nil}
-    its (:pledge_free) {should == nil}
-    its (:pledge_blocked) {should == nil}
-    its (:vm_reserve) {should == nil}
-    its (:vm_intercl) {should == nil}
-    its (:fee) {should == nil}
-    its (:fee_reserve) {should == nil}
-    its (:limit_spot_buy) {should == nil}
-    its (:limit_spot_buy_used) {should == nil}
-    its (:coeff_go) {should == nil}
-    its (:coeff_liquidity) {should == nil}
-    its (:is_auto_update_limit) {should == nil}
-    its (:is_auto_update_spot_limit) {should == nil}
-    its (:no_fut_discount) {should == nil}
-    its (:limits_set) {should == nil}
-    its (:premium) {should == nil}
-    its (:premium_order_reserve) {should == nil}
-
-#    client_code	  c7	��� �������
-#    money_old	    d26.2	����� �� ������ ������
-#    money_amount	  d26.2	����� �����
-#    money_free	    d26.2	�������� �����
-#    money_blocked	d26.2	������������� �����
-#
-#    pledge_old	    d26.2	������� �� ������ ������
-#    pledge_amount	d26.2	����� �������
-#    pledge_free	  d26.2	�������� �������
-#    pledge_blocked	d26.2	������������� �������
-#
-#    vm_reserve	    d26.2	�����, ����������������� ��� ������������� ������������ �����
-#    vm_intercl	    d26.2	������������ �����, ��������� ��� ���������� � ����. �������
-#
-#    fee	          d26.2	��������� ����
-#    fee_reserve	  d26.2	��������������� ������ ����� ��� ������
-#
-#    limit_spot_buy	      d26.2	����� �� ������� ������.
-#    limit_spot_buy_used	d26.2	�������������� ����� �� ������� ������
-#
-#    coeff_go	        d16.5	����������� ����������� ��
-#    coeff_liquidity	d16.5	����������� �����������
-#
-#    is_auto_update_limit	      i1	������� �������������� ��������� ������ �� ��������
-#                                ������ ��� ������� ����� ��������: 0-���, 1-������.
-#    is_auto_update_spot_limit	i1	������� �������������� ��������� ������� �� ������
-#                               (�� �������, � �� �������) ��� ������� ����� ��������:
-#                               0-���, 1-������.
-#    no_fut_discount	i1	���������� ������������� ������ �� ���������: 1-������, 0-���.
-#    limits_set	      i1	������� ��������� �������. 0 � ������ �����������
-#    premium	        d26.2	������
-#    premium_order_reserve	f	������ ������ ��� ������
-  end
+    it_behaves_like 'model'
 
-  describe '#new with opts' do
-    subject { Fin::MoneyLimit.new :repl_id => 12,
-                                     :repl_rev => 123,
-                                     :client_code => '1234',
-                                     :money_old => 1234,
-                                     :money_amount => 12345,
-                                     :money_free => 123456,
-                                     :money_blocked => 1,
-                                     :pledge_old => 12,
-                                     :pledge_amount => 123,
-                                     :pledge_free => 1234,
-                                     :pledge_blocked => 12345,
-                                     :vm_reserve => 123456,
-                                     :vm_intercl => 1,
-                                     :fee => 12,
-                                     :fee_reserve => 123,
-                                     :limit_spot_buy => 1234,
-                                     :limit_spot_buy_used => 12345,
-                                     :coeff_go => 123456,
-                                     :coeff_liquidity => 1,
-                                     :is_auto_update_limit => 1,
-                                     :is_auto_update_spot_limit => 0,
-                                     :no_fut_discount => 1,
-                                     :limits_set => 1,
-                                     :premium => 123,
-                                     :premium_order_reserve => 1234,
-    }
-
-    its (:repl_id) {should == 12} # replId
-    its (:repl_rev) {should == 123} # replRev
-    its (:client_code) {should == '1234'}
-    its (:money_old) {should == 1234}
-    its (:money_amount) {should == 12345}
-    its (:money_free) {should == 123456}
-    its (:money_blocked) {should == 1}
-    its (:pledge_old) {should == 12}
-    its (:pledge_amount) {should == 123}
-    its (:pledge_free) {should == 1234}
-    its (:pledge_blocked) {should == 12345}
-    its (:vm_reserve) {should == 123456}
-    its (:vm_intercl) {should == 1}
-    its (:fee) {should == 12}
-    its (:fee_reserve) {should == 123}
-    its (:limit_spot_buy) {should == 1234}
-    its (:limit_spot_buy_used) {should == 12345}
-    its (:coeff_go) {should == 123456}
-    its (:coeff_liquidity) {should == 1}
-    its (:is_auto_update_limit) {should == 1}
-    its (:is_auto_update_spot_limit) {should == 0}
-    its (:no_fut_discount) {should == 1}
-    its (:limits_set) {should == 1}
-    its (:premium) {should == 123}
-    its (:premium_order_reserve) {should == 1234}
-
-    describe '#to_s, #inspect' do
+    describe '#to_s' do
       it 'is just right' do
         right = "Money: Old 1234 Amt 12345 Free 123456 Blck 1 " +
             "Pledge: Old 12 Amt 123 Free 1234 Blck 12345 " +
             "VM: Reserve 123456 Intercl 1 Fee: 12 Reserve 123 " +
             "Limit Spot: Buy 1234 Used 12345"
         subject.to_s.should == right
-        subject.inspect.should == right
       end
     end
 
@@ -139,5 +24,49 @@ describe Fin::MoneyLimit do
       end
     end
   end
+
+  describe '#new with empty initializer' do
+    let(:property_hash) { {} }
+    subject { Fin::MoneyLimit.new }
+
+    it_behaves_like 'model'
+
+    it 'has all nil properties' do
+      subject.class.attribute_types.each { |prop, _| subject.send(prop).should == nil }
+    end
+  end
+
+  describe '#new with opts' do
+    let(:property_hash) do
+      {:repl_id => 12,
+       :repl_rev => 123,
+       :client_code => '1234',
+       :money_old => 1234,
+       :money_amount => 12345,
+       :money_free => 123456,
+       :money_blocked => 1,
+       :pledge_old => 12,
+       :pledge_amount => 123,
+       :pledge_free => 1234,
+       :pledge_blocked => 12345,
+       :vm_reserve => 123456,
+       :vm_intercl => 1,
+       :fee => 12,
+       :fee_reserve => 123,
+       :limit_spot_buy => 1234,
+       :limit_spot_buy_used => 12345,
+       :coeff_go => 123456,
+       :coeff_liquidity => 1,
+       :is_auto_update_limit => 1,
+       :is_auto_update_spot_limit => 0,
+       :no_fut_discount => 1,
+       :limits_set => 1,
+       :premium => 123,
+       :premium_order_reserve => 1234,
+      }
+    end
+    subject { Fin::MoneyLimit.new property_hash }
+    it_behaves_like 'limit_with_set_properties'
+  end
 end