activefacts 0.8.9 → 0.8.10

data/spec/helpers/string_matcher.rb

@@ -1,39 +1,40 @@
 require 'diff/lcs'
 
-module StringMatcher
-  class BeDifferentString
-    def initialize(expected)
-      @expected = expected.scan(/[^\n]+/)
-    end
+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
 
-    def matches?(actual)
-      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)
+        end
 
-    def failure_message
-      "expected a difference, but got none"
-    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 negative_failure_message
-      "expected no difference, but got:\n#{@diff}"
-    end
-  end
+        def failure_message_for_should
+          "expected a difference, but got none"
+        end
 
-  def have_different_contents(expected)
-    BeDifferentString.new(expected)
+        failure_message_for_should_not do |actual|
+          "expected no difference, but got:\n#{@diff}"
+        end
+      end
+    end
   end
 end
-
-Spec::Runner.configure do |config|
-  config.include(StringMatcher)
-end

data/spec/norma_cql_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/norma_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/norma_ruby_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'

data/spec/norma_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'
@@ -45,6 +45,8 @@ describe "NORMA Loader with SQL output" do
       pending("expected output file #{expected_file} not found") unless File.exists? expected_file
 
       expected_text = File.open(expected_file) {|f| f.read }
+      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/norma_tables_spec.rb

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

data/spec/ruby_api_spec.rb

@@ -0,0 +1,23 @@
+#
+# 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'
+
+describe "Requiring vocabularies in Ruby" do
+  ruby_failures = {
+    "MetamodelNext" => "Has a duplicate role name",
+  }
+  pattern = ENV["AFTESTS"] || "*"
+  Dir["examples/ruby/#{pattern}.rb"].each do |ruby_file|
+    base = File.basename(ruby_file, ".rb")
+    next if ruby_failures.include?(base)
+    it "#{ruby_file} should load cleanly" do
+      require ruby_file
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -5,10 +5,11 @@
 #   actual_text.should_not differ_from(expected_text)
 #
 
-require 'spec/helpers/diff_matcher'
-require 'spec/helpers/array_matcher'
-require 'spec/helpers/file_matcher'
-require 'spec/helpers/string_matcher'
+require 'helpers/diff_matcher'
+require 'helpers/array_matcher'
+require 'helpers/file_matcher'
+require 'helpers/string_matcher'
+require 'helpers/parse_to_ast_matcher'
 
 class String
   def strip_comments()

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: activefacts
 version: !ruby/object:Gem::Version 
-  hash: 45
-  prerelease: false
+  hash: 43
+  prerelease: 
   segments: 
   - 0
   - 8
-  - 9
-  version: 0.8.9
+  - 10
+  version: 0.8.10
 platform: ruby
 authors: 
 - Clifford Heath
@@ -15,13 +15,28 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-27 00:00:00 +10:00
-default_executable: 
+date: 2011-06-27 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: treetop
+  name: activefacts-api
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 43
+        segments: 
+        - 0
+        - 8
+        - 10
+        version: 0.8.10
+  type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: treetop
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -33,11 +48,11 @@ dependencies:
         - 1
         version: 1.4.1
   type: :runtime
-  version_requirements: *id001
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: rake
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -49,39 +64,38 @@ dependencies:
         - 7
         version: 0.8.7
   type: :runtime
-  version_requirements: *id002
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: newgem
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 5
         segments: 
         - 1
         - 5
-        - 2
-        version: 1.5.2
+        - 3
+        version: 1.5.3
   type: :development
-  version_requirements: *id003
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: hoe
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 5
+        hash: 17
         segments: 
         - 2
-        - 3
-        - 3
-        version: 2.3.3
+        - 9
+        version: "2.9"
   type: :development
-  version_requirements: *id004
+  version_requirements: *id005
 description: |
   
   ActiveFacts provides a semantic modeling language, the Constellation
@@ -134,7 +148,6 @@ files:
 - examples/CQL/OilSupply.cql
 - examples/CQL/OneToOnes.cql
 - examples/CQL/Orienteering.cql
