activefacts 0.8.10 → 0.8.12

data/spec/cql/parser/fact_types_spec.rb

@@ -24,6 +24,9 @@ describe "Fact Types" do
 #    ],
     [ "A is interesting : b- C has F -g;",
       ["FactType: [{A} \"is interesting\"] where {b- C} \"has\" {F -g}"]
+    ],
+    [ "A has one pre-- bound B;",
+      [%q{FactType: [{A} "has" {[1..1] pre-bound- B}]}]
     ]
     # REVISIT: Test all quantifiers
   ]

data/spec/cql/role_matching_spec.rb

@@ -2,13 +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 File.dirname(__FILE__) + '/../helpers/compile_helpers'
 
 describe "When comparing roles of a reading with an existing reading" do
   before :each do
@@ -48,7 +49,7 @@ describe "When comparing roles of a reading with an existing reading" do
       @asts.size.should == 1
       side_effects = match_readings_to_existing(@asts[0], @simple_ft.all_reading.single)
       side_effects[0].should_not be_nil
-      side_effects.to_s.should == 'side-effects are [{Boy} absorbs 0/0 at 0, {Girl} absorbs 0/0 at 5]'
+      side_effects.to_s.should == '[side-effects are [{Boy} absorbs 0/0 at 0, {Girl} absorbs 0/0 at 5]]'
     end
 
     it "should match with explicit leading adjective" do
@@ -56,7 +57,7 @@ describe "When comparing roles of a reading with an existing reading" do
       @asts.size.should == 1
       side_effects = match_readings_to_existing(@asts[0], @ugly_ft.all_reading.single)
       side_effects[0].should_not be_nil
-      side_effects.to_s.should == 'side-effects are [{Boy} absorbs 0/0 at 0, {ugly- Girl} absorbs 0/0 at 2]'
+      side_effects.to_s.should == '[side-effects are [{Boy} absorbs 0/0 at 0, {ugly- Girl} absorbs 0/0 at 2]]'
     end
 
     it "should match with implicit leading adjective" do
@@ -64,7 +65,7 @@ describe "When comparing roles of a reading with an existing reading" do
       @asts.size.should == 1
       side_effects = match_readings_to_existing(@asts[0], @ugly_ft.all_reading.single)
       side_effects[0].should_not be_nil
-      side_effects.to_s.should == 'side-effects are [{Boy} absorbs 0/0 at 0, {Girl} absorbs 1/0 at 3]'
+      side_effects.to_s.should == '[side-effects are [{Boy} absorbs 0/0 at 0, {Girl} absorbs 1/0 at 3]]'
     end
 
     it "should match with local leading adjective" do
@@ -104,7 +105,7 @@ describe "When comparing roles of a reading with an existing reading" do
       side_effects = match_readings_to_existing(@asts[0], @hurts_ft.all_reading.single)
       pending "Thinks trailing adjectives are always residual"
       side_effects[0].should_not be_nil
-      side_effects.to_s.should == ''
+      side_effects[0].to_s.should == ''
     end
 
     it "should match with implicit trailing adjective" do
@@ -112,7 +113,7 @@ describe "When comparing roles of a reading with an existing reading" do
       @asts.size.should == 1
       side_effects = match_readings_to_existing(@asts[0], @hurts_ft.all_reading.single)
       side_effects[0].should_not be_nil
-      side_effects.to_s.should == 'side-effects are [{Boy} absorbs 0/1 at 0, {Girl} absorbs 0/0 at 3]'
+      side_effects.to_s.should == '[side-effects are [{Boy} absorbs 0/1 at 0, {Girl} absorbs 0/0 at 3]]'
     end
 
     it "should match with local trailing adjective" do
@@ -124,7 +125,7 @@ describe "When comparing roles of a reading with an existing reading" do
       side_effects = match_readings_to_existing(@asts[0], @simple_ft.all_reading.single)
       side_effects.size.should == 2
       side_effects[0].should_not be_nil
