activefacts-metamodel 1.9.5 → 1.9.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1f7f44626a2f296fa2526060928c417750b40470
-  data.tar.gz: 8eafb8c56e8d769a71f63109126b85f1c8c6380a
+  metadata.gz: 7b1f0ae97a0a31369e5681e2310eb8deeb663390
+  data.tar.gz: d5cbf6dc32862b3982eb8c2f26aa28fb033d2afe
 SHA512:
-  metadata.gz: 9e8f19d52180aad423c425b6277d8f13daf33e3cb66e812185e85c6796507ffb0d63623c7d81a4f6e7e61f815387f5acede0b4f7ea203c0fccc4bf711965263d
-  data.tar.gz: c2dab88c77154b6eef9ef0cf38d8fd26ca405f2bfa1ddb03e1b04ab56d1819ca66574725179947ada99ebfa70ebeb0c3684446e6aa6c75be031d30d23bc9c6b3
+  metadata.gz: 9031e41a724f5eb9c57aa7aa8f5ea2c8f22d0de1b6c9ea8808b6ebb062b31450cff6f08b8b19b744868fcee2b3f3db8d51cac187a0073292f2d044ee6bb78944
+  data.tar.gz: d9922fc63374fb60f7d553e0251c6d91b0a6dfd1d0c784f17a0c5a4ce03fab7b1e9fa2cf9eb51adb19ba509aa5b9e73524aee4c0bad12f8725e20eb5ff545398

data/Gemfile

@@ -2,7 +2,11 @@ source 'https://rubygems.org'
 
 gemspec
 
