activefacts 0.8.10 → 0.8.12

data/lib/activefacts/persistence/tables.rb

@@ -237,6 +237,12 @@ module ActiveFacts
                     }
                   debug :absorption, "#{object_type.name} has #{non_identifying_refs_from.size} non-identifying functional roles"
 
+                  # If all non-identifying functional roles are one-to-ones that can be flipped, do that:
+                  if non_identifying_refs_from.all? { |ref| ref.role_type == :one_one && (ref.to.is_table || ref.to.tentative) }
+                    non_identifying_refs_from.each { |ref| ref.flip }
+                    non_identifying_refs_from = []
+                  end
+
                   if object_type.references_to.size > 1 and
                       non_identifying_refs_from.size > 0
                     debug :absorption, "#{object_type.name} has non-identifying functional dependencies so 3NF requires it be a table"

data/lib/activefacts/support.rb

@@ -150,3 +150,21 @@ class Array
     self
   end
 end
+
+# Load the ruby debugger before everything else, if requested
+if debug :debug
+  begin
+    require 'ruby-debug'
+    Debugger.start # (:post_mortem => true)  # Some Ruby versions crash on post-mortem debugging
+  rescue LoadError
+    # Ok, no debugger, tough luck.
+  end
+
+  if debug :trap
+    trap('SIGINT') do
+      puts "Stopped at:\n\t"+caller*"\n\t"
+      debugger
+      true
+    end
+  end
+end

data/lib/activefacts/version.rb

@@ -5,5 +5,5 @@
 # Copyright (c) 2009 Clifford Heath. Read the LICENSE file.
 #
 module ActiveFacts
-  VERSION = '0.8.10'
+  VERSION = '0.8.12'
 end

data/lib/activefacts/vocabulary/extensions.rb

@@ -53,6 +53,10 @@ module ActiveFacts
           reading.text =~ /\{\d\}/ and reading.role_sequence.all_role_ref_in_order[$1.to_i].role == role
         end || preferred_reading
       end
+
+      def all_role_in_order
+        all_role.sort_by{|r| r.ordinal}
+      end
     end
 
     class Role
@@ -179,7 +183,7 @@ module ActiveFacts
 
     class EntityType
       def preferred_identifier
-        #return @preferred_identifier if @preferred_identifier
+        return @preferred_identifier if @preferred_identifier
         if fact_type
 
           # For a nested fact type, the PI is a unique constraint over N or N-1 roles