-- examples/CQL/OrienteeringER.cql
 - examples/CQL/PersonPlaysGame.cql
 - examples/CQL/RedundantDependency.cql
 - examples/CQL/SchoolActivities.cql
@@ -153,37 +166,25 @@ files:
 - examples/local.css
 - index.html
 - lib/activefacts.rb
-- lib/activefacts/api.rb
-- lib/activefacts/api/concept.rb
-- lib/activefacts/api/constellation.rb
-- lib/activefacts/api/entity.rb
-- lib/activefacts/api/instance.rb
-- lib/activefacts/api/instance_index.rb
-- lib/activefacts/api/numeric.rb
-- lib/activefacts/api/role.rb
-- lib/activefacts/api/role_proxy.rb
-- lib/activefacts/api/role_values.rb
-- lib/activefacts/api/standard_types.rb
-- lib/activefacts/api/support.rb
-- lib/activefacts/api/value.rb
-- lib/activefacts/api/vocabulary.rb
 - lib/activefacts/cql.rb
 - lib/activefacts/cql/CQLParser.treetop
-- lib/activefacts/cql/Concepts.treetop
 - lib/activefacts/cql/Context.treetop
 - lib/activefacts/cql/Expressions.treetop
 - lib/activefacts/cql/FactTypes.treetop
 - lib/activefacts/cql/Language/English.treetop
 - lib/activefacts/cql/LexicalRules.treetop
+- lib/activefacts/cql/ObjectTypes.treetop
 - lib/activefacts/cql/Rakefile
 - lib/activefacts/cql/Terms.treetop
 - lib/activefacts/cql/ValueTypes.treetop
 - lib/activefacts/cql/compiler.rb
+- lib/activefacts/cql/compiler/clause.rb
 - lib/activefacts/cql/compiler/constraint.rb
 - lib/activefacts/cql/compiler/entity_type.rb
+- lib/activefacts/cql/compiler/expression.rb
 - lib/activefacts/cql/compiler/fact.rb
 - lib/activefacts/cql/compiler/fact_type.rb
-- lib/activefacts/cql/compiler/reading.rb
+- lib/activefacts/cql/compiler/join.rb
 - lib/activefacts/cql/compiler/shared.rb
 - lib/activefacts/cql/compiler/value_type.rb
 - lib/activefacts/cql/parser.rb
@@ -200,9 +201,9 @@ files:
 - lib/activefacts/input/orm.rb
 - lib/activefacts/persistence.rb
 - lib/activefacts/persistence/columns.rb
-- lib/activefacts/persistence/concept.rb
 - lib/activefacts/persistence/foreignkey.rb
 - lib/activefacts/persistence/index.rb
+- lib/activefacts/persistence/object_type.rb
 - lib/activefacts/persistence/reference.rb
 - lib/activefacts/persistence/tables.rb
 - lib/activefacts/support.rb
@@ -212,57 +213,56 @@ files:
 - lib/activefacts/vocabulary/metamodel.rb
 - lib/activefacts/vocabulary/verbaliser.rb
 - script/txt2html
+- spec/cql/comparison_spec.rb
+- spec/cql/contractions_spec.rb
+- spec/cql/entity_type_spec.rb
+- spec/cql/expressions_spec.rb
+- spec/cql/french_spec.rb
+- spec/cql/role_matching_spec.rb
+- spec/ruby_api_spec.rb
 - spec/absorption_spec.rb
-- spec/api/autocounter.rb
-- spec/api/constellation.rb
-- spec/api/entity_type.rb
-- spec/api/instance.rb
-- spec/api/roles.rb
-- spec/api/value_type.rb
-- spec/api_spec.rb
 - spec/cql/context_spec.rb
 - spec/cql/deontic_spec.rb
