activefacts 0.8.9 → 0.8.10

data/spec/cql_mysql_spec.rb

@@ -3,7 +3,7 @@
 # Copyright (c) 2008 Clifford Heath. Read the LICENSE file.
 #
 
-require 'spec/spec_helper'
+require 'spec_helper'
 require 'stringio'
 require 'activefacts/vocabulary'
 require 'activefacts/support'

data/spec/cql_ruby_spec.rb

@@ -3,7 +3,7 @@
 # Copyright (c) 2008 Clifford Heath. Read the LICENSE file.
 #
 
-require 'spec/spec_helper'
+require 'spec_helper'
 require 'stringio'
 require 'activefacts/vocabulary'
 require 'activefacts/support'

data/spec/cql_sql_spec.rb

@@ -3,7 +3,7 @@
 # Copyright (c) 2008 Clifford Heath. Read the LICENSE file.
 #
 
-require 'spec/spec_helper'
+require 'spec_helper'
 require 'stringio'
 require 'activefacts/vocabulary'
 require 'activefacts/support'
@@ -58,8 +58,8 @@ describe "CQL Loader with SQL output" do
         }
       else
         # Discard index names:
-        sql_text.gsub!(/(CREATE .* INDEX )([^ ]* )ON /, '\1ON ')
-        expected_text.gsub!(/(CREATE .* INDEX )([^ ]* )ON /, '\1ON ')
+        sql_text.gsub!(/ INDEX (\[[^\]]*\]|`[^`]*`|[^ ]*) ON /, ' INDEX <Name is hidden> ON ')
+        expected_text.gsub!(/ INDEX (\[[^\]]*\]|`[^`]*`|[^ ]*) ON /, ' INDEX <Name is hidden> ON ')
         sql_text.should_not differ_from(expected_text)
         File.delete(actual_file)  # It succeeded, we don't need the file.
       end

data/spec/cql_symbol_tables_spec.rb

@@ -11,8 +11,8 @@ require 'activefacts/input/cql'
 
 describe "CQL Symbol table" do
 
-  # A Form here is a form of reference to a concept, being a name and optional adjectives, possibly designated by a role name:
-  # Struct.new("Form", :concept, :name, :leading_adjective, :trailing_adjective, :role_name)
+  # A Form here is a form of reference to a object_type, being a name and optional adjectives, possibly designated by a role name:
+  # Struct.new("Form", :object_type, :name, :leading_adjective, :trailing_adjective, :role_name)
   # def initialize(constellation, vocabulary)
   # def bind(words, leading_adjective = nil, trailing_adjective = nil, role_name = nil, allowed_forward = false, leading_speculative = false, trailing_speculative = false)
 
@@ -106,7 +106,7 @@ describe "CQL Symbol table" do
 
         player, bound = @symbols.bind(*args)
         player.should_not be_nil
-        player.should == bound.concept
+        player.should == bound.object_type
         [bound.name, bound.leading_adjective, bound.trailing_adjective, bound.role_name].should == result
       else
         lambda {player, bound = @symbols.bind(*args)}.should raise_error
@@ -115,17 +115,17 @@ describe "CQL Symbol table" do
   end
 
   it "should disallow binding to a role name where a leading adjective is provided" do
-    concept, = @symbols.bind("Name", nil, nil, "GivenName", true)
+    object_type, = @symbols.bind("Name", nil, nil, "GivenName", true)
     lambda{player, bound = @symbols.bind("GivenName", "SomeAdj")}.should raise_error
   end
 
   it "should disallow binding to a role name where a trailing adjective is provided" do
-    concept, = @symbols.bind("Name", nil, nil, "GivenName", true)
+    object_type, = @symbols.bind("Name", nil, nil, "GivenName", true)
     lambda{player, bound = @symbols.bind("GivenName", nil, "SomeAdj")}.should raise_error
   end
 
   it "should disallow binding to a role name and defining a new role name" do
-    concept, = @symbols.bind("Name", nil, nil, "GivenName", true)
+    object_type, = @symbols.bind("Name", nil, nil, "GivenName", true)
     lambda{player, bound = @symbols.bind("GivenName", nil, nil, "SomeName")}.should raise_error
   end
 
@@ -137,50 +137,50 @@ describe "CQL Symbol table" do
   ]
 
   it "should allow adding a role name to an adjectival form without one" do
