activefacts-api 1.9.10 → 1.9.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b2ae2f52c3b4809d9032158fab55e93634e6bb6f
-  data.tar.gz: 9da905e8331bf238bc7d4aebd1dc556181cc24b8
+  metadata.gz: 25d2b489a8eae8b845892def91b49758612dfdde
+  data.tar.gz: 8682af38486aad1436f16503398a1e8d74915a61
 SHA512:
-  metadata.gz: 8c5ab2949f5a5767f9e3eaa1951bbbe0de21bcbd2bb5a3469f127f17cae9ddbbfe0f5d184bcb6fcd6bd0d8a68cb80b683bb7abacf4e1dac3d0d2f33a77d3e0b5
-  data.tar.gz: d83db68561b25300a0ef71b753c0e983db8aacf35b6a7f0c48f5880772150801a4f7fcfc7e4ef1f90b4cbc361f3c9434c97cfa64bf72c621401961ce12c5c459
+  metadata.gz: 9506523f2552e1ae21b3e06f5c555b0bd5d99680e2d58b3f8bf6d13469e35193ee46119d9670dd2226f77c837e5a77730493a9f95f858d43402f065198b61c4c
+  data.tar.gz: 45dd288ac6fa9b6eccddf7579aba79e7e3dee85d3e1149f49fc5e4ebd26745a2ccd89f567eaa188d02bb460a1b0819385f23a1e749188184dab6f35eeee52573

data/lib/activefacts/api/constellation.rb

@@ -75,7 +75,8 @@ module ActiveFacts
       end
 
       def define_class_accessor m, klass
-        singleton_class.send(:define_method, m) do |*args|
+        singleton_class.
+          send(:define_method, m) do |*args|
             if args.size == 0
               # Return the collection of all instances of this class in the constellation:
               instances[klass]

data/lib/activefacts/api/entity.rb

@@ -32,9 +32,9 @@ module ActiveFacts
       end
 
       def initialize_existential_roles(klass, arg_hash)
-        # If overrides_identification_of, assign those attributes too (recursively)
-        if o = klass.overrides_identification_of
-          initialize_existential_roles(o, arg_hash)
+        # Assign the identifying attributes of all superclasses first
+        klass.supertypes_transitive.each do |supertype|
+          initialize_existential_roles(supertype, arg_hash)
         end
 
         irns = klass.identifying_role_names
@@ -159,9 +159,9 @@ module ActiveFacts
       # identified by this entity.  Save the current key and
       # class for each such instance.
       # This function is transitive!
-      def analyse_impacts role
-        impacts = []
-        impacted_roles = []
+      def collect_instance_index_updates role
+        instance_index_updates = []
+        propagation_roles = []
 
         # Consider the object itself and all its supertypes
         ([self.class]+self.class.supertypes_transitive).map do |supertype|
@@ -169,7 +169,7 @@ module ActiveFacts
 
           old_key = identifying_role_values(supertype)
           # puts "Need to reindex #{self.class} as #{supertype} from #{old_key.inspect}"
-          impacts << [constellation.instances[supertype], self, old_key]
+          instance_index_updates << [constellation.instances[supertype], self, old_key]
 
           supertype.
           all_role.
@@ -178,29 +178,29 @@ module ActiveFacts
             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
+              propagation_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]
+              instance_index_updates << [role_values, self, old_key]
             end
           end
         end
 
-        impacted_roles.each do |role|
+        propagation_roles.each do |role|
           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))
+            instance_index_updates.concat(counterpart.collect_instance_index_updates(role.counterpart))
           end
         end
-        impacts
+        instance_index_updates
       end
 
-      def apply_impacts impacts
-        impacts.each do |index, entity, old_key|
+      def apply_instance_index_updates instance_index_updates
+        instance_index_updates.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}"
 

data/lib/activefacts/api/instance.rb

@@ -77,14 +77,14 @@ module ActiveFacts
         # The counterpart roles get cleared automatically.
         klasses = [self.class]+self.class.supertypes_transitive
 
-        irvrvs = {}  # identifying_role_values by RoleValues
+        key_by_type = {}
         self.class.all_role_transitive.each do |_, role|
           next unless role.counterpart and
             role.unique and
             !role.counterpart.unique and
             counterpart = send(role.getter)
           role_values = counterpart.send(role.counterpart.getter)
-          irvrvs[role_values] = role_values.index_values(self)
+          key_by_type[role.object_type] ||= identifying_role_values(role.object_type)
         end
 
         # Nullify the counterpart role of objects we identify first, before damaging our identifying_role_values:
@@ -124,7 +124,7 @@ module ActiveFacts
                 counterpart_instance.send(counterpart.setter, nil, false)
               else
                 rv = counterpart_instance.send(role.counterpart.getter)
-                rv.delete_instance(self, irvrvs[rv])
+                rv.delete_instance(self, key_by_type[role.object_type])
 
                 if (rv.empty? && !counterpart_instance.class.is_entity_type)
                   counterpart_instance.retract if counterpart_instance.plays_no_role

data/lib/activefacts/api/object_type.rb

