activefacts-api 0.9.4 → 0.9.5

data/VERSION

@@ -1 +1 @@
-0.9.4
+0.9.5

data/activefacts-api.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "activefacts-api"
-  s.version = "0.9.4"
+  s.version = "0.9.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Clifford Heath"]
-  s.date = "2013-01-14"
+  s.date = "2013-01-16"
   s.description = "\nThe ActiveFacts API is a Ruby DSL for managing constellations of elementary facts.\nEach fact is either existential (a value or an entity), characteristic (boolean) or\nbinary relational (A rel B). Relational facts are consistently co-referenced, so you\ncan traverse them efficiently in any direction. Each constellation maintains constraints\nover the fact population.\n"
   s.email = "clifford.heath@gmail.com"
   s.extra_rdoc_files = [

data/lib/activefacts/api/entity.rb

@@ -205,7 +205,7 @@ module ActiveFacts
 	      next if existing_value == new_key	  # This can happen when the counterpart is a value type
 
 	      existing_key = existing_value.identifying_role_values
-	      next if existing_key.identifying_role_values == new_key
+	      next if existing_key == new_key
 	      raise TypeConflictException.new(basename, supertype, new_key, existing_key)
 	    end
 	  end
@@ -266,7 +266,8 @@ module ActiveFacts
 	      end
 	    elsif proto
 	      value = proto.send(n)
-	      arg_hash[n] = value.identifying_role_values # Save the value for making a new instance
+	      value = value.identifying_role_values
+	      arg_hash[n] = value # Save the value for making a new instance
 	      next value if (role.is_unary)
 	    else
 	      value = nil

data/lib/activefacts/api/instance.rb

@@ -46,7 +46,7 @@ module ActiveFacts
 	  if last_irns != irns
 	    last_identity = identifying_role_values(klass)
 	    role_position = irns.index(role.name)
-	    last_identity[role_position] = value
+	    last_identity[role_position] = value.identifying_role_values
 	  end
 	  @constellation.instances[klass][last_identity]
         end

data/lib/activefacts/api/instance_index.rb

@@ -4,7 +4,6 @@
 #
 # Copyright (c) 2009 Clifford Heath. Read the LICENSE file.
 #
-
 require 'forwardable'
 
 module ActiveFacts
@@ -35,28 +34,17 @@ module ActiveFacts
       end
 
       def []=(key, value)   #:nodoc:
-        @hash[flatten_key(key)] = value
+        @hash[key] = value
       end
 
       def [](key)
-        @hash[flatten_key(key)]
+        @hash[key]
       end
 
       def refresh_key(key)
         value = @hash.delete(key)
         @hash[value.identifying_role_values] = value if value
       end
-
-      private
-      def flatten_key(key)
-        if key.is_a?(Array)
-          key.map { |identifier| flatten_key(identifier) }
-        elsif key.respond_to?(:identifying_role_values)
-          key.identifying_role_values
-        else
-          key
-        end
-      end
     end
   end
 end

data/spec/constellation/instance_index_spec.rb

@@ -51,7 +51,7 @@ describe ActiveFacts::API::InstanceIndex do
 
   describe "#flatten_key" do
     it "should use identifying role values when using an entity type" do
-      @constellation.EntityA[@a].should == @a
+      @constellation.EntityA[@a.identifying_role_values].should == @a
     end
 
     it "should recursively try to use identifying role values within an array" do

data/spec/constellation/instance_spec.rb

@@ -171,7 +171,7 @@ describe "An instance of every type of ObjectType" do
     @test_by_date_time_entity = @constellation.TestByDateTimeEntity(@test_by_date_time)
     @test_by_decimal_entity = @constellation.TestByDecimalEntity(@test_by_decimal)
     @test_by_guid_entity = @constellation.TestByGuidEntity(@test_by_guid)
-    @constellation.TestByGuidEntity[[@test_by_guid]].should_not be_nil
+    @constellation.TestByGuidEntity[[@test_by_guid.identifying_role_values]].should_not be_nil
 
     # Entity subtypes
     @test_sub_by_int = @constellation.TestSubByInt(2*2)

data/spec/object_type/entity_type/multipart_identification_spec.rb

@@ -31,9 +31,10 @@ describe "Multi-part identifiers" do
   end
 
   it "should allow children to be found in the instance index" do
-    @c.Child[[@p, 0]].should == @c0
-    @c.Child[[@p, 1]].should == @c1
-    @c.Child[[@p, 2]].should == @c2
+    pv = @p.identifying_role_values
+    @c.Child[[pv, 0]].should == @c0
+    @c.Child[[pv, 1]].should == @c1
+    @c.Child[[pv, 2]].should == @c2
   end
 
   it "should sort child keys in the instance index" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activefacts-api
 version: !ruby/object:Gem::Version
-  version: 0.9.4
+  version: 0.9.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-14 00:00:00.000000000 Z
+date: 2013-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -255,7 +255,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4472389217963530963
+      hash: 1210306376532031473
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: