activefacts 0.7.0 → 0.7.1

data/lib/activefacts/vocabulary/metamodel.rb

@@ -127,8 +127,8 @@ module ActiveFacts
     class PresenceConstraint < Constraint
       maybe :is_mandatory
       maybe :is_preferred_identifier
-      has_one :max_frequency, Frequency           # See Frequency.all_presence_constraint_by_max_frequency
-      has_one :min_frequency, Frequency           # See Frequency.all_presence_constraint_by_min_frequency
+      has_one :max_frequency, Frequency           # See Frequency.all_presence_constraint_as_max_frequency
+      has_one :min_frequency, Frequency           # See Frequency.all_presence_constraint_as_min_frequency
       has_one :role_sequence                      # See RoleSequence.all_presence_constraint
     end
 
@@ -141,7 +141,7 @@ module ActiveFacts
     end
 
     class RingConstraint < Constraint
-      has_one :other_role, "Role"                 # See Role.all_ring_constraint_by_other_role
+      has_one :other_role, "Role"                 # See Role.all_ring_constraint_as_other_role
       has_one :ring_type                          # See RingType.all_ring_constraint
       has_one :role                               # See Role.all_ring_constraint
     end
@@ -163,8 +163,8 @@ module ActiveFacts
     end
 
     class SubsetConstraint < SetConstraint
-      has_one :subset_role_sequence, RoleSequence  # See RoleSequence.all_subset_constraint_by_subset_role_sequence
-      has_one :superset_role_sequence, RoleSequence  # See RoleSequence.all_subset_constraint_by_superset_role_sequence
+      has_one :subset_role_sequence, RoleSequence  # See RoleSequence.all_subset_constraint_as_subset_role_sequence
+      has_one :superset_role_sequence, RoleSequence  # See RoleSequence.all_subset_constraint_as_superset_role_sequence
     end
 
     class Unit
@@ -177,15 +177,15 @@ module ActiveFacts
 
     class UnitBasis
       identified_by :base_unit, :derived_unit
-      has_one :base_unit, Unit                    # See Unit.all_unit_basis_by_base_unit
-      has_one :derived_unit, Unit                 # See Unit.all_unit_basis_by_derived_unit
+      has_one :base_unit, Unit                    # See Unit.all_unit_basis_as_base_unit
+      has_one :derived_unit, Unit                 # See Unit.all_unit_basis_as_derived_unit
       has_one :exponent                           # See Exponent.all_unit_basis
     end
 
     class ValueRange
       identified_by :minimum_bound, :maximum_bound
-      has_one :maximum_bound, Bound               # See Bound.all_value_range_by_maximum_bound
-      has_one :minimum_bound, Bound               # See Bound.all_value_range_by_minimum_bound
+      has_one :maximum_bound, Bound               # See Bound.all_value_range_as_maximum_bound
+      has_one :minimum_bound, Bound               # See Bound.all_value_range_as_minimum_bound
     end
 
     class ValueRestriction
@@ -206,7 +206,7 @@ module ActiveFacts
 
     class Import
       identified_by :imported_vocabulary, :vocabulary
-      has_one :imported_vocabulary, Vocabulary    # See Vocabulary.all_import_by_imported_vocabulary
+      has_one :imported_vocabulary, Vocabulary    # See Vocabulary.all_import_as_imported_vocabulary
       has_one :vocabulary                         # See Vocabulary.all_import
     end
 
@@ -219,8 +219,8 @@ module ActiveFacts
     class Correspondence
       identified_by :imported_feature, :import
       has_one :import                             # See Import.all_correspondence
-      has_one :imported_feature, Feature          # See Feature.all_correspondence_by_imported_feature
-      has_one :local_feature, Feature             # See Feature.all_correspondence_by_local_feature
+      has_one :imported_feature, Feature          # See Feature.all_correspondence_as_imported_feature
+      has_one :local_feature, Feature             # See Feature.all_correspondence_as_local_feature
     end
 
     class Population
@@ -233,7 +233,8 @@ module ActiveFacts
     end
 
     class SetComparisonRoles