@@ -390,39 +394,43 @@ module ActiveFacts
         (0...role_refs.size).each{|i|
             role_ref = role_refs[i]
             role = role_ref.role
-            la = "#{role_ref.leading_adjective}".sub(/(.\b|.\Z)/, '\1-').sub(/- /,'-  ')
-            la = nil if la == ""
+            l_adj = "#{role_ref.leading_adjective}".sub(/(\b-\b|.\b|.\Z)/, '\1-').sub(/\b--\b/,'-- ').sub(/- /,'-  ')
+            l_adj = nil if l_adj == ""
             # Double the space to compensate for space removed below
-            ta = "#{role_ref.trailing_adjective}".sub(/(\b.|\A.)/, '-\1').sub(/ -/,'  -')
-            ta = nil if ta == ""
+            # REVISIT: hyphenated trailing adjectives are not correctly represented here
+            t_adj = "#{role_ref.trailing_adjective}".sub(/(\b.|\A.)/, '-\1').sub(/ -/,'  -')
+            t_adj = nil if t_adj == ""
 
-            expanded.gsub!(/\{#{i}\}/) {
+            expanded.gsub!(/\{#{i}\}/) do
                 role_ref = role_refs[i]
                 player = role_ref.role.object_type
                 role_name = role.role_name
                 role_name = nil if role_name == ""
                 if role_name && define_role_names == false
-                  la = ta = nil   # When using role names, don't add adjectives
+                  l_adj = t_adj = nil   # When using role names, don't add adjectives
                 end
-                fc = frequency_constraints[i]
-                fc = fc.frequency if fc && fc.is_a?(ActiveFacts::Metamodel::PresenceConstraint)
-                if fc.is_a?(Array)
-                  fc, player_name = *fc
+                freq_con = frequency_constraints[i]
+                freq_con = freq_con.frequency if freq_con && freq_con.is_a?(ActiveFacts::Metamodel::PresenceConstraint)
+                if freq_con.is_a?(Array)
+                  freq_con, player_name = *freq_con
                 else
                   player_name = player.name
                 end
                 literal = literals[i]
-                [
-                  fc ? fc : nil,
-                  la,
+                words = [
+                  freq_con ? freq_con : nil,
+                  l_adj,
                   define_role_names == false && role_name ? role_name : player_name,
-                  ta,
+                  t_adj,
                   define_role_names && role_name && player.name != role_name ? "(as #{role_name})" : nil,
                   # Can't have both a literal and a value constraint, but we don't enforce that here:
                   literal ? literal : nil
-                ].compact*" " +
-                  (subscript_block ? subscript_block.call(role_ref) : "")
-            }
+                ]
+                if (subscript_block)
+                  words = subscript_block.call(role_ref, *words)
+                end
+                words.compact*" "
+            end
         }
         expanded.gsub!(/ ?- ?/, '-')        # Remove single spaces around adjectives
         #debug "Expanded '#{expanded}' using #{frequency_constraints.inspect}"
@@ -441,6 +449,37 @@ module ActiveFacts
           end
         end
       end
+
+      # Return the array of the numbers of the RoleRefs inserted into this reading from the role_sequence
+      def role_numbers
+        text.scan(/\{(\d)\}/).flatten.map{|m| Integer(m) }
+      end
+
+      def expand_with_final_presence_constraint &b
+        # Arrange the roles in order they occur in this reading:
+        role_refs = role_sequence.all_role_ref_in_order
+        role_numbers = text.scan(/\{(\d)\}/).flatten.map{|m| Integer(m) }
+        roles = role_numbers.map{|m| role_refs[m].role }
+        fact_constraints = fact_type.internal_presence_constraints
+
+        # Find the constraints that constrain frequency over each role we can verbalise:
+        frequency_constraints = []
+        roles.each do |role|
+          frequency_constraints <<
+            if (role == roles.last)   # On the last role of the reading, emit any presence constraint
+              constraint = fact_constraints.
+                detect do |c|  # Find a UC that spans all other Roles
+                  c.is_a?(ActiveFacts::Metamodel::PresenceConstraint) &&
+                    roles-c.role_sequence.all_role_ref.map(&:role) == [role]
+                end
+              constraint && constraint.frequency
+            else
+              nil
+            end
+        end
+
+        expand(frequency_constraints) { |*a| b && b.call(*a) }
+      end
     end
 
     class ValueConstraint
@@ -482,7 +521,7 @@ module ActiveFacts
             min_literal = min.literal
           end
         else
-          min_literal = infinity ? "INFINITY" : ""
+          min_literal = infinity ? "-Infinity" : ""
         end
         if max = value_range.maximum_bound
           max = max.value
@@ -492,7 +531,7 @@ module ActiveFacts
             max_literal = max.literal
           end
         else
-          max_literal = infinity ? "INFINITY" : ""
+          max_literal = infinity ? "Infinity" : ""
         end
 
         min_literal +

data/lib/activefacts/vocabulary/metamodel.rb

@@ -41,6 +41,10 @@ module ActiveFacts
       value_type 
     end
 
+    class DisjunctionId < AutoCounter
+      value_type 
+    end
+
     class DisplayRoleNamesSetting < String
       value_type 
       restrict 'false', 'true'
@@ -182,6 +186,11 @@ module ActiveFacts
       has_one :object_type                        # See ObjectType.all_context_note
     end
 
+    class Disjunction
+      identified_by :disjunction_id
+      one_to_one :disjunction_id, :mandatory => true  # See DisjunctionId.disjunction
+    end
+
     class Enforcement
       identified_by :constraint
       has_one :agent                              # See Agent.all_enforcement
@@ -300,9 +309,9 @@ module ActiveFacts
       has_one :coefficient                        # See Coefficient.all_unit
       has_one :ephemera_url, :class => EphemeraURL  # See EphemeraURL.all_unit
       maybe :is_fundamental
-      has_one :name, :mandatory => true           # See Name.all_unit
+      one_to_one :name, :mandatory => true        # See Name.unit
       has_one :offset                             # See Offset.all_unit
-      has_one :plural_name, :class => Name        # See Name.all_unit_as_plural_name
+      one_to_one :plural_name, :class => Name     # See Name.unit_as_plural_name
       one_to_one :unit_id, :mandatory => true     # See UnitId.unit
       has_one :vocabulary, :mandatory => true     # See Vocabulary.all_unit
     end
@@ -380,6 +389,7 @@ module ActiveFacts
 
     class JoinStep
       identified_by :input_join_role, :output_join_role
+      has_one :disjunction                        # See Disjunction.all_join_step
       has_one :fact_type, :mandatory => true      # See FactType.all_join_step
       has_one :input_join_role, :class => JoinRole, :mandatory => true  # See JoinRole.all_join_step_as_input_join_role
       maybe :is_anti
@@ -400,7 +410,6 @@ module ActiveFacts
     end
 
     class ObjectTypeShape < Shape
-      maybe :has_expanded_reference_mode
       has_one :object_type, :mandatory => true    # See ObjectType.all_object_type_shape
     end
 
@@ -491,9 +500,7 @@ module ActiveFacts
 
     class EntityType < ObjectType
       one_to_one :fact_type                       # See FactType.entity_type
-    end
-
-    class ImplicitBooleanValueType < ValueType
+      maybe :is_implied_by_objectification
     end
 
     class Facet
@@ -502,6 +509,16 @@ module ActiveFacts
       has_one :value_type, :mandatory => true     # See ValueType.all_facet
     end
 
+    class FacetValue
+      identified_by :value_type, :facet
+      has_one :facet, :mandatory => true          # See Facet.all_facet_value
+      has_one :value, :mandatory => true          # See Value.all_facet_value
+      has_one :value_type, :mandatory => true     # See ValueType.all_facet_value
+    end
+
+    class ImplicitBooleanValueType < ValueType
+    end
+
     class TypeInheritance < FactType
       identified_by :subtype, :supertype
       has_one :subtype, :class => EntityType, :mandatory => true  # See EntityType.all_type_inheritance_as_subtype
@@ -510,12 +527,5 @@ module ActiveFacts
       maybe :provides_identification
     end
 
-    class FacetValue
-      identified_by :value_type, :facet
-      has_one :facet, :mandatory => true          # See Facet.all_facet_value
-      has_one :value, :mandatory => true          # See Value.all_facet_value
-      has_one :value_type, :mandatory => true     # See ValueType.all_facet_value
-    end
-
   end
 end

data/lib/activefacts/vocabulary/verbaliser.rb

@@ -305,8 +305,10 @@ module ActiveFacts
       # these expansions include frequency constraints, role names and value constraints as passed-in,
       # and also define adjectives by using the hyphenated form (on at least the first occurrence).
       def expand_reading(reading, frequency_constraints = [], define_role_names = nil, value_constraints = [], &subscript_block)
-        reading.expand(frequency_constraints, define_role_names, value_constraints) do |role_ref|
-          (!(role_ref.role.role_name and define_role_names != nil) and p = player(role_ref) and p.subscript) ? "(#{p.subscript})" : ""
+        reading.expand(frequency_constraints, define_role_names, value_constraints) do |role_ref, *parts|
+          parts + [
+            (!(role_ref.role.role_name and define_role_names != nil) and p = player(role_ref) and p.subscript) ? "(#{p.subscript})" : nil
+          ]
         end
       end
 
@@ -626,7 +628,7 @@ module ActiveFacts
         # role_refs = steps.map{|step| [step.input_join_role.join_node, step.output_join_role.join_node].map{|jn| jn.all_role_ref.detect{|rr| rr.role.fact_type == object_type.fact_type}}}.flatten.compact.uniq
 
         reading = object_type.fact_type.preferred_reading
-        " (where #{expand_reading_text(objectification_step, reading.text, reading.role_sequence, player_by_role)})" 
+        " (in which #{expand_reading_text(objectification_step, reading.text, reading.role_sequence, player_by_role)})" 
       end
 
       def elided_objectification(next_step, fact_type, last_is_contractable, next_node)

data/spec/absorption_spec.rb

@@ -21,6 +21,7 @@ describe "Absorption" do
     Claim is identified by ClaimID where
       Claim has exactly one ClaimID,
       ClaimID is of at most one Claim;
+    Claim was reported on one DateTime;
   }
   AT_Incident = %Q{
     Incident is identified by Claim where
@@ -50,7 +51,7 @@ describe "Absorption" do
         #{AT_Prologue} #{AT_Claim} #{AT_Incident}
         Incident relates to loss on exactly one DateTime;
       },
-      :tables => { "Claim" => [%w{Claim ID}, %w{Incident Date Time}]}
+      :tables => { "Claim" => [%w{Claim ID}, %w{Date Time}, %w{Incident Date Time}]}
     },
 
     { :should => "absorb an objectified binary with single-role UC",
@@ -62,7 +63,7 @@ describe "Absorption" do
         Person has exactly one birth-DateTime;
       },
       :tables => {
-        "Claim" => [%w{Claim ID}, %w{Lodgement Date Time}, %w{Lodgement Person ID}],
+        "Claim" => [%w{Claim ID}, %w{Date Time}, %w{Lodgement Date Time}, %w{Lodgement Person ID}],
         "Party" => [%w{Party ID}, %w{Person Birth Date Time}]
       }
     },

