activefacts-api 0.9.3 → 0.9.4

data/spec/constellation/instance_spec.rb

@@ -3,8 +3,14 @@
 # Copyright (c) 2008 Clifford Heath. Read the LICENSE file.
 #
 
+#require 'ruby-debug'; Debugger.start
+#trap "INT" do
+#  puts caller*"\n\t"
+#  debugger
+#end
+
 describe "An instance of every type of ObjectType" do
-  before :each do
+  before :all do
     Object.send :remove_const, :Mod if Object.const_defined?("Mod")
     module Mod
       # These are the base value types we're going to test:
@@ -84,6 +90,8 @@ describe "An instance of every type of ObjectType" do
       end
     end
 
+    @constellation = ActiveFacts::API::Constellation.new(Mod)
+
     # Simple Values
     @int = 0
     @real = 0.0
@@ -96,76 +104,86 @@ describe "An instance of every type of ObjectType" do
     @guid = '01234567-89ab-cdef-0123-456789abcdef'
 
     # Value Type instances
-    @int_value = Mod::IntVal.new(1)
-    @real_value = Mod::RealVal.new(1.0)
-    @auto_counter_value = Mod::AutoCounterVal.new(1)
-    @new_auto_counter_value = Mod::AutoCounterVal.new(:new)
-    @string_value = Mod::StringVal.new("one")
-    @date_value = Mod::DateVal.new(2008, 04, 20)
+    @int_value = @constellation.IntVal(1)
+    @real_value = @constellation.RealVal(1.0)
+    @auto_counter_value = @constellation.AutoCounterVal(1)
+    @new_auto_counter_value = @constellation.AutoCounterVal(:new)
+    @string_value = @constellation.StringVal("one")
+    @date_value = @constellation.DateVal(2008, 04, 20)
     # Parse the date:
-    @date_value = Mod::DateVal.new '2nd Nov 2001'
+    @date_value = @constellation.DateVal('2nd Nov 2001')
     d = ::Date.civil(2008, 04, 20)
-    @date_time_value = Mod::DateTimeVal.new d # 2008, 04, 20, 10, 28, 14
+    @date_time_value = Mod::DateTimeVal.civil(2008, 04, 20, 10, 28, 14)
     # This next isn't in the same pattern; it makes a Decimal from a BigDecimal rather than a String (coverage reasons)
-    @decimal_value = Mod::DecimalVal.new(BigDecimal.new('98765432109876543210'))
-    @guid_value = Mod::GuidVal.new(:new)
+    @decimal_value = @constellation.DecimalVal(BigDecimal.new('98765432109876543210'))
+    @guid_value = @constellation.GuidVal(:new)
+    @guid_as_value = @constellation.GuidVal(@guid)
 
     # Value SubType instances
-    @int_sub_value = Mod::IntSubVal.new(4)
-    @real_sub_value = Mod::RealSubVal.new(4.0)
-    @auto_counter_sub_value = Mod::AutoCounterSubVal.new(4)
-    @auto_counter_sub_value_new = Mod::AutoCounterSubVal.new(:new)
-    @string_sub_value = Mod::StringSubVal.new("five")
-    @date_sub_value = Mod::DateSubVal.new(2008, 04, 25)
-    @date_time_sub_value = Mod::DateTimeSubVal.new(::DateTime.civil(2008, 04, 26, 10, 28, 14))
+    @int_sub_value = @constellation.IntSubVal(4)
+    @real_sub_value = @constellation.RealSubVal(4.0)
+    @auto_counter_sub_value = @constellation.AutoCounterSubVal(4)
+    @auto_counter_sub_value_new = @constellation.AutoCounterSubVal(:new)
+    @string_sub_value = @constellation.StringSubVal("five")
+    @date_sub_value = @constellation.DateSubVal(2008, 04, 25)
+    @date_time_sub_value = @constellation.DateTimeSubVal(::DateTime.civil(2008, 04, 26, 10, 28, 14))
     # This next isn't in the same pattern; it makes a Decimal from a BigNum rather than a String (coverage reasons)
