activefacts 1.0.2 → 1.1.0

data/spec/cql/contractions_spec.rb

@@ -176,7 +176,7 @@ describe "When compiling a query, " do
     end
 
     it "and should project the fact type roles from the query" do
-      pending "Plays are not yet projected" do
+      skip "Plays are not yet projected" do
         query = derivation(fact_type)
         queries = fact_type.all_role.map{|r| r.all_play.map{|play| play.query}}.flatten.uniq
         queries.size == 1

data/spec/cql/entity_type_spec.rb

@@ -307,7 +307,7 @@ describe "When compiling an entity type, " do
             test.call(@compiler.vocabulary.constellation)
           rescue RSpec::Expectations::ExpectationNotMetError
             raise
-          rescue RSpec::Core::Pending::PendingDeclaredInExample.new
+          rescue RSpec::Core::Pending::PendingDeclaredInExample
             raise
           rescue => e
             puts "Failed on\n\t"+tests.select{|t| t.is_a?(String)}*" "

data/spec/cql/fact_type_matching_spec.rb

@@ -69,7 +69,7 @@ describe "When matching a reading" do
       end
 
       it "should remove duplicate new readings" do
-        pending("duplicate new clauses cause an error") do
+        skip("duplicate new clauses cause an error") do
           compile %q{
               Girl is going out with Boy,
                 Girl is going out with Boy,
@@ -99,7 +99,7 @@ describe "When matching a reading" do
           }
         (new_fact_types = fact_types).size.should == 1
         (readings = (fact_type = new_fact_types[0]).all_reading.to_a).size.should == 2
-        readings.detect{|r| r.text =~ /semi-trailer/}.should be_true
+        readings.detect{|r| r.text =~ /semi-trailer/}.should be_truthy
         (pcs = fact_pcs(fact_type)).size.should == 1
       end
 
@@ -112,7 +112,7 @@ describe "When matching a reading" do
       end
 
       it "should match role names" do
