activefacts 0.8.9 → 0.8.10

data/Manifest.txt

@@ -31,7 +31,6 @@ examples/CQL/OddIdentifier.cql
 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
@@ -50,37 +49,25 @@ examples/intro.html
 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
@@ -97,9 +84,9 @@ lib/activefacts/input/cql.rb
 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
@@ -109,38 +96,46 @@ lib/activefacts/vocabulary/extensions.rb
 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

data/Rakefile

@@ -1,12 +1,11 @@
-%w[rubygems hoe rake rake/clean fileutils newgem rubigen spec spec/rake/spectask].each { |f| require f }
+%w[rubygems hoe rake rake/clean fileutils newgem thread rubigen].each { |f|
+  require f
+}
 
-# Use mislav-hanna to the API format documentation, if it's installed:
-begin
-  require 'hanna/rdoctask'
-  HANNA = true
-rescue
-  HANNA = false
-end
+require 'rspec'
+require 'rspec/core/rake_task'
+
+gem "rspec", :require => "spec/rake/spectask"
 
 require File.dirname(__FILE__) + '/lib/activefacts'
 
@@ -28,6 +27,7 @@ and object models in SQL, Ruby and other languages.
   p.post_install_message = 'For more information on ActiveFacts, see http://dataconstellation.com/ActiveFacts'
   p.rubyforge_name       = "cjheath@rubyforge.org"
   p.extra_deps         = [
+    ['activefacts-api','>= 0.8.10'],
     ['treetop','>= 1.4.1'],
     ['rake','>= 0.8.7'],
   ]
@@ -38,9 +38,8 @@ and object models in SQL, Ruby and other languages.
   # Magic Hoe hook to prevent the generation of diagrams:
   ENV['NODOT'] = 'yes'
   p.spec_extras[:rdoc_options] = ['-S'] +
-    (HANNA ? %w{ -S -T hanna} : []) +
+    # RDoc used to have these options: -A has_one -A one_to_one -A maybe
     %w{
-      -A has_one -A one_to_one -A maybe
       -x lib/activefacts/cql/.*.rb
       -x lib/activefacts/vocabulary/.*.rb
     }
@@ -56,9 +55,9 @@ Dir['tasks/**/*.rake'].each { |t| load t }
 # TODO - want other tests/tasks run by default? Add them to the list
 # task :default => [:spec, :features]
 
-Spec::Rake::SpecTask.new(:spec) do |t|
+RSpec::Core::RakeTask.new do |t|
     t.ruby_opts = ['-I', "lib"]
-    t.spec_files = FileList['spec/**/*_spec.rb']
+    # t.pattern = FileList['spec/**/*_spec.rb']
     # t.rcov = true
     # t.rcov_opts = ['--exclude', 'spec,/usr/lib/ruby' ]
 end

data/bin/cql

@@ -22,22 +22,14 @@ require 'activefacts/cql/compiler'
 class InteractiveCQL < ActiveFacts::CQL::Compiler
   def initialize *a
     @show_tree = false  # Show the raw Treetop parse tree
+    @show_highlight = false  # Show the highlighted CQL text from the parse tree
     super *a
     self.root = :definition
   end
 
   def list_instances name
-    if name.empty?
-      @vocabulary.constellation.Instance.values
-    else
-      if !@vocabulary.constellation.Concept[[[@vocabulary.name], name]]
-	puts "Object type '#{name}' does not exist in vocabulary '#{@vocabulary.name}'"
-	[]
-      else
-	@vocabulary.constellation.Instance.values.select{|i| i.concept.supertypes_transitive.detect{|k| k.name == name}}
-      end
-    end.select do |instance|
-      instance.concept.vocabulary == @vocabulary
+    if (name.is_a?(ActiveFacts::Metamodel::ObjectType))
+      name.all_instance
     end.map do |instance|
       instance.verbalise
     end.sort.each do |verbalisation|
@@ -52,31 +44,31 @@ class InteractiveCQL < ActiveFacts::CQL::Compiler
   end
 
   def list_object_types
-    concepts_by_vocabulary = {}
-    @constellation.Concept.keys.
+    object_types_by_vocabulary = {}
+    @constellation.ObjectType.keys.
       each do |v,t|
-	(concepts_by_vocabulary[v[0]] ||= []) << t
+	(object_types_by_vocabulary[v[0]] ||= []) << t
       end
-    concepts_by_vocabulary.keys.sort.each do |v|
-      puts "#{v}:\n\t" + concepts_by_vocabulary[v].sort*"\n\t"
+    object_types_by_vocabulary.keys.sort.each do |v|
+      puts "#{v}:\n\t" + object_types_by_vocabulary[v].sort*"\n\t"
     end
   end
 
   def list_connotations word
-    concept = @constellation.Concept[[@vocabulary.identifying_role_values, word]]
-    unless concept
+    object_type = @constellation.ObjectType[[@vocabulary.identifying_role_values, word]]
+    unless object_type
       puts "Object type '#{word}' is unknown in #{@vocabulary.name}"
       return
     end
     puts "Fact types in which '#{word}' plays a part:"
-    if concept.is_a?(ActiveFacts::Metamodel::ValueType)
-      puts "\t#{concept.name} is written as #{concept.supertype.name};" if concept.supertype
-      concept.all_value_type_as_supertype.each do |st|
-	puts "#{st.name} is written as #{concept.name};"
+    if object_type.is_a?(ActiveFacts::Metamodel::ValueType)
+      puts "\t#{object_type.name} is written as #{object_type.supertype.name};" if object_type.supertype
+      object_type.all_value_type_as_supertype.each do |st|
+	puts "#{st.name} is written as #{object_type.name};"
       end
     end
-    concept.all_role.map{|role| role.fact_type}.uniq.each do |fact_type|
-      puts "\t#{fact_type.default_reading}"
+    object_type.all_role.map{|role| role.fact_type}.uniq.each do |fact_type|
+      puts "\t" + fact_type.all_reading.map{|r| r.expand}*', '
     end
   end
 
@@ -84,8 +76,6 @@ class InteractiveCQL < ActiveFacts::CQL::Compiler
     # meta-commands start with /
     words = line.split
     case cmd = words.shift
-    when /(\w*)\?/
-      list_instances $1
     when "/trace"
       if words.empty?
 	puts debug_keys*", "
@@ -95,6 +85,12 @@ class InteractiveCQL < ActiveFacts::CQL::Compiler
     when "/tree"
       @show_tree = !@show_tree
       puts "Will #{@show_tree ? "" : "not "}show the parse tree"
+    when "/highlight"
+      @show_highlight = !@show_highlight
+      puts "Will #{@show_highlight ? "" : "not "}show the highlighted parse"
+    when "/timings"
+      $show_timings = !$show_timings
+      puts "Will #{$show_timings ? "" : "not "}show command timings"
     when "/root"
       self.root = words[0] && words[0].to_sym || :definition
       puts "Looking for a #{self.root}"
@@ -131,11 +127,24 @@ class InteractiveCQL < ActiveFacts::CQL::Compiler
     end
   end
 
+  def process_query(join)
+    if join.all_join_node.size == 1 and join.all_join_step.size == 0
+      list_instances(join.all_join_node.single.object_type)
+    else
+      # REVISIT: Identify all the unbound Join Nodes, and do a nested-loops iteration checking all Steps
+      puts "Can't yet process complex queries (involving #{join.all_join_node.map{|jn|jn.object_type.name}*', '})"
+    end
+  end
+
   def process(statement)
     begin
       @results = []
       compile(statement)
-      puts(@results.map{|r| "\t"+r.inspect}*"\n")
+      if @results.size == 1 && @results[0].is_a?(ActiveFacts::Metamodel::Join)
+	process_query(@results[0])
+      else
+	puts(@results.map{|r| "\t"+r.inspect}*"\n")
+      end
     rescue => e
       puts e
       puts "\t"+e.backtrace*"\n\t" if ENV["DEBUG"] =~ /exception/
@@ -145,10 +154,33 @@ class InteractiveCQL < ActiveFacts::CQL::Compiler
   def compile_definition ast
     # Accumulate the results:
     p ast if @show_tree
-    @results += Array(result = super)
+    puts highlight_tree(ast.tree) if @show_highlight
+    result = super
+    @results += Array(result)
     result
   end
 
+  # Return an HTML representation of the source text with classed spans surrounding types of text
+  def highlight_tree(ast, prev = nil)
+    if ast.node_type == :composite
+      wrap = prev != :keyword
+      (wrap ? "<span class='keyword'>" : '') +
+	(ast.elements.map do |e|
+	  highlight_tree(e, :keyword)
+	end * '').
+	  gsub(%r{(<span class='([a-z]*)'>[^<]*)</span><span class='\2'>},'\1') +
+	(wrap ? "</span>" : '')
+    else
+      t = ast.text_value.gsub('<', '&lt;').gsub('>', '&gt;')
+      if t == ''
+	t
+      else
+	n = ast.node_type
+	n == prev ? t : "<span class='#{n}'>#{ast.text_value}</span>"
+      end
+    end
+  end
+
   def help words = []
     if words.empty?
       puts %Q{
@@ -157,9 +189,11 @@ Meta-commands are:
   /help\t\t\tThis help message
   /help topic\t\thelp on a specific topic
   /help topics\t\tList the available help topics
+  /highlight\t\t\tRe-display the parsed CQL with HTML highlighting markup
   /list\t\t\tList all object type names (terms)
   /load file.cql\tLoad a CQL file
   /root rule\t\tParse just a fragment of a CQL statement, matching syntax rule only
+  /timings\t\t\tDisplay the elapsed time to execute each command
   /tree\t\t\tDisplay the abstract syntax tree from each statement parsed
   /trace key\t\tToggle debug tracing key, or list available keys
 }
@@ -376,25 +410,35 @@ end
 
 compiler = InteractiveCQL.new
 statement = nil
+loaded_files = false
 ARGV.each do |arg|
-  compiler.load_file(arg)
-end
-puts "Enter / for help on special commands"
-
-while line = Readline::readline(statement ? "CQL+ " : "CQL? ", [])
-  statement = statement ? statement + "\n"+line : line
-  if statement =~ /\s*(.*?)\s*\?\s*$/
-    compiler.list_instances $1
-    statement = nil
-  elsif line =~ %r{\A/}
-    compiler.metacommand(line)
-    statement = nil
-  elsif compiler.root != :definition or
-      line.gsub(/(['"])([^\1\\]|\\.)*\1/,'') =~ /[;?]/
-    # After stripping string literals the line contains a ';' or /?', we've found the last line of the command:
-    compiler.process(statement)
-    statement = nil
+  if arg =~ /^--(.*)/
+    compiler.metacommand('/'+$1)
+  else
+    loaded_files = false or break if arg == '-'
+    compiler.load_file(arg)
+    loaded_files = true
   end
 end
-puts
 
+if !loaded_files
+  puts "Enter / for help on special commands"
+
+  while line = Readline::readline(statement ? "CQL+ " : "CQL? ", [])
+    statement = statement ? statement + "\n"+line : line
+    start = Time.now
+    case
+    when line =~ %r{\A/}
+      compiler.metacommand(line)
+      statement = nil
+    when compiler.root != :definition || line.gsub(/(['"])([^\1\\]|\\.)*\1/,'') =~ /[;?]/
+      # After stripping string literals the line contains a ';' or /?', we've found the last line of the command:
+      compiler.process(statement)
+      statement = nil
+    end
+    if $show_timings && statement == nil
+      puts "Done in #{((Time.now.to_f-start.to_f)*1000000).to_i} usec"
+    end
+  end
+  puts
+end

data/examples/CQL/Blog.cql

@@ -31,7 +31,8 @@ Content provides text of Comment,
 	Comment consists of one text-Content;
 
 Post is identified by its Id;
-Post was written by one Author;
+Post was written by one Author,
+	Author wrote Post;
 
 Topic is identified by its Id;
 Post belongs to one Topic,

data/examples/CQL/CompanyDirectorEmployee.cql

@@ -15,7 +15,7 @@ Company is identified by its Name where
 	Company is called Company Name;
 Company is listed;
 
-Meeting is identified by Date and Meeting is board meeting and Company where
+Meeting is independent identified by Date and Meeting is board meeting and Company where
 	Meeting is held on one Date,
 	Meeting is board meeting,
 	Company held Meeting,
@@ -49,4 +49,4 @@ Manager is ceo;
 /*
  * Constraints:
  */
-either Employee is supervised by Manager(1) or Employee is a Manager(2) that is ceo but not both;
+either Employee is supervised by Manager(2) or Employee is a Manager(1) that is ceo but not both;

data/examples/CQL/Death.cql

@@ -9,7 +9,7 @@ Person Name is written as String(40);
 /*
  * Entity Types
  */
-Person is identified by its Name [independent];
+Person is independent identified by its Name;
 
 Death is where
 	Person is dead;

data/examples/CQL/Diplomacy.cql

@@ -10,17 +10,17 @@ LanguageName is written as String;
 /*
  * Entity Types
  */
-Country is identified by its Name;
+Country is independent identified by its Name;
 
 Diplomat is identified by its Name;
 Diplomat represents one Country (as Represented Country);
 Diplomat serves in one Country (as Served Country);
 
-Language is identified by its Name;
+Language is independent identified by its Name;
 
 LanguageUse is where
 	Language is spoken in Country,
-	Country uses at least one Language;
+	Country uses Language;
 
 Ambassador is a kind of Diplomat;
 
@@ -29,8 +29,8 @@ Fluency is where
 	Language is spoken by Diplomat;
 
 Representation is where
-	Ambassador is from Country (as Represented Country) to Country(2),
-	Represented Country(1) is represented in Country(2) by one Ambassador;
+	Ambassador is from Country (as Represented Country) to Country,
+	Represented Country is represented in Country by one Ambassador;
 
 /*
  * Constraints:
@@ -38,11 +38,11 @@ Representation is where
 for each Diplomat, Country at most one of these holds:
 	Diplomat serves in Country,
 	Diplomat represents Country;
-Diplomat is an Ambassador that is from Country(1) to Country(2)
-	only if Diplomat represents Country(1);
 Diplomat is an Ambassador that is from Country(2) to Country(1)
-	only if Diplomat serves in Country(1);
+	only if Diplomat represents Country(2);
+Diplomat is an Ambassador that is from Country(1) to Country(2)
+	only if Diplomat serves in Country(2);
 Diplomat serves in Country
 	only if Diplomat speaks Language that is spoken in Country;
 each Ambassador occurs at least one time in
-	Ambassador is from Country to Country;
+	Ambassador is from Country(1) to Country(2);