-      side_effects.to_s.should == 'side-effects are [{Boy} absorbs 0/0 at 0, {Girl -troublemaker} absorbs 0/0 at 5 with residual adjectives] with residual adjectives'
+      side_effects.to_s.should == '[side-effects are [{Boy} absorbs 0/0 at 0, {Girl -troublemaker} absorbs 0/0 at 5 with residual adjectives] with residual adjectives, nil]'
     end
 
     it "should match with explicit and local trailing adjective" do

data/spec/cql/samples_spec.rb

@@ -103,6 +103,14 @@ describe "Sample data" do
     ],
   ]
 
+  def render_value v
+    if v.to_s !~ /[^-+0-9.]/ and (n = eval(v.to_s) rescue nil)
+      n
+    else
+      "'"+v.to_s.gsub(/'/,'\\\'')+"'"
+    end
+  end
+
   # REVISIT: This code does a better job than verbalise. Consider incorporating it?
   def instance_name(i)
     if i.is_a?(ActiveFacts::Metamodel::Fact)
@@ -112,14 +120,14 @@ describe "Sample data" do
       role_values_in_reading_order = fact.all_role_value.sort_by{|rv| reading_roles.index(rv.role) }
       instance_verbalisations = role_values_in_reading_order.map do |rv|
         next nil unless v = rv.instance.value
-        v.to_s
+        render_value(v)
       end
       return reading.expand([], false, instance_verbalisations)
       # REVISIT: Include the instance_names of all role players
     end
 
     if i.object_type.is_a?(ActiveFacts::Metamodel::ValueType)
-      return "#{i.object_type.name} #{i.value}"
+      return "#{i.object_type.name} #{render_value(i.value)}"
     end
 
     if i.object_type.fact_type      # An instance of an objectified fact type

data/spec/cql_dm_spec.rb

@@ -38,8 +38,9 @@ describe "CQL Loader with DataMapper output" do
   mapping_failures = {  # These models can't be mapped to DM
     'OrienteeringER' => 'Invalid CQL results in unmappable model',
     'Insurance' => 'Cannot handle models that contain classes like Vehicle Incident with external supertypes (Incident)',
-    'MetamodelNext' => 'Cannot handle models that contain classes like Constraint with external supertypes (ObjectType)',
     'MultiInheritance' => 'Cannot handle models that contain classes like Australian Employee with external supertypes (Australian)',
+    'Metamodel' => 'cannot be used as a property name since it collides with an existing method',
+    'MetamodelNext' => 'Cannot map classes like Constraint with roles inherited from external supertypes (Concept)',
     'SeparateSubtype' => 'Cannot handle models that contain classes like Vehicle Incident with external supertypes (Incident)',
     'ServiceDirector' => 'Cannot handle models that contain classes like Client with external supertypes (Company)',
   }

data/spec/helpers/array_matcher.rb

@@ -1,40 +1,23 @@
-module RSpec
-  module Matchers
-    class ArrayMatcher < Matcher
-      def initialize expected
-        super(:be_different_array_from, expected) do |*_expected|
-          match_for_should do |actual|
-            perform_match(actual, _expected[0])
-            @extra + @missing != []
-          end
-
-          match_for_should_not do |actual|
-            perform_match(actual, _expected[0])
-            @extra + @missing == []
-          end
-
-          def perform_match(actual, expected)
-            @extra = actual - expected
-            @missing = expected - actual
-          end
+RSpec::Matchers.define :be_different_array_from do |x|
+  match do |actual|
+    perform_match(actual, expected)
+    @extra + @missing != []
+  end
 
-          def failure_message_for_should
-            "expected a difference in the two lists, but got none"
-          end
+  def perform_match(actual, expected)
+    @extra = actual - expected
+    @missing = expected - actual
+  end
 
