activefacts 0.8.16 → 0.8.18

data/spec/cql_cql_spec.rb

@@ -20,7 +20,7 @@ describe "CQL Loader" do
     "units" => "Unit verbalisation into CQL is not implemented"
   }
   cql_cql_failures = {
-#    "Insurance" => "Misses a join in a subset constraint",
+#    "Insurance" => "Misses a query in a subset constraint",
 #    "OddIdentifier" => "Doesn't support identification of object fact types using mixed external/internal roles",
   }
   # Generate and return the CQL for the given vocabulary
@@ -52,6 +52,7 @@ describe "CQL Loader" do
           raise
         end
       end
+      vocabulary.finalise
 
       # Build and save the actual file:
       cql_text = cql(vocabulary)

data/spec/cql_dm_spec.rb

@@ -64,6 +64,8 @@ describe "CQL Loader with DataMapper output" do
     actual_file = cql_file.sub(%r{examples/CQL/(.*).cql\Z}, 'spec/actual/\1.dm.rb')
     base = File.basename(cql_file, ".cql")
 
+    next unless ENV["AFTESTS"] || File.exists?(expected_file)
+
     it "should load #{cql_file} and dump DataMapper models matching #{expected_file}" do
       vocabulary = nil
       broken = cql_failures[base]
@@ -74,12 +76,14 @@ describe "CQL Loader with DataMapper output" do
       else
         vocabulary = ActiveFacts::Input::CQL.readfile(cql_file)
       end
+      vocabulary.finalise
 
       # Build and save the actual file:
       dm_text = ''
       lambda do
         begin
           dm_text = dm(vocabulary)
+	  Dir.mkdir "spec/actual" rescue nil
           File.open(actual_file, "w") { |f| f.write dm_text }
         rescue
           raise unless mapping_failures[base]

data/spec/cql_mysql_spec.rb

@@ -33,6 +33,8 @@ describe "CQL Loader with SQL output" do
     actual_file = cql_file.sub(%r{examples/CQL/(.*).cql}, 'spec/actual/\1.my.sql')
     expected_file = cql_file.sub(%r{examples/CQL/(.*).cql\Z}, 'examples/MySQL/\1.sql')
 
+    next unless ENV["AFTESTS"] || File.exists?(expected_file)
+
     it "should load #{cql_file} and dump MySQL matching #{expected_file}" do
       broken = cql_failures[File.basename(cql_file, ".cql")]
       vocabulary = nil
@@ -43,9 +45,11 @@ describe "CQL Loader with SQL output" do
       else
         lambda { vocabulary = ActiveFacts::Input::CQL.readfile(cql_file) }.should_not raise_error
       end
+      vocabulary.finalise
 
       # Build and save the actual file:
       sql_text = sql(vocabulary)
+      Dir.mkdir "spec/actual" rescue nil
       File.open(actual_file, "w") { |f| f.write sql_text }
 
       pending("expected output file #{expected_file} not found") unless File.exists? expected_file

data/spec/cql_parse_spec.rb

@@ -20,6 +20,7 @@ describe "CQL Parser" do
     it "should load CQL #{cql_file} without parse errors" do
       broken = cql_failures[File.basename(cql_file, ".cql")]
 