-    concept, = @symbols.bind("Name", "Given", nil, nil, true)
+    object_type, = @symbols.bind("Name", "Given", nil, nil, true)
     player, bound = @symbols.bind("Name", nil, nil, "GivenName")
-    player.should == concept
+    player.should == object_type
   end
 
   it "should create new binding with a role name rather than binding to existing simple player without adjectives" do
-    concept, bare = @symbols.bind("Name", nil, nil, nil, true)
+    object_type, bare = @symbols.bind("Name", nil, nil, nil, true)
     player, bound = @symbols.bind("Name", nil, nil, "SomeAdj")
     bare.should_not == bound
   end
 
-  it "should disallow adding a role name which is the name of an existing concept" do
-    concept, = @symbols.bind("Name", "Given", nil, nil, true)
+  it "should disallow adding a role name which is the name of an existing object_type" do
+    object_type, = @symbols.bind("Name", "Given", nil, nil, true)
     lambda{player, bound = @symbols.bind("Name", "Given", nil, "Date")}.should raise_error
   end
 
   it "should disallow adding a role name to a role player that already has one" do
-    concept, first = @symbols.bind("Name", "Given", nil, "GivenName", true)
+    object_type, first = @symbols.bind("Name", "Given", nil, "GivenName", true)
     player, bound = @symbols.bind("Name", "Given", nil, "FirstName")
     first.should_not == bound
   end
 
   it "should bind to an existing player without adjectives" do
-    concept, = @symbols.bind("Name", nil, nil, nil, true)
+    object_type, = @symbols.bind("Name", nil, nil, nil, true)
     player, bound = @symbols.bind("Name")
-    player.should == concept
+    player.should == object_type
   end
 
   it "should bind to an existing player using a leading adjective" do
-    concept, = @symbols.bind("Name", nil, nil, nil, true)
+    object_type, = @symbols.bind("Name", nil, nil, nil, true)
     player, bound = @symbols.bind("Name", "Given")
-    player.should == concept
+    player.should == object_type
   end
 
   it "should bind to an existing player using a trailing adjective" do
-    concept, = @symbols.bind("Name", nil, nil, nil, true)
+    object_type, = @symbols.bind("Name", nil, nil, nil, true)
     player, bound = @symbols.bind("Name", nil, "Donné")
-    player.should == concept
+    player.should == object_type
   end
 
   it "should bind to an existing player only using the defined leading adjective" do
-    concept, = @symbols.bind("Name", "Given", nil, nil, true)
+    object_type, = @symbols.bind("Name", "Given", nil, nil, true)
     player, bound = @symbols.bind("Name", "Given")
-    player.should == concept
+    player.should == object_type
     forms = [bound]
 
     player, alt = @symbols.bind("Name")
@@ -196,9 +196,9 @@ describe "CQL Symbol table" do
   end
 
   it "should bind to an existing player only using a defined trailing adjective" do
-    concept, = @symbols.bind("Name", nil, "Donné", nil, true)
+    object_type, = @symbols.bind("Name", nil, "Donné", nil, true)
     player, bound = @symbols.bind("Name", nil, "Donné")
-    player.should == concept
+    player.should == object_type
     forms = [bound]
 
     player, alt = @symbols.bind("Name")
@@ -214,9 +214,9 @@ describe "CQL Symbol table" do
   end
 
   it "should bind to an existing player only using defined leading and trailing adjective" do
-    concept, = @symbols.bind("Name", "Given", "Donné", nil, true)
+    object_type, = @symbols.bind("Name", "Given", "Donné", nil, true)
     player, bound = @symbols.bind("Name", "Given", "Donné")
-    player.should == concept
+    player.should == object_type
     forms = [bound]
 
     player, alt = @symbols.bind("Name")
@@ -232,9 +232,9 @@ describe "CQL Symbol table" do
   end
 
   it "should bind to an existing player using a speculative leading adjective" do
-    concept, = @symbols.bind("Name", "Given", nil, nil, true)
+    object_type, = @symbols.bind("Name", "Given", nil, nil, true)
     player, bound = @symbols.bind("Name", l = "Given", t = "Donné", nil, nil, true, true)
-    player.should == concept
+    player.should == object_type
     bound.leading_adjective.should == "Given"
     bound.trailing_adjective.should be_nil
     l.should be_empty