-      identified_by :set_comparison_constraint, :role_sequence
+      identified_by :set_comparison_constraint, :ordinal
+      has_one :ordinal                            # See Ordinal.all_set_comparison_roles
       has_one :role_sequence                      # See RoleSequence.all_set_comparison_roles
       has_one :set_comparison_constraint          # See SetComparisonConstraint.all_set_comparison_roles
     end
@@ -258,8 +259,8 @@ module ActiveFacts
       has_one :concept                            # See Concept.all_role
       has_one :fact_type                          # See FactType.all_role
       has_one :ordinal                            # See Ordinal.all_role
-      has_one :role_name, Name                    # See Name.all_role_by_role_name
-      has_one :role_value_restriction, ValueRestriction  # See ValueRestriction.all_role_by_role_value_restriction
+      has_one :role_name, Name                    # See Name.all_role_as_role_name
+      has_one :role_value_restriction, ValueRestriction  # See ValueRestriction.all_role_as_role_value_restriction
     end
 
     class RoleRef
@@ -267,17 +268,17 @@ module ActiveFacts
       has_one :ordinal                            # See Ordinal.all_role_ref
       has_one :role                               # See Role.all_role_ref
       has_one :role_sequence                      # See RoleSequence.all_role_ref
-      has_one :leading_adjective, Adjective       # See Adjective.all_role_ref_by_leading_adjective
-      has_one :trailing_adjective, Adjective      # See Adjective.all_role_ref_by_trailing_adjective
+      has_one :leading_adjective, Adjective       # See Adjective.all_role_ref_as_leading_adjective
+      has_one :trailing_adjective, Adjective      # See Adjective.all_role_ref_as_trailing_adjective
     end
 
     class JoinPath
       identified_by :role_ref, :join_step
-      has_one :join_step, Ordinal                 # See Ordinal.all_join_path_by_join_step
+      has_one :join_step, Ordinal                 # See Ordinal.all_join_path_as_join_step
       has_one :role_ref                           # See RoleRef.all_join_path
       has_one :concept                            # See Concept.all_join_path
-      has_one :input_role, Role                   # See Role.all_join_path_by_input_role
-      has_one :output_role, Role                  # See Role.all_join_path_by_output_role
+      has_one :input_role, Role                   # See Role.all_join_path_as_input_role
+      has_one :output_role, Role                  # See Role.all_join_path_as_output_role
     end
 
     class EntityType < Concept
@@ -286,15 +287,15 @@ module ActiveFacts
 
     class TypeInheritance < FactType
       identified_by :subtype, :supertype
-      has_one :subtype, EntityType                # See EntityType.all_type_inheritance_by_subtype
-      has_one :supertype, EntityType              # See EntityType.all_type_inheritance_by_supertype
+      has_one :subtype, EntityType                # See EntityType.all_type_inheritance_as_subtype
+      has_one :supertype, EntityType              # See EntityType.all_type_inheritance_as_supertype
       maybe :provides_identification
     end
 
     class ValueType < Concept
       has_one :length                             # See Length.all_value_type
       has_one :scale                              # See Scale.all_value_type
-      has_one :supertype, ValueType               # See ValueType.all_value_type_by_supertype
+      has_one :supertype, ValueType               # See ValueType.all_value_type_as_supertype
       has_one :unit                               # See Unit.all_value_type
       has_one :value_restriction                  # See ValueRestriction.all_value_type
     end

data/spec/api/autocounter.rb

@@ -49,10 +49,10 @@ describe "AutoCounter Value Type instances" do
       }.should raise_error
   end
 
-  it "should allow its roles to be assigned" do
+  it "should not allow its identifying roles to be assigned" do
     lambda {
         @thing.thing_id = @thing_id
-      }.should_not raise_error
+      }.should raise_error
   end
 
   it "should allow an existing counter to be re-used" do

data/spec/api/entity_type.rb

@@ -83,10 +83,10 @@ describe "Entity Type class definitions" do
   end
 
   it "should return the identifying roles" do
-    Mod::Person.identifying_roles.should == [:name]
+    Mod::Person.identifying_role_names.should == [:name]
   end
 