@@ -260,16 +260,16 @@ module ActiveFacts
 
           if role.is_identifying and (options&CHECKED_IDENTIFYING_ROLE) == 0
             check_identification_change_legality(role, value)
-            impacts = analyse_impacts(role)
+            instance_index_updates = collect_instance_index_updates(role)
           end
 
           instance_variable_set(role.variable, value)
 
-          if impacts
+          if instance_index_updates
             @constellation.when_admitted do
               # REVISIT: Consider whether we want to provide a way to find all instances
               # playing/not playing this boolean role, analogous to true.all_thing_as_role_name...
-              apply_impacts(impacts)    # Propagate dependent key changes
+              apply_instance_index_updates(instance_index_updates)    # Propagate dependent key changes
             end
           end
 
@@ -314,7 +314,7 @@ module ActiveFacts
             check_identification_change_legality(role, value)
 
             # puts "Starting to analyse impact of changing 1-1 #{role.inspect} to #{value.inspect}"
-            impacts = analyse_impacts(role)
+            instance_index_updates = collect_instance_index_updates(role)
           end
 
           instance_variable_set(role_var, value)
@@ -328,7 +328,7 @@ module ActiveFacts
             # Assign self to the new counterpart
             value.send(role.counterpart.setter, self, options) if value && (options&SKIP_MUTUAL_PROPAGATION) == 0
 
-            apply_impacts(impacts) if impacts   # Propagate dependent key changes
+            apply_instance_index_updates(instance_index_updates) if instance_index_updates   # Propagate dependent key changes
           end
 
           unless @constellation.loggers.empty? or options != 0
@@ -363,12 +363,12 @@ module ActiveFacts
             check_identification_change_legality(role, value)
 
             # puts "Starting to analyse impact of changing 1-N #{role.inspect} to #{value.inspect}"
-            impacts = analyse_impacts(role)
+            instance_index_updates = collect_instance_index_updates(role)
           end
 
           if old and (options&SKIP_MUTUAL_PROPAGATION) == 0
             old_role_values = old.send(getter = role.counterpart.getter)
-            old_key = old_role_values.index_values(self)
+            old_key = identifying_role_values(role.object_type)
           end
 
           instance_variable_set(role_var, value)
@@ -388,7 +388,7 @@ module ActiveFacts
               rv.add_instance(self, identifying_role_values(role.object_type))
             end
 
-            apply_impacts(impacts) if impacts   # Propagate dependent key changes
+            apply_instance_index_updates(instance_index_updates) if instance_index_updates   # Propagate dependent key changes
           end
 
           unless @constellation.loggers.empty? or options != 0

data/lib/activefacts/api/role_values.rb

@@ -11,6 +11,7 @@ module ActiveFacts
       attr_accessor :role
       attr_accessor :sort
       attr_accessor :index_roles
+
       def object_type
         @role.object_type
       end
@@ -21,7 +22,11 @@ module ActiveFacts
         @sort = API::sorted
         @excluded_role = excluded_role
         @a = @sort ? RBTree.new : []
-        (@index_roles = role.object_type.identifying_roles.dup).delete_at(@excluded_role) if @excluded_role
+        if @excluded_role
+          @index_roles = role.object_type.identifying_roles.dup
+          @index_roles.delete_at(@excluded_role)
+          @index_roles.freeze
+        end
       end
 
       def +(a)
@@ -68,17 +73,19 @@ module ActiveFacts
         KeyArray.new(a)
       end
 
+      # Return the full key for the object according to the object_type of this role
       def index_values object
-        if @index_roles
-          @index_roles.map{|r|
+        if @excluded_role
+          @index_roles.map do |r|
             role_value = object.send(r.name)
             role_value.identifying_role_values((c = r.counterpart) ? c.object_type : role_value.class)
-          }
+          end
         else
-          object.identifying_role_values
+          object.identifying_role_values(role.object_type)
         end
       end
 
+      # The key must include the excluded role, if any
       def add_instance(value, key)
         if @sort
           # Exclude the excluded role, if any:
@@ -89,9 +96,12 @@ module ActiveFacts
         end
       end
 
+      # The key must include the excluded role, if any
       def delete_instance(value, key)
         if @sort
-          # Exclude the excluded role, if any:
+          if key.size != role.object_type.identifying_roles.size
+            raise "Internal error: incorrectly-sized key #{key.inspect} to delete_instance"
+          end
           (key = key.dup).delete_at(@excluded_role) if @excluded_role
           deleted = @a.delete(form_key(key))
         else

data/lib/activefacts/api/support.rb

@@ -11,12 +11,6 @@ unless Object.const_defined?("Infinity")
   Infinity = 1.0/0.0
 end
 
-class Symbol #:nodoc:
-  def to_proc
-    Proc.new{|*args| args.shift.__send__(self, *args)}
-  end
-end
-
 class String #:nodoc:
   # This may be overridden by a version from ActiveSupport. For our purposes, either will work.
   def camelcase(first_letter = :upper)

data/lib/activefacts/api/version.rb

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

metadata

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