-          failure_message_for_should_not do |actual|
-            "expected no difference, but result #{
-              [ (@missing.empty? ? nil : 'lacks '+@missing.sort.inspect),
-                (@extra.empty? ? nil : 'has extra '+@extra.sort.inspect)
-              ].compact * ' and '
-            }"
-          end
-        end
-      end
-    end
+  failure_message_for_should do |actual|
+    "expected a difference in the two lists, but got none"
+  end
 
-    def be_different_array_from(expected)
-      ArrayMatcher.new(expected)
-    end
+  failure_message_for_should_not do |actual|
+    "expected no difference, but result #{
+      [ (@missing.empty? ? nil : 'lacks '+@missing.sort.inspect),
+        (@extra.empty? ? nil : 'has extra '+@extra.sort.inspect)
+      ].compact * ' and '
+    }"
   end
 end

data/spec/helpers/diff_matcher.rb

@@ -1,18 +1,39 @@
 require 'pathname'
 
-module RSpec
-  module Matchers
-    def differ_from(expected)
-      case expected
-      when Pathname
-        FileMatcher.new(expected)
-      when Array
-        ArrayMatcher.new(expected)
-      when String
-        FileMatcher.new(expected)
-      else
-        raise "DiffMatcher doesn't know how to match a #{expected.class}"
-      end
+require 'rspec/matchers'
+
+class RSpec::Matchers::DSL::Matcher
+  attr_writer :expected
+end
+
+RSpec::Matchers.define :differ_from do |expected|
+  match do |actual|
+    case expected
+    when Pathname
+      @m = have_different_contents
+      @m.expected = expected
+      @m.matches?(actual)
+    when Array
+      # If we pass "expected" here, it expects an array.
+      # Works here, but not for Pathname or String
+      # Hence the need for the attr_writer hack above.
+      @m = be_different_array_from
+      @m.expected = expected
+      @m.matches?(actual)
+    when String
+      @m = have_different_contents
+      @m.expected = expected
+      @m.matches?(actual)
+    else
+      raise "DiffMatcher doesn't know how to match a #{expected.class}"
     end
   end
+
+  failure_message_for_should do |actual|
+    @m.failure_message_for_should
+  end
+
+  failure_message_for_should_not do |actual|
+    @m.failure_message_for_should_not
+  end
 end

data/spec/helpers/file_matcher.rb

@@ -1,50 +1,34 @@
 require 'diff/lcs'
 
-module RSpec
-  module Matchers
-    class FileMatcher < Matcher
-      def initialize expected
-        super(:have_different_contents, expected) do |*_expected|
-          match_for_should do |actual|
-            perform_match(actual, _expected[0])
-          end
-
-          match_for_should_not do |actual|
-            !perform_match(actual, _expected[0])
-          end
-
-          def perform_match(actual, expected)
-            expected = File.open(expected).read if expected.is_a?(Pathname)
-            expected = expected.scan(/[^\n]+/) unless expected.is_a?(Array)
-
-            actual = File.open(actual).read if actual.is_a?(Pathname)
-            actual = actual.scan(/[^\n]+/) unless actual.is_a?(Array)
-
-            differences = Diff::LCS::diff(expected, actual)
-            @diff = differences.map do |chunk|
-                added_at = (add = chunk.detect{|d| d.action == '+'}) && add.position+1
-                removed_at = (remove = chunk.detect{|d| d.action == '-'}) && remove.position+1
-                "Line #{added_at}/#{removed_at}:\n"+
-                chunk.map do |change|
-                  "#{change.action} #{change.element}"
-                end*"\n"
-              end*"\n"
-            @diff != ''
-          end
+RSpec::Matchers.define :have_different_contents do |x|
+  match do |actual|
+    perform_match(actual, expected)
+  end
 