data/spec/cql/comparison_spec.rb

@@ -8,9 +8,7 @@ require 'rspec/expectations'
 require 'activefacts/support'
 require 'activefacts/api/support'
 require 'activefacts/cql/compiler'
-require 'spec/helpers/compile_helpers'
-
-require 'ruby-debug'; Debugger.start
+require File.dirname(__FILE__) + '/../helpers/compile_helpers'
 
 describe "When matching a reading with an existing fact type" do
   before :each do

data/spec/cql/context_spec.rb

@@ -41,7 +41,7 @@ describe "Business Context Notes" do
     ],
     # Entity and Fact types
     # Entity and Fact types
-    [ 'Foo is identified by Bar [independent] where Foo has one Bar (so that we have an id);',
+    [ 'Foo is identified by Bar [independent] where Foo has one(to avoid fuckups) Bar (so that we have an id);',
       1, 'so_that'
     ],
     [ 'Baz has one Bar (so that we have an id), Bar is of one Baz (because we need that);',

data/spec/cql/entity_type_spec.rb

@@ -137,7 +137,7 @@ describe "When compiling an entity type, " do
         eval(lambda { example.call(*c) }, BlackHole.new)
       rescue => raised
       end
-      raise RSpec::Core::PendingExampleFixedError.new(msg) unless raised
+      raise RSpec::Core::Pending::PendingExampleFixedError.new(msg) unless raised
       throw :pending_declared_in_example, msg
     }
   end
@@ -306,7 +306,7 @@ describe "When compiling an entity type, " do
             test.call(@compiler.vocabulary.constellation)
           rescue RSpec::Expectations::ExpectationNotMetError
             raise
-          rescue RSpec::Core::ExamplePendingError
+          rescue RSpec::Core::Pending::PendingDeclaredInExample.new
             raise
           rescue => e
             puts "Failed on\n\t"+tests.select{|t| t.is_a?(String)}*" "

data/spec/cql/expressions_spec.rb

@@ -8,9 +8,7 @@ require 'rspec/expectations'
 require 'activefacts/support'
 require 'activefacts/api/support'
 require 'activefacts/cql/compiler'
-require 'spec/helpers/compile_helpers'
-
-require 'ruby-debug'; Debugger.start
+require File.dirname(__FILE__) + '/../helpers/compile_helpers'
 
 describe "When compiling expressions" do
   before :each do
@@ -55,7 +53,7 @@ describe "When compiling expressions" do
       (is_old_ft.all_reading.map{ |r| r.expand }*', ').should == "Person is old"
 
       comparison_ft = (new_fact_types - [is_old_ft])[0]
-      (comparison_ft.all_reading.map{ |r| r.expand }*', ').should == "Age >= product(Integer, sum(Integer, Integer))"
+      (comparison_ft.all_reading.map{ |r| r.expand }*', ').should == "Boolean = Age >= product(Integer, sum(Integer, Integer))"
 
       # one_join_with_value 60, 'year'
     end

data/spec/cql/fact_type_matching_spec.rb

@@ -2,15 +2,14 @@
 # ActiveFacts CQL Fact Type matching tests
 # Copyright (c) 2009 Clifford Heath. Read the LICENSE file.
 #
+$: << Dir::getwd
 
 require 'rspec/expectations'
 
 require 'activefacts/support'
 require 'activefacts/api/support'
 require 'activefacts/cql/compiler'
-require 'spec/helpers/compile_helpers'
-
-require 'ruby-debug'; Debugger.start
+require File.dirname(__FILE__) + '/../helpers/compile_helpers'
 
 describe "When matching a reading" do
   before :each do
@@ -279,5 +278,58 @@ describe "When matching a reading" do
         (pcs = fact_pcs(fact_type)).size.should == 1
       end
     end
+
+    describe "with hyphenated adjectives" do
+      before :each do
+        compile %q{Girl is going out with at most one butt-- ugly Boy;}
+        # baseline
+      end
+
+      it "should compile them correctly" do
+        (new_fact_types = fact_types).size.should == 1
+        (readings = new_fact_types[0].all_reading).size.should == 1
+        (role_refs = readings.single.role_sequence.all_role_ref).size.should == 2
+        (boy_role_ref = role_refs.sort_by{|rr| rr.ordinal}[1])
+        boy_role_ref.leading_adjective.should == 'butt-ugly'
+      end
+
+      it "should match using explicit adjectives" do
+        compile %q{
+            Girl is going out with butt-- ugly Boy,
+            butt-ugly Boy is going out with Girl;
+          }
+        (new_fact_types = fact_types).size.should == 1
+        (fact_type = new_fact_types[0]).all_reading.size.should == 2
+        (pcs = fact_pcs(fact_type)).size.should == 1
+        # REVISIT: Check new and existing reading
+      end
+
+      it "should match using implicit adjectives" do
+        compile %q{
+            Girl is going out with butt-- ugly Boy,
+            butt-ugly Boy is going out with Girl;
+          }
+        (new_fact_types = fact_types).size.should == 1
+        (fact_type = new_fact_types[0]).all_reading.size.should == 2
+        (pcs = fact_pcs(fact_type)).size.should == 1
+        # REVISIT: Check new and existing reading
+      end
+    end
+
+    describe "with hyphenated trailing adjectives" do
+      before :each do
+        compile %q{Girl is going out with at most one Boy tres --gross;}
+        # baseline
+      end
+
+      it "should compile them correctly" do
+        (new_fact_types = fact_types).size.should == 1
+        (readings = new_fact_types[0].all_reading).size.should == 1
+        (role_refs = readings.single.role_sequence.all_role_ref).size.should == 2
+        (boy_role_ref = role_refs.sort_by{|rr| rr.ordinal}[1])
+        boy_role_ref.trailing_adjective.should == 'tres-gross'
+      end
+
+    end
   end
 end