-        pending("duplicate new clauses cause an error") do
+        skip("duplicate new clauses cause an error") do
           compile %q{
               Girl (as Girlfriend) is going out with Boy,
               Boy is going out with Girlfriend;

data/spec/cql/role_matching_spec.rb

@@ -78,7 +78,7 @@ describe "When comparing roles of a reading with an existing reading" do
       side_effects.size.should == 2
       side_effects[0].should_not be_nil
       side_effects[1].should be_nil
-      pending side_effects[0].to_s
+      skip side_effects[0].to_s
       side_effects[0].to_s.should == '[{bad- Boy} absorbs 0/0 at 0 with residual adjectives, {Girl} absorbs 0/0 at 5] with residual adjectives'
       #side_effects[1].to_s.should == ''
     end
@@ -91,7 +91,7 @@ describe "When comparing roles of a reading with an existing reading" do
       @asts.size.should == 1
       side_effects = match_readings_to_existing(@asts[0], @ugly_ft.all_reading.single)
       side_effects.size.should == 2
-      pending "Matched adjectives must be removed and the role rebound before deciding whether residual adjectives have a purpose" do
+      skip "Matched adjectives must be removed and the role rebound before deciding whether residual adjectives have a purpose" do
         side_effects[0].should_not be_nil
         puts side_effects[0].to_s
         #side_effects.to_s.should == ''
@@ -103,7 +103,7 @@ describe "When comparing roles of a reading with an existing reading" do
       parse %q{Boy-monster hurts Girl;}
       @asts.size.should == 1
       side_effects = match_readings_to_existing(@asts[0], @hurts_ft.all_reading.single)
-      pending "Thinks trailing adjectives are always residual"
+      skip "Thinks trailing adjectives are always residual"
       side_effects[0].should_not be_nil
       side_effects[0].to_s.should == ''
     end
@@ -137,7 +137,7 @@ describe "When comparing roles of a reading with an existing reading" do
       side_effects = match_readings_to_existing(@asts[0], @hurts_ft.all_reading.single)
       side_effects.size.should == 2
 
-      pending "Matched adjectives must be removed and the role rebound before deciding whether residual adjectives have a purpose" do
+      skip "Matched adjectives must be removed and the role rebound before deciding whether residual adjectives have a purpose" do
         side_effects[0].should_not be_nil
         puts side_effects.to_s
         # side_effects.to_s.should == ''

data/spec/cql/samples_spec.rb

@@ -181,7 +181,7 @@ describe "Sample data" do
           @vocabulary = ActiveFacts::Input::CQL.readstring(@text)
 	  @vocabulary.finalise
         rescue => exception
-          if debug :exception
+          if trace :exception
             puts "#{exception.message}"
             puts "\t#{exception.backtrace*"\n\t"}"
           end
@@ -206,7 +206,7 @@ describe "Sample data" do
         begin
           @vocabulary = ActiveFacts::Input::CQL.readstring(@text)
         rescue => exception
-          if debug :exception
+          if trace :exception
             puts "#{exception.message}"
             puts "\t#{exception.backtrace*"\n\t"}"
           end

data/spec/cql_cql_spec.rb

@@ -47,7 +47,7 @@ describe "CQL Loader" do
         begin
           vocabulary = ActiveFacts::Input::CQL.readfile(cql_file)
         rescue => e
-          debug :exception, "#{e.message}\n" +
+          trace :exception, "#{e.message}\n" +
             "\t#{e.backtrace*"\n\t"}"
           raise
         end

data/spec/helpers/array_matcher.rb

@@ -1,6 +1,6 @@
 RSpec::Matchers.define :be_different_array_from do |x|
   match do |actual|
-    perform_match(actual, expected)
+    perform_match(actual, expected_as_array)
     @extra + @missing != []
   end
 

data/spec/norma_ruby_sql_spec.rb

@@ -65,7 +65,7 @@ describe "Column lists from absorption compared with Ruby's" do
             begin
               eval_it.call
             rescue => exception
-              if debug :exception
+              if trace :exception
                 puts exception.to_s+": \n\t"+exception.backtrace*"\n\t"
               end
               raise
@@ -77,7 +77,7 @@ describe "Column lists from absorption compared with Ruby's" do
           begin
             eval_it.call
           rescue => exception
-            if debug :exception
+            if trace :exception
               puts exception.to_s+": \n\t"+exception.backtrace*"\n\t"
             end
             raise

data/spec/norma_tables_spec.rb

@@ -18,12 +18,13 @@ require 'activefacts/input/orm'
 orm_failures = {
 }
 norma_table_exceptions = {
-  "Metamodel" => [%w{Query}, %w{Agreement Enforcement Comment ContactReport ID Money Nr Photo ReferenceCheck Resource TimeDivision}],          # ActiveFacts absorbs Agreement into ContextNote, Enforcement into Constraint, lots into Concept
+  "Corporate" => [%w{}, %w{Comment ContactReport ID Money Name Nr Photo ReferenceCheck Resource TimeDivision}],          # ActiveFacts absorbs Agreement into ContextNote, Enforcement into Constraint, lots into Concept
+  "Metamodel" => [%w{Query}, %w{Agreement Enforcement Comment ContactReport ID Money Nr Photo ReferenceCheck Resource TimeDivision Constraint ContextNote Fact Instance Query Unit}],          # ActiveFacts absorbs Agreement into ContextNote, Enforcement into Constraint, lots into Concept
   "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
+  "Warehousing" => [%w{Product Warehouse}, %w{Dispatch Receipt}],                     # NORMA doesn't make a table for the IDENTITY field
   "ServiceDirector" => [%w{DataStoreService MonitorNotificationUser}, %w{DataStoreFileHostSystem }],
   "SeparateSubtype" => [%w{Claim}, %w{Incident}],
 }

metadata

@@ -1,236 +1,216 @@
 --- !ruby/object:Gem::Specification
 name: activefacts
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors:
 - Clifford Heath
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-25 00:00:00.000000000 Z
+date: 2015-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activefacts-api
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
-    - - ~>
+        version: '1.7'
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
-    - - ~>
+        version: '1.7'
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1'
 - !ruby/object:Gem::Dependency
   name: rbtree-pure
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.1
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.1
-    - - ~>
+    - - "~>"
       - !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
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.4.14
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.4'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.6'
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.6'
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1'
-- !ruby/object:Gem::Dependency
-  name: debugger
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4'
 - !ruby/object:Gem::Dependency
   name: dm-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.2'
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.2'
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1'
 - !ruby/object:Gem::Dependency
   name: dm-constraints
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.2'
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.2'
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1'
 - !ruby/object:Gem::Dependency
   name: dm-migrations
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.2'
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.2'
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1'
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.0'
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.0'
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.11.0
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.11.0
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.11'
-description: ! '
+description: |2
 
   ActiveFacts provides a semantic modeling language, the Constellation
-
   Query Language (CQL).  CQL combines natural language verbalisation and
-
   formal logic, producing a formal language that reads like plain
-
   English. ActiveFacts converts semantic models from CQL to relational
-
   and object models in SQL, Ruby and other languages.
-
-'
 email: cjh@dataconstellation.com
 executables:
 - afgen
@@ -395,21 +375,20 @@ licenses:
 metadata: {}
 post_install_message: 
 rdoc_options:
-- -S
-- -x
+- "-x"
 - lib/activefacts/cql/.*.rb
-- -x
+- "-x"
 - lib/activefacts/vocabulary/.*.rb
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []