activefacts 1.5.1 → 1.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 887391f1fb780fae6998c9ea40bc158d1b68638d
-  data.tar.gz: ca958351f21cf0b5bf81116982fa9604735b2a42
+  metadata.gz: 8e2981653d1f22d1608e717058a8050882dc2b6c
+  data.tar.gz: dc5680eabdcf6dd519379e80ffad95e8637a0bcc
 SHA512:
-  metadata.gz: d708a24d6ebc6db435c50a2f5aa3a3f7f3dcf416fe7a1104dc9deec10bfb0128853a39ea0e31688bcb49914acd45a3df7298409d7410f8ea36888b019cf09672
-  data.tar.gz: aa44870543b7485a003e2a1ffe3bf12aa73e5f1c3516825a62819dd9c2eed2ddc47bffdf56b01e8af8a0847520ce68da66e6340bd83db628f80e7a8fa89e7611
+  metadata.gz: 7ab00dc1b433b91551196edfae8519ab89f7c99c3a3958df7545014b7d554991a5e0c01916a942d9bc601a95566c17f686d6a655dcc4fe538bcce05130d00180
+  data.tar.gz: 539bc7a595f7c12b0fee750af7303aaee6014942e64732f746af42f203be02bee13cb9c4a6b5158e3f270e09e6bde4583a6d8d6c4822133675fa490d3d324816

data/examples/CQL/Metamodel.cql

@@ -56,10 +56,12 @@ Coefficient is identified by Numerator and Denominator and Coefficient is precis
 Concept is identified by Guid where
 	Concept has one Guid,
 	Guid is of at most one Concept;
-Concept has mapping-Annotation,
-	Annotation applies to at most one Concept;
 
-Constraint is identified by Concept where
+Concept Annotation is where
+	Concept has mapping-Annotation,
+	Annotation applies to Concept;
+
+Constraint [separate] is identified by Concept where
 	Constraint is an instance of one Concept;
 Name is of Constraint,
 	Constraint is called at most one Name;

data/lib/activefacts/cql/compiler/entity_type.rb

@@ -39,7 +39,7 @@ module ActiveFacts
             add_supertype(supertype_name, @identification || i > 0)
           end
 	  @pragmas.each do |p|
-	    @constellation.Annotation(p, :concept => @entity_type.concept)
+	    @constellation.ConceptAnnotation(:concept => @entity_type.concept, :mapping_annotation => p)
 	  end if @pragmas
 
           context = CompilationContext.new(@vocabulary)

data/lib/activefacts/cql/compiler/fact_type.rb

@@ -171,7 +171,7 @@ module ActiveFacts
             end
           end
 	  @pragmas.each do |p|
-	    @constellation.Annotation(p, :concept => @fact_type.concept)
+	    @constellation.ConceptAnnotation(:concept => @fact_type.concept, :mapping_annotation => p)
 	  end if @pragmas
 
           @clauses.each do |clause|

data/lib/activefacts/cql/compiler/value_type.rb

@@ -115,7 +115,7 @@ module ActiveFacts
 	    @constellation.ValueType(@vocabulary, @name, :concept => :new)
           vt.is_independent = true if @pragmas.delete('independent')
 	  @pragmas.each do |p|
-	    @constellation.Annotation(p, :concept => vt.concept)
+	    @constellation.ConceptAnnotation(:concept => vt.concept, :mapping_annotation => p)
 	  end if @pragmas
           vt.supertype = base_type if base_type
           vt.length = length if length

data/lib/activefacts/persistence/reference.rb

@@ -323,9 +323,9 @@ module ActiveFacts
 
         when :supertype   # A subtype absorbs a reference to its supertype when separate, or all when partitioned
           # REVISIT: Or when partitioned
-          raise hell unless role.fact_type.is_a?(ActiveFacts::Metamodel::TypeInheritance)
+          raise "Internal error, expected TypeInheritance" unless role.fact_type.is_a?(ActiveFacts::Metamodel::TypeInheritance)
 	  counterpart_role = (role.fact_type.all_role.to_a-[role])[0]
-          if role.fact_type.assimilation or counterpart_role.object_type.is_independent  # assimilation == 'separate' or assimilation == 'partitioned'
+          if role.fact_type.assimilation or counterpart_role.object_type.is_separate
             trace :references, "supertype #{name} doesn't absorb a reference to separate subtype #{role.fact_type.subtype.name}"
           else
             r = ActiveFacts::Persistence::Reference.new(self, role)
@@ -335,7 +335,7 @@ module ActiveFacts
           end
 
         when :subtype    # This object is a supertype, which can absorb the subtype unless that's independent
-          if role.fact_type.assimilation or is_independent
+          if role.fact_type.assimilation or is_separate
             ActiveFacts::Persistence::Reference.new(self, role).tabulate
             # If partitioned, the supertype is absorbed into *each* subtype; a reference to the supertype needs to know which
           else
@@ -348,8 +348,8 @@ module ActiveFacts
           # Decide which way the one-to-one is likely to go; it will be flipped later if necessary.
           # Force the decision if just one is independent:
           # REVISIT: Decide whether supertype assimilation can affect this
-          r.tabulate and return if is_independent and !r.to.is_independent
-          return if !is_independent and r.to.is_independent
+          r.tabulate and return if is_separate and !r.to.is_separate
+          return if !is_separate and r.to.is_separate
 
           if is_a?(ValueType)
             # Never absorb an entity type into a value type

data/lib/activefacts/persistence/tables.rb

@@ -28,8 +28,8 @@ module ActiveFacts
         return @is_table if @is_table != nil
 
         # Always a table if marked so:
-        if is_independent
-          trace :absorption, "ValueType #{name} is declared independent"
+        if is_separate
+          trace :absorption, "ValueType #{name} is declared independent or separate"
           @tentative = false
           return @is_table = true
         end
@@ -73,8 +73,8 @@ module ActiveFacts
         @tentative = false
 
         # Always a table if marked so
-        if is_independent or concept.all_mapping_annotation.include?('separate')
-          trace :absorption, "EntityType #{name} is declared independent"
+        if is_separate
+          trace :absorption, "EntityType #{name} is declared independent or separate"
           return @is_table = true
         end
 
@@ -199,7 +199,7 @@ module ActiveFacts
         # Strategy:
         # 1) Populate references for all ObjectTypes
         # 2) Decide which ObjectTypes must be and must not be tables
-        #  a. ObjectTypes labelled is_independent are tables (See the is_table methods above)
+        #  a. ObjectTypes labelled is_independent/separate are tables (See the is_table methods above)
         #  b. Entity types having no references to them must be tables
         #  c. subtypes are not tables unless marked with assimilation = separate or partitioned
         #  d. ValueTypes are never tables unless they independent or can have references (to other ValueTypes)

data/lib/activefacts/version.rb

@@ -8,7 +8,7 @@ module ActiveFacts
   module Version
     MAJOR = 1
     MINOR = 5
-    PATCH = 1
+    PATCH = 2
 
     STRING = [MAJOR, MINOR, PATCH].compact.join('.')
   end

data/lib/activefacts/vocabulary/extensions.rb

@@ -411,6 +411,10 @@ module ActiveFacts
     class ObjectType
       # Placeholder for the surrogate transform
       attr_reader :injected_surrogate_role
+
+      def is_separate
+	is_independent or concept.all_concept_annotation.detect{|ca| ca.mapping_annotation == 'separate'}
+      end
     end
 
     class ValueType

data/lib/activefacts/vocabulary/metamodel.rb

@@ -19,7 +19,6 @@ module ActiveFacts
 
     class Annotation < String
       value_type 
-      has_one :concept, :counterpart => :mapping_annotation  # See Concept.all_mapping_annotation
     end
 
     class Assimilation < String
@@ -180,6 +179,12 @@ module ActiveFacts
       has_one :topic                              # See Topic.all_concept
     end
 
+    class ConceptAnnotation
+      identified_by :concept, :mapping_annotation
+      has_one :concept, :mandatory => true        # See Concept.all_concept_annotation
+      has_one :mapping_annotation, :class => Annotation, :mandatory => true  # See Annotation.all_concept_annotation_as_mapping_annotation
+    end
+
     class Constraint
       identified_by :concept
       one_to_one :concept, :mandatory => true     # See Concept.constraint

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activefacts
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.5.2
 platform: ruby
 authors:
 - Clifford Heath