-  it "should prevent a role name from matching a concept that exists unless that concept is the player" do
+  it "should prevent a role name from matching a concept that exists unless that concept is the counterpart" do
     lambda {
         module Mod
           class LegalEntity

data/spec/api/instance.rb

@@ -190,7 +190,9 @@ describe "An instance of every type of Concept" do
         :int_value, :real_value, :auto_counter_value, :auto_counter_value,
         :string_value, :date_value, :date_time_value,
         :int_sub_value, :real_sub_value, :auto_counter_sub_value, :auto_counter_sub_value,
-        :string_sub_value, :date_sub_value, :date_time_sub_value
+        :string_sub_value, :date_sub_value, :date_time_sub_value,
+        :int_value, :real_value, :auto_counter_value, :auto_counter_value,
+        :string_value, :date_value, :date_time_value,
       ]
     @role_values = [
         3, 3.0, 6, 7,
@@ -223,11 +225,11 @@ describe "An instance of every type of Concept" do
 
       # All identifying roles should be in the verbalisation.
       # Strictly this should be the role name, but we don't set names here.
-      entity_type.identifying_roles.each do |ir|
+      entity_type.identifying_role_names.each do |ir|
           role = entity_type.roles(ir)
           role.should_not be_nil
-          player = role.player
-          verbalisation.should =~ %r{\b#{player.basename}\b}
+          counterpart_concept = role.counterpart_concept
+          verbalisation.should =~ %r{\b#{counterpart_concept.basename}\b}
         end
     end
   end
@@ -247,11 +249,11 @@ describe "An instance of every type of Concept" do
       entity.respond_to?(:verbalise).should be_true
       verbalisation = entity.verbalise
       verbalisation.should =~ %r{\b#{entity.class.basename}\b}
-      entity.class.identifying_roles.each do |ir|
+      entity.class.identifying_role_names.each do |ir|
           role = entity.class.roles(ir)
           role.should_not be_nil
-          player = role.player
-          verbalisation.should =~ %r{\b#{player.basename}\b}
+          counterpart_concept = role.counterpart_concept
+          verbalisation.should =~ %r{\b#{counterpart_concept.basename}\b}
         end
     end
   end
@@ -272,7 +274,7 @@ describe "An instance of every type of Concept" do
       end
     end
     @entities_by_entity.each do |entity|
-      role = entity.class.roles(entity.class.identifying_roles[0])
+      role = entity.class.roles(entity.class.identifying_role_names[0])
       role_name = role.name
       entity.respond_to?(role_name).should be_true
       entity.respond_to?(:"#{role_name}=").should be_true
@@ -310,37 +312,27 @@ describe "An instance of every type of Concept" do
             e = entity_type.new(value)
           }.should_not raise_error
         # Verify that the identifying role has a equivalent value (except AutoCounter):
-        role_name = entity_type.identifying_roles[0]
+        role_name = entity_type.identifying_role_names[0]
         role = entity_type.roles(role_name)
-        player = role.player
-        player_superclasses = [ player.superclass, player.superclass.superclass ]
+        counterpart_concept = role.counterpart_concept
+        player_superclasses = [ counterpart_concept.superclass, counterpart_concept.superclass.superclass ]
         e.send(role_name).should == klass.new(*value) unless player_superclasses.include?(AutoCounter)
       end
     end
   end
 
-  it "that are entities should not allow its identifying roles to be assigned" do
-    pending
-    @entities.zip(@test_role_names, @role_values).each do |entity, role_name, value|
-      lambda {
-          entity.send(:"#{role_name}=", value)
-        }.should raise_error
-    end
-    @entities_by_entity.each do |entity|
-      role = entity.class.roles(entity.class.identifying_roles[0])
-      role_name = role.name
-      lambda {
-          entity.send(:"#{role_name}=", nil)
-        }.should raise_error
-    end
-  end
-
   it "should allow its non-identifying roles to be assigned values" do
     @entities.zip(@test_role_names).each do |entity, identifying_role|
       @test_role_names.zip(@role_values).each do |role_name, value|
-        next if role_name == identifying_role
+        # No roles of ValueType instances are tested in this file:
+        raise hell unless entity.class.included_modules.include?(ActiveFacts::API::Entity)
+        next if entity.class.identifying_role_names.include?(role_name)
         lambda {
-            entity.send(:"#{role_name}=", value)
+            begin
+              entity.send(:"#{role_name}=", value)
+            rescue => e
+              raise
+            end
           }.should_not raise_error
         lambda {
             entity.send(:"one_#{role_name}=", value)
@@ -349,6 +341,45 @@ describe "An instance of every type of Concept" do
     end
   end
 
+  it "that is an entity type should not allow its identifying roles to be re-assigned" do
+    @entities.zip(@test_role_names).each do |entity, identifying_role|
+      @test_role_names.zip(@role_values).each do |role_name, value|
+        if entity.class.identifying_role_names.include?(role_name) && entity.send(role_name) != nil && value != nil
+          lambda {
+              entity.send(:"#{role_name}=", value)
+            }.should raise_error
+        end
+        one_role = :"one_#{role_name}"
+        if entity.class.identifying_role_names.include?(one_role) && entity.send(one_role) != nil
+          lambda {
+              entity.send(:"one_#{role_name}=", value)
+            }.should raise_error
+        end
+      end
+    end
+  end
+
+  it "that is an entity type should allow its identifying roles to be assigned to and from nil" do
+    @entities.zip(@test_role_names).each do |entity, identifying_role|
+      @test_role_names.zip(@role_values).each do |role_name, value|
+        if entity.class.identifying_role_names.include?(role_name)
+          # Nullify the value first:
+          entity.send(:"#{role_name}=", nil)
+          lambda {
+              entity.send(:"#{role_name}=", value)
+            }.should_not raise_error
+        end
+        one_role = :"one_#{role_name}"
+        if entity.class.identifying_role_names.include?(one_role) && entity.send(one_role) == nil
+          entity.send(one_role, nil)
+          lambda {
+              entity.send(one_role, value)
+            }.should_not raise_error
+        end
+      end
+    end
+  end
+
   it "should allow its non-identifying roles to be assigned instances" do
     @entities.zip(@test_role_names).each do |entity, identifying_role|
       @test_role_names.zip(@value_types, @role_values).each do |role_name, klass, value|
@@ -384,7 +415,7 @@ describe "An instance of every type of Concept" do
     end
   end
 
-  it "should add to has_one's conterpart role when non-identifying roles are assigned values" do
+  it "should add to has_one's counterpart role when non-identifying roles are assigned values" do
     @entities.zip(@test_role_names).each do |entity, identifying_role|
       @test_role_names.zip(@role_values).each do |role_name, value|
         next if role_name == identifying_role or !value

data/spec/api/roles.rb

@@ -39,7 +39,7 @@ describe "Roles" do
     end
     role = Mod::Existing1.roles(:name)
     role.should_not be_nil
-    role.player.should == Mod::Name
+    role.counterpart_concept.should == Mod::Name
   end
 
   it "should inject the respective role name into the matching concept" do
@@ -50,7 +50,7 @@ describe "Roles" do
       end
     end
     Mod::Name.roles(:all_existing1).should_not be_nil
-    Mod::LegalEntity.roles(:all_contract_by_first).should_not be_nil
+    Mod::LegalEntity.roles(:all_contract_as_first).should_not be_nil
   end
 
   it "should associate a role name with a matching concept after it's created" do
@@ -63,7 +63,7 @@ describe "Roles" do
     # print "Mod::Existing2.roles = "; p Mod::Existing2.roles
     r = Mod::Existing2.roles(:given_name)
     r.should_not be_nil
-    Symbol.should === r.player
+    Symbol.should === r.counterpart_concept
     module Mod
       class GivenName < String
         value_type
@@ -72,7 +72,7 @@ describe "Roles" do
     # puts "Should resolve now:"
     r = Mod::Existing2.roles(:given_name)
     r.should_not be_nil
-    r.player.should == Mod::GivenName
+    r.counterpart_concept.should == Mod::GivenName
   end
 
   it "should handle subtyping a value type" do
@@ -84,8 +84,8 @@ describe "Roles" do
     end
     r = Mod::FamilyName.roles(:patriarch)
     r.should_not be_nil
-    r.player.should == Mod::Person
-    r.player.roles(:family_name).player.should == Mod::FamilyName
+    r.counterpart_concept.should == Mod::Person
+    r.counterpart_concept.roles(:family_name_as_patriarch).counterpart_concept.should == Mod::FamilyName
   end
 
   it "should instantiate the matching concept on assignment" do
@@ -98,7 +98,7 @@ describe "Roles" do
     contract.second.should == acme
     end
 
-  it "should append the player into the respective role array in the matching concept" do
+  it "should append the counterpart into the respective role array in the matching concept" do
     foo = Mod::Name.new("Foo")
     le = Mod::LegalEntity.new(foo)
     le.respond_to?(:name).should be_true
@@ -106,7 +106,7 @@ describe "Roles" do
     name.respond_to?(:all_legal_entity).should be_true
 
     #pending
-    name.all_legal_entity.should === [le]
+    Array(name.all_legal_entity).should === [le]
   end
 
   it "should instantiate subclasses sensibly" do
@@ -115,7 +115,7 @@ describe "Roles" do
     #pending
     p = c.Person("Fred", "Bloggs")
     p.related_to = "Bloggs & Co"
-    Mod::LegalEntity.should === p.related_to
+    p.related_to.should be_is_a(Mod::LegalEntity)
     bloggs.object_id.should == p.related_to.object_id
   end
 

data/spec/cql_parse_spec.rb

@@ -17,6 +17,7 @@ describe "CQL Parser" do
     CompanyQuery
     Insurance
     OrienteeringER
+    ServiceDirector
   }
 
   #Dir["examples/CQL/Bl*.cql"].each do |cql_file|

data/spec/norma_tables_spec.rb

@@ -18,14 +18,14 @@ include ActiveFacts::Metamodel
 
 Exceptions = {
   "Blog" => ["Author", "Comment", "Paragraph", "Post", "Topic"],
-  "DeathAsBinary" => ["Person"],
+  "JoinEquality" => ["Event", "Seat", "Ticket", "Venue"],
   "Metamodel" => ["AllowedRange", "Constraint", "Correspondence", "Derivation", "Fact", "FactType", "Feature", "Instance", "JoinPath", "Reading", "Role", "RoleRef", "RoleSequence", "RoleValue", "SetComparisonRoles", "Unit", "ValueRestriction"],
   "MetamodelTerms" => ["AllowedValue", "Concept", "Constraint", "Derivation", "Fact", "FactType", "Import", "Instance", "Join", "JoinRole", "ParamValue", "Reading", "Role", "RoleRef", "RoleSequence", "RoleValue", "SetComparisonRoles", "Term", "Unit", "ValueRestriction"],
   "OilSupply" => ["AcceptableSubstitutes", "Month", "ProductionForecast", "RegionalDemand", "TransportRoute"],
-  "OilSupplyWithCosts" => ["AcceptableSubstitutes", "Month", "ProductionForecast", "RegionalDemand", "TransportRoute"],
   "Orienteering" => ["Club", "Entry", "Event", "EventControl", "EventScoringMethod", "Map", "Person", "Punch", "PunchPlacement", "Series", "Visit"],
   "SeparateSubtype" => ["Claim", "VehicleIncident"],
-  "Warehousing" => ["Bin", "DirectOrderMatch", "DispatchItem", "Party", "Product", "PurchaseOrder", "PurchaseOrderItem", "ReceivedItem", "SalesOrder", "SalesOrderItem", "TransferRequest", "Warehouse"]
+  "Warehousing" => ["Bin", "DirectOrderMatch", "DispatchItem", "Party", "Product", "PurchaseOrder", "PurchaseOrderItem", "ReceivedItem", "SalesOrder", "SalesOrderItem", "TransferRequest", "Warehouse"],
+  "RedundantDependency" => ["Address", "LegislativeDistrict", "StateOrProvince"],
 }
 
 def extract_created_tables_from_sql sql_file

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: activefacts
 version: !ruby/object:Gem::Version 
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors: 
 - Clifford Heath
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-09 00:00:00 +11:00
+date: 2009-01-23 00:00:00 +11:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -147,12 +147,16 @@ has_rdoc: true
 homepage: http://dataconstellation.com/ActiveFacts/
 post_install_message: For more information on ActiveFacts, see http://dataconstellation.com/ActiveFacts
 rdoc_options: 
+- -A
+- has_one
+- -A
+- one_to_one
+- -A
+- maybe
 - -x
 - lib/activefacts/cql/.*.rb
 - -x
 - lib/activefacts/vocabulary/.*.rb
-- -x
-- lib/activefacts/persistence/.*.rb
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement