activefacts-api 1.9.9 → 1.9.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f86657355ff6c748b745dadd01508eb174992352
-  data.tar.gz: 874518fe95ea9674746018eb1e2d28fb12b92e2f
+  metadata.gz: b2ae2f52c3b4809d9032158fab55e93634e6bb6f
+  data.tar.gz: 9da905e8331bf238bc7d4aebd1dc556181cc24b8
 SHA512:
-  metadata.gz: 221ca6727dcfdde1389070a40aab5bc56133a51134ea346f82169bbe8239b9ae57c2bbc6c46cea22343107c1e4c0b64921957396707776b63f557a2c1192764b
-  data.tar.gz: b2f8b6dba4580ca1c9a3e7f15d6f8a7ffc20fdb197596b710aaaefbe132eaae12a865206d3490f9134cbdea2f47e94899b014a1c744f13f2606a2667a0afa18d
+  metadata.gz: 8c5ab2949f5a5767f9e3eaa1951bbbe0de21bcbd2bb5a3469f127f17cae9ddbbfe0f5d184bcb6fcd6bd0d8a68cb80b683bb7abacf4e1dac3d0d2f33a77d3e0b5
+  data.tar.gz: d83db68561b25300a0ef71b753c0e983db8aacf35b6a7f0c48f5880772150801a4f7fcfc7e4ef1f90b4cbc361f3c9434c97cfa64bf72c621401961ce12c5c459

data/lib/activefacts/api/entity.rb

@@ -91,11 +91,10 @@ module ActiveFacts
 
     public
       def inspect #:nodoc:
-        inc = constellation ? " in #{constellation.inspect}" : ""
         irnv = self.class.identifying_role_names.map do |role_name|
-          "@#{role_name}="+send(role_name).inspect
+          "#{role_name}: "+send(role_name).inspect
         end
-        "\#<#{self.class.basename}:#{object_id}#{inc} #{ irnv*' ' }>"
+        "<#{self.class.name} #{ irnv*', ' }>"
       end
 
       # When used as a hash key, the hash key of this entity instance is calculated
@@ -162,6 +161,7 @@ module ActiveFacts
       # This function is transitive!
       def analyse_impacts role
         impacts = []
+        impacted_roles = []
 
         # Consider the object itself and all its supertypes
         ([self.class]+self.class.supertypes_transitive).map do |supertype|
@@ -169,21 +169,28 @@ module ActiveFacts
 
           old_key = identifying_role_values(supertype)
           # puts "Need to reindex #{self.class} as #{supertype} from #{old_key.inspect}"
-          impacts << [supertype, self, old_key]
-        end
-
-        # Now consider objects whose identifiers include this object.
-        # Find our roles in those identifiers first.
-        impacted_roles = []
-        self.class.all_role_transitive.each do |n, role|
-          if role.counterpart && role.counterpart.is_identifying
-            # puts "Changing #{role.inspect} affects #{role.inspect}"
-            impacted_roles << role
+          impacts << [constellation.instances[supertype], self, old_key]
+
+          supertype.
+          all_role.
+          each do |role_name, propagation_role|
+            next if role == propagation_role  # Propagation has already been taken care of
+            next unless counterpart = propagation_role.counterpart  # And the role is not unary
+            if counterpart.is_identifying                         # This object identifies another
+              # puts "Changing #{propagation_role.inspect} affects #{counterpart.inspect}"
+              impacted_roles << propagation_role
+            else
+              next if counterpart.unique                          # But a one-to-many
+              next unless value = send(propagation_role.getter)   # A value is set
+              role_values = value.send(counterpart.getter)        # This is the index we have to change
+              # puts "Changing #{role.inspect} of a #{self.class} requires updating #{propagation_role.counterpart.inspect}"
+              impacts << [role_values, self, old_key]
+            end
           end
         end
 
         impacted_roles.each do |role|
-          affected_instances = Array(instance_variable_get(role.variable))
+          affected_instances = Array(send(role.getter))
           # puts "considering #{affected_instances.size} #{role.object_type.name} instances that include #{role.inspect}: #{affected_instances.map(&:identifying_role_values).inspect}"
           affected_instances.each do |counterpart|
             impacts.concat(counterpart.analyse_impacts(role.counterpart))
@@ -193,14 +200,13 @@ module ActiveFacts
       end
 
       def apply_impacts impacts
-        impacts.each do |klass, entity, old_key|
-          instance_index = entity.constellation.instances[klass]
-          new_key = entity.identifying_role_values(klass)
+        impacts.each do |index, entity, old_key|
+          new_key = entity.identifying_role_values(index.object_type)
           # puts "Reindexing #{klass} from #{old_key.inspect} to #{new_key.inspect}"
 
           if new_key != old_key
-            instance_index.delete(old_key)
-            instance_index[new_key] = entity
+            index.delete_instance(entity, old_key)
+            index.add_instance(entity, new_key)
           end
         end
       end

data/lib/activefacts/api/instance_index.rb

@@ -62,6 +62,7 @@ module ActiveFacts
     #
     class InstanceIndex
       attr_reader :sort
+      attr_reader :object_type
 
       # Should be in module ForwardableWithArityChecking
       def self.def_single_delegator(accessor, method, *expected_arities)
@@ -84,15 +85,23 @@ module ActiveFacts
       def_single_delegator :@hash, :values
       def_single_delegator :@hash, :keys
 
-      def initialize(constellation, klass, sort)
+      def initialize(constellation, object_type, sort)
         @constellation = constellation
-        @klass = klass
+        @object_type = object_type
         @sort = sort
         @hash = sort ? RBTree.new : {}
       end
 
       def inspect
-        "<InstanceIndex for #{@klass.name} in #{@constellation.inspect}>"
+        "<InstanceIndex for #{@object_type.name} in #{@constellation.inspect}>"
+      end
+
+      def add_instance(instance, k)
+        self[k] = instance
+      end
+
+      def delete_instance(instance, k)
+        @hash.delete(@sort ? form_key(k) : k)
       end
 
       def delete(k)
@@ -114,7 +123,7 @@ module ActiveFacts
 
       def refresh_key(old_key)
         value = @hash.delete(@sort ? form_key(old_key) : old_key)
-        new_key = value.identifying_role_values(@klass)
+        new_key = value.identifying_role_values(@object_type)
         @hash[@sort ? form_key(new_key) : new_key] = value if value
       end
 

data/lib/activefacts/api/role_values.rb

@@ -84,7 +84,6 @@ module ActiveFacts
           # Exclude the excluded role, if any:
           (key = key.dup).delete_at(@excluded_role) if @excluded_role
           @a[form_key(key)] = value
-          # Old slow way:  @a[form_key(index_values(value))] = value
         else
           @a << value
         end
@@ -92,6 +91,8 @@ module ActiveFacts
 
       def delete_instance(value, key)
         if @sort
+          # Exclude the excluded role, if any:
+          (key = key.dup).delete_at(@excluded_role) if @excluded_role
           deleted = @a.delete(form_key(key))
         else
           deleted = @a.delete(value)  # Slow: it has to search the array

data/lib/activefacts/api/version.rb

@@ -1,5 +1,5 @@
 module ActiveFacts
   module API
-    VERSION = "1.9.9"
+    VERSION = "1.9.10"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activefacts-api
 version: !ruby/object:Gem::Version
-  version: 1.9.9
+  version: 1.9.10
 platform: ruby
 authors:
 - Clifford Heath