view_component 2.19.1 → 2.23.0

data/lib/rails/generators/component/templates/component.rb.tt

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class <%= class_name %>Component < <%= parent_class %>
 <%- if initialize_signature -%>
   def initialize(<%= initialize_signature %>)

data/lib/rails/generators/test_unit/templates/component_test.rb.tt

@@ -1,7 +1,7 @@
 require "test_helper"
 
 class <%= class_name %>ComponentTest < ViewComponent::TestCase
-  test "component renders something useful" do
+  def test_component_renders_something_useful
     # assert_equal(
     #   %(<span>Hello, components!</span>),
     #   render_inline(<%= class_name %>Component.new(message: "Hello, components!")).css("span").to_html

data/lib/view_component.rb

@@ -6,6 +6,7 @@ module ViewComponent
   extend ActiveSupport::Autoload
 
   autoload :Base
+  autoload :Compiler
   autoload :Preview
   autoload :PreviewTemplateError
   autoload :TestHelpers

data/lib/view_component/base.rb

@@ -6,6 +6,7 @@ require "view_component/collection"
 require "view_component/compile_cache"
 require "view_component/previewable"
 require "view_component/slotable"
+require "view_component/slotable_v2"
 
 module ViewComponent
   class Base < ActionView::Base
@@ -20,10 +21,6 @@ module ViewComponent
     class_attribute :content_areas
     self.content_areas = [] # class_attribute:default doesn't work until Rails 5.2
 
-    # Hash of registered Slots
-    class_attribute :slots
-    self.slots = {}
-
     # Entrypoint for rendering components.
     #
     # view_context: ActionView context from calling view
@@ -64,7 +61,7 @@ module ViewComponent
       @virtual_path ||= virtual_path
 
       # For template variants (+phone, +desktop, etc.)
-      @variant = @lookup_context.variants.first
+      @variant ||= @lookup_context.variants.first
 
       # For caching, such as #cache_if
       @current_template = nil unless defined?(@current_template)
@@ -77,7 +74,7 @@ module ViewComponent
       before_render
 
       if render?
-        send(self.class.call_method_name(@variant))
+        render_template_for(@variant)
       else
         ""
       end
@@ -99,13 +96,16 @@ module ViewComponent
 
     def initialize(*); end
 
-    # If trying to render a partial or template inside a component,
-    # pass the render call to the parent view_context.
+    # Re-use original view_context if we're not rendering a component.
+    #
+    # This prevents an exception when rendering a partial inside of a component that has also been rendered outside
+    # of the component. This is due to the partials compiled template method existing in the parent `view_context`,
+    #  and not the component's `view_context`.
     def render(options = {}, args = {}, &block)
-      if options.is_a?(String) || (options.is_a?(Hash) && options.has_key?(:partial))
-        view_context.render(options, args, &block)
-      else
+      if options.is_a? ViewComponent::Base
         super
+      else
+        view_context.render(options, args, &block)
       end
     end
 
@@ -132,7 +132,10 @@ module ViewComponent
 
     # For caching, such as #cache_if
     def format
-      @variant
+      # Ruby 2.6 throws a warning without checking `defined?`, 2.7 does not
+      if defined?(@variant)
+        @variant
+      end
     end
 
     # Assign the provided content to the content area accessor
@@ -149,6 +152,12 @@ module ViewComponent
       nil
     end
 
+    def with_variant(variant)
+      @variant = variant
+
+      self
+    end
+
     private
 
     # Exposes the current request to the component.
@@ -201,23 +210,11 @@ module ViewComponent
         # Removes the first part of the path and the extension.
         child.virtual_path = child.source_location.gsub(%r{(.*app/components)|(\.rb)}, "")
 
-        # Clone slot configuration into child class
-        # see #test_slots_pollution
-        child.slots = self.slots.clone
-
         super
       end
 
-      def call_method_name(variant)
-        if variant.present? && variants.include?(variant)
-          "call_#{variant}"
-        else
-          "call"
-        end
-      end
-
       def compiled?
-        CompileCache.compiled?(self)
+        template_compiler.compiled?
       end
 
       # Compile templates to instance methods, assuming they haven't been compiled already.
@@ -225,75 +222,11 @@ module ViewComponent
       # Do as much work as possible in this step, as doing so reduces the amount
       # of work done each time a component is rendered.
       def compile(raise_errors: false)
-        return if compiled?
-
-        if template_errors.present?
-          raise ViewComponent::TemplateError.new(template_errors) if raise_errors
-          return false
-        end
-
-        if instance_methods(false).include?(:before_render_check)
-          ActiveSupport::Deprecation.warn(
-            "`before_render_check` will be removed in v3.0.0. Use `before_render` instead."
-          )
-        end
-
-        # Remove any existing singleton methods,
-        # as Ruby warns when redefining a method.
-        remove_possible_singleton_method(:variants)
-        remove_possible_singleton_method(:collection_parameter)
-        remove_possible_singleton_method(:collection_counter_parameter)
-        remove_possible_singleton_method(:counter_argument_present?)
-
-        define_singleton_method(:variants) do
-          templates.map { |template| template[:variant] } + variants_from_inline_calls(inline_calls)
-        end
-
-        define_singleton_method(:collection_parameter) do
-          if provided_collection_parameter
-            provided_collection_parameter
-          else
-            name.demodulize.underscore.chomp("_component").to_sym
-          end
-        end
-
-        define_singleton_method(:collection_counter_parameter) do
-          "#{collection_parameter}_counter".to_sym
-        end
-
-        define_singleton_method(:counter_argument_present?) do
-          instance_method(:initialize).parameters.map(&:second).include?(collection_counter_parameter)
-        end
-
-        validate_collection_parameter! if raise_errors
-
-        # If template name annotations are turned on, a line is dynamically
-        # added with a comment. In this case, we want to return a different
-        # starting line number so errors that are raised will point to the
-        # correct line in the component template.
-        line_number =
-          if ActionView::Base.respond_to?(:annotate_rendered_view_with_filenames) &&
-            ActionView::Base.annotate_rendered_view_with_filenames
-            -2
-          else
-            -1
-          end
-
-        templates.each do |template|
-          # Remove existing compiled template methods,
-          # as Ruby warns when redefining a method.
-          method_name = call_method_name(template[:variant])
-          undef_method(method_name.to_sym) if instance_methods.include?(method_name.to_sym)
-
-          class_eval <<-RUBY, template[:path], line_number
-            def #{method_name}
-              @output_buffer = ActionView::OutputBuffer.new
-              #{compiled_template(template[:path])}
-            end
-          RUBY
-        end
+        template_compiler.compile(raise_errors: raise_errors)
+      end
 
-        CompileCache.register self
+      def template_compiler
+        @_template_compiler ||= Compiler.new(self)
       end
 
       # we'll eventually want to update this to support other types
@@ -357,112 +290,6 @@ module ViewComponent
       def provided_collection_parameter
         @provided_collection_parameter ||= nil
       end
-
-      def compiled_template(file_path)
-        handler = ActionView::Template.handler_for_extension(File.extname(file_path).gsub(".", ""))
-        template = File.read(file_path)
-
-        if handler.method(:call).parameters.length > 1
-          handler.call(self, template)
-        else
-          handler.call(OpenStruct.new(source: template, identifier: identifier, type: type))
-        end
-      end
-
-      def inline_calls
-        @inline_calls ||=
-          begin
-            # Fetch only ViewComponent ancestor classes to limit the scope of
-            # finding inline calls
-            view_component_ancestors =
-              ancestors.take_while { |ancestor| ancestor != ViewComponent::Base } - included_modules
-
-            view_component_ancestors.flat_map { |ancestor| ancestor.instance_methods(false).grep(/^call/) }.uniq
-          end
-      end
-
-      def inline_calls_defined_on_self
-        @inline_calls_defined_on_self ||= instance_methods(false).grep(/^call/)
-      end
-
-      def matching_views_in_source_location
-        return [] unless source_location
-
-        location_without_extension = source_location.chomp(File.extname(source_location))
-
-        extensions = ActionView::Template.template_handler_extensions.join(",")
-
-        # view files in the same directory as the component
-        sidecar_files = Dir["#{location_without_extension}.*{#{extensions}}"]
-
-        # view files in a directory named like the component
-        directory = File.dirname(source_location)
-        filename = File.basename(source_location, ".rb")
-        component_name = name.demodulize.underscore
-
-        sidecar_directory_files = Dir["#{directory}/#{component_name}/#{filename}.*{#{extensions}}"]
-
-        (sidecar_files - [source_location] + sidecar_directory_files)
-      end
-
-      def templates
-        @templates ||=
-          matching_views_in_source_location.each_with_object([]) do |path, memo|
-            pieces = File.basename(path).split(".")
-
-            memo << {
-              path: path,
-              variant: pieces.second.split("+").second&.to_sym,
-              handler: pieces.last
-            }
-          end
-      end
-
-      def template_errors
-        @template_errors ||=
-          begin
-            errors = []
-
-            if (templates + inline_calls).empty?
-              errors << "Could not find a template file or inline render method for #{self}."
-            end
-
-            if templates.count { |template| template[:variant].nil? } > 1
-              errors << "More than one template found for #{self}. There can only be one default template file per component."
-            end
-
-            invalid_variants = templates
-                                  .group_by { |template| template[:variant] }
-                                  .map { |variant, grouped| variant if grouped.length > 1 }
-                                  .compact
-                                  .sort
-
-            unless invalid_variants.empty?
-              errors << "More than one template found for #{'variant'.pluralize(invalid_variants.count)} #{invalid_variants.map { |v| "'#{v}'" }.to_sentence} in #{self}. There can only be one template file per variant."
-            end
-
-            if templates.find { |template| template[:variant].nil? } && inline_calls_defined_on_self.include?(:call)
-              errors << "Template file and inline render method found for #{self}. There can only be a template file or inline render method per component."
-            end
-
-            duplicate_template_file_and_inline_variant_calls =
-              templates.pluck(:variant) & variants_from_inline_calls(inline_calls_defined_on_self)
-
-            unless duplicate_template_file_and_inline_variant_calls.empty?
-              count = duplicate_template_file_and_inline_variant_calls.count
-
-              errors << "Template #{'file'.pluralize(count)} and inline render #{'method'.pluralize(count)} found for #{'variant'.pluralize(count)} #{duplicate_template_file_and_inline_variant_calls.map { |v| "'#{v}'" }.to_sentence} in #{self}. There can only be a template file or inline render method per variant."
-            end
-
-            errors
-          end
-      end
-
-      def variants_from_inline_calls(calls)
-        calls.reject { |call| call == :call }.map do |variant_call|
-          variant_call.to_s.sub("call_", "").to_sym
-        end
-      end
     end
 
     ActiveSupport.run_load_hooks(:view_component, self)