-          def failure_message_for_should
-            "expected a difference, but got none"
-          end
+  def perform_match(actual, expected)
+    expected = File.open(expected).read if expected.is_a?(Pathname)
+    expected = expected.scan(/[^\n]+/) unless expected.is_a?(Array)
+
+    actual = File.open(actual).read if actual.is_a?(Pathname)
+    actual = actual.scan(/[^\n]+/) unless actual.is_a?(Array)
+
+    differences = Diff::LCS::diff(expected, actual)
+    @diff = differences.map do |chunk|
+        added_at = (add = chunk.detect{|d| d.action == '+'}) && add.position+1
+        removed_at = (remove = chunk.detect{|d| d.action == '-'}) && remove.position+1
+        "Line #{added_at}/#{removed_at}:\n"+
+        chunk.map do |change|
+          "#{change.action} #{change.element}"
+        end*"\n"
+      end*"\n"
+    @diff != ''
+  end
 
-          failure_message_for_should_not do |actual|
-            "expected no difference, but got:\n#{@diff}"
-          end
-        end
-      end
-    end
+  failure_message_for_should do |actual|
+    "expected a difference, but got none"
+  end
 
-    def have_different_contents(expected)
-      FileMatcher.new(expected)
-    end
+  failure_message_for_should_not do |actual|
+    "expected no difference, but got:\n#{@diff}"
   end
 end

data/spec/helpers/string_matcher.rb

@@ -1,40 +1,30 @@
 require 'diff/lcs'
 
-module RSpec
-  module Matchers
-    def have_different_contents(expected)
-      Matcher.new :have_different_contents, expected do |*_expected|
-        match_for_should do |actual|
-          perform_match(actual, _expected)
-        end
-
-        match_for_should_not do |actual|
-          !perform_match(actual, _expected)
-        end
+RSpec::Matchers.define :have_different_contents do |x|
+  match do |actual|
+    perform_match(actual, expected)
+  end
 
-        def perform_match(actual, expected)
-          expected_lines = expected.scan(/[^\n]+/)
-          actual_lines = actual.scan(/[^\n]+/)
-          differences = Diff::LCS::diff(expected_lines, actual_lines)
-          @diff = differences.map do |chunk|
-              added_at = (add = chunk.detect{|d| d.action == '+'}) && add.position+1
-              removed_at = (remove = chunk.detect{|d| d.action == '-'}) && remove.position+1
-              "Line #{added_at}/#{removed_at}:\n"+
-              chunk.map do |change|
-                "#{change.action} #{change.element}"
-              end*"\n"
-            end*"\n"
-          @diff != ''
-        end
+  def perform_match(actual, expected)
+    expected_lines = expected.scan(/[^\n]+/)
+    actual_lines = actual.scan(/[^\n]+/)
+    differences = Diff::LCS::diff(expected_lines, actual_lines)
+    @diff = differences.map do |chunk|
+        added_at = (add = chunk.detect{|d| d.action == '+'}) && add.position+1
+        removed_at = (remove = chunk.detect{|d| d.action == '-'}) && remove.position+1
+        "Line #{added_at}/#{removed_at}:\n"+
+        chunk.map do |change|
+          "#{change.action} #{change.element}"
+        end*"\n"
+      end*"\n"
+    @diff != ''
+  end
 
-        def failure_message_for_should
-          "expected a difference, but got none"
-        end
+  failure_message_for_should do |actual|
+    "expected a difference, but got none"
+  end
 
-        failure_message_for_should_not do |actual|
-          "expected no difference, but got:\n#{@diff}"
-        end
-      end
-    end
+  failure_message_for_should_not do |actual|
+    "expected no difference, but got:\n#{@diff}"
   end
 end

data/spec/norma_cql_spec.rb

@@ -17,6 +17,7 @@ describe "Norma Loader" do
   orm_cql_failures = {
     # "OddIdentifier" => "Strange identification pattern is incorrectly verbalised to CQL",  # Fixed
     "UnaryIdentification" => "No PI for VisitStatus",
+    "Supervision" => "Join constraints not imported from NORMA",
   }
   # Generate and return the CQL for the given vocabulary
   def cql(vocabulary)

data/spec/norma_tables_spec.rb