+      vocabulary = nil
       if broken
         pending(broken) {
           lambda { vocabulary = ActiveFacts::Input::CQL.readfile(cql_file) }.should_not raise_error
@@ -27,6 +28,7 @@ describe "CQL Parser" do
       else
         lambda { vocabulary = ActiveFacts::Input::CQL.readfile(cql_file) }.should_not raise_error
       end
+      vocabulary.finalise
     end
   end
 end

data/spec/cql_ruby_spec.rb

@@ -38,6 +38,8 @@ describe "CQL Loader with Ruby output" do
     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')
 
+    next unless ENV["AFTESTS"] || File.exists?(expected_file)
+
     it "should load #{cql_file} and dump Ruby matching #{expected_file}" do
       vocabulary = nil
       broken = cql_failures[File.basename(cql_file, ".cql")]
@@ -48,9 +50,11 @@ describe "CQL Loader with Ruby output" do
       else
         vocabulary = ActiveFacts::Input::CQL.readfile(cql_file)
       end
+      vocabulary.finalise
 
       # 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

data/spec/cql_sql_spec.rb

@@ -33,6 +33,8 @@ describe "CQL Loader with SQL output" do
     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')
 
+    next unless ENV["AFTESTS"] || File.exists?(expected_file)
+
     it "should load #{cql_file} and dump SQL matching #{expected_file}" do
       vocabulary = nil
       broken = cql_failures[File.basename(cql_file, ".cql")]
@@ -43,9 +45,11 @@ describe "CQL Loader with SQL output" do
       else
         vocabulary = ActiveFacts::Input::CQL.readfile(cql_file)
       end
+      vocabulary.finalise
 
       # Build and save the actual file:
       sql_text = sql(vocabulary)
+      Dir.mkdir "spec/actual" rescue nil
       File.open(actual_file, "w") { |f| f.write sql_text }
 
       pending("expected output file #{expected_file} not found") unless File.exists? expected_file

data/spec/cqldump_spec.rb

@@ -4,6 +4,7 @@
 #
 
 require 'stringio'
+require 'activefacts'
 require 'activefacts/support'
 require 'activefacts/vocabulary'
 require 'activefacts/generate/cql'
@@ -58,15 +59,17 @@ END
   end
 
   def value_type(name, datatype = "String", length = 0, scale = 0)
-    dt = @constellation.ValueType(@vocabulary, datatype, :guid => :new)
-    vt = @constellation.ValueType(@vocabulary, name, :supertype => dt, :guid => :new)
+    dt = @constellation.ValueType[[@vocabulary.identifying_role_values, datatype]] ||
+	@constellation.ValueType(@vocabulary, datatype, :guid => :new)
+    vt = @constellation.ValueType[[@vocabulary.identifying_role_values, name]] ||
+	@constellation.ValueType(@vocabulary, name, :supertype => dt, :guid => :new)
     vt.length = length if length != 0
     vt.scale = scale if scale != 0
     vt
   end
 
   def one_to_many(one, many, reading)
-    # Join them with a fact type:
+    # Combine them with a fact type:
     ft = @constellation.FactType(:new)
     role0 = @constellation.Role(ft, 0, :object_type => one, :guid => :new)
     role1 = @constellation.Role(ft, 1, :object_type => many, :guid => :new)
@@ -88,7 +91,7 @@ END
   end
 
   def one_to_one(first, second, reading)
-    # Join them with a fact type:
+    # Combine them with a fact type:
     ft = @constellation.FactType(:new)
     role0 = @constellation.Role(ft, 0, :object_type => first, :guid => :new)
     role1 = @constellation.Role(ft, 1, :object_type => second, :guid => :new)

data/spec/helpers/parse_to_ast_matcher.rb

@@ -52,9 +52,13 @@ end
 
 RSpec::Matchers.define :fail_to_parse do |*error_regexp|
   match do |actual|
-    @parser = TestParser.new
-    @actual = actual
-    @result = @parser.parse_all(actual, :definition)
+    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

data/spec/helpers/test_parser.rb

@@ -1,5 +1,7 @@
 # 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     

data/spec/norma_cql_spec.rb

@@ -12,12 +12,12 @@ require 'activefacts/generate/cql'
 
 describe "Norma Loader" do
   orm_failures = {
-    "SubtypePI" => "Has an illegal uniqueness join constraint",
+    "SubtypePI" => "Has an illegal uniqueness constraint",
   }
   orm_cql_failures = {
     # "OddIdentifier" => "Strange identification pattern is incorrectly verbalised to CQL",  # Fixed
     "UnaryIdentification" => "No PI for VisitStatus",
-    "Supervision" => "Join constraints not imported from NORMA",
+    "Supervision" => "Derivations are not imported from NORMA",
   }
   # Generate and return the CQL for the given vocabulary
   def cql(vocabulary)
@@ -34,6 +34,8 @@ describe "Norma Loader" do
     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)
@@ -44,6 +46,7 @@ describe "Norma Loader" do
 
       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

data/spec/norma_ruby_spec.rb

@@ -19,7 +19,7 @@ end
 
 describe "NORMA Loader with Ruby output" do
   orm_failures = {
-    "SubtypePI" => "Has an illegal uniqueness join constraint",
+    "SubtypePI" => "Has an illegal uniqueness constraint",
   }
 
   # Generate and return the Ruby for the given vocabulary
@@ -37,6 +37,8 @@ describe "NORMA Loader with Ruby output" do
     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)
@@ -47,6 +49,7 @@ describe "NORMA Loader with Ruby output" do
 
       # 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

data/spec/norma_ruby_sql_spec.rb

@@ -13,7 +13,7 @@ require 'activefacts/generate/ruby'
 
 describe "Column lists from absorption compared with Ruby's" do
   orm_failures = {
-    "SubtypePI" => "Has an illegal uniqueness join constraint",
+    "SubtypePI" => "Has an illegal uniqueness constraint",
   }
   norma_ruby_failures = {
     "UnaryIdentification" => "No PI for VisitStatus",
@@ -35,6 +35,8 @@ describe "Column lists from absorption compared with Ruby's" do
     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)
@@ -49,6 +51,7 @@ describe "Column lists from absorption compared with Ruby's" do
 
       # 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]

data/spec/norma_sql_spec.rb

@@ -13,7 +13,7 @@ require 'activefacts/generate/sql/server'
 
 describe "NORMA Loader with SQL output" do
   orm_failures = {
-    "SubtypePI" => "Has an illegal uniqueness join constraint",
+    "SubtypePI" => "Has an illegal uniqueness constraint",
   }
   # Generate and return the SQL for the given vocabulary
   def sql(vocabulary)
@@ -30,6 +30,8 @@ describe "NORMA Loader with SQL output" do
     actual_file = orm_file.sub(%r{examples/norma/(.*).orm\Z}, 'spec/actual/\1.sql')
     base = File.basename(orm_file, ".orm")
 
+    next unless ENV["AFTESTS"] || File.exists?(expected_file)
+
     it "should load #{orm_file} and dump SQL matching #{expected_file}" do
       begin
         vocabulary = ActiveFacts::Input::ORM.readfile(orm_file)
@@ -40,6 +42,7 @@ describe "NORMA Loader with SQL output" do
 
       # Build and save the actual file:
       sql_text = sql(vocabulary)
+      Dir.mkdir "spec/actual" rescue nil
       File.open(actual_file, "w") { |f| f.write sql_text }
 
       pending("expected output file #{expected_file} not found") unless File.exists? expected_file

data/spec/norma_tables_spec.rb

@@ -18,14 +18,14 @@ require 'activefacts/input/orm'
 orm_failures = {
 }
 norma_table_exceptions = {
-  "Metamodel" => [[], %w{Agreement Enforcement}],                   # ActiveFacts absorbs Agreement into ContextNote, Enforcement into Constraint
+  "Metamodel" => [%w{Concept}, %w{Agreement Enforcement}],          # ActiveFacts absorbs Agreement into ContextNote, Enforcement into Constraint
   "MetamodelNext" => [[], %w{Agreement Enforcement TypeInheritance}],
   "Orienteering" => [%w{Punch}, []],                                # NORMA doesn't make a table for the IDENTITY field
   "OrienteeringER" => [%w{SeriesEvent}, []],                        # NORMA doesn't make a table for the IDENTITY field
   "RedundantDependency" => [%w{Politician StateOrProvince}, %w{LegislativeDistrict}],   # NORMA doesn't make a table for the 3 IDENTITY fields
   "Warehousing" => [%w{Product Warehouse}, []],                     # NORMA doesn't make a table for the IDENTITY field
   "ServiceDirector" => [%w{DataStoreService MonitorNotificationUser}, %w{DataStoreFileHostSystem }],
-  
+  "SeparateSubtype" => [%w{Claim}, %w{Incident}],
 }
   
 def extract_created_tables_from_sql sql_file

data/spec/ruby_api_spec.rb

@@ -17,7 +17,7 @@ describe "Requiring vocabularies in Ruby" do
     base = File.basename(ruby_file, ".rb")
     next if ruby_failures.include?(base)
     it "#{ruby_file} should load cleanly" do
-      require ruby_file
+      require "./"+ruby_file
     end
   end
 end

data/spec/spec_helper.rb

@@ -11,6 +11,8 @@ require 'helpers/file_matcher'
 require 'helpers/string_matcher'
 require 'helpers/parse_to_ast_matcher'
 
+Dir[File.dirname(__FILE__)+"/helpers/**rb"].each do |helper| require helper; end
+
 class String
   def strip_comments()
     c_comment = %r{/\*((?!\*/).)*\*/}m

data/spec/transform_surrogate_spec.rb

@@ -0,0 +1,59 @@
+#
+# ActiveFacts tests: Parse all CQL files and check the surrogate key transformation
+# Copyright (c) 2012 Clifford Heath. Read the LICENSE file.
+#
+
+require 'spec_helper'
+require 'stringio'
+require 'activefacts/vocabulary'
+require 'activefacts/support'
+require 'activefacts/input/cql'
+require 'activefacts/generate/absorption'
+require 'activefacts/generate/transform/surrogate'
+
+describe "CQL Loader with Surrogate transformation" do
+  cql_failures = {
+  }
+
+  pattern = ENV["AFTESTS"] || "*"
+  Dir["examples/CQL/#{pattern}.cql"].each do |cql_file|
+    expected_file = cql_file.sub(%r{/CQL/(.*).cql\Z}, '/transform-surrogate/\1.transform-surrogate')
+    actual_file = cql_file.sub(%r{examples/CQL/(.*).cql\Z}, 'spec/actual/\1.transform-surrogate')
+
+    next unless ENV["AFTESTS"] || File.exists?(expected_file)
+
+    it "should load #{cql_file} and make transformations like #{expected_file}" do
+      vocabulary = nil
+      broken = cql_failures[File.basename(cql_file, ".cql")]
+      if broken
+        pending(broken) {
+          vocabulary = ActiveFacts::Input::CQL.readfile(cql_file)
+        }
+      else
+        vocabulary = ActiveFacts::Input::CQL.readfile(cql_file)
+      end
+      vocabulary.finalise
+
+      # Build and save the actual file:
+      output = StringIO.new
+
+      transformer = ActiveFacts::Generate::Transform::Surrogate.new(vocabulary)
+      transformer.generate(output)
+
+      absorption = ActiveFacts::Generate::Absorption.new(vocabulary)
+      absorption.generate(output)
+
+      # Save the output from the StringIO:
+      output.rewind
+      transformed_text = output.read
+      Dir.mkdir "spec/actual" rescue nil
+      File.open(actual_file, "w") { |f| f.write transformed_text }
+
+      pending("expected output file #{expected_file} not found") unless File.exists? expected_file
+
+      expected_text = File.open(expected_file) {|f| f.read }
+      transformed_text.should_not differ_from(expected_text)
+      File.delete(actual_file)  # It succeeded, we don't need the file.
+    end
+  end
+end

metadata

@@ -1,36 +1,32 @@
 --- !ruby/object:Gem::Specification
 name: activefacts
 version: !ruby/object:Gem::Version
-  version: 0.8.16
-  prerelease: 
+  version: 0.8.18
 platform: ruby
 authors:
 - Clifford Heath
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-01 00:00:00.000000000 Z
+date: 2013-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activefacts-api
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.3
+        version: 0.9.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.3
+        version: 0.9.8
 - !ruby/object:Gem::Dependency
