activefacts 1.6.0 → 1.7.1

data/spec/helpers/ctrl_c_support.rb

@@ -1,52 +0,0 @@
-# Monkey patch in CTRL-C support for rspec from 
-# http://github.com/dchelimsky/rspec/commit/029f77c5063894cf52af05335b8e1c278411978b
-# until it gets released
-
-module Spec
-  module Example
-    module ExampleMethods
-      def execute(run_options, instance_variables) # :nodoc:
-        run_options.reporter.example_started(@_proxy)
-        set_instance_variables_from_hash(instance_variables)
- 
-        execution_error = nil
-        Timeout.timeout(run_options.timeout) do
-          begin
-            before_each_example
-            instance_eval(&@_implementation)
-          rescue Interrupt
-            exit 1
-          rescue Exception => e
-            execution_error ||= e
-          end
-          begin
-            after_each_example
-          rescue Interrupt
-            exit 1
-          rescue Exception => e
-            execution_error ||= e
-          end
-        end
- 
-        run_options.reporter.example_finished(@_proxy.update(description), execution_error)
-        success = execution_error.nil? || ExamplePendingError === execution_error
-      end
-    end
-  end
-end
-
-module Spec
-  module Runner
-    class ExampleGroupRunner
-      def run
-        prepare
-        success = true
-        example_groups.each do |example_group|
-          success = success & example_group.run(@options)
-        end
-        finish
-        success
-      end
-    end
-  end
-end

data/spec/helpers/diff_matcher.rb

@@ -1,39 +0,0 @@
-require 'pathname'
-
-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,34 +0,0 @@
-require 'diff/lcs'
-
-RSpec::Matchers.define :have_different_contents do |x|
-  match do |actual|
-    perform_match(actual, expected)
-  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 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

data/spec/helpers/parse_to_ast_matcher.rb

@@ -1,80 +0,0 @@
-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|
-    begin
-      @parser = TestParser.new
-      @actual = actual
-      @result = @parser.parse_all(actual, :definition)
-    rescue => e
-      @exception = e.message
-    end
-    @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

data/spec/helpers/string_matcher.rb

@@ -1,30 +0,0 @@
-require 'diff/lcs'
-
-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
-
-  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

data/spec/helpers/test_parser.rb

@@ -1,15 +0,0 @@
-# The test parser regards any word starting with an upper-case letter as a pre-existing term
-require 'activefacts/cql/Language/English'
-class TestParser < ActiveFacts::CQL::Parser
-  include ActiveFacts::CQL::English
-  def context
-    @context ||= Context.new(self)
-  end     
-
-  class Context < ActiveFacts::CQL::Parser::Context
-    # Capitalised words that are otherwise undefined are treated as terms:
-    def system_term(t)
-      (first = t[0,1] and first.upcase == first) ? {t=>t} : false
-    end
-  end
-end

data/spec/norma_cql_spec.rb

@@ -1,66 +0,0 @@
-#
-# ActiveFacts tests: Parse all NORMA files and check the generated CQL.
-# Copyright (c) 2008 Clifford Heath. Read the LICENSE file.
-#
-
-require 'spec_helper'
-require 'stringio'
-require 'activefacts/vocabulary'
-require 'activefacts/support'
-require 'activefacts/input/orm'
-require 'activefacts/generate/cql'
-
-describe "Norma Loader" do
-  orm_failures = {
-    "SubtypePI" => "Has an illegal uniqueness constraint",
-  }
-  orm_cql_failures = {
-    # "OddIdentifier" => "Strange identification pattern is incorrectly verbalised to CQL",  # Fixed
-    "UnaryIdentification" => "No PI for VisitStatus",
-  }
-  # Generate and return the CQL for the given vocabulary
-  def cql(vocabulary)
-    output = StringIO.new
-    @dumper = ActiveFacts::Generate::CQL.new(vocabulary.constellation)
-    @dumper.generate(output)
-    output.rewind
-    output.read
-  end
-
-  pattern = ENV["AFTESTS"] || "*"
-  Dir["examples/norma/#{pattern}.orm"].each do |orm_file|
-    expected_file = orm_file.sub(%r{/norma/(.*).orm\Z}, '/CQL/\1.cql')
-    actual_file = orm_file.sub(%r{examples/norma/(.*).orm\Z}, 'spec/actual/\1.cql')
-    base = File.basename(orm_file, ".orm")
-
-    next unless ENV["AFTESTS"] || File.exists?(expected_file)
-
-    it "should load #{orm_file} and dump CQL matching #{expected_file}" do
-      begin
-        vocabulary = ActiveFacts::Input::ORM.readfile(orm_file)
-      rescue => e
-        raise unless orm_failures.include?(base)
-        pending orm_failures[base]
-      end
-
-      cql_text = cql(vocabulary)
-      # Save the actual file:
-      Dir.mkdir "spec/actual" rescue nil
-      File.open(actual_file, "w") { |f| f.write cql_text }
-
-      pending("expected output file #{expected_file} not found") unless File.exists? expected_file
-
-      expected_text = File.open(expected_file) {|f| f.read }
-
-      broken = orm_cql_failures[base]
-      if broken
-        pending(broken) {
-          cql_text.should_not differ_from(expected_text)
-        }
-      else
-        cql_text.should_not differ_from(expected_text)
-        File.delete(actual_file)
-      end
-    end
-  end
-end

data/spec/norma_ruby_spec.rb

@@ -1,62 +0,0 @@
-#
-# ActiveFacts tests: Parse all CQL files and check the generated Ruby.
-# Copyright (c) 2008 Clifford Heath. Read the LICENSE file.
-#
-
-require 'spec_helper'
-require 'stringio'
-require 'activefacts/vocabulary'
-require 'activefacts/support'
-require 'activefacts/input/orm'
-require 'activefacts/generate/ruby'
-
-class String
-  def strip_comments()
-    c_comment = %r{/\*((?!\*/).)*\*/}m
-    gsub(c_comment, '').gsub(%r{\n\n+},"\n")
-  end
-end
-
-describe "NORMA Loader with Ruby output" do
-  orm_failures = {
-    "SubtypePI" => "Has an illegal uniqueness constraint",
-  }
-
-  # Generate and return the Ruby for the given vocabulary
-  def ruby(vocabulary)
-    output = StringIO.new
-    @dumper = ActiveFacts::Generate::RUBY.new(vocabulary.constellation)
-    @dumper.generate(output)
-    output.rewind
-    output.read
-  end
-
-  pattern = ENV["AFTESTS"] || "*"
-  Dir["examples/norma/#{pattern}.orm"].each do |orm_file|
-    expected_file = orm_file.sub(%r{examples/norma/(.*).orm\Z}, 'examples/ruby/\1.rb')
-    actual_file = orm_file.sub(%r{examples/norma/(.*).orm\Z}, 'spec/actual/\1.rb')
-    base = File.basename(orm_file, ".orm")
-
-    next unless ENV["AFTESTS"] || File.exists?(expected_file)
-
-    it "should load #{orm_file} and dump Ruby matching #{expected_file}" do
-      begin
-        vocabulary = ActiveFacts::Input::ORM.readfile(orm_file)
-      rescue => e
-        raise unless orm_failures.include?(base)
-        pending orm_failures[base]
-      end
-
-      # Build and save the actual file:
-      ruby_text = ruby(vocabulary)
-      Dir.mkdir "spec/actual" rescue nil
-      File.open(actual_file, "w") { |f| f.write ruby_text }
-
-      pending("expected output file #{expected_file} not found") unless File.exists? expected_file
-
-      expected_text = File.open(expected_file) {|f| f.read }
-      ruby_text.should_not differ_from(expected_text)
-      File.delete(actual_file)  # It succeeded, we don't need the file.
-    end
-  end
-end

