Merge pull request #1688 from jhawthorn/taxons_cache_key

Replace cache_key_for_taxons with cache

CHANGELOG.md

@@ -16,6 +16,10 @@
     comparisons. A comparison will fail if the two objects do not use the same
     currency. [#1682](https://github.com/solidusio/solidus/pull/1682)
 
+*   Deprecations
+
+    * `cache_key_for_taxons` helper has been deprecated in favour of `cache [I18n.locale, @taxons]`
+
 ## Solidus 2.1.0 (unreleased)
 
 *   The OrderUpdater (as used by `order.update!`) now fully updates taxes.

core/app/helpers/spree/store_helper.rb

@@ -8,6 +8,11 @@ def store_menu?
     end
 
     def cache_key_for_taxons
+      Spree::Deprecation.warn <<-WARN.strip_heredoc
+        cache_key_for_taxons is deprecated. Rails >= 5 has built-in support for collection cache keys.
+        Instead in your view use:
+        cache [I18n.locale, @taxons] do
+      WARN
       max_updated_at = @taxons.maximum(:updated_at).to_i
       parts = [@taxon.try(:id), max_updated_at].compact.join("-")
       "#{I18n.locale}/taxons/#{parts}"

frontend/app/views/spree/shared/_search.html.erb

@@ -1,6 +1,6 @@
 <% @taxons = @taxon && @taxon.parent ? @taxon.parent.children : Spree::Taxon.roots %>
 <%= form_tag spree.products_path, :method => :get do %>
-  <% cache(cache_key_for_taxons) do %>
+  <% cache [I18n.locale, @taxons] do %>
     <%= select_tag :taxon,
           options_for_select([[Spree.t(:all_departments), '']] +
                                 @taxons.map {|t| [t.name, t.id]},

frontend/spec/features/caching/products_spec.rb

@@ -13,7 +13,6 @@
     assert_written_to_cache("views/en/USD/spree/products/all--#{product.updated_at.utc.to_s(:number)}")
     assert_written_to_cache("views/en/USD/spree/products/#{product.id}-#{product.updated_at.utc.to_s(:number)}")
     assert_written_to_cache("views/en/spree/taxonomies/#{taxonomy.id}")
-    assert_written_to_cache("views/en/taxons/#{taxon.updated_at.utc.to_i}")
 
     clear_cache_events
   end

frontend/spec/features/caching/taxons_spec.rb

@@ -8,7 +8,6 @@
     # warm up the cache
     visit spree.root_path
     assert_written_to_cache("views/en/spree/taxonomies/#{taxonomy.id}")
-    assert_written_to_cache("views/en/taxons/#{taxon.updated_at.utc.to_i}")
 
     clear_cache_events
   end