@@ -19,11 +19,10 @@ orm_failures = {
 }
 norma_table_exceptions = {
   "Metamodel" => [[], %w{Agreement Enforcement}],                   # ActiveFacts absorbs Agreement into ContextNote, Enforcement into Constraint
-  "MetamodelNext" => [[], %w{Agreement Enforcement}],
+  "MetamodelNext" => [[], %w{Agreement Enforcement TypeInheritance}],
   "Orienteering" => [%w{Punch}, []],                                # NORMA doesn't make a table for the IDENTITY field
   "OrienteeringER" => [%w{SeriesEvent}, []],                        # NORMA doesn't make a table for the IDENTITY field
   "RedundantDependency" => [%w{Politician StateOrProvince}, %w{LegislativeDistrict}],   # NORMA doesn't make a table for the 3 IDENTITY fields
-  "SeparateSubtype" => [%w{Claim}, %w{Incident}],                   # NORMA doesn't make a table for the IDENTITY field. Even when Claim is independent, it still doesn't absorb Incident either and I don't know why, must ask Matt.
   "Warehousing" => [%w{Product Warehouse}, []],                     # NORMA doesn't make a table for the IDENTITY field
   "ServiceDirector" => [%w{DataStoreService MonitorNotificationUser}, %w{DataStoreFileHostSystem }],
   

metadata

@@ -1,120 +1,121 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: activefacts
-version: !ruby/object:Gem::Version 
-  hash: 43
+version: !ruby/object:Gem::Version
+  version: 0.8.12
   prerelease: 
-  segments: 
-  - 0
-  - 8
-  - 10
-  version: 0.8.10
 platform: ruby
-authors: 
+authors:
 - Clifford Heath
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-06-27 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-10-15 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: activefacts-api
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 43
-        segments: 
-        - 0
-        - 8
-        - 10
-        version: 0.8.10
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.8.12
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: treetop
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.8.12
+- !ruby/object:Gem::Dependency
+  name: treetop
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 1
-        - 4
-        - 1
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.4.1
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 49
-        segments: 
-        - 0
-        - 8
-        - 7
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.4.1
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.8.7
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: newgem
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 1
-        - 5
-        - 3
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.8.7
+- !ruby/object:Gem::Dependency
+  name: newgem
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.5.3
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: hoe
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.5.3
+- !ruby/object:Gem::Dependency
+  name: hoe
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 17
-        segments: 
-        - 2
-        - 9
-        version: "2.9"
+      - !ruby/object:Gem::Version
+        version: '3.1'
   type: :development
-  version_requirements: *id005
-description: |
-  
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.1'
+description: ! '
+
   ActiveFacts provides a semantic modeling language, the Constellation
+
   Query Language (CQL).  CQL combines natural language verbalisation and
+
   formal logic, producing a formal language that reads like plain
+
   English. ActiveFacts converts semantic models from CQL to relational
+
   and object models in SQL, Ruby and other languages.
 
-email: 
+'
+email:
 - cjh@dataconstellation.org
-executables: 
+executables:
 - afgen
 - cql
-extensions: 
+extensions:
 - lib/activefacts/cql/Rakefile
-extra_rdoc_files: 
+extra_rdoc_files:
 - History.txt
 - Manifest.txt
-files: 
+- README.rdoc
+files:
 - History.txt
 - LICENSE
 - Manifest.txt
@@ -259,40 +260,32 @@ files:
 - .gemtest
 homepage: http://dataconstellation.com/ActiveFacts/
 licenses: []
-
 post_install_message: For more information on ActiveFacts, see http://dataconstellation.com/ActiveFacts
-rdoc_options: 
+rdoc_options:
 - -S
 - -x
 - lib/activefacts/cql/.*.rb
 - -x
 - lib/activefacts/vocabulary/.*.rb
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: cjheath@rubyforge.org
-rubygems_version: 1.8.5
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: A semantic modeling and query language (CQL) and application runtime (the Constellation API)
+summary: A semantic modeling and query language (CQL) and application runtime (the
+  Constellation API)
 test_files: []
-