data/spec/norma_ruby_sql_spec.rb

@@ -1,107 +0,0 @@
-#
-# ActiveFacts tests: Compare column lists created by aborption and by generated Ruby.
-# Copyright (c) 2008 Clifford Heath. Read the LICENSE file.
-#
-
-require 'spec_helper'
-require 'stringio'
-require 'activefacts/vocabulary'
-require 'activefacts/support'
-require 'activefacts/input/orm'
-require 'activefacts/persistence'
-require 'activefacts/generate/ruby'
-
-describe "Column lists from absorption compared with Ruby's" do
-  orm_failures = {
-    "SubtypePI" => "Has an illegal uniqueness constraint",
-  }
-  norma_ruby_failures = {
-    "UnaryIdentification" => "No PI for VisitStatus",
-    "BPMN" => "Has duplicate column names",
-  }
-
-  # Generate and return the Ruby for the given vocabulary
-  def ruby(vocabulary)
-    output = StringIO.new
-    @dumper = ActiveFacts::Generate::RUBY.new(vocabulary.constellation, "mapping=sql")
-    @dumper.generate(output)
-    output.rewind
-    output.read
-  end
-
-  pattern = ENV["AFTESTS"] || "*"
-  Dir["examples/norma/#{pattern}.orm"].each do |orm_file|
-    expected_file = orm_file.sub(%r{examples/norma/(.*).orm\Z}, 'examples/ruby/\1.rb')
-    actual_file = orm_file.sub(%r{examples/norma/(.*).orm\Z}, 'spec/actual/\1.rb')
-    base = File.basename(orm_file, ".orm")
-
-    next unless ENV["AFTESTS"] || File.exists?(expected_file)
-
-    it "should load #{orm_file} and generate relational composition and Ruby with matching column names" do
-      begin
-        vocabulary = ActiveFacts::Input::ORM.readfile(orm_file)
-      rescue => e
-        raise unless orm_failures.include?(base)
-        pending orm_failures[base]
-      end
-
-      # Get the list of tables from the relational composition:
-      absorption_tables = vocabulary.tables.sort_by(&:name)
-      absorption_table_names = absorption_tables.map{|at| at.name.gsub(/\s/,'')}
-
-      # Build the Ruby and eval it:
-      ruby_text = ruby(vocabulary)
-      Dir.mkdir "spec/actual" rescue nil
-      File.open(actual_file, "w") { |f| f.write ruby_text }
-
-      broken = norma_ruby_failures[base]
-      eval_it = lambda {
-        Object.send :eval, ruby_text
-      }
-      exception = nil
-      if broken
-        pending(broken) {
-          lambda {
-            begin
-              eval_it.call
-            rescue => exception
-              if trace :exception
-                puts exception.to_s+": \n\t"+exception.backtrace*"\n\t"
-              end
-              raise
-            end
-          }.should_not raise_error
-        }
-      else
-        lambda {
-          begin
-            eval_it.call
-          rescue => exception
-            if trace :exception
-              puts exception.to_s+": \n\t"+exception.backtrace*"\n\t"
-            end
-            raise
-          end
-        }.should_not raise_error
-      end
-
-      # Get a list of table classes in the new module, sorted by name
-      mod = eval(vocabulary.name)
-      ruby_tables = mod.constants.map{|n|
-          c = mod.const_get(n)
-	  next unless c.class == Class
-	  c.is_table ? c : nil
-        }.compact.sort_by{|c|
-          c.basename
-        }
-      ruby_table_names = ruby_tables.map{|c| c.basename}
-
-      # Assert that the list of tables is the same:
-      ruby_table_names.should_not differ_from(absorption_table_names)
-
-      # Clean up:
-      Object.send :remove_const, vocabulary.name.to_sym
-      File.delete(actual_file)  # It succeeded, we don't need the file.
-    end
-  end
-end