fix cache

Author: reeganviljoen

lib/view_component/base.rb

@@ -45,14 +45,12 @@ def config
     delegate :content_security_policy_nonce, to: :helpers
 
     # Config option that strips trailing whitespace in templates before compiling them.
-    class_attribute :__vc_cache_dependencies, instance_accessor: false, instance_predicate: false, default: []
+    class_attribute :__vc_cache_dependencies, default: []
     class_attribute :__vc_strip_trailing_whitespace, instance_accessor: false, instance_predicate: false
     self.__vc_strip_trailing_whitespace = false # class_attribute:default doesn't work until Rails 5.2
 
     attr_accessor :__vc_original_view_context
 
-
-
     # Components render in their own view context. Helpers and other functionality
     # require a reference to the original Rails view context, an instance of
     # `ActionView::Base`. Use this method to set a reference to the original
@@ -295,6 +293,12 @@ def __vc_request
       @__vc_request ||= controller.request if controller.respond_to?(:request)
     end
 
+    def view_cache_dependencies
+      return unless __vc_cache_dependencies.present? && __vc_cache_dependencies.any?
+
+      __vc_cache_dependencies.map { |dep| send(dep) }.compact
+    end
+
     # The content passed to the component instance as a block.
     #
     # @return [String]
@@ -458,7 +462,8 @@ def safe_output_postamble
     # config.view_component.generate.preview = true
     # ```
     #
-    #  Defaults to `false`.
+    #  Defaults to `false`
+    #
 
     class << self
       # The file path of the component Ruby file.
@@ -472,6 +477,8 @@ class << self
       # @private
       attr_accessor :virtual_path
 
+
+
       # Find sidecar files for the given extensions.
       #
       # The provided array of extensions is expected to contain
@@ -514,16 +521,8 @@ def sidecar_files(extensions)
         (sidecar_files - [identifier] + sidecar_directory_files + nested_component_files).uniq
       end
 
-
-
       def cache_on(*args)
-        self.__vc_cache_dependencies.push(*args)
-      end
-
-      def view_cache_dependencies
-        return unless __vc_cache_dependencies.any?
-
-        __vc_cache_dependencies.map { |dep| send(dep) }.compact
+        __vc_cache_dependencies.push(*args)
       end
 
       # Render a component for each element in a collection ([documentation](/guide/collections)):
@@ -591,6 +590,8 @@ def render_template_for(variant = nil, format = nil)
           child.instance_variable_set(:@__vc_ancestor_calls, vc_ancestor_calls)
         end
 
+        child.__vc_cache_dependencies = self.__vc_cache_dependencies.dup
+
         super
       end
 

test/sandbox/test/rendering_test.rb

@@ -1245,16 +1245,16 @@ def test_cache_component
     component = CacheComponent.new(foo: "foo", bar: "bar")
     render_inline(component)
 
-    assert_selector(".cache-component__cache-key", text: component.component_cache_dependencies)
+    assert_selector(".cache-component__cache-key", text: component.view_cache_dependencies)
     assert_selector(".cache-component__cache-message", text: "foo bar")
 
     render_inline(CacheComponent.new(foo: "foo", bar: "bar"))
 
-    assert_selector(".cache-component__cache-key", text: component.component_cache_dependencies)
+    assert_selector(".cache-component__cache-key", text: component.view_cache_dependencies)
 
     render_inline(CacheComponent.new(foo: "foo", bar: "baz"))
 
-    refute_selector(".cache-component__cache-key", text: component.component_cache_dependencies)
+    refute_selector(".cache-component__cache-key", text: component.view_cache_dependencies)
     refute_selector(".cache-component__cache-message", text: "foo bar")
   end
 end