activefacts 0.7.2 → 0.7.3

data/Manifest.txt

@@ -52,6 +52,7 @@ lib/activefacts/generate/null.rb
 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

data/Rakefile

@@ -1,5 +1,7 @@
 %w[rubygems rake rake/clean fileutils newgem rubigen spec spec/rake/spectask].each { |f| require f }
 
+require 'hanna/rdoctask'
+
 require File.dirname(__FILE__) + '/lib/activefacts'
 
 # Generate all the Rake tasks
@@ -19,6 +21,7 @@ $hoe = Hoe.new('activefacts', ActiveFacts::VERSION) do |p|
   # Magic Hoe hook to prevent the generation of diagrams:
   ENV['NODOT'] = 'yes'
   p.spec_extras[:rdoc_options] = %w{
+      -S -T hanna
       -A has_one -A one_to_one -A maybe
       -x lib/activefacts/cql/.*.rb
       -x lib/activefacts/vocabulary/.*.rb

data/bin/afgen

@@ -1,4 +1,4 @@
-#! env ruby
+#! /usr/bin/env ruby
 #
 #	ActiveFacts: Read a Vocabulary (from a NORMA, CQL or other file) and run a generator
 #
@@ -7,11 +7,17 @@
 $:.unshift File.dirname(File.expand_path(__FILE__))+"/../lib"
 
 require 'rubygems'
-require 'ruby-debug'
 require 'activefacts'
 require 'activefacts/vocabulary'
 
-debugger if debug :exception
+if ENV['DEBUG']
+  begin
+    require 'ruby-debug'
+    debugger if debug :exception
+  rescue LoadError
+    # Ok, no debugger, tough luck.
+  end
+end
 true # Ok, got the stack set up, continue to the fault
 
 arg = ARGV.shift

data/examples/CQL/Address.cql

@@ -3,13 +3,13 @@ vocabulary Address;
 /*
  * Value Types
  */
-City is defined as VariableLengthText(64);
-CompanyName is defined as VariableLengthText();
-FamilyName is defined as VariableLengthText(20);
-GivenNames is defined as VariableLengthText(20);
-Number is defined as VariableLengthText(12);
-Postcode is defined as VariableLengthText();
-StreetLine is defined as VariableLengthText(64);
+City is written as VariableLengthText(64);
+CompanyName is written as VariableLengthText();
+FamilyName is written as VariableLengthText(20);
+GivenNames is written as VariableLengthText(20);
+Number is written as VariableLengthText(12);
+Postcode is written as VariableLengthText();
+StreetLine is written as VariableLengthText(64);
 
 /*
  * Entity Types

data/examples/CQL/Blog.cql

@@ -3,14 +3,14 @@ vocabulary Blog;
 /*
  * Value Types
  */
-AuthorId is defined as AutoCounter();
-CommentId is defined as AutoCounter();
-Name is defined as VariableLengthText(64);
-Ordinal is defined as UnsignedInteger(32);
-PostId is defined as AutoCounter();
-Style is defined as VariableLengthText(20);
-Text is defined as LargeLengthText();
-TopicId is defined as AutoCounter();
+AuthorId is written as AutoCounter();
+CommentId is written as AutoCounter();
+Name is written as VariableLengthText(64);
+Ordinal is written as UnsignedInteger(32);
+PostId is written as AutoCounter();
+Style is written as VariableLengthText(20);
+Text is written as LargeLengthText();
+TopicId is written as AutoCounter();
 
 /*
  * Entity Types

data/examples/CQL/CompanyDirectorEmployee.cql

@@ -3,9 +3,9 @@ vocabulary CompanyDirectorEmployee;
 /*
  * Value Types
  */
-CompanyName is defined as VariableLengthText(48);
-EmployeeNr is defined as SignedInteger(32);
-Name is defined as VariableLengthText(48);
+CompanyName is written as VariableLengthText(48);
+EmployeeNr is written as SignedInteger(32);
+Name is written as VariableLengthText(48);
 
 /*
  * Entity Types

data/examples/CQL/Death.cql

@@ -3,8 +3,8 @@ vocabulary Death;
 /*
  * Value Types
  */
-CauseOfDeath is defined as VariableLengthText();
-PersonName is defined as VariableLengthText(40);
+CauseOfDeath is written as VariableLengthText();
+PersonName is written as VariableLengthText(40);
 
 /*
  * Entity Types

data/examples/CQL/Genealogy.cql

@@ -3,27 +3,27 @@ vocabulary Genealogy;
 /*
  * Value Types
  */
-Address is defined as VariableLengthText(128);
-Certificate is defined as VariableLengthText(64);
-Day is defined as UnsignedInteger(32) restricted to {1..31};
-Email is defined as VariableLengthText(64);
-EventID is defined as AutoCounter();
-EventLocation is defined as VariableLengthText(128);
-EventRoleName is defined as VariableLengthText() restricted to {'Celebrant', 'Father', 'Husband', 'Mother', 'Subject', 'Wife'};
-EventTypeID is defined as AutoCounter();
-EventTypeName is defined as VariableLengthText(16) restricted to {'Birth', 'Burial', 'Christening', 'Death', 'Divorce', 'Marriage'};
-Gender is defined as FixedLengthText(1) restricted to {'F', 'M'};
-Month is defined as UnsignedInteger(32) restricted to {1..12};
-Name is defined as VariableLengthText(128);
-Occupation is defined as VariableLengthText(128);
-Official is defined as VariableLengthText(64);
-PersonID is defined as AutoCounter();
-Picture is defined as PictureRawData(20);
-RoleID is defined as AutoCounter();
-SourceID is defined as AutoCounter();
-SourceName is defined as VariableLengthText(128);
-UserID is defined as AutoCounter();
-Year is defined as UnsignedInteger(32);
+Address is written as VariableLengthText(128);
+Certificate is written as VariableLengthText(64);
+Day is written as UnsignedInteger(32) restricted to {1..31};
+Email is written as VariableLengthText(64);
+EventID is written as AutoCounter();
+EventLocation is written as VariableLengthText(128);
+EventRoleName is written as VariableLengthText() restricted to {'Celebrant', 'Father', 'Husband', 'Mother', 'Subject', 'Wife'};
+EventTypeID is written as AutoCounter();
+EventTypeName is written as VariableLengthText(16) restricted to {'Birth', 'Burial', 'Christening', 'Death', 'Divorce', 'Marriage'};
+Gender is written as FixedLengthText(1) restricted to {'F', 'M'};
+Month is written as UnsignedInteger(32) restricted to {1..12};
+Name is written as VariableLengthText(128);
+Occupation is written as VariableLengthText(128);
+Official is written as VariableLengthText(64);
+PersonID is written as AutoCounter();
+Picture is written as PictureRawData(20);
+RoleID is written as AutoCounter();
+SourceID is written as AutoCounter();
+SourceName is written as VariableLengthText(128);
+UserID is written as AutoCounter();
+Year is written as UnsignedInteger(32);
 
 /*
  * Entity Types

data/examples/CQL/Marriage.cql

@@ -3,7 +3,7 @@ vocabulary Marriage;
 /*
  * Value Types
  */
-Name is defined as VariableLengthText();
+Name is written as VariableLengthText();
 
 /*
  * Entity Types

data/examples/CQL/Metamodel.cql

@@ -3,27 +3,28 @@ vocabulary Metamodel;
 /*
  * Value Types
  */
-Adjective is defined as VariableLengthText(64);
-ConstraintId is defined as AutoCounter();
-Denominator is defined as UnsignedInteger(32);
-Enforcement is defined as VariableLengthText(16);
-Exponent is defined as SignedSmallInteger(32);
-FactId is defined as AutoCounter();
-FactTypeId is defined as AutoCounter();
-Frequency is defined as UnsignedInteger(32);
-InstanceId is defined as AutoCounter();
-Length is defined as UnsignedInteger(32);
-Name is defined as VariableLengthText(64);
-Numerator is defined as Decimal();
-Ordinal is defined as UnsignedSmallInteger(32);
-Pronoun is defined as VariableLengthText() restricted to {'feminine', 'masculine', 'personal'};
-RingType is defined as VariableLengthText();
-RoleSequenceId is defined as AutoCounter();
-Scale is defined as UnsignedInteger(32);
-Text is defined as VariableLengthText(256);
-UnitId is defined as AutoCounter();
-Value is defined as VariableLengthText(256);
-ValueRestrictionId is defined as AutoCounter();
+Adjective is written as VariableLengthText(64);
+ConstraintId is written as AutoCounter();
+Denominator is written as UnsignedInteger(32);
+Enforcement is written as VariableLengthText(16);
+Exponent is written as SignedSmallInteger(32);
+FactId is written as AutoCounter();
+FactTypeId is written as AutoCounter();
+Frequency is written as UnsignedInteger(32);
+InstanceId is written as AutoCounter();
+Length is written as UnsignedInteger(32);
+Name is written as VariableLengthText(64);
+Numerator is written as Decimal();
+Offset is written as Decimal();
+Ordinal is written as UnsignedSmallInteger(32);
+Pronoun is written as VariableLengthText(20) restricted to {'feminine', 'masculine', 'personal'};
+RingType is written as VariableLengthText();
+RoleSequenceId is written as AutoCounter();
+Scale is written as UnsignedInteger(32);
+Text is written as VariableLengthText(256);
+UnitId is written as AutoCounter();
+Value is written as VariableLengthText(256);
+ValueRestrictionId is written as AutoCounter();
 
 /*
  * Entity Types
@@ -89,6 +90,7 @@ Unit is identified by its Id;
 Name is of Unit,
 	Unit is called one Name;
 Unit has at most one Coefficient;
+Unit has at most one Offset;
 Unit is fundamental;
 Derivation is where
 	Unit (as DerivedUnit) is derived from base-Unit (as BaseUnit) [acyclic, intransitive];
@@ -106,15 +108,13 @@ Vocabulary is identified by Name where
 	Vocabulary is called one Name;
 Vocabulary contains Constraint,
 	Constraint belongs to at most one Vocabulary;
-Import is where
-	Vocabulary imports imported-Vocabulary [acyclic];
+Vocabulary includes Unit,
+	Unit is in one Vocabulary;
 
 Feature is identified by Vocabulary and Name where
 	Feature belongs to at most one Vocabulary,
 	Vocabulary contains Feature,
 	Feature is called one Name;
-Correspondence is where
-	in Import imported-Feature corresponds to at most one local-Feature;
 
 Population is identified by Vocabulary and Name where
 	Vocabulary includes Population,
@@ -140,8 +140,6 @@ SetEqualityConstraint is a kind of SetComparisonConstraint;
 SetExclusionConstraint is a kind of SetComparisonConstraint;
 SetExclusionConstraint is mandatory;
 
-Alias is a kind of Feature;
-
 Concept is a kind of Feature;
 Concept uses at most one Pronoun;
 Concept is independent;
@@ -190,6 +188,11 @@ ValueType is of at most one Unit;
 ValueType has at most one ValueRestriction;
 ValueType is subtype of at most one super-ValueType (as Supertype) [acyclic],
 	Supertype is supertype of ValueType;
+Parameter is where
+	Name is a parameter of ValueType,
+	ValueType has parameter called Name;
+ParamValue is where
+	Value for Parameter applies to at most one ValueType;
 
 /*
  * Constraints:
@@ -202,8 +205,7 @@ for each Constraint exactly one of these holds:
 	SetConstraint is a subtype of Constraint,
 	RingConstraint is a subtype of Constraint;
 for each Feature exactly one of these holds:
-	Concept is a subtype of Feature,
-	Alias is a subtype of Feature;
+	Concept is a subtype of Feature;
 Instance plays RoleValue and Instance is of Concept
 	if and only if
 	RoleValue is of Role and FactType has Ordinal role played by Concept;
@@ -243,3 +245,6 @@ each ValueRange occurs at least one time in
 each combination Vocabulary, Name occurs at most one time in
 	Vocabulary contains Constraint,
 	Name is of Constraint;
+each combination Vocabulary, Name occurs at most one time in
+	Vocabulary includes Unit,
+	Name is of Unit;

data/examples/CQL/MultiInheritance.cql

@@ -3,9 +3,9 @@ vocabulary MultiInheritance;
 /*
  * Value Types
  */
-EmployeeID is defined as AutoCounter();
-PersonName is defined as VariableLengthText();
-TFN is defined as FixedLengthText(9);
+EmployeeID is written as AutoCounter();
+PersonName is written as VariableLengthText();
+TFN is written as FixedLengthText(9);
 
 /*
  * Entity Types

data/examples/CQL/OilSupply.cql

@@ -3,15 +3,15 @@ vocabulary OilSupply;
 /*
  * Value Types
  */
-Cost is defined as Money();
-MonthCode is defined as FixedLengthText();
-ProductName is defined as VariableLengthText();
-Quantity is defined as UnsignedInteger(32);
-RefineryName is defined as VariableLengthText(80);
-RegionName is defined as VariableLengthText();
-Season is defined as VariableLengthText(6) restricted to {'Autumn', 'Spring', 'Summer', 'Winter'};
-TransportMethod is defined as VariableLengthText() restricted to {'Rail', 'Road', 'Sea'};
-YearNr is defined as SignedInteger(32);
+Cost is written as Money();
+MonthCode is written as FixedLengthText();
+ProductName is written as VariableLengthText();
+Quantity is written as UnsignedInteger(32);
+RefineryName is written as VariableLengthText(80);
+RegionName is written as VariableLengthText();
+Season is written as VariableLengthText(6) restricted to {'Autumn', 'Spring', 'Summer', 'Winter'};
+TransportMethod is written as VariableLengthText() restricted to {'Rail', 'Road', 'Sea'};
+YearNr is written as SignedInteger(32);
 
 /*
  * Entity Types

data/examples/CQL/Orienteering.cql

@@ -3,33 +3,33 @@ vocabulary Orienteering;
 /*
  * Value Types
  */
-Accessibility is defined as FixedLengthText(1) restricted to {'A'..'D'};
-ClubCode is defined as VariableLengthText(6);
-ClubName is defined as VariableLengthText(32);
-ControlNumber is defined as UnsignedInteger(32) restricted to {1..1000};
-Course is defined as VariableLengthText(16) restricted to {'A'..'E', 'PW'};
-EntryID is defined as AutoCounter();
-EventID is defined as AutoCounter();
-EventName is defined as VariableLengthText(50);
-FamilyName is defined as VariableLengthText(48);
-Gender is defined as FixedLengthText(1) restricted to {'F', 'M'};
-GivenName is defined as VariableLengthText(48);
-Location is defined as VariableLengthText(200);
-MapID is defined as AutoCounter();
-MapName is defined as VariableLengthText(80);
-Number is defined as UnsignedInteger(32) restricted to {1..100};
-PersonID is defined as AutoCounter();
-Placing is defined as UnsignedInteger(32);
-PointValue is defined as UnsignedInteger(32);
-PostCode is defined as UnsignedInteger(32);
-PunchID is defined as AutoCounter();
-Score is defined as SignedInteger(32);
-ScoringMethod is defined as VariableLengthText(32) restricted to {'Scatter', 'Score', 'Special'};
-SeriesID is defined as AutoCounter();
-SeriesName is defined as VariableLengthText(40);
-StartTime is defined as DateAndTime();
-Time is defined as DateAndTime();
-Year is defined as UnsignedInteger(32) restricted to {1900..3000};
+Accessibility is written as FixedLengthText(1) restricted to {'A'..'D'};
+ClubCode is written as VariableLengthText(6);
+ClubName is written as VariableLengthText(32);
+ControlNumber is written as UnsignedInteger(32) restricted to {1..1000};
+Course is written as VariableLengthText(16) restricted to {'A'..'E', 'PW'};
+EntryID is written as AutoCounter();
+EventID is written as AutoCounter();
+EventName is written as VariableLengthText(50);
+FamilyName is written as VariableLengthText(48);
+Gender is written as FixedLengthText(1) restricted to {'F', 'M'};
+GivenName is written as VariableLengthText(48);
+Location is written as VariableLengthText(200);
+MapID is written as AutoCounter();
+MapName is written as VariableLengthText(80);
+Number is written as UnsignedInteger(32) restricted to {1..100};
+PersonID is written as AutoCounter();
+Placing is written as UnsignedInteger(32);
+PointValue is written as UnsignedInteger(32);
+PostCode is written as UnsignedInteger(32);
+PunchID is written as AutoCounter();
+Score is written as SignedInteger(32);
+ScoringMethod is written as VariableLengthText(32) restricted to {'Scatter', 'Score', 'Special'};
+SeriesID is written as AutoCounter();
+SeriesName is written as VariableLengthText(40);
+StartTime is written as DateAndTime();
+Time is written as DateAndTime();
+Year is written as UnsignedInteger(32) restricted to {1900..3000};
 
 /*
  * Entity Types

data/examples/CQL/PersonPlaysGame.cql

@@ -3,8 +3,8 @@ vocabulary PersonPlaysGame;
 /*
  * Value Types
  */
-GameCode is defined as FixedLengthText();
-PersonName is defined as VariableLengthText();
+GameCode is written as FixedLengthText();
+PersonName is written as VariableLengthText();
 
 /*
  * Entity Types

data/examples/CQL/SchoolActivities.cql

@@ -3,9 +3,9 @@ vocabulary SchoolActivities;
 /*
  * Value Types
  */
-ActivityName is defined as VariableLengthText(32);
-SchoolName is defined as VariableLengthText();
-StudentName is defined as VariableLengthText();
+ActivityName is written as VariableLengthText(32);
+SchoolName is written as VariableLengthText();
+StudentName is written as VariableLengthText();
 
 /*
  * Entity Types

data/examples/CQL/SimplestUnary.cql

@@ -3,7 +3,7 @@ vocabulary SimplestUnary;
 /*
  * Value Types
  */
-SomeString is defined as VariableLengthText();
+SomeString is written as VariableLengthText();
 
 /*
  * Fact Types

data/examples/CQL/SubtypePI.cql

@@ -3,10 +3,10 @@ vocabulary SubtypePI;
 /*
  * Value Types
  */
-EntrantID is defined as AutoCounter();
-FamilyName is defined as VariableLengthText();
-GivenName is defined as VariableLengthText();
-TeamID is defined as AutoCounter();
+EntrantID is written as AutoCounter();
+FamilyName is written as VariableLengthText();
+GivenName is written as VariableLengthText();
+TeamID is written as AutoCounter();
 
 /*
  * Entity Types