activefacts-compositions 1.9.4 → 1.9.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bad26d18580fa095acc7cbb4a2722694f0020c30
-  data.tar.gz: 45c9fc0cf6516095c7794bd7fb291ce33c80b074
+  metadata.gz: 61900437c96a5fa32c68fdcc195c8a681ace3cd9
+  data.tar.gz: 9f4917265c5b36482552e74c554197e2fa390874
 SHA512:
-  metadata.gz: 76fafc569a0516de38ddb19e604c243ec7b87318823fffac3bd3b8b84ec491e131d4429dae139944322a2882574e2c6d9693fad176fa9962dcf2f5495851f13b
-  data.tar.gz: ca70f4978bffffea9737812c3199503a81242809f0f0a27674be0c769b96d82aef6937a7cbd0213ac50ac971684ee2ec476e9c6c517729de1d92a109b45bd782
+  metadata.gz: c052e52630a0a814533cab84d1880bf9518968be13dde299d167514496c411acc4a5708c4c9bd35f0f670c0e15f28a5973ee0fc8b8868921f6df4b146bf5b8e4
+  data.tar.gz: 7f475031a473c7f0ee566d33baaf49c9785cca3e4c2b142e16e0e176993ee387d64bf03e893debb3ee575e4f72afbd6aa652e059bdaec8fc644dea524cad71fe

data/activefacts-compositions.gemspec

@@ -23,9 +23,9 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.3"
 
-  spec.add_runtime_dependency("activefacts-api", "~> 1", ">= 1.9.2")
-  spec.add_runtime_dependency("activefacts-metamodel", "~> 1", ">= 1.9.1")
-  spec.add_runtime_dependency "tracing", "~> 2", ">= 2.0.5"
+  spec.add_runtime_dependency("activefacts-api", "~> 1", ">= 1.9.4")
+  spec.add_runtime_dependency("activefacts-metamodel", "~> 1", ">= 1.9.5")
+  spec.add_runtime_dependency "tracing", "~> 2", ">= 2.0.6"
 
   spec.add_development_dependency "activefacts", "~> 1", ">= 1.8"
   spec.add_development_dependency "activefacts-cql", "~> 1", ">= 1.8"

data/bin/schema_compositor

@@ -20,6 +20,7 @@ while arg = ARGV.shift and arg =~ /^-/
 end
 
 validate = options.delete('validate')
+show = options.delete('show')
 
 # Load the file type input method
 if arg
@@ -47,10 +48,46 @@ begin
 
   compositor = ActiveFacts::Compositions::Relational.new(vocabulary.constellation, "test", options)
   compositor.generate
-  trace.enable 'composition_validator'
-  compositor.validate do |component, problem|
-    trace :composition_validator, "!!PROBLEM!! #{component.inspect}: #{problem}"
-  end if validate
+
+  if validate
+    trace.enable 'composition_validator'
+    compositor.validate do |component, problem|
+      trace :composition_validator, "!!PROBLEM!! #{component.inspect}: #{problem}"
+    end
+  end
+
+  if show
+    compositor.
+    composition.
+    all_composite.
+    sort_by{|composite| composite.mapping.name}.
+    each do |composite|
+      puts composite.mapping.name
+      indices = composite.all_indices_by_rank
+
+      composite.mapping.leaves.each do |leaf|
+	# Build a symbolic representation of the index participation of this leaf
+	pos = 0
+	indexing = indices.inject([]) do |a, index|
+	  pos += 1
+	  if part = index.position_in_index(leaf)
+	    a << "#{pos}.#{part}"
+	  end
+	  a
+	end
+
+	puts "\t#{leaf.path.map{|component|
+	    if component.is_a?(ActiveFacts::Metamodel::Absorption) && component.foreign_key
+	      "[#{component.name}]"
+	    else
+	      component.name
+	    end +
+	      (component.is_a?(ActiveFacts::Metamodel::Absorption) && !component.parent_role.is_mandatory ? '?' : '')
+	  }*'->'}" +
+	  (indexing.empty? ? '' : "[#{indexing*','}]")	# Show the indexing
+      end
+    end
+  end
 
 rescue => e
   $stderr.puts "#{e.message}"

data/lib/activefacts/compositions/compositor.rb

@@ -16,12 +16,13 @@ require "activefacts/metamodel"
 module ActiveFacts
   module Compositions
     class Compositor
-      attr_reader :options, :name
+      attr_reader :options, :name, :composition
 
       def initialize constellation, name, options = {}
 	@constellation = constellation
 	@name = name
 	@options = options
+	$stderr.puts "Unknown options: #{options.inspect}" unless options.empty?
       end
 
       # Generate all Mappings into @binary_mappings for a binary composition of all ObjectTypes in this constellation

data/lib/activefacts/compositions/relational.rb

@@ -16,6 +16,12 @@ module ActiveFacts
     private
       MM = ActiveFacts::Metamodel
     public
+      def initialize constellation, name, options = {}
+	# Extract recognised options so our superclass doesn't complain:
+	@option_surrogates = options.delete('surrogates')
+	super constellation, name, options
+      end
+
       def generate
 	super
 
@@ -36,7 +42,7 @@ module ActiveFacts
 	  inject_value_fields
 
 	  # Inject surrogate keys if the options ask for that
-	  inject_surrogates if @options['surrogates']
+	  inject_surrogates if @option_surrogates
 
 	  # Remove the un-used absorption paths
 	  delete_reverse_absorptions
@@ -264,7 +270,7 @@ module ActiveFacts
       end
 
       def inject_surrogates
-	surrogate_type_name = [true, '', 'true', 'yes'].include?(t = @options['surrogates']) ? 'Auto Counter' : t
+	surrogate_type_name = [true, '', 'true', 'yes'].include?(t = @option_surrogates) ? 'Auto Counter' : t
 	composites = @composition.all_composite.to_a
 	return if composites.empty?
 	vocabulary = composites[0].mapping.object_type.vocabulary	# REVISIT: Crappy: choose the first (currently always single)

data/lib/activefacts/compositions/version.rb

@@ -1,5 +1,5 @@
 module ActiveFacts
   module Compositions
-    VERSION = "1.9.4"
+    VERSION = "1.9.5"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activefacts-compositions
 version: !ruby/object:Gem::Version
-  version: 1.9.4
+  version: 1.9.5
 platform: ruby
 authors:
 - Clifford Heath
@@ -67,7 +67,7 @@ dependencies:
         version: '1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.9.2
+        version: 1.9.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -77,7 +77,7 @@ dependencies:
         version: '1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.9.2
+        version: 1.9.4
 - !ruby/object:Gem::Dependency
   name: activefacts-metamodel
   requirement: !ruby/object:Gem::Requirement
@@ -87,7 +87,7 @@ dependencies:
         version: '1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.9.1
+        version: 1.9.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -97,7 +97,7 @@ dependencies:
         version: '1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.9.1
+        version: 1.9.5
 - !ruby/object:Gem::Dependency
   name: tracing
   requirement: !ruby/object:Gem::Requirement
@@ -107,7 +107,7 @@ dependencies:
         version: '2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.5
+        version: 2.0.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -117,7 +117,7 @@ dependencies:
         version: '2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.5
+        version: 2.0.6
 - !ruby/object:Gem::Dependency
   name: activefacts
   requirement: !ruby/object:Gem::Requirement