data/lib/view_component/compiler.rb

@@ -0,0 +1,229 @@
+# frozen_string_literal: true
+
+module ViewComponent
+  class Compiler
+    def initialize(component_class)
+      @component_class = component_class
+    end
+
+    def compiled?
+      CompileCache.compiled?(component_class)
+    end
+
+    def compile(raise_errors: false)
+      return if compiled?
+
+      if template_errors.present?
+        raise ViewComponent::TemplateError.new(template_errors) if raise_errors
+        return false
+      end
+
+      if component_class.instance_methods(false).include?(:before_render_check)
+        ActiveSupport::Deprecation.warn(
+          "`before_render_check` will be removed in v3.0.0. Use `before_render` instead."
+        )
+      end
+
+      # Remove any existing singleton methods,
+      # as Ruby warns when redefining a method.
+      component_class.remove_possible_singleton_method(:collection_parameter)
+      component_class.remove_possible_singleton_method(:collection_counter_parameter)
+      component_class.remove_possible_singleton_method(:counter_argument_present?)
+
+      component_class.define_singleton_method(:collection_parameter) do
+        if provided_collection_parameter
+          provided_collection_parameter
+        else
+          name.demodulize.underscore.chomp("_component").to_sym
+        end
+      end
+
+      component_class.define_singleton_method(:collection_counter_parameter) do
+        "#{collection_parameter}_counter".to_sym
+      end
+
+      component_class.define_singleton_method(:counter_argument_present?) do
+        instance_method(:initialize).parameters.map(&:second).include?(collection_counter_parameter)
+      end
+
+      component_class.validate_collection_parameter! if raise_errors
+
+      templates.each do |template|
+        # Remove existing compiled template methods,
+        # as Ruby warns when redefining a method.
+        method_name = call_method_name(template[:variant])
+        component_class.send(:undef_method, method_name.to_sym) if component_class.instance_methods.include?(method_name.to_sym)
+
+        component_class.class_eval <<-RUBY, template[:path], -1
+          def #{method_name}
+            @output_buffer = ActionView::OutputBuffer.new
+            #{compiled_template(template[:path])}
+          end
+        RUBY
+      end
+
+      define_render_template_for
+
+      CompileCache.register(component_class)
+    end
+
+    private
+
+    attr_reader :component_class
+
+    def define_render_template_for
+      component_class.send(:undef_method, :render_template_for) if component_class.instance_methods.include?(:render_template_for)
+
+      variant_elsifs = variants.compact.uniq.map do |variant|
+        "elsif variant.to_sym == :#{variant}\n    #{call_method_name(variant)}"
+      end.join("\n")
+
+      component_class.class_eval <<-RUBY
+        def render_template_for(variant = nil)
+          if variant.nil?
+            call
+          #{variant_elsifs}
+          else
+            call
+          end
+        end
+      RUBY
+
+    end
+
+    def template_errors
+      @_template_errors ||= begin
+        errors = []
+
+        if (templates + inline_calls).empty?
+          errors << "Could not find a template file or inline render method for #{component_class}."
+        end
+
+        if templates.count { |template| template[:variant].nil? } > 1
+          errors << "More than one template found for #{component_class}. There can only be one default template file per component."
+        end
+
+        invalid_variants = templates
+          .group_by { |template| template[:variant] }
+          .map { |variant, grouped| variant if grouped.length > 1 }
+          .compact
+          .sort
+
+        unless invalid_variants.empty?
+          errors << "More than one template found for #{'variant'.pluralize(invalid_variants.count)} #{invalid_variants.map { |v| "'#{v}'" }.to_sentence} in #{component_class}. There can only be one template file per variant."
+        end
+
+        if templates.find { |template| template[:variant].nil? } && inline_calls_defined_on_self.include?(:call)
+          errors << "Template file and inline render method found for #{component_class}. There can only be a template file or inline render method per component."
+        end
+
+        duplicate_template_file_and_inline_variant_calls =
+          templates.pluck(:variant) & variants_from_inline_calls(inline_calls_defined_on_self)
+
+        unless duplicate_template_file_and_inline_variant_calls.empty?
+          count = duplicate_template_file_and_inline_variant_calls.count
+
+          errors << "Template #{'file'.pluralize(count)} and inline render #{'method'.pluralize(count)} found for #{'variant'.pluralize(count)} #{duplicate_template_file_and_inline_variant_calls.map { |v| "'#{v}'" }.to_sentence} in #{component_class}. There can only be a template file or inline render method per variant."
+        end
+
+        errors
+      end
+    end
+
+    def templates
+      @templates ||= matching_views_in_source_location.each_with_object([]) do |path, memo|
+        pieces = File.basename(path).split(".")
+
+        memo << {
+          path: path,
+          variant: pieces.second.split("+").second&.to_sym,
+          handler: pieces.last
+        }
+      end
+    end
+
+    def matching_views_in_source_location
+      source_location = component_class.source_location
+      return [] unless source_location
+
+      extensions = ActionView::Template.template_handler_extensions.join(",")
+
+      # view files in a directory named like the component
+      directory = File.dirname(source_location)
+      filename = File.basename(source_location, ".rb")
+      component_name = component_class.name.demodulize.underscore
+
+      # Add support for nested components defined in the same file.
+      #
+      # e.g.
+      #
+      # class MyComponent < ViewComponent::Base
+      #   class MyOtherComponent < ViewComponent::Base
+      #   end
+      # end
+      #
+      # Without this, `MyOtherComponent` will not look for `my_component/my_other_component.html.erb`
+      nested_component_files = if component_class.name.include?("::")
+        nested_component_path = component_class.name.deconstantize.underscore
+        Dir["#{directory}/#{nested_component_path}/#{component_name}.*{#{extensions}}"]
+      else
+        []
+      end
+
+      # view files in the same directory as the component
+      sidecar_files = Dir["#{directory}/#{component_name}.*{#{extensions}}"]
+
+      sidecar_directory_files = Dir["#{directory}/#{component_name}/#{filename}.*{#{extensions}}"]
+
+      (sidecar_files - [source_location] + sidecar_directory_files + nested_component_files)
+    end
+
+    def inline_calls
+      @inline_calls ||= begin
+        # Fetch only ViewComponent ancestor classes to limit the scope of
+        # finding inline calls
+        view_component_ancestors =
+          component_class.ancestors.take_while { |ancestor| ancestor != ViewComponent::Base } - component_class.included_modules
+
+        view_component_ancestors.flat_map { |ancestor| ancestor.instance_methods(false).grep(/^call/) }.uniq
+      end
+    end
+
+    def inline_calls_defined_on_self
+      @inline_calls_defined_on_self ||= component_class.instance_methods(false).grep(/^call/)
+    end
+
+    def variants
+      @_variants = (
+        templates.map { |template| template[:variant] } + variants_from_inline_calls(inline_calls)
+      ).compact.uniq
+    end
+
+    def variants_from_inline_calls(calls)
+      calls.reject { |call| call == :call }.map do |variant_call|
+        variant_call.to_s.sub("call_", "").to_sym
+      end
+    end
+
+    # :nocov:
+    def compiled_template(file_path)
+      handler = ActionView::Template.handler_for_extension(File.extname(file_path).gsub(".", ""))
+      template = File.read(file_path)
+
+      if handler.method(:call).parameters.length > 1
+        handler.call(component_class, template)
+      else
+        handler.call(OpenStruct.new(source: template, identifier: component_class.identifier, type: component_class.type))
+      end
+    end
+    # :nocov:
+
+    def call_method_name(variant)
+      if variant.present? && variants.include?(variant)
+        "call_#{variant}"
+      else
+        "call"
+      end
+    end
+  end
+end