activefacts 0.7.1 → 0.7.2

data/spec/absorption_spec.rb

@@ -43,7 +43,7 @@ describe "Absorption" do
         #{Prologue}
         Month is in exactly one Season;
       },
-      :tables => { "Month" => [ "MonthValue", "Season" ] }
+      :tables => { "Month" => [["Month", "Value"], ["Season"]] }
     },
 
     { :should => "absorb a one-to-one along the identification path",

data/spec/cql_symbol_tables_spec.rb

@@ -101,7 +101,7 @@ describe "CQL Symbol table" do
     it "should define #{description}" do
       if result
         # Predefine an entity type, some cases use it:
-        @constellation.EntityType("Person", @vocabulary.identifying_role_values)
+        @constellation.EntityType(@vocabulary.identifying_role_values, "Person")
 
         player, bound = @symbols.bind(*args)
         player.should_not be_nil

data/spec/cqldump_spec.rb

@@ -17,8 +17,8 @@ describe "CQL Dumper" do
   setup do
     @constellation = ActiveFacts::API::Constellation.new(ActiveFacts::Metamodel)
     @vocabulary = @constellation.Vocabulary("TestVocab")
-    @string_type = @constellation.ValueType("String", @vocabulary)
-    @integer_type = @constellation.ValueType("Integer", @vocabulary)
+    @string_type = @constellation.ValueType(@vocabulary, "String")
+    @integer_type = @constellation.ValueType(@vocabulary, "Integer")
     @dumper = ActiveFacts::Generate::CQL.new(@constellation)
   end
 
@@ -30,7 +30,7 @@ describe "CQL Dumper" do
   end
 
   it "should dump a String ValueType" do
-    vt = @constellation.ValueType("Name", @vocabulary, :supertype => @string_type, :length => 20)
+    vt = @constellation.ValueType(@vocabulary, "Name", :supertype => @string_type, :length => 20)
     vt.supertype = @string_type
     vt.length = 20
     #p vt.class.roles.keys.sort_by{|s| s.to_s}
@@ -47,7 +47,7 @@ END
   end
 
   it "should dump an Integer ValueType" do
-    vt = @constellation.ValueType("Count", @vocabulary, :supertype => @integer_type, :length => 32)
+    vt = @constellation.ValueType(@vocabulary, "Count", :supertype => @integer_type, :length => 32)
     cql.should == <<END
 vocabulary TestVocab;
 
@@ -60,8 +60,8 @@ END
   end
 
   def value_type(name, datatype = "String", length = 0, scale = 0)
-    dt = @constellation.ValueType(datatype, @vocabulary)
-    vt = @constellation.ValueType(name, @vocabulary, :supertype => dt)
+    dt = @constellation.ValueType(@vocabulary, datatype)
+    vt = @constellation.ValueType(@vocabulary, name, :supertype => dt)
     vt.length = length if length != 0
     vt.scale = scale if scale != 0
     vt
@@ -143,8 +143,8 @@ END
   end
 
   it "should dump an named EntityType" do
-    vt = @constellation.ValueType("Name", @vocabulary, :supertype => @string_type, :length => 20)
-    et = @constellation.EntityType("Company", @vocabulary)
+    vt = @constellation.ValueType(@vocabulary, "Name", :supertype => @string_type, :length => 20)
+    et = @constellation.EntityType(@vocabulary, "Company")
 
     ft = one_to_one(et, vt, "{0} is called {1}")
 

data/spec/norma_tables_spec.rb

@@ -19,7 +19,7 @@ include ActiveFacts::Metamodel
 Exceptions = {
   "Blog" => ["Author", "Comment", "Paragraph", "Post", "Topic"],
   "JoinEquality" => ["Event", "Seat", "Ticket", "Venue"],
-  "Metamodel" => ["AllowedRange", "Constraint", "Correspondence", "Derivation", "Fact", "FactType", "Feature", "Instance", "JoinPath", "Reading", "Role", "RoleRef", "RoleSequence", "RoleValue", "SetComparisonRoles", "Unit", "ValueRestriction"],
+  "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"],
   "OilSupply" => ["AcceptableSubstitutes", "Month", "ProductionForecast", "RegionalDemand", "TransportRoute"],
   "Orienteering" => ["Club", "Entry", "Event", "EventControl", "EventScoringMethod", "Map", "Person", "Punch", "PunchPlacement", "Series", "Visit"],

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: activefacts
 version: !ruby/object:Gem::Version 
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors: 
 - Clifford Heath
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-23 00:00:00 +11:00
+date: 2009-01-31 00:00:00 +11:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -83,8 +83,11 @@ files:
 - 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
@@ -112,6 +115,7 @@ files:
 - 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/reference.rb
@@ -174,7 +178,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: cjheath@rubyforge.org
-rubygems_version: 1.2.0
+rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2
 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