@@ -242,17 +242,17 @@ describe "CQL Symbol table" do
   end
 
   it "should bind to an existing player using a speculative trailing adjective" do
-    concept, = @symbols.bind("Name", nil, "Donné", nil, true)
+    object_type, = @symbols.bind("Name", nil, "Donné", nil, true)
     player, bound = @symbols.bind("Name", l = "Given", t = "Donné", nil, nil, true, true)
-    player.should == concept
+    player.should == object_type
     l.should == "Given"
     t.should be_empty
   end
 
   it "should bind to an existing player using a speculative leading and trailing adjective" do
-    concept, = @symbols.bind("Name", "Given", "Donné", nil, true)
+    object_type, = @symbols.bind("Name", "Given", "Donné", nil, true)
     player, bound = @symbols.bind("Name", l = "Given", t = "Donné", nil, nil, true, true)
-    player.should == concept
+    player.should == object_type
     l.should be_empty
     t.should be_empty
   end

data/spec/cqldump_spec.rb

@@ -68,8 +68,8 @@ END
   def one_to_many(one, many, reading)
     # Join them with a fact type:
     ft = @constellation.FactType(:new)
-    role0 = @constellation.Role(ft, 0, :concept => one)
-    role1 = @constellation.Role(ft, 1, :concept => many)
+    role0 = @constellation.Role(ft, 0, :object_type => one)
+    role1 = @constellation.Role(ft, 1, :object_type => many)
 
     # Make a role sequence:
     rs = @constellation.RoleSequence(:new)
@@ -90,8 +90,8 @@ END
   def one_to_one(first, second, reading)
     # Join them with a fact type:
     ft = @constellation.FactType(:new)
-    role0 = @constellation.Role(ft, 0, :concept => first)
-    role1 = @constellation.Role(ft, 1, :concept => second)
+    role0 = @constellation.Role(ft, 0, :object_type => first)
+    role1 = @constellation.Role(ft, 1, :object_type => second)
 
     # Make a role sequence for the reading
     rs = @constellation.RoleSequence(:new)

data/spec/helpers/array_matcher.rb

@@ -1,35 +1,40 @@
-require 'pathname'
+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
 
-module ArrayMatcher
-  class BeDifferentArray
-    def initialize(expected)
-      @expected = expected
-    end
+          match_for_should_not do |actual|
+            perform_match(actual, _expected[0])
+            @extra + @missing == []
+          end
 
-    def matches?(actual)
-      @extra = actual - @expected
-      @missing = @expected - actual
-      @extra + @missing != []   # Because the predicate is "be_different_array_from", the sense is inverted
-    end
+          def perform_match(actual, expected)
+            @extra = actual - expected
+            @missing = expected - actual
+          end
 
-    def failure_message
-      "expected a difference in the two lists, but got none"
-    end
+          def failure_message_for_should
+            "expected a difference in the two lists, but got none"
+          end
 
-    def negative_failure_message
-      "expected no difference, but result #{
-        [ (@missing.empty? ? nil : 'lacks '+@missing.sort.inspect),
-          (@extra.empty? ? nil : 'has extra '+@extra.sort.inspect)
-        ].compact * ' and '
-      }"
+          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
-  end
 
-  def be_different_array_from(expected)
-    BeDifferentArray.new(expected)
+    def be_different_array_from(expected)
+      ArrayMatcher.new(expected)
+    end
   end
 end
-
-Spec::Runner.configure do |config|
-  config.include(ArrayMatcher)
-end

data/spec/helpers/diff_matcher.rb

@@ -1,38 +1,18 @@
 require 'pathname'
 
-module DiffMatcher
-  class DifferFrom
-    def initialize(expected)
+module RSpec
+  module Matchers
+    def differ_from(expected)
       case expected
       when Pathname
-        @matcher = FileMatcher::BeDifferentFile.new(expected)
+        FileMatcher.new(expected)
       when Array
-        @matcher = ArrayMatcher::BeDifferentArray.new(expected)
+        ArrayMatcher.new(expected)
       when String
-        @matcher = FileMatcher::BeDifferentFile.new(expected)
+        FileMatcher.new(expected)
       else
         raise "DiffMatcher doesn't know how to match a #{expected.class}"
       end
     end
-
-    def matches?(actual)
-      @matcher.matches?(actual)
-    end
-
-    def failure_message
-      @matcher.failure_message
-    end
-
-    def negative_failure_message
-      @matcher.negative_failure_message
-    end
-  end
-
-  def differ_from(expected)
-    DifferFrom.new(expected)
   end
 end
-
-Spec::Runner.configure do |config|
-  config.include(DiffMatcher)
-end

data/spec/helpers/file_matcher.rb

@@ -1,41 +1,50 @@
 require 'diff/lcs'
 
-module FileMatcher
-  class BeDifferentFile
-    def initialize(expected)
-      expected = File.open(expected).read if expected.is_a?(Pathname)
-      @expected = expected.scan(/[^\n]+/)
-    end
+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
 
-    def matches?(actual)
-      actual = File.open(actual).read if actual.is_a?(Pathname)
-      actual_lines = actual.scan(/[^\n]+/)
-      differences = Diff::LCS::diff(@expected, 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
+          match_for_should_not do |actual|
+            !perform_match(actual, _expected[0])
+          end
 
-    def failure_message
-      "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
 
-    def negative_failure_message
-      "expected no difference, but got:\n#{@diff}"
+          def failure_message_for_should
+            "expected a difference, but got none"
+          end
+
+          failure_message_for_should_not do |actual|
+            "expected no difference, but got:\n#{@diff}"
+          end
+        end
+      end
     end
-  end
 
-  def have_different_contents(expected)
-    BeDifferentFile.new(expected)
+    def have_different_contents(expected)
+      FileMatcher.new(expected)
+    end
   end
 end
-
-Spec::Runner.configure do |config|
-  config.include(FileMatcher)
-end

data/spec/helpers/parse_to_ast_matcher.rb

@@ -0,0 +1,76 @@
+require 'rspec/expectations'
+
+require 'activefacts/cql'
+require 'activefacts/support'
+require 'activefacts/api/support'
+require 'helpers/test_parser'
+
+RSpec::Matchers.define :parse_to_ast do |*expected_asts|
+  def canonicalise(s)
+    if s.is_a?(Array)
+      s.map{|e| canonicalise(e)}
+    else
+      s.to_s.gsub(/\s+/,' ').strip
+    end
+  end
+
+  match do |actual|
+    @parser = TestParser.new
+    @result = @parser.parse_all(actual, :definition)
+
+    # If the expected_asts is "false", treat this test as pending:
+    if expected_asts == [false]
+      if @result
+        # Unfortunately there's no way to say why the failure was expected here
+        # RSpec stores it in example.metadata[:execution_result][:pending_message]
+        raise RSpec::Core::PendingExampleFixedError.new
+      else
+        throw :pending_declared_in_example, "Should parse #{actual.strip.inspect}"
+      end
+    end
+
+    # If we failed to parse, fail and say why:
+    next false unless @result
+
+    # Otherwise compare the canonical form of the AST
+    @canonical_form = @result.map{|d| canonicalise(d.ast)}
+
+    # If we weren't given an AST, this test is pending. Show what result we obtained:
+    throw :pending_declared_in_example, actual.inspect+' should parse to ['+@canonical_form*', '+']' if expected_asts.empty?
+
+    @canonical_form == canonicalise(expected_asts)
+  end
+
+  failure_message_for_should do
+    if !@result
+      @parser.failure_reason
+    else
+      "Expected %q{#{canonicalise(expected_asts)}}\nbut got: %q{#{@canonical_form}}"
+    end
+  end
+end
+
+RSpec::Matchers.define :fail_to_parse do |*error_regexp|
+  match do |actual|
+    @parser = TestParser.new
+    @actual = actual
+    @result = @parser.parse_all(actual, :definition)
+    @result.should be_nil
+    if @re = error_regexp[0]
+      @parser.failure_reason.should =~ @re
+    else
+      throw :pending_declared_in_example, actual.inspect+' fails, please add message pattern to match '+@parser.failure_reason.inspect
+    end
+  end
+
+  failure_message_for_should do
+    if @result
+      @canonical_form = @result.map{|d| canonicalise(d.ast)}
+      "Expected not to succeed in parsing #{actual.inspect}\nbut got #{@canonical_form.inspect}"
+    else
+      "Failed as expected in parsing #{actual.inspect}\n" +
+        "but not for the right reason: #{@re.inspect}\n"+
+        "got #{@parser.failure_reason.inspect}"
+    end
+  end
+end