-    @decimal_sub_value = Mod::DecimalSubVal.new(98765432109876543210)
-    @guid_sub_value = Mod::GuidSubVal.new(:new)
+    @decimal_sub_value = @constellation.DecimalSubVal(98765432109876543210)
+    @guid_sub_value = @constellation.GuidSubVal(:new)
 
     # Entities identified by Value Type, SubType and Entity-by-value-type instances
-    @test_by_int = Mod::TestByInt.new(2)
-    @test_by_real = Mod::TestByReal.new(2.0)
-    @test_by_auto_counter = Mod::TestByAutoCounter.new(2)
-    @test_by_auto_counter_new = Mod::TestByAutoCounter.new(:new)
-    @test_by_string = Mod::TestByString.new("two")
-    @test_by_date = Mod::TestByDate.new(Date.new(2008,04,28))
-    #@test_by_date = Mod::TestByDate.new(2008,04,28)
+    @test_by_int = @constellation.TestByInt(2)
+    @test_by_real = @constellation.TestByReal(2.0)
+    @test_by_auto_counter = @constellation.TestByAutoCounter(2)
+    @test_by_auto_counter_new = @constellation.TestByAutoCounter(:new)
+    @test_by_string = @constellation.TestByString("two")
+    @test_by_date = @constellation.TestByDate(Date.civil(2008,04,28))
+    #@test_by_date = @constellation.TestByDate(2008,04,28)
+    # Array packing/unpacking obfuscates the following case
+    # @test_by_date_time = @constellation.TestByDateTime([2008,04,28,10,28,15])
+    # Pass an array of values directly to DateTime.civil:
+    @test_by_date_time = @constellation.TestByDateTime(@date_time_value)
+    #@test_by_date_time = @constellation.TestByDateTime(DateTime.civil(2008,04,28,10,28,15))
+    @test_by_decimal = @constellation.TestByDecimal('98765432109876543210')
+
+    @test_by_guid = @constellation.TestByGuid(@guid)
+    @constellation.TestByGuid[[@guid_as_value]].should_not be_nil
+
+    @test_by_int_sub = @constellation.TestByIntSub(2)
+    @test_by_real_sub = @constellation.TestByRealSub(5.0)
+    @test_by_auto_counter_sub = @constellation.TestByAutoCounterSub(6)
+    @test_by_auto_counter_new_sub = @constellation.TestByAutoCounterSub(:new)
+    @test_by_string_sub = @constellation.TestByStringSub("six")
+    @test_by_date_sub = @constellation.TestByDateSub(Date.civil(2008,04,27))
+    # Array packing/unpacking obfuscates the following case
+    # @test_by_date_time_sub = @constellation.TestByDateTimeSub([2008,04,29,10,28,15])
     # Pass an array of values directly to DateTime.civil:
