activefacts 0.7.2 → 0.7.3

data/lib/activefacts/version.rb

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

data/lib/activefacts/vocabulary/extensions.rb

@@ -88,7 +88,7 @@ module ActiveFacts
 
       # Two RoleRefs are equal if they have the same role and Joins with matching roles
       def ==(role_ref)
-        RoleRef === role_ref &&
+        role_ref.is_a?(ActiveFacts::Metamodel::RoleRef) &&
         role_ref.role == role &&
         all_join.size == role_ref.all_join.size &&
         !all_join.sort_by{|j|j.join_step}.
@@ -119,7 +119,6 @@ module ActiveFacts
     end
 
     class EntityType
-      include ActiveFacts
       def preferred_identifier
         if fact_type
 
@@ -161,7 +160,7 @@ module ActiveFacts
               end
             debug :pi, "Got PI #{pi.name||pi.object_id} for nested #{name}" if pi
             debug :pi, "Looking for PI on entity that nests this fact" unless pi
-            raise "Oops, pi for nested fact is #{pi.class}" unless !pi || PresenceConstraint === pi
+            raise "Oops, pi for nested fact is #{pi.class}" unless !pi || pi.is_a?(ActiveFacts::Metamodel::PresenceConstraint)
             return pi if pi
           end
         end
@@ -228,7 +227,7 @@ module ActiveFacts
                 }
               throw :pi, nil
             end
-          raise "Oops, pi for entity is #{pi.class}" if pi && !(PresenceConstraint === pi)
+          raise "Oops, pi for entity is #{pi.class}" if pi && !pi.is_a?(ActiveFacts::Metamodel::PresenceConstraint)
           debug :pi, "Got PI #{pi.name||pi.object_id} for #{name}" if pi
 
           if !pi
@@ -332,8 +331,8 @@ module ActiveFacts
                   la = ta = nil   # When using role names, don't add adjectives
                 end
                 fc = frequency_constraints[i]
-                fc = fc.frequency if fc && PresenceConstraint === fc
-                if Array === fc
+                fc = fc.frequency if fc && fc.is_a?(ActiveFacts::Metamodel::PresenceConstraint)
+                if fc.is_a?(Array)
                   fc, player_name = *fc
                 else
                   player_name = player.name

data/spec/absorption_spec.rb

@@ -12,11 +12,11 @@ require 'activefacts/persistence'
 describe "Absorption" do
   Prologue = %Q{
     vocabulary Test;
-    DateTime is defined as DateAndTime();
-    Month is defined as VariableLengthText(3);
-    Season is defined as VariableLengthText(6);
-    PartyID is defined as AutoCounter();
-    ClaimID is defined as AutoCounter();
+    DateTime is written as DateAndTime();
+    Month is written as VariableLengthText(3);
+    Season is written as VariableLengthText(6);
+    PartyID is written as AutoCounter();
+    ClaimID is written as AutoCounter();
   }
   Claim = %Q{
     Claim is identified by ClaimID where
@@ -51,7 +51,7 @@ describe "Absorption" do
         #{Prologue} #{Claim} #{Incident}
         Incident relates to loss on exactly one DateTime;
       },
-      :tables => { "Claim" => ["ClaimID", %w{Incident DateTime}]}
+      :tables => { "Claim" => [%w{Claim ID}, %w{Incident Date Time}]}
     },
 
     { :should => "absorb an objectified binary with single-role UC",
@@ -63,16 +63,13 @@ describe "Absorption" do
         Person has exactly one birth-Date;
       },
       :tables => {
-        "Claim" => ["ClaimID", %w{Lodgement DateTime}, %w{Lodgement Person ID}],
-        "Party" => ["PartyID", %w{Person Birth Date}]
+        "Claim" => [%w{Claim ID}, %w{Lodgement Date Time}, %w{Lodgement Person ID}],
+        "Party" => [%w{Party ID}, %w{Person Birth Date}]
       }
     },
 
   ]
 
-  setup do
-  end
-
   Tests.each do |test|
     should = test[:should]
     cql = test[:cql]

data/spec/api/autocounter.rb

@@ -3,7 +3,7 @@
 # Copyright (c) 2008 Clifford Heath. Read the LICENSE file.
 #
 describe "AutoCounter Value Type instances" do
-  setup do
+  before :each do
     Object.send :remove_const, :Mod if Object.const_defined?("Mod")
     module Mod
       class ThingId < AutoCounter

data/spec/api/constellation.rb

@@ -7,7 +7,7 @@ require "ruby-debug"
 require 'activefacts/api'
 
 describe "A Constellation instance" do
-  setup do
+  before :each do
     Object.send :remove_const, :Mod if Object.const_defined?("Mod")
     module Mod
       @base_types = [

data/spec/api/entity_type.rb

@@ -3,7 +3,7 @@
 # Copyright (c) 2008 Clifford Heath. Read the LICENSE file.
 #
 describe "Entity Type class definitions" do
-  setup do
+  before :each do
     Object.send :remove_const, :Mod if Object.const_defined?("Mod")
     module Mod
       class Name < String

data/spec/api/instance.rb

@@ -3,7 +3,7 @@
 # Copyright (c) 2008 Clifford Heath. Read the LICENSE file.
 #
 describe "An instance of every type of Concept" do
-  setup do
+  before :each do
     Object.send :remove_const, :Mod if Object.const_defined?("Mod")
     module Mod
       # These are the base value types we're going to test:

data/spec/api/roles.rb

@@ -3,7 +3,7 @@
 # Copyright (c) 2008 Clifford Heath. Read the LICENSE file.
 #
 describe "Roles" do
-  setup do
+  before :each do
     Object.send :remove_const, :Mod if Object.const_defined?("Mod")
     module Mod
       class Name < String

data/spec/api/value_type.rb

@@ -3,7 +3,7 @@
 # Copyright (c) 2008 Clifford Heath. Read the LICENSE file.
 #
 describe "Value Type class definitions" do
-  setup do
+  before :each do
     Object.send :remove_const, :Mod if Object.const_defined?("Mod")
     module Mod
       class Name < String

data/spec/cql_cql_spec.rb

@@ -37,10 +37,8 @@ describe "CQL Loader" do
     output.read
   end
 
-  #Dir["examples/CQL/Bl*.cql"].each do |cql_file|
-  #Dir["examples/CQL/Meta*.cql"].each do |cql_file|
-  #Dir["examples/CQL/[ACG]*.cql"].each do |cql_file|
-  Dir["examples/CQL/*.cql"].each do |cql_file|
+  pattern = ENV["AFTESTS"] || "*"
+  Dir["examples/CQL/#{pattern}.cql"].each do |cql_file|
     actual_file = cql_file.sub(%r{examples/CQL/}, 'spec/actual/')
 
     it "should load CQL and dump valid CQL for #{cql_file}" do

data/spec/cql_parse_spec.rb

@@ -20,10 +20,8 @@ describe "CQL Parser" do
     ServiceDirector
   }
 
-  #Dir["examples/CQL/Bl*.cql"].each do |cql_file|
-  #Dir["examples/CQL/Meta*.cql"].each do |cql_file|
-  #Dir["examples/CQL/[ACG]*.cql"].each do |cql_file|
-  Dir["examples/CQL/*.cql"].each do |cql_file|
+  pattern = ENV["AFTESTS"] || "*"
+  Dir["examples/CQL/#{pattern}.cql"].each do |cql_file|
     it "should load CQL #{cql_file} without parse errors" do
       pending if CQLPARSE_FAILURES.include? File.basename(cql_file, ".cql")
       lambda { vocabulary = ActiveFacts::Input::CQL.readfile(cql_file) }.should_not raise_error

data/spec/cql_ruby_spec.rb

@@ -37,10 +37,8 @@ describe "CQL Loader with Ruby output" do
     output.read
   end
 
-  #Dir["examples/CQL/Bl*.cql"].each do |cql_file|
-  #Dir["examples/CQL/Meta*.cql"].each do |cql_file|
-  #Dir["examples/CQL/[ACG]*.cql"].each do |cql_file|
-  Dir["examples/CQL/*.cql"].each do |cql_file|
+  pattern = ENV["AFTESTS"] || "*"
+  Dir["examples/CQL/#{pattern}.cql"].each do |cql_file|
     expected_file = cql_file.sub(%r{/CQL/(.*).cql\Z}, '/ruby/\1.rb')
     actual_file = cql_file.sub(%r{examples/CQL/(.*).cql\Z}, 'spec/actual/\1.rb')
 

data/spec/cql_sql_spec.rb

@@ -15,8 +15,10 @@ include ActiveFacts::Metamodel
 describe "CQL Loader with SQL output" do
   CQL_SQL_FAILURES = %w{
     Airline
+    CompanyDirectorEmployee
     CompanyQuery
     Insurance
+    JoinEquality
     Marriage
     OrienteeringER
     ServiceDirector
@@ -32,10 +34,8 @@ describe "CQL Loader with SQL output" do
     output.read
   end
 
-  #Dir["examples/CQL/Bl*.cql"].each do |cql_file|
-  #Dir["examples/CQL/Meta*.cql"].each do |cql_file|
-  #Dir["examples/CQL/[ACG]*.cql"].each do |cql_file|
-  Dir["examples/CQL/*.cql"].each do |cql_file|
+  pattern = ENV["AFTESTS"] || "*"
+  Dir["examples/CQL/#{pattern}.cql"].each do |cql_file|
     actual_file = cql_file.sub(%r{examples/CQL/(.*).cql}, 'spec/actual/\1.sql')
     expected_file = cql_file.sub(%r{examples/CQL/(.*).cql\Z}, 'examples/SQL/\1.sql')
 

data/spec/cql_symbol_tables_spec.rb

@@ -15,7 +15,7 @@ describe "CQL Symbol table" do
   # 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)
 
-  setup do
+  before :each do
     include ActiveFacts::Input::CQL
     @constellation = ActiveFacts::API::Constellation.new(ActiveFacts::Metamodel)
     @vocabulary = @constellation.Vocabulary("Test")

data/spec/cql_unit_spec.rb

@@ -12,7 +12,7 @@ describe "Valid Numbers, Strings and Ranges" do
   ValidNumbersEtc = [
     "a=b();",                                   # Basic data type declaration, minimal whitespace
     "a = b ( ) ; ",                             # Basic data type declaration, maximal whitespace
-    "a is defined as b();",                     # Verbally named data type declaration
+    "a is written as b();",                     # Verbally named data type declaration
     "a=b() inch;",                              # Data type declaration with unit
     "a=b() inch ; ",                            # Data type declaration with unit
     "a=b() inch^2 ; ",                          # Data type declaration with unit and exponent
@@ -100,7 +100,7 @@ describe "Valid Numbers, Strings and Ranges" do
     "a=b() restricted to { 'A'.. };",           # String range, open end
   ]
 
-  setup do
+  before :each do
     @parser = ActiveFacts::CQLParser.new
   end
 
@@ -137,7 +137,7 @@ describe "Invalid Numbers and Strings" do
     "b() restricted to { 'a'..27 };",           # Cross-typed range
   ]
 
-  setup do
+  before :each do
     @parser = ActiveFacts::CQLParser.new
   end
 
@@ -162,7 +162,7 @@ describe "Data Types" do
 #    ],
   ]
 
-  setup do
+  before :each do
     @parser = ActiveFacts::CQLParser.new
   end
 
@@ -257,7 +257,7 @@ describe "Entity Types" do
     EntityTypes_Objectified +
     EntityTypes_Subtypes
 
-  setup do
+  before :each do
     @parser = ActiveFacts::CQLParser.new
   end
 
@@ -303,7 +303,7 @@ describe "Fact Types" do
     ]
   ]
 
-  setup do
+  before :each do
     @parser = ActiveFacts::CQLParser.new
   end
 

data/spec/cqldump_spec.rb

@@ -14,7 +14,7 @@ describe "CQL Dumper" do
   def self.hide(*a,&b)
   end
 
-  setup do
+  before :each do
     @constellation = ActiveFacts::API::Constellation.new(ActiveFacts::Metamodel)
     @vocabulary = @constellation.Vocabulary("TestVocab")
     @string_type = @constellation.ValueType(@vocabulary, "String")
@@ -41,7 +41,7 @@ vocabulary TestVocab;
 /*
  * Value Types
  */
-Name is defined as String(20);
+Name is written as String(20);
 
 END
   end
@@ -54,7 +54,7 @@ vocabulary TestVocab;
 /*
  * Value Types
  */
-Count is defined as Integer(32);
+Count is written as Integer(32);
 
 END
   end
@@ -131,8 +131,8 @@ vocabulary TestVocab;
 /*
  * Value Types
  */
-Count is defined as Integer(32);
-Name is defined as String(20);
+Count is written as Integer(32);
+Name is written as String(20);
 
 /*
  * Fact Types
@@ -154,7 +154,7 @@ vocabulary TestVocab;
 /*
  * Value Types
  */
-Name is defined as String(20);
+Name is written as String(20);
 
 /*
  * Entity Types

data/spec/norma_cql_spec.rb

@@ -25,10 +25,8 @@ describe "Norma Loader" do
     output.readlines
   end
 
-  #Dir["examples/norma/Bl*.orm"].each do |orm_file|
-  #Dir["examples/norma/Meta*.orm"].each do |orm_file|
-  #Dir["examples/norma/[AC]*.orm"].each do |orm_file|
-  Dir["examples/norma/*.orm"].each do |orm_file|
+  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')

data/spec/norma_ruby_spec.rb

@@ -28,10 +28,8 @@ describe "NORMA Loader with Ruby output" do
     output.read
   end
 
-  #Dir["examples/norma/Bl*.orm"].each do |orm_file|
-  #Dir["examples/norma/Meta*.orm"].each do |orm_file|
-  #Dir["examples/norma/[ACG]*.orm"].each do |orm_file|
-  Dir["examples/norma/*.orm"].each do |orm_file|
+  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')
 

data/spec/norma_sql_spec.rb

@@ -23,10 +23,8 @@ describe "NORMA Loader with SQL output" do
     output.read
   end
 
-  #Dir["examples/norma/Bl*.orm"].each do |orm_file|
-  #Dir["examples/norma/Meta*.orm"].each do |orm_file|
-  #Dir["examples/norma/[ACG]*.orm"].each do |orm_file|
-  Dir["examples/norma/*.orm"].each do |orm_file|
+  pattern = ENV["AFTESTS"] || "*"
+  Dir["examples/norma/#{pattern}.orm"].each do |orm_file|
     expected_file = orm_file.sub(%r{examples/norma/(.*).orm\Z}, 'examples/SQL/\1.sql')
     actual_file = orm_file.sub(%r{examples/norma/(.*).orm\Z}, 'spec/actual/\1.sql')
 

data/spec/norma_tables_spec.rb

@@ -19,8 +19,8 @@ include ActiveFacts::Metamodel
 Exceptions = {
   "Blog" => ["Author", "Comment", "Paragraph", "Post", "Topic"],
   "JoinEquality" => ["Event", "Seat", "Ticket", "Venue"],
-  "Metamodel" => ["AllowedRange", "Constraint", "Correspondence", "Derivation", "Fact", "FactType", "Feature", "Instance", "Join", "Reading", "Role", "RoleRef", "RoleSequence", "RoleValue", "SetComparisonRoles", "Unit", "ValueRestriction"],
-  "MetamodelTerms" => ["AllowedValue", "Concept", "Constraint", "Derivation", "Fact", "FactType", "Import", "Instance", "Join", "JoinRole", "ParamValue", "Reading", "Role", "RoleRef", "RoleSequence", "RoleValue", "SetComparisonRoles", "Term", "Unit", "ValueRestriction"],
+  "Metamodel" => ["AllowedRange", "Constraint", "Derivation", "Fact", "FactType", "Feature", "Instance", "Join", "ParamValue", "Reading", "Role", "RoleRef", "RoleSequence", "RoleValue", "SetComparisonRoles", "Unit", "ValueRestriction"],
+  "MetamodelTerms" => ["AllowedRange", "Concept", "Constraint", "Derivation", "Fact", "FactType", "Import", "Instance", "Join", "ParamValue", "Reading", "Role", "RoleRef", "RoleSequence", "RoleValue", "SetComparisonRoles", "Term", "Unit", "ValueRestriction"],
   "OilSupply" => ["AcceptableSubstitutes", "Month", "ProductionForecast", "RegionalDemand", "TransportRoute"],
   "Orienteering" => ["Club", "Entry", "Event", "EventControl", "EventScoringMethod", "Map", "Person", "Punch", "PunchPlacement", "Series", "Visit"],
   "SeparateSubtype" => ["Claim", "VehicleIncident"],
@@ -43,11 +43,8 @@ def extract_created_tables_from_sql sql_file
 end
 
 describe "Relational Composition from NORMA" do
-  #Dir["examples/norma/B*.orm"].each do |orm_file|
-  #Dir["examples/norma/Ins*.orm"].each do |orm_file|
-  #Dir["examples/norma/Meta*.orm"].each do |orm_file|
-  #Dir["examples/norma/W*.orm"].each do |orm_file|
-  Dir["examples/norma/*.orm"].each do |orm_file|
+  pattern = ENV["AFTESTS"] || "*"
+  Dir["examples/norma/#{pattern}.orm"].each do |orm_file|
     expected_tables = Exceptions[File.basename(orm_file, ".orm")]
     if !expected_tables
       sql_file_pattern = orm_file.sub(/\.orm\Z/, '*.sql')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: activefacts
 version: !ruby/object:Gem::Version 
-  version: 0.7.2
+  version: 0.7.3
 platform: ruby
 authors: 
 - Clifford Heath
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-31 00:00:00 +11:00
+date: 2009-05-15 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -30,7 +30,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.1.0
+        version: 1.4.1
     version: 
 - !ruby/object:Gem::Dependency 
   name: hoe
@@ -42,7 +42,24 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 1.8.0
     version: 
-description: ActiveFacts is a semantic modeling toolkit, comprising an implementation of the Constellation Query Language, the Constellation API, and code generators that receive CQL or ORM (Object Role Modeling files, from NORMA) to emit CQL, Ruby and SQL.  Semantic modeling is a refinement of fact-based modeling techniques that draw on natural language verbalisation and formal logic. Fact based modeling is essentially the same as relational modeling in the sixth normal form. The tools provided here automatically condense that to third normal form for efficient storage. They also generate object models as a Ruby module which has an effective mapping to both the original semantic model and to the generated SQL.  The result is a formal language that reads like plain English, and allows creation of relational and object models that are guaranteed equivalent, and much more stable in the face of schema evolution than SQL is.
+description: |-
+  ActiveFacts is a semantic modeling toolkit, comprising an implementation
+  of the Constellation Query Language, the Constellation API, and code
+  generators that receive CQL or ORM (Object Role Modeling files, from
+  NORMA) to emit CQL, Ruby and SQL.
+  
+  Semantic modeling is a refinement of fact-based modeling techniques
+  that draw on natural language verbalisation and formal logic. Fact
+  based modeling is essentially the same as relational modeling in the
+  sixth normal form. The tools provided here automatically condense
+  that to third normal form for efficient storage. They also generate
+  object models as a Ruby module which has an effective mapping to
+  both the original semantic model and to the generated SQL.
+  
+  The result is a formal language that reads like plain English, and
+  allows creation of relational and object models that are guaranteed
+  equivalent, and much more stable in the face of schema evolution than
+  SQL is.
 email: 
 - cjh@dataconstellation.org
 executables: 
@@ -109,6 +126,7 @@ files:
 - lib/activefacts/generate/oo.rb
 - lib/activefacts/generate/ordered.rb
 - lib/activefacts/generate/ruby.rb
+- lib/activefacts/generate/sql/mysql.rb
 - lib/activefacts/generate/sql/server.rb
 - lib/activefacts/generate/text.rb
 - lib/activefacts/input/cql.rb
@@ -149,8 +167,13 @@ files:
 - spec/spec_helper.rb
 has_rdoc: true
 homepage: http://dataconstellation.com/ActiveFacts/
+licenses: []
+
 post_install_message: For more information on ActiveFacts, see http://dataconstellation.com/ActiveFacts
 rdoc_options: 
+- -S
+- -T
+- hanna
 - -A
 - has_one
 - -A
@@ -178,9 +201,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: cjheath@rubyforge.org
-rubygems_version: 1.3.1
+rubygems_version: 1.3.3
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: ActiveFacts is a semantic modeling toolkit, comprising an implementation of the Constellation Query Language, the Constellation API, and code generators that receive CQL or ORM (Object Role Modeling files, from NORMA) to emit CQL, Ruby and SQL
 test_files: []