get pr up top date

Author: reeganviljoen

lib/view_component/base.rb

@@ -75,7 +75,7 @@ def config
     # Config option that strips trailing whitespace in templates before compiling them.
 
     class_attribute :__vc_response_format, instance_accessor: false, instance_predicate: false, default: nil
-    class_attribute :__vc_cache_dependencies, instance_accessor: false, instance_predicate: false, 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
 
@@ -318,15 +318,6 @@ def virtual_path
       self.class.virtual_path
     end
 
-    # For caching, such as #cache_if
-    #
-    # @private
-    def view_cache_dependencies
-      return unless __vc_cache_dependencies.present? && __vc_cache_dependencies.any?
-
-      __vc_cache_dependencies.filter_map { |dep| send(dep) }
-    end
-
     # For caching, such as #cache_if
     #
     # @private
@@ -348,15 +339,6 @@ def __vc_request
       @__vc_request ||= controller.request if controller.respond_to?(:request)
     end
 
-    # For caching, such as #cache_if
-    #
-    # @private
-    def view_cache_dependencies
-      return unless __vc_cache_dependencies.present? && __vc_cache_dependencies.any?
-
-      __vc_cache_dependencies.filter_map { |dep| send(dep) }
-    end
-
     # The content passed to the component instance as a block.
     #
     # @return [String]
@@ -372,7 +354,7 @@ def content
         end
     end
 
-    # Whether `content` has been passed to the component.
+    # Whether f render?`content` has been passed to the component.
     #
     # @return [Boolean]
     def content?
@@ -543,16 +525,6 @@ def sidecar_files(extensions)
         (sidecar_files - [identifier] + sidecar_directory_files + nested_component_files).uniq
       end
 
-      def cache_on(*args)
-        __vc_cache_dependencies.push(*args)
-      end
-
-      def view_cache_dependencies
-        return unless __vc_cache_dependencies.any?
-
-        __vc_cache_dependencies.filter_map { |dep| send(dep) }
-      end
-
       # Render a component for each element in a collection ([documentation](/guide/collections)):
       #
       # ```ruby

lib/view_component/cache_digestor.rb

@@ -1,28 +1,21 @@
 # # frozen_string_literal: true
 
-require 'view_component/templat_dependency_extractor'
+require "view_component/templat_dependency_extractor"
 
 module ViewComponent
   class CacheDigestor
     def initialize(component:)
-      @component= component.class
+      @component = component
     end
 
     def digest
-      gather_templates
-      @templates.map do |template|
-        if template.type == :file
-          template_string = template.source
-          ViewComponent::TemplateDependencyExtractor.new(template_string, template.extension.to_sym).extract
-        else
-          # A digest cant be built for inline calls as there is no template to parse
-          []
-        end
+      template = @component.current_template
+      if template.nil? && template == :inline_call
+        []
+      else
+        template_string = template.source
+        ViewComponent::TemplateDependencyExtractor.new(template_string, template.details.handler).extract
       end
     end
-
-    def gather_templates
-      @templates = @component.compiler.send(:gather_templates)
-    end
   end
 end

lib/view_component/cacheable.rb

@@ -1,14 +1,12 @@
 # frozen_string_literal: true
 
-require "set"
 require "view_component/cache_registry"
 require "view_component/cache_digestor"
 
 module ViewComponent::Cacheable
   extend ActiveSupport::Concern
 
   included do
-
     class_attribute :__vc_cache_options, default: Set[:identifier]
     class_attribute :__vc_cache_dependencies, default: Set.new
 
@@ -29,32 +27,32 @@ def view_cache_options
     # Render component from cache if possible
     #
     # @private
-    def __vc_render_cacheable(rendered_template)
-      if __vc_cache_options.any?
+    def __vc_render_cacheable(safe_call)
+      if (__vc_cache_options - [:identifier]).any?
         ViewComponent::CachingRegistry.track_caching do
-          template_fragment(rendered_template)
+          template_fragment(safe_call)
         end
       else
-        __vc_render_template(rendered_template)
+        instance_exec(&safe_call)
       end
     end
 
-    def template_fragment(rendered_template)
+    def template_fragment
       if content = read_fragment
         @view_renderer.cache_hits[@current_template&.virtual_path] = :hit if defined?(@view_renderer)
         content
       else
         @view_renderer.cache_hits[@current_template&.virtual_path] = :miss if defined?(@view_renderer)
-        write_fragment(rendered_template)
+        write_fragment
       end
     end
 
     def read_fragment
       Rails.cache.fetch(view_cache_options)
     end
 
-    def write_fragment(rendered_template)
-      content = __vc_render_template(rendered_template)
+    def write_fragment
+      content = instance_exec(&safe_call)
       Rails.cache.fetch(view_cache_options) do
         content
       end
@@ -81,7 +79,7 @@ def cache_on(*args)
 
     def inherited(child)
       child.__vc_cache_options = __vc_cache_options.dup
-      
+
       super
     end
   end

lib/view_component/compiler.rb

@@ -97,13 +97,21 @@ def define_render_template_for
         safe_call = template.safe_method_name_call
         @component.define_method(:render_template_for) do |_|
           @current_template = template
-          instance_exec(&safe_call)
+          if @component.respond_to?(:__vc_render_cacheable)
+            @component.__vc_render_cacheable(safe_call)
+          else
+            instance_exec(&safe_call)
+          end
         end
       else
         compiler = self
         @component.define_method(:render_template_for) do |details|
           if (@current_template = compiler.find_templates_for(details).first)
-            instance_exec(&@current_template.safe_method_name_call)
+            if @component.respond_to?(:__vc_render_cacheable)
+              @component.__vc_render_cacheable(@current_template.safe_method_name_call)
+            else
+              instance_exec(&@current_template.safe_method_name_call)
+            end
           else
             raise MissingTemplateError.new(self.class.name, details)
           end

lib/view_component/templat_dependency_extractor.rb

@@ -1,8 +1,7 @@
-
 # frozen_string_literal: true
 
-require_relative 'template_ast_builder'
-require_relative 'prism_render_dependency_extractor'
+require_relative "template_ast_builder"
+require_relative "prism_render_dependency_extractor"
 
 module ViewComponent
   class TemplateDependencyExtractor
@@ -14,7 +13,8 @@ def initialize(template_string, engine)
 
     def extract
       ast = TemplateAstBuilder.build(@template_string, @engine)
-      walk(ast.split(';'))
+      return @dependencies unless ast.present?
+      walk(ast.split(";"))
       @dependencies.uniq
     end
 
@@ -35,7 +35,7 @@ def extract_from_ruby(ruby_code)
 
     def extract_partial_or_layout(code)
       partial_match = code.match(/partial:\s*["']([^"']+)["']/)
-      layout_match  = code.match(/layout:\s*["']([^"']+)["']/)
+      layout_match = code.match(/layout:\s*["']([^"']+)["']/)
       direct_render = code.match(/render\s*\(?\s*["']([^"']+)["']/)
 
       @dependencies << partial_match[1] if partial_match

lib/view_component/template_ast_builder.rb

@@ -1,10 +1,9 @@
-
 # frozen_string_literal: true
 
-require 'temple'
-require 'slim'
-require 'haml'
-require 'erb'
+require "temple"
+require "slim"
+require "haml"
+require "erb"
 
 module ViewComponent
   class TemplateAstBuilder
@@ -25,12 +24,12 @@ def call(template)
     ENGINE_MAP = {
       slim: -> { Slim::Engine.new },
       haml: -> { HamlTempleWrapper.new },
-      erb:  -> { ErbTempleWrapper.new }
+      erb: -> { ErbTempleWrapper.new }
     }
 
     def self.build(template_string, engine_name)
       engine = ENGINE_MAP.fetch(engine_name.to_sym) do
-        raise ArgumentError, "Unsupported engine: #{engine_name.inspect}"
+        return nil
       end.call
 
       engine.call(template_string)