-  name: treetop
+  name: rbtree-pure
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -38,15 +34,27 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: treetop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.4.14
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.4.14
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -54,15 +62,27 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: dm-core
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: debugger
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -70,15 +90,13 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: dm-constraints
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -86,15 +104,13 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: dm-migrations
+  name: dm-core
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -102,15 +118,13 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: jeweler
+  name: dm-constraints
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -118,31 +132,27 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: dm-migrations
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.11.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.11.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: jeweler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -150,15 +160,27 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.11.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.11.0
 - !ruby/object:Gem::Dependency
   name: activefacts-api
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -166,7 +188,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -174,7 +195,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: treetop
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -182,7 +202,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -190,7 +209,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -198,7 +216,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -206,7 +223,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -214,7 +230,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -222,7 +237,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -230,7 +244,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -238,7 +251,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -246,7 +258,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -254,7 +265,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -262,7 +272,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -289,7 +298,6 @@ extensions:
 extra_rdoc_files:
 - LICENSE
 - README.rdoc
-- TODO
 files:
 - History.txt
 - LICENSE
@@ -359,7 +367,7 @@ files:
 - lib/activefacts/cql/compiler/expression.rb
 - lib/activefacts/cql/compiler/fact.rb
 - lib/activefacts/cql/compiler/fact_type.rb
-- lib/activefacts/cql/compiler/join.rb
+- lib/activefacts/cql/compiler/query.rb
 - lib/activefacts/cql/compiler/shared.rb
 - lib/activefacts/cql/compiler/value_type.rb
 - lib/activefacts/cql/nodes.rb
@@ -368,19 +376,24 @@ files:
 - lib/activefacts/generate/cql.rb
 - lib/activefacts/generate/dm.rb
 - lib/activefacts/generate/help.rb
+- lib/activefacts/generate/helpers/oo.rb
+- lib/activefacts/generate/helpers/ordered.rb
+- lib/activefacts/generate/helpers/rails.rb
 - lib/activefacts/generate/html/glossary.rb
 - lib/activefacts/generate/json.rb
 - lib/activefacts/generate/null.rb
-- lib/activefacts/generate/oo.rb
-- lib/activefacts/generate/ordered.rb
+- lib/activefacts/generate/rails/models.rb
+- lib/activefacts/generate/rails/schema.rb
 - lib/activefacts/generate/records.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/generate/transform/surrogate.rb
 - lib/activefacts/generate/version.rb
 - lib/activefacts/input/cql.rb
 - lib/activefacts/input/orm.rb
+- lib/activefacts/mapping/rails.rb
 - lib/activefacts/persistence.rb
 - lib/activefacts/persistence/columns.rb
 - lib/activefacts/persistence/foreignkey.rb
@@ -388,6 +401,7 @@ files:
 - lib/activefacts/persistence/object_type.rb
 - lib/activefacts/persistence/reference.rb
 - lib/activefacts/persistence/tables.rb
+- lib/activefacts/registry.rb
 - lib/activefacts/support.rb
 - lib/activefacts/version.rb
 - lib/activefacts/vocabulary.rb
@@ -436,12 +450,13 @@ files:
 - spec/norma_tables_spec.rb
 - spec/ruby_api_spec.rb
 - spec/spec_helper.rb
+- spec/transform_surrogate_spec.rb
 - status.html
 - why.html
-- TODO
 homepage: http://github.com/cjheath/activefacts
 licenses:
 - MIT
+metadata: {}
 post_install_message: For more information on ActiveFacts, see http://dataconstellation.com/ActiveFacts
 rdoc_options:
 - -S
@@ -452,25 +467,20 @@ rdoc_options:
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 3445837228112835093
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.1.10
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A semantic modeling and query language (CQL) and application runtime (the
   Constellation API)
 test_files: []