-- spec/cql/matching_spec.rb
+- spec/cql/fact_type_matching_spec.rb
+- spec/cql/parser/bad_literals_spec.rb
+- spec/cql/parser/constraints_spec.rb
+- spec/cql/parser/entity_types_spec.rb
+- spec/cql/parser/expressions_spec.rb
+- spec/cql/parser/fact_types_spec.rb
+- spec/cql/parser/literals_spec.rb
+- spec/cql/parser/pragmas_spec.rb
+- spec/cql/parser/value_types_spec.rb
 - spec/cql/samples_spec.rb
-- spec/cql/unit_spec.rb
 - spec/cql_cql_spec.rb
+- spec/cql_dm_spec.rb
 - spec/cql_mysql_spec.rb
 - spec/cql_parse_spec.rb
 - spec/cql_ruby_spec.rb
 - spec/cql_sql_spec.rb
 - spec/cql_symbol_tables_spec.rb
 - spec/cqldump_spec.rb
+- spec/norma_cql_spec.rb
+- spec/norma_ruby_spec.rb
+- spec/norma_ruby_sql_spec.rb
+- spec/norma_sql_spec.rb
+- spec/norma_tables_spec.rb
 - spec/helpers/array_matcher.rb
 - spec/helpers/ctrl_c_support.rb
 - spec/helpers/diff_matcher.rb
 - spec/helpers/file_matcher.rb
+- spec/helpers/parse_to_ast_matcher.rb
 - spec/helpers/string_matcher.rb
 - spec/helpers/test_parser.rb
-- spec/norma_cql_spec.rb
-- spec/norma_ruby_spec.rb
-- spec/norma_ruby_sql_spec.rb
-- spec/norma_sql_spec.rb
-- spec/norma_tables_spec.rb
-- spec/spec.opts
 - spec/spec_helper.rb
 - status.html
 - why.html
-has_rdoc: true
+- .gemtest
 homepage: http://dataconstellation.com/ActiveFacts/
 licenses: []
 
 post_install_message: For more information on ActiveFacts, see http://dataconstellation.com/ActiveFacts
 rdoc_options: 
 - -S
-- -S
-- -T
-- hanna
-- -A
-- has_one
-- -A
-- one_to_one
-- -A
-- maybe
 - -x
 - lib/activefacts/cql/.*.rb
 - -x
@@ -290,7 +290,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: cjheath@rubyforge.org
-rubygems_version: 1.3.7
+rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
 summary: A semantic modeling and query language (CQL) and application runtime (the Constellation API)

data/examples/CQL/OrienteeringER.cql

@@ -1,58 +0,0 @@
-vocabulary OrienteeringER;
-
-/*
- * Value Types
- */
-Accessibility is written as Char;
-Club Name is written as String;
-Code is written as Char;
-Control is written as Unsigned Integer(32);
-Course is written as Char;
-Date is written as Date Time;
-Event Name is written as String;
-ID is written as Auto Counter;
-Location is written as String;
-Name is written as String;
-Number is written as Signed Integer(32);
-Point Value is written as Unsigned Integer(32);
-Series Name is written as String;
-
-/*
- * Entity Types
- */
-Club is where
-	Code is of the club called one Club Name,
-	the club called Club Name has one Code;
-
-Map is where
-	map-Name having Accessibility belongs to Club;
-
-Series Event is where
-	Series Name includes event-Number,
-	event-Number is in Series Name;
-
-Event is where
-	event-ID is Series Event called Event Name run by Club using Map on Date at Location;
-
-Event Control is where
-	Event includes Control which is worth one Point Value;
-
-Event Course is where
-	Course is available at Event,
-	Event offers Course;
-
-/*
- * Constraints:
- */
-each Club occurs at least one time in
-	event ID is Series Event called Event Name run by Club using Map on Date at Location;
-each Event Name occurs one time in
-	event ID is Series Event called Event Name run by Club using Map on Date at Location;
-each Event occurs at least one time in
-	Event includes Control which is worth Point Value;
-each ID occurs one time in
-	event ID is Series Event called Event Name run by Club using Map on Date at Location;
-each Name occurs one time in
-	map Name having Accessibility belongs to Club;
-each Series Event occurs one time in
-	event ID is Series Event called Event Name run by Club using Map on Date at Location;