-    @test_by_date_time = Mod::TestByDateTime.new([[2008,04,28,10,28,15]])
-    #@test_by_date_time = Mod::TestByDateTime.new(DateTime.new(2008,04,28,10,28,15))
-    @test_by_decimal = Mod::TestByDecimal.new('98765432109876543210')
-    @test_by_guid = Mod::TestByGuid.new('01234567-89ab-cdef-0123-456789abcdef')
-
-    @test_by_int_sub = Mod::TestByIntSub.new(2)
-    @test_by_real_sub = Mod::TestByRealSub.new(5.0)
-    @test_by_auto_counter_sub = Mod::TestByAutoCounterSub.new(6)
-    @test_by_auto_counter_new_sub = Mod::TestByAutoCounterSub.new(:new)
-    @test_by_string_sub = Mod::TestByStringSub.new("six")
-    @test_by_date_sub = Mod::TestByDateSub.new(Date.new(2008,04,27))
-    @test_by_date_time_sub = Mod::TestByDateTimeSub.new(2008,04,29,10,28,15)
-    @test_by_decimal_sub = Mod::TestByDecimalSub.new('98765432109876543210')
-    @test_by_guid_sub = Mod::TestByGuidSub.new('01234567-89ab-cdef-0123-456789abcdef')
-
-    @test_by_int_entity = Mod::TestByIntEntity.new(@test_by_int)
-    @test_by_real_entity = Mod::TestByRealEntity.new(@test_by_real)
-    @test_by_auto_counter_entity = Mod::TestByAutoCounterEntity.new(@test_by_auto_counter)
-    @test_by_auto_counter_new_entity = Mod::TestByAutoCounterEntity.new(@test_by_auto_counter_new)
-    @test_by_string_entity = Mod::TestByStringEntity.new(@test_by_string)
-    @test_by_date_entity = Mod::TestByDateEntity.new(@test_by_date)
-    @test_by_date_time_entity = Mod::TestByDateTimeEntity.new(@test_by_date_time)
-    @test_by_decimal_entity = Mod::TestByDecimalEntity.new(@test_by_decimal)
-    @test_by_guid_entity = Mod::TestByGuidEntity.new(@test_by_guid)
+    @test_by_date_time_sub = @constellation.TestByDateTimeSub(@date_time_value)
+    @test_by_decimal_sub = @constellation.TestByDecimalSub('98765432109876543210')
+    @test_by_guid_sub = @constellation.TestByGuidSub('01234567-89ab-cdef-0123-456789abcdef')
+
+    @test_by_int_entity = @constellation.TestByIntEntity(@test_by_int)
+    @test_by_real_entity = @constellation.TestByRealEntity(@test_by_real)
+    @test_by_auto_counter_entity = @constellation.TestByAutoCounterEntity(@test_by_auto_counter)
+    @test_by_auto_counter_new_entity = @constellation.TestByAutoCounterEntity(@test_by_auto_counter_new)
+    @test_by_string_entity = @constellation.TestByStringEntity(@test_by_string)
+    @test_by_date_entity = @constellation.TestByDateEntity(@test_by_date)
+    @test_by_date_time_entity = @constellation.TestByDateTimeEntity(@test_by_date_time)
+    @test_by_decimal_entity = @constellation.TestByDecimalEntity(@test_by_decimal)
+    @test_by_guid_entity = @constellation.TestByGuidEntity(@test_by_guid)
+    @constellation.TestByGuidEntity[[@test_by_guid]].should_not be_nil
 
     # Entity subtypes
