thredded 0.16.15 → 0.16.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ac00c63103252bbf9bff35aa057a6630605ad897368010665476b8b4d2abfc3a
-  data.tar.gz: cf7c0937115c8967c8fed0ba5789e4445db0a9e8b098a3109563b63be3883059
+  metadata.gz: 8b60a5b76cbbde2198978ed1130913cb72ed1d85e6dbca1020b529eb94a35c46
+  data.tar.gz: ee2fe30289d73591eef33ee5355715fa313437a694abb8dedb6f876545547a25
 SHA512:
-  metadata.gz: cd1d9295ea54d35b3f6f1ac48f741b2766645c118b4519b717d5c4f87d926be12492ff2f4b76449088dfe2357b10e518b28442c76ac2998c19614ea2d3631603
-  data.tar.gz: 6d8892713aba82af3017146f0c4f5f8238af39842f4536640689915fa3833b68dc63023502c23e1311a63b6dd45aec0c02c14e4be3367fa6b67e3a471df70caf
+  metadata.gz: 1cec58bb0b89b1e7d9174821be631eb85db63ba82cc315dd7c47c97d6a917eba53fb2179d65f22375a92d84d12023785984a8852349d6d63b4abcd044ef774c4
+  data.tar.gz: ac9efa6f7844dbcb56cc900fd59c9eb32538a00735ad8a8335f5c61d9c3c33ababff6f324a1445a5c9e2ae32bd90ba6fb43002cf5b83f02cf143a816d525d635

data/README.md

@@ -96,7 +96,7 @@ Then, see the rest of this Readme for more information about using and customizi
 Add the gem to your Gemfile:
 
 ```ruby
-gem 'thredded', '~> 0.16.15'
+gem 'thredded', '~> 0.16.16'
 ```
 
 Add the Thredded [initializer] to your parent app by running the install generator.

data/app/view_models/thredded/post_view.rb

@@ -13,6 +13,7 @@ module Thredded
              :blocked?,
              :last_moderation_record,
              :cache_key,
+             :cache_version,
              :cache_key_with_version,
              to: :@post
 

data/lib/thredded/collection_to_strings_with_cache_renderer.rb

@@ -26,13 +26,12 @@ module Thredded
       collection = collection.to_a
       instrument(:collection, identifier: template.identifier, count: collection.size) do |instrumentation_payload|
         return [] if collection.blank?
-        keyed_collection = collection.each_with_object({}) do |item, hash|
-          key = ActiveSupport::Cache.expand_cache_key(
-            view_context.cache_fragment_name(item, virtual_path: template.virtual_path), :views
-          )
-          # #read_multi & #write may require key mutability, Dalli 2.6.0.
-          hash[key.frozen? ? key.dup : key] = item
-        end
+
+        # Result is a hash with the key represents the
+        # key used for cache lookup and the value is the item
+        # on which the partial is being rendered
+        keyed_collection, ordered_keys = collection_by_cache_keys(collection, view_context, template)
+
         cache = collection_cache
         cached_partials = cache.read_multi(*keyed_collection.keys)
         instrumentation_payload[:cache_hits] = cached_partials.size if instrumentation_payload
@@ -44,9 +43,9 @@ module Thredded
           partial: partial, locals: locals, **opts
         ).each
 
