card-mod-counts 0.1 → 0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 07bf8f2a2e551a3ba76bb0a9be5acc9f60d06eafe89acdf74756e3fb69a49280
-  data.tar.gz: 8a033c80c7e6b778bd34f9c4be1402b73d7fb69daf5a9f16287fac5c88ca1b34
+  metadata.gz: a140a2c877d847b1db64601670fceed0c71f192f254209c666b45385bd60702f
+  data.tar.gz: 3dac501b4bec70164cf19b5f23e9f38c0f3b470f56b541b0dcb46e7358a1ea1b
 SHA512:
-  metadata.gz: 39ed100f2208371f60233693c7b04d6d0e42f8519bbf58259ac83f54e3944e331c487a0313178a3fe3422714f5174bf87bb08f2348351292ba63a6b6d2fb11c0
-  data.tar.gz: '08f255b8eb96a16f2a4ee5e023fab2d54bb3562dc7f39f8095f4c08ad55a62b271ee274594f420249ecdcfab2c7d5bcda4831df53e5847d93ae9207cb560cdf1'
+  metadata.gz: 992719450d8a926a71793e064603fca794be95b2844ba99c0b8a6c649f5575180d25ffe7125b384e79d41e74b6ef81da9cfd5e5474d1f862cdf5d8e279349a19
+  data.tar.gz: 81a9b8edc4bbd66da11673ad7f789ea9533c35b1151b924438c1a2dd08432fb4582ed53e02aa75d4d0c112d03745387c8750340b7628c6cbeb25519555f57b57

data/set/abstract/01_cached_count.rb

@@ -10,10 +10,6 @@ def cached_count
   @cached_count || hard_cached_count(::Count.fetch_value(self))
 end
 
-def update_cached_count _changed_card=nil
-  hard_cached_count ::Count.refresh(self)
-end
-
 def hard_cached_count value
   Card.cache.hard&.write_attribute key, :cached_count, value
   @cached_count = value
@@ -27,6 +23,15 @@ def recount
   count
 end
 
+event :update_cached_count, :integrate_with_delay, trigger: :required  do
+  hard_cached_count ::Count.refresh(self)
+end
+
+# cannot delay event without id
+def update_cached_count_when_ready
+  send "update_cached_count#{'_without_callbacks' if new?}"
+end
+
 module ClassMethods
   # @param parts [Array] set parts of changed card
   def recount_trigger *set_parts, &block
@@ -36,6 +41,8 @@ module ClassMethods
     define_recount_event set, event_name, event_args, &block
   end
 
+  # use in cases where both the base card and the field card can trigger counting
+  # (prevents double work)
   def field_recount field_card
     yield unless field_card.left&.action&.in? %i[create delete]
   end
@@ -45,9 +52,7 @@ module ClassMethods
   def define_recount_event set, event_name, event_args
     set.class_eval do
       event event_name, :after_integrate, event_args do
-        Array.wrap(yield(self)).compact.each do |count_card|
-          count_card.update_cached_count self if count_card.respond_to? :recount
-        end
+        Array.wrap(yield(self)).compact.each(&:update_cached_count_when_ready)
       end
     end
   end

data/set/abstract/list_ref_cached_count.rb

@@ -17,9 +17,10 @@ def self.included host_class
     recount_trigger :type_plus_right,
                     host_class.type_to_count,
                     host_class.list_field do |changed_card|
-      trait_name = host_class.try(:count_trait) || host_class.type_to_count
+      field_code = host_class.try(:count_field) || host_class.type_to_count
+
       changed_card.changed_item_names.map do |item_name|
-        Card.fetch item_name.to_name.trait(trait_name)
+        Card.fetch item_name.to_name.field(field_code)
       end
     end
 

data/set/abstract/pointer/events.rb

@@ -0,0 +1,22 @@
+# Abstract::ListRefCachedCount needs to know which items have been changed.
+# But the standard ActiveModel dirty/mutations mechanism for this is not serializable
+# and therefore cannot be thus preserved for delayed jobs (when the cached counting
+# now takes place.)
+#
+# In the long term it would be preferable to have a more general solution, but for
+# now we are just stashing
+
+# Card.action_specific_attributes << :changed_item_names
+#
+# # make these available in delayed jobs
+# event :stash_changed_item_names, :after_integrate do
+#   @changed_item_names = changed_item_names.map(&:to_s)
+# end
+#
+# def changed_item_names
+#   if @changed_item_names
+#     @changed_item_names.map(&:to_name)
+#   else
+#     dropped_item_names + added_item_names
+#   end
+# end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: card-mod-counts
 version: !ruby/object:Gem::Version
-  version: '0.1'
+  version: '0.2'
 platform: ruby
 authors:
 - Philipp Kühl
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-26 00:00:00.000000000 Z
+date: 2021-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: card
@@ -55,6 +55,7 @@ files:
 - set/abstract/02_search_cached_count.rb
 - set/abstract/list_cached_count.rb
 - set/abstract/list_ref_cached_count.rb
+- set/abstract/pointer/events.rb
 homepage: http://decko.org
 licenses:
 - GPL-3.0
@@ -75,7 +76,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.28
+rubygems_version: 3.2.15
 signing_key:
 specification_version: 4
 summary: caching of counts