-    @test_sub_by_int = Mod::TestSubByInt.new(2)
-    @test_sub_by_real = Mod::TestSubByReal.new(2.0)
-    @test_sub_by_auto_counter = Mod::TestSubByAutoCounter.new(2)
-    @test_sub_by_auto_counter_new = Mod::TestSubByAutoCounter.new(:new)
-    @test_sub_by_string = Mod::TestSubByString.new("two")
-    @test_sub_by_date = Mod::TestSubByDate.new(Date.new(2008,04,28))
-    @test_sub_by_date_time = Mod::TestSubByDateTime.new(2008,04,28,10,28,15)
-    @test_sub_by_decimal = Mod::TestSubByDecimal.new('98765432109876543210')
-    @test_sub_by_guid = Mod::TestSubByGuid.new('01234567-89ab-cdef-0123-456789abcdef')
+    @test_sub_by_int = @constellation.TestSubByInt(2*2)
+    @test_sub_by_real = @constellation.TestSubByReal(2.0*2)
+    @test_sub_by_auto_counter = @constellation.TestSubByAutoCounter(2*2)
+    @test_sub_by_auto_counter_new = @constellation.TestSubByAutoCounter(:new)
+    @test_sub_by_string = @constellation.TestSubByString("twotwo")
+    @test_sub_by_date = @constellation.TestSubByDate(Date.civil(2008,04*2,28))
+    # Array packing/unpacking obfuscates the following case
+    # @test_sub_by_date_time = @constellation.TestSubByDateTime([2008,04*2,28,10,28,15])
+    @test_sub_by_decimal = @constellation.TestSubByDecimal('987654321098765432109')
+    @test_sub_by_guid = @constellation.TestSubByGuid('01234567-89ab-cdef-0123-456789abcde0')
 
     # These arrays get zipped together in various ways. Keep them aligned.
     @values = [
@@ -213,7 +231,7 @@ describe "An instance of every type of ObjectType" do
         @test_sub_by_int, @test_sub_by_real, @test_sub_by_auto_counter, @test_sub_by_auto_counter_new,
         @test_sub_by_string, @test_sub_by_date, @test_sub_by_date_time, @test_sub_by_decimal,
         @test_sub_by_guid,
-      ]
+      ].compact
     @entities_by_entity = [
         @test_by_int_entity,
         @test_by_real_entity,
@@ -224,7 +242,7 @@ describe "An instance of every type of ObjectType" do
         @test_by_date_time_entity,
         @test_by_decimal_entity,
         @test_by_guid_entity,
-      ]
+      ].compact
     @entities_by_entity_types = [
         Mod::TestByIntEntity, Mod::TestByRealEntity, Mod::TestByAutoCounterEntity, Mod::TestByAutoCounterEntity,
         Mod::TestByStringEntity, Mod::TestByDateEntity, Mod::TestByDateTimeEntity, Mod::TestByDecimalEntity,
@@ -243,23 +261,23 @@ describe "An instance of every type of ObjectType" do
       ]
     @role_values = [
         3, 4.0, 5, 6,
-        "three", Date.new(2008,4,21), DateTime.new(2008,4,22,10,28,16),
+        "three", Date.civil(2008,4,21), DateTime.civil(2008,4,22,10,28,16),
         '98765432109876543210',
         '01234567-89ab-cdef-0123-456789abcdef'
       ]
     @role_alternate_values = [
         4, 5.0, 6, 7,
-        "four", Date.new(2009,4,21), DateTime.new(2009,4,22,10,28,16),
+        "four", Date.civil(2009,4,21), DateTime.civil(2009,4,22,10,28,16),
         '98765432109876543211',
         '01234567-89ab-cdef-0123-456789abcdef'
       ]
     @subtype_role_instances = [
-        Mod::IntSubVal.new(6), Mod::RealSubVal.new(6.0),
-        Mod::AutoCounterSubVal.new(:new), Mod::AutoCounterSubVal.new(8),
-        Mod::StringSubVal.new("seven"),
-        Mod::DateSubVal.new(2008,4,29), Mod::DateTimeSubVal.new(2008,4,30,10,28,16),
-        Mod::DecimalSubVal.new('98765432109876543210'),
-        Mod::DecimalSubVal.new('01234567-89ab-cdef-0123-456789abcdef'),
+        @constellation.IntSubVal(6), Mod::RealSubVal.new(6.0),
+        @constellation.AutoCounterSubVal(:new), Mod::AutoCounterSubVal.new(8),
+        @constellation.StringSubVal("seven"),
+        @constellation.DateSubVal(2008,4,29), @constellation.DateTimeSubVal(2008,4,30,10,28,16),
+        @constellation.DecimalSubVal('98765432109876543210'),
+        @constellation.DecimalSubVal('01234567-89ab-cdef-0123-456789abcdef'),
       ]
   end
 
@@ -293,8 +311,13 @@ describe "An instance of every type of ObjectType" do
     end
 
     it "should inspect" do
-      (@value_instances+@entities+@entities_by_entity).each do |object|
-        object.inspect
+      (@value_instances+@entities+@entities_by_entity).each_with_index do |object, i|
+	begin
+	  object.inspect
+	rescue Exception => e
+	  puts "FAILED on #{object.class} at #{i}"
+	  raise
+	end
       end
     end
 
@@ -309,7 +332,6 @@ describe "An instance of every type of ObjectType" do
 
     it "if an entity, should respond to verbalise" do
       (@entities+@entities_by_entity).each do |entity|
-        #puts entity.verbalise
         entity.respond_to?(:verbalise).should be_true
         verbalisation = entity.verbalise
         verbalisation.should =~ %r{\b#{entity.class.basename}\b}
@@ -325,12 +347,14 @@ describe "An instance of every type of ObjectType" do
 
   it "should respond to constellation" do
     (@value_instances+@entities+@entities_by_entity).each do |instance|
+      next if instance == nil
       instance.respond_to?(:constellation).should be_true
     end
   end
 
   it "should return the module in response to .vocabulary()" do
     (@value_types+@entity_types).zip((@value_instances+@entities+@entities_by_entity)).each do |object_type, instance|
+      next if instance == nil
       instance.class.vocabulary.should == Mod
     end
   end

data/spec/fact_type/role_values_spec.rb

@@ -21,10 +21,18 @@ module TestValueTypesModule
   end
   BASE_VALUE_TYPE_ROLE_NAMES = VALUE_TYPES.map { |base_type| base_type.name.snakecase }
   VALUE_TYPE_ROLE_NAMES = BASE_VALUE_TYPE_ROLE_NAMES.map { |n| [ :"#{n}_val", :"#{n}_sub_val" ] }.flatten
-  VALUE_TYPES.map do |value_type|
+
+  TestValueTypesModule.module_eval <<-END
+    class Extra < String
+      value_type
+    end
+  END
+
+  VALUE_TYPES.each do |value_type|
     code = <<-END
       class #{value_type.name}Val < #{value_type.name}
         value_type
+	has_one :extra
       end
 
       class #{value_type.name}ValSub < #{value_type.name}Val
@@ -34,6 +42,7 @@ module TestValueTypesModule
       class #{value_type.name}Entity
         identified_by :#{identifying_role_name = "id_#{value_type.name.snakecase}_val"}
         one_to_one :#{identifying_role_name}, :class => #{value_type.name}Val
+	has_one :extra
       end
 
       class #{value_type.name}EntitySub < #{value_type.name}Entity
@@ -98,6 +107,7 @@ describe "Object type role values" do
     end
   end
 
+=begin
   describe "Instantiating bare objects" do
     OBJECT_TYPES.each do |object_type|
       required_value_type = VALUE_TYPE_FOR_OBJECT_TYPE[object_type]
@@ -118,6 +128,7 @@ describe "Object type role values" do
       end
     end
   end
+=end
 
   describe "A constellation" do
     before :each do
@@ -168,20 +179,16 @@ describe "Object type role values" do
         end
       end
 
-      if object_type.respond_to?(:identifying_roles)
-        # REVISIT: Here, there are many possible problems with re-assigning identifying role values. We need tests!
-        # The implementation will need to be reworked to detect problems and reverse any partial changes before chucking an exception
-=begin
-        it "should not allow re-assigning a #{object_type_name} entity's identifying role value from #{values[0]} to #{values[1]}" do
+      if object_type.is_entity_type
+        it "should allow re-assigning a #{object_type_name} entity's identifying role value from #{values[0]} to #{values[1]}" do
           object = @constellation.send(object_type_name, *object_identifying_parameters(object_type_name, values[0]))
           object.class.identifying_roles.each do |identifying_role|
             next if identifying_role.name == :counter
             lambda {
               object.send(:"#{identifying_role.name}=", values[1])
-            }.should raise_error
+            }.should_not raise_error
           end
         end
-=end
 
         it "should allow nullifying and reassigning a #{object_type_name} entity's identifying role value" do
           object = @constellation.send(object_type_name, *object_identifying_parameters(object_type_name, values[0]))
@@ -194,21 +201,35 @@ describe "Object type role values" do
         end
       else
         it "should allow initialising value type #{object_type.name} with an instance of that value type" do
-          bare_value = object_type.new(*object_identifying_parameters(object_type_name, values[0]))
+	  params = object_identifying_parameters(object_type_name, values[0])
+	  if object_type.respond_to?(:civil)
+	    # Handle Date/Time specially:
+	    bare_value = object_type.civil(params[0].year)
+	  else
+	    bare_value = object_type.new(*params)
+	  end
           object = @constellation.send(object_type_name, bare_value)
+	  # Here, the bare_value is not the same object which has been added to the constellatiom
 
           # Now link the bare value to an Octopus:
           octopus = @constellation.Octopus(0)
           octopus_role_name = :"octopus_as_one_#{object_type_name.snakecase}"
-          bare_value.send(:"#{octopus_role_name}=", octopus)
-          counterpart_name = bare_value.class.roles[octopus_role_name].counterpart.name
+          object.send(:"#{octopus_role_name}=", octopus)
+          counterpart_name = object.class.roles[octopus_role_name].counterpart.name
 
           # Create a reference by assigning the object from a RoleProxy:
           proxy = octopus.send(counterpart_name)
+
           #proxy.should be_respond_to(:__getobj__)
-          object2 = @constellation.send(object_type_name, proxy)
+	  object2 = @constellation.send(object_type_name, proxy)
           object2.should == object
         end
+
+	it "should allow adding extra role assignments when asserting an instance" do
+          object = @constellation.send(object_type_name, *(object_identifying_parameters(object_type_name, values[0]) + [{:extra => 'foo'}]))
+	  object.extra.should == 'foo'
+	end
+
       end
     end
 

data/spec/fact_type/roles_spec.rb

@@ -161,8 +161,9 @@ describe "Roles" do
     end
 
   it "should append the counterpart into the respective role array in the matching object_type" do
-    foo = Mod::Name.new("Foo")
-    le = Mod::LegalEntity.new(foo)
+    c = ActiveFacts::API::Constellation.new(Mod)
+    foo = c.Name("Foo")
+    le = c.LegalEntity(foo)
     le.respond_to?(:name).should be_true
     name = le.name
     name.respond_to?(:legal_entity).should be_true
@@ -202,38 +203,13 @@ describe "Roles" do
     lambda {p.family.foo}.should raise_error(RuntimeError)
   end
 
-  it "should keep a trace of the overwritten class when changing identification" do
-    pending
-    c = ActiveFacts::API::Constellation.new(Mod)
-    e = c.Employee(:identifier => "Project2501")
-    e.overrides_identification_of.is_a?(Mod::LegalEntity).should be_true
-  end
-
   it "should be able to import an entity from another constellation" do
     c1 = ActiveFacts::API::Constellation.new(Mod)
     c2 = ActiveFacts::API::Constellation.new(Mod)
 
     e = c1.Employee("PuppetMaster")
-    identifier = c2.Identifier("Project2501", :employee => e)
+    identifier = c2.Identifier "Project2501", :employee => e
     identifier.employee.name.should == "PuppetMaster"
   end
 
-  it "should be able to import an entity from another constellation which subclass another entity" do
-    pending "fails because identify_role_values get only the current class identifying roles" do
-      # in this example, it returns :identifier, but not :name from LegalEntity
-      module Mod
-        class Person2 < LegalEntity
-          identified_by :identifier
-          one_to_one :identifier
-        end
-      end
-
-      c1 = ActiveFacts::API::Constellation.new(Mod)
-      c2 = ActiveFacts::API::Constellation.new(Mod)
-
-      p = c1.Person2("Person2Name", :identifier => "Project2501")
-      identifier = c2.Identifier("Project2501", :person2 => p)
-      identifier.person2.name.should == "Person2Name"
-    end
-  end
 end

data/spec/identification_scheme/identification_spec.rb

@@ -42,6 +42,7 @@ describe "An Entity Type" do
 
     describe "when asserted" do
       before :each do
+        @bus = @c.Business
         @bus = @c.Business('Acme')
         @acme = @c.Name['Acme']
       end

data/spec/identification_scheme/identity_change_spec.rb

@@ -51,7 +51,7 @@ describe "identity" do
       end
 
       it "should be denied" do
-        @change.should raise_error(DuplicateIdentifyingValueException)
+        @change.should raise_error(TypeMigrationException)
       end
 
       it "should not change instance subtype" do
@@ -61,13 +61,13 @@ describe "identity" do
       it "should have no side-effects" do
         begin
           @change.call
-        rescue DuplicateIdentifyingValueException => e
+        rescue TypeMigrationException => e
+	  # Now check that no unexpected change occurred
         end
 
         @p2.should be_nil
         @c1.Name.values.should =~ [@juliar, @tony]
         @c1.Name.keys.should =~ [@juliar, @tony]
-        pending "This functionality was poorly implemented and has been temporarily switched off"
         @c1.TFN.keys.should =~ [123]
         @c1.Person.values.should =~ [@p1, @p3]
         @c1.Person.keys.should =~ [[@juliar],[@tony]]
@@ -78,7 +78,7 @@ describe "identity" do
         @p2_tfn = @c1.TFN(789)
         begin
           @change.call
-        rescue DuplicateIdentifyingValueException => e
+        rescue TypeMigrationException => e
         end
 
         @c1.TFN.keys.should =~ [123, 789]