-        keyed_collection.map do |cache_key, item|
-          [item, cached_partials[cache_key] || rendered_partials.next.tap do |rendered|
-            cache.write(cache_key, rendered, expires_in: expires_in)
+        ordered_keys.map do |cache_key|
+          [keyed_collection[cache_key], cached_partials[cache_key] || rendered_partials.next.tap do |rendered|
+            cached_partials[cache_key] = cache.write(cache_key, rendered, expires_in: expires_in)
           end]
         end
       end
@@ -54,16 +53,24 @@ module Thredded
 
     private
 
-    def collection_cache
-      if ActionView::PartialRenderer.respond_to?(:collection_cache)
-        # Rails 5.0+
-        ActionView::PartialRenderer.collection_cache
-      else
-        # Rails 4.2.x
-        Rails.application.config.action_controller.cache_store
+    def collection_by_cache_keys(collection, view, template)
+      digest_path = digest_path_from_template(view, template)
+
+      collection.each_with_object([{}, []]) do |item, (hash, ordered_keys)|
+        key = expanded_cache_key(item, view, template, digest_path)
+        ordered_keys << key
+        hash[key] = item
       end
     end
 
+    def expanded_cache_key(key, view, template, digest_path)
+      key = combined_fragment_cache_key(
+        view,
+        cache_fragment_name(view, key, virtual_path: template.virtual_path, digest_path: digest_path)
+      )
+      key.frozen? ? key.dup : key # #read_multi & #write may require mutability, Dalli 2.6.0.
+    end
+
     # @return [Array<String>]
     def render_partials(view_context, collection:, render_threads:, **opts)
       return [] if collection.empty?
@@ -72,7 +79,13 @@ module Thredded
         render_partials_serial(view_context, collection, opts)
       else
         collection.each_slice(collection.size / num_threads).map do |slice|
-          Thread.start { render_partials_serial(view_context.dup, slice, opts) }
+          Thread.start do
+            # `ActionView::PartialRenderer` mutates the contents of `opts[:locals]`, `opts[:locals][:as]` in particular:
+            # https://github.com/rails/rails/blob/v6.0.2.1/actionview/lib/action_view/renderer/partial_renderer.rb#L379
+            # https://github.com/rails/rails/blob/v6.0.2.1/actionview/lib/action_view/renderer/partial_renderer.rb#L348-L356
+            opts[:locals] = opts[:locals].dup if opts[:locals]
+            render_partials_serial(view_context.dup, slice, opts)
+          end
         end.flat_map(&:value)
       end
     end
@@ -86,11 +99,59 @@ module Thredded
       collection.map { |object| render_partial(partial_renderer, view_context, opts.merge(object: object)) }
     end
 
+    if Rails::VERSION::MAJOR >= 5
+      def collection_cache
+        ActionView::PartialRenderer.collection_cache
+      end
+    else
+      def collection_cache
+        Rails.application.config.action_controller.cache_store
+      end
+    end
+
+    if Rails::VERSION::MAJOR > 5 || (Rails::VERSION::MAJOR == 5 && Rails::VERSION::MINOR >= 2)
+      def combined_fragment_cache_key(view, key)
+        view.combined_fragment_cache_key(key)
+      end
+    elsif Rails::VERSION::MAJOR >= 5
+      def combined_fragment_cache_key(view, key)
+        view.fragment_cache_key(key)
+      end
+    else
+      def combined_fragment_cache_key(view, key)
+        view.controller.fragment_cache_key(key)
+      end
+    end
+
     if Rails::VERSION::MAJOR >= 6
+      def cache_fragment_name(view, key, virtual_path:, digest_path:)
+        view.cache_fragment_name(key, virtual_path: virtual_path, digest_path: digest_path)
+      end
+
+      def digest_path_from_template(view, template)
+        view.digest_path_from_template(template)
+      end
+
       def render_partial(partial_renderer, view_context, opts)
         partial_renderer.render(view_context, opts, nil).body
       end
     else
+      def cache_fragment_name(_view, key, virtual_path:, digest_path:)
+        if digest_path
+          ["#{virtual_path}:#{digest_path}", key]
+        else
+          [virtual_path, key]
+        end
+      end
+
+      def digest_path_from_template(view, template)
+        ActionView::Digestor.digest(
+          name: template.virtual_path,
+          finder: @lookup_context,
+          dependencies: view.view_cache_dependencies
+        ).presence
+      end
+
       def render_partial(partial_renderer, view_context, opts)
         partial_renderer.render(view_context, opts, nil)
       end

data/lib/thredded/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Thredded
-  VERSION = '0.16.15'
+  VERSION = '0.16.16'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: thredded
 version: !ruby/object:Gem::Version
-  version: 0.16.15
+  version: 0.16.16
 platform: ruby
 authors:
 - Joel Oliveira
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-30 00:00:00.000000000 Z
+date: 2020-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_record_union