-if ENV['PWD'] =~ %r{\A#{ENV['HOME']}/work}i
-  $stderr.puts "Using work area gems for #{File.basename(File.dirname(__FILE__))} from activefacts-metamodel"
-  gem 'activefacts-api', path: '../api'
+this_file = File.absolute_path(__FILE__)
+if this_file =~ %r{\A#{ENV['HOME']}}i
+  dir = File.dirname(File.dirname(this_file))
+  $stderr.puts "Using work area gems in #{dir} from activefacts-metamodel"
+  gem 'activefacts-cql', path: dir+'/cql'
+  gem 'activefacts-compositions', path: dir+'/compositions'
+  gem 'activefacts-api', path: dir+'/api'
 end

data/Rakefile

@@ -36,15 +36,7 @@ end
 desc "Generate new Ruby from the CQL file"
 task :ruby do
   system %q{
-    afgen --ruby cql/Metamodel.cql 2>/dev/null |
-      sed '2a\
-module ActiveFacts
-	
-	3s/:://
-	3,$s/^/  /
-	$a\
-end
-      ' > metamodel.rb
+    schema_compositor --binary --ruby=scope=ActiveFacts cql/Metamodel.cql > metamodel.rb &&
+    diff -ub lib/activefacts/metamodel/metamodel.rb metamodel.rb
   }
-  system "diff -ub lib/activefacts/metamodel/metamodel.rb metamodel.rb"
 end

data/activefacts-metamodel.gemspec

@@ -24,6 +24,8 @@ This gem provides the core representations for the Fact Modeling tools of Active
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.3"
 
-  spec.add_runtime_dependency "activefacts-api", "~> 1", ">= 1.9.4"
-  spec.add_development_dependency "activefacts", "~> 1", "~> 1.8"
+  spec.add_development_dependency "activefacts-compositions", ">= 1.9.6"  # Needed for schema_compositor to emit Ruby from CQL
+  spec.add_development_dependency "activefacts", "~> 1", ">= 1.8"	  # Needed to emit CQL from ORM (and check it from CQL)
+
+  spec.add_runtime_dependency "activefacts-api", "~> 1", ">= 1.9.5"
 end

data/cql/Metamodel.cql

@@ -446,11 +446,6 @@ Composite is identified by Mapping where
 Composition contains Composite,
 	Composite belongs to one Composition;
 
-Scoping is a kind of Mapping;
-Injection is a kind of Mapping;
-Value Field is a kind of Injection;
-Surrogate Key is a kind of Injection;
-
 Absorption is a kind of Mapping;
 Absorption traverses to one child-Role;
 Absorption traverses from one parent-Role;
@@ -473,6 +468,26 @@ some Object Type is involved in some Full Absorption that applies to some Absorp
 	that Mapping represents that Object Type;
 */
 
+/*
+ * Composition constraint categories
+ */
+Leaf Constraint is where
+	Component has leaf-Constraint,
+	Constraint applies to Component;
+
+Local Constraint is where
+	Composite contains local-Constraint,
+	local-Constraint connects leaves of Composite;
+ 
+Spanning Constraint is where
+	Composite has spanning-Constraint,
+	Constraint spans Composite;
+
+Scoping is a kind of Mapping;
+Injection is a kind of Mapping;
+Value Field is a kind of Injection;
+Surrogate Key is a kind of Injection;
+
 /* Access Paths */
 Access Path is identified by Guid where
 	Access Path has one Guid,

data/lib/activefacts/metamodel/extensions.rb

@@ -334,7 +334,18 @@ module ActiveFacts
       end
 
       def unary_name
-	fact_type.preferred_reading.text.gsub(/\{[0-9]\}/,'').words.titlewords*' '
+	fact_type.
+	preferred_reading.
+	text.
+	gsub(/(.*)\{[0-9]\}(.*)/) do
+	  if $1.empty? or $2.empty?
+	    "#{$1} #{$2}"
+	  else
+	    "#{$1} #{object_type.name} #{$2}"
+	  end
+	end.
+	words.
+	titlewords*' '
       end
 
       def is_link_role
@@ -359,11 +370,26 @@ module ActiveFacts
 	  nil # raise "counterpart roles are undefined in n-ary fact types"
 	end
       end
+
+      # return an array of all the constraints on this role (not including ValueConstraint on a ValueType player)
+      def all_constraint
+	(
+	  Array(role_value_constraint) +
+	  all_role_ref.to_a.flat_map do |rr|
+	    rr.role_sequence.all_presence_constraint.to_a +
+	    rr.role_sequence.all_subset_constraint_as_superset_role_sequence +
+	    rr.role_sequence.all_subset_constraint_as_subset_role_sequence +
+	    rr.role_sequence.all_set_comparison_roles.map(&:set_comparison_constraint)
+	  end +
+	  all_ring_constraint.to_a +
+	  all_ring_constraint_as_other_role.to_a
+	).uniq
+      end
     end
 
     class RoleRef
       def describe
-        role_name
+        role.name + " in (#{role.fact_type.default_reading})"
       end
 
       def preferred_reference
@@ -434,7 +460,9 @@ module ActiveFacts
     class RoleSequence
       def describe(highlighted_role_ref = nil)
         "("+
-          all_role_ref.sort_by{|rr| rr.ordinal}.map{|rr| rr.describe + (highlighted_role_ref == rr ? '*' : '') }*", "+
+          all_role_ref_in_order.map{|rr| rr.role.name + (highlighted_role_ref == rr ? '*' : '') }*", " +
+	  " in " +
+	  all_role_ref.map(&:role).map(&:fact_type).uniq.map(&:default_reading).map(&:inspect)*', ' +
         ")"
       end
 
@@ -457,6 +485,10 @@ module ActiveFacts
     end
 
     class ValueType
+      def all_supertype
+	Array(supertype)
+      end
+
       def supertypes_transitive
         [self] + (supertype ? supertype.supertypes_transitive : [])
       end
@@ -694,6 +726,10 @@ module ActiveFacts
           }
       end
 
+      def all_supertype
+	supertypes
+      end
+
       # An array of all direct subtypes
       def all_subtype
         all_type_inheritance_as_supertype.map(&:subtype)
@@ -935,6 +971,10 @@ module ActiveFacts
           all_allowed_range.single.to_s
         end
       end
+
+      def all_constrained_role
+	Array(role_as_role_value_constraint) # Empty unless it's a role value constraint
+      end
     end
 
     class AllowedRange
@@ -1009,16 +1049,35 @@ module ActiveFacts
       def covers_role role
 	role_sequence.all_role_ref.map(&:role).include?(role)
       end
+
+      def all_constrained_role
+	role_sequence.all_role_ref.map(&:role)
+      end
     end
 
     class SubsetConstraint
       def describe
         'SubsetConstraint(' +
-        subset_role_sequence.describe 
-        ' < ' +
+        subset_role_sequence.describe +
+        ' only if ' +
         superset_role_sequence.describe +
         ')'
       end
+
+      def all_constrained_role
+	subset_role_sequence.all_role_ref.map(&:role) +
+	superset_role_sequence.all_role_ref.map(&:role)
+      end
+    end
+
+    class SetComparisonRoles
+      def describe
+        "("+
+          role_sequence.all_role_ref_in_order.map{|rr| rr.role.name }*", " +
+	  " in " +
+	  role_sequence.all_role_ref.map(&:role).map(&:fact_type).uniq.map(&:default_reading).map(&:inspect)*', ' +
+        ")"
+      end
     end
 
     class SetComparisonConstraint
@@ -1033,8 +1092,26 @@ module ActiveFacts
         end*',' +
         ')'
       end
+
+      def all_constrained_role
+	all_set_comparison_roles.map(&:role_sequence).flat_map(&:all_role_ref).map(&:role).uniq
+      end
     end
 
+    class SetEqualityConstraint
+      def describe
+	all_set_comparison_roles.map(&:describe) * " if and only if "
+      end
+    end
+
+    class SetExclusionConstraint
+      def describe
+	(is_mandatory ? "exactly one of " : "at most one of ") +
+	all_set_comparison_roles.map(&:describe) * " or "
+      end
+    end
+
+
     class RingConstraint
       def describe
         'RingConstraint(' +
@@ -1044,6 +1121,10 @@ module ActiveFacts
         role.fact_type.default_reading +
         ')'
       end
+
+      def all_constrained_role
+	[role, other_role]
+      end
     end
 
     class TypeInheritance
@@ -1438,16 +1519,19 @@ module ActiveFacts
 	"Composite #{mapping.inspect}"
       end
 
+      def all_index
+	all_access_path.
+	select{|ap| ap.is_a?(Index)}.
+	sort_by{|ap| [ap.composite_as_primary_index ? 0 : 1] + Array(ap.name)+ap.all_index_field.map(&:inspect) }  # REVISIT: Fix hack for stable ordering
+      end
+
       def show_trace
 	trace :composition, inspect do
 	  trace :composition?, "Columns" do
 	    mapping.show_trace
 	  end
 
-	  indices =
-	    all_access_path.
-	    select{|ap| ap.is_a?(Index)}.
-	    sort_by{|ap| [ap.composite_as_primary_index ? 0 : 1] + Array(ap.name)+ap.all_index_field.map(&:inspect) }  # REVISIT: Fix hack for stable ordering
+	  indices = all_index
 	  unless indices.empty?
 	    trace :composition, "Indices" do
 	      indices.each do |ap|
@@ -1590,6 +1674,14 @@ module ActiveFacts
           end
         end
       end
+
+      def is_mandatory
+	true
+      end
+
+      def path_mandatory
+	true
+      end
     end
 
     class Nesting
@@ -1707,6 +1799,22 @@ module ActiveFacts
 	end
       end
 
+      def all_role
+	([child_role, parent_role] + all_nesting.map(&:index_role)).flat_map{|role| [role, role.base_role]}.uniq
+      end
+
+      def value_constraints
+	return [] unless object_type.is_a?(ValueType)
+	object_type.supertypes_transitive.flat_map{|vt| Array(vt.value_constraint)}
+      end
+
+      def is_mandatory
+	parent_role.is_mandatory
+      end
+
+      def path_mandatory
+	is_mandatory && parent.path_mandatory
+      end
     end
 
     class FullAbsorption
@@ -1723,6 +1831,14 @@ module ActiveFacts
       def show_trace
 	trace :composition, "#{ordinal ? "#{ordinal}: " : ''}#{inspect} #{name ? "(as #{name.inspect})" : ''}"
       end
+
+      def all_role
+	[role, role.base_role].uniq
+      end
+
+      def is_mandatory
+	false
+      end
     end
 
     class Discriminator
@@ -1733,6 +1849,10 @@ module ActiveFacts
       def show_trace
 	trace :composition, "#{ordinal ? "#{ordinal}: " : ''}#{inspect} #{name ? " (as #{name.inspect})" : ''}"
       end
+
+      def all_role
+	all_discriminated_role.map(&:role).flat_map{|role| [role, role.base_role]}.uniq
+      end
     end
 
     class ValueField
@@ -1881,6 +2001,18 @@ module ActiveFacts
         (parent ? parent.path+[self] : [self])
       end
 
+      def is_mandatory
+	parent.is_mandatory
+      end
+
+      def path_mandatory
+	parent.path_mandatory
+      end
+
+      def all_role
+	[]
+      end
+
       def rank_path
         (parent ? parent.rank_path+[ordinal] : [ordinal])
       end