view_component 4.0.0.alpha5 → 4.0.0.alpha6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 544de384800ad5d0870666b9b1fdb3a74da9fd59d77f78e0d72ee5e134a3c307
-  data.tar.gz: 430c3652f5abc6fef9815b937274f66ebac34de297318e1ca6839589fa290ddf
+  metadata.gz: dbca6043a0eebf7c6f63358c7b1c193ef59170b81a35eb9290f211d365bfb3cb
+  data.tar.gz: 033db44d3dab35956b7ab8ac1a1a12673b7e82a0d4e0bbf3d3e791234dbcf757
 SHA512:
-  metadata.gz: f30651af979f6c1c5fd43514d04cef3f6430982198e593375d61ce79190e83b8b2d61d7cccb67607248f0b791346b09db33b4705e81cb257b87bd8255c5b2d63
-  data.tar.gz: 956af9c486961785821e9401c9c1ce6b187f3f21a0425d5d6d36602f384f3beb79629f9be2e743e13f525bdc15498480565989cbdb37952a7b0e1cbb2aaabbb0
+  metadata.gz: ddd3ac59908bf697da69f8f0fa29b2e779e468a07a6f37e96240165797fce088bbf6937473363d349b7e48fa8011434377b52345c8f60204ff94a7a794a4fee8
+  data.tar.gz: c8fac0e676aa9632453337a13169b690ed36bc9cd65e0de754c63f77878ba1b598c9a344f8f547a8b7c530c0e12c285de2fc0eee3afa4a1f7fe8805293414b8e

data/app/controllers/concerns/view_component/preview_actions.rb

@@ -47,7 +47,7 @@ module ViewComponent
 
     # :doc:
     def default_preview_layout
-      ViewComponent::Base.config.default_preview_layout
+      ViewComponent::Base.config.previews.default_layout
     end
 
     # :doc:
@@ -64,7 +64,11 @@ module ViewComponent
       if preview
         @preview = ViewComponent::Preview.find(preview)
       else
+        # TODO: This branch is covered in #test_returns_404_when_preview_does_not_exist,
+        # but Simplecov doesn't always mark it as covered.
+        # :nocov:
         raise AbstractController::ActionNotFound, "Component preview '#{params[:path]}' not found."
+        # :nocov:
       end
     end
 
@@ -95,7 +99,7 @@ module ViewComponent
     end
 
     def prepend_preview_examples_view_path
-      prepend_view_path(ViewComponent::Base.preview_paths)
+      prepend_view_path(ViewComponent::Base.previews.paths)
     end
   end
 end

data/app/controllers/view_components_system_test_controller.rb

@@ -19,9 +19,7 @@ class ViewComponentsSystemTestController < ActionController::Base # :nodoc:
     def validate_file_path
       base_path = ::File.realpath(self.class.temp_dir)
       @path = ::File.realpath(params.permit(:file)[:file], base_path)
-      unless @path.start_with?(base_path)
-        raise ViewComponent::SystemTestControllerNefariousPathError
-      end
+      raise ViewComponent::SystemTestControllerNefariousPathError unless @path.start_with?(base_path)
     end
   end
 end

data/docs/CHANGELOG.md

@@ -10,6 +10,40 @@ nav_order: 6
 
 ## main
 
+## 4.0.0.alpha6
+
+* BREAKING: Remove `config.test_controller` in favor of `vc_test_controller_class` test helper method.
+
+    *Joel Hawksley*
+
+* BREAKING: `config.component_parent_class` is now `config.generate.component_parent_class`, moving the generator-specific option to the generator configuration namespace.
+
+    *Joel Hawksley*
+
+* BREAKING: Move previews-related configuration (`enabled`, `route`, `paths`, `default_layout`, `controller`) to under `previews` namespace.
+
+    *Joel Hawksley*
+
+* Add template annotations for components with `def call`.
+
+    *Joel Hawksley*
+
+* Add support for including Turbo::StreamsHelper.
+
+    *Stephen Nelson*
+
+* Update documentation on performance to reflect more representative benchmark showing 2-3x speed increase over partials.
+
+    *Joel Hawksley*
+
+* Add documentation note about instrumentation negatively affecting performance.
+
+    *Joel Hawksley*
+
+* Revert object shapes optimization due to lack of evidence of improvement.
+
+    *Joel Hawksley*
+
 ## 4.0.0.alpha5
 
 * BREAKING: `config.view_component_path` is now `config.generate.path`, as components have long since been able to exist in any directory.
@@ -20,10 +54,6 @@ nav_order: 6
 
     *Joel Hawksley*
 
-* Add internal optimization for Ruby object shapes.
-
-    *Adam Hess*, *Joel Hawksley*
-
 ## 4.0.0.alpha4
 
 * BREAKING: Remove default initializer from `ViewComponent::Base`. Previously, `ViewComponent::Base` defined a catch-all initializer that allowed components without an initializer defined to be passed arbitrary arguments.
@@ -156,6 +186,24 @@ This release makes the following breaking changes:
 
     *Simon Fish*
 
+* Reduce string allocations during compilation.
+
+    *Jonathan del Strother*
+
+## 3.23.2
+
+* Include .tt files in published gem. Fixes templates not being available when using generators.
+
+    *Florian Aßmann*
+
+## 3.23.1
+
+* Restore Rake tasks in published gem.
+
+    *Franz Liedke*
+
+## 3.23.0
+
 * Add docs about Slack channel in Ruby Central workspace. (Join us! #oss-view-component). Email joelhawksley@github.com for an invite.
 
     *Joel Hawksley

data/lib/view_component/base.rb

@@ -5,7 +5,6 @@ require "active_support/configurable"
 require "view_component/collection"
 require "view_component/compile_cache"
 require "view_component/compiler"
-require "view_component/component_local_config"
 require "view_component/config"
 require "view_component/errors"
 require "view_component/inline_template"
@@ -35,15 +34,6 @@ module ViewComponent
     class << self
       delegate(*ViewComponent::Config.defaults.keys, to: :config)
 
-      # Redefine `new` so we can pre-allocate instance variables to optimize
-      # for Ruby object shapes.
-      def new(...)
-        instance = allocate
-        instance.__vc_pre_allocate_instance_variables
-        instance.send(:initialize, ...)
-        instance
-      end
-
       # Returns the current config.
       #
       # @return [ActiveSupport::OrderedOptions]
@@ -57,29 +47,6 @@ module ViewComponent
       end
     end
 
-    def __vc_pre_allocate_instance_variables
-      @__vc_parent_render_level = 0
-      @__vc_set_slots = {}
-      @__vc_content_evaluated = false
-      @current_template = nil
-      @output_buffer = nil
-      @lookup_context = nil
-      @view_flow = nil
-      @view_context = nil
-      @virtual_path = nil
-      @__vc_ancestor_calls = nil
-      @__vc_controller = nil
-      @__vc_content = :unset # some behaviors depend on checking for nil
-      @__vc_content_set_by_with_content = nil
-      @__vc_helpers = nil
-      @__vc_inline_template = nil
-      @__vc_inline_template_defined = nil
-      @__vc_render_in_block = nil
-      @__vc_request = nil
-      @__vc_requested_details = nil
-      @__vc_original_view_context = nil
-    end
-
     include ActionView::Helpers
     include ERB::Escape
     include ActiveSupport::CoreExt::ERBUtil
@@ -89,7 +56,6 @@ module ViewComponent
     include ViewComponent::Slotable
     include ViewComponent::Translatable
     include ViewComponent::WithContentHelper
-    include ViewComponent::ComponentLocalConfig
 
     # For CSRF authenticity tokens in forms
     delegate :form_authenticity_token, :protect_against_forgery?, :config, to: :helpers
@@ -97,9 +63,16 @@ module ViewComponent
     # HTML construction methods
     delegate :output_buffer, :lookup_context, :view_renderer, :view_flow, to: :helpers
 
+    # For Turbo::StreamsHelper
+    delegate :formats, :formats=, to: :helpers
+
     # For Content Security Policy nonces
     delegate :content_security_policy_nonce, to: :helpers
 
+    # Config option that strips trailing whitespace in templates before compiling them.
+    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
     attr_reader :current_template
 
@@ -146,12 +119,14 @@ module ViewComponent
       @__vc_requested_details ||= @lookup_context.vc_requested_details
 
       # For caching, such as #cache_if
+      @current_template = nil unless defined?(@current_template)
       old_current_template = @current_template
 
-      if block && __vc_content_set_by_with_content?
+      if block && defined?(@__vc_content_set_by_with_content)
         raise DuplicateContentError.new(self.class.name)
       end
 
+      @__vc_content_evaluated = false
       @__vc_render_in_block = block
 
       before_render
@@ -170,6 +145,11 @@ module ViewComponent
           end
         end
 
+        if ActionView::Base.annotate_rendered_view_with_filenames && current_template.inline_call? && request&.format == :html
+          identifier = defined?(Rails.root) ? self.class.identifier.sub("#{Rails.root}/", "") : self.class.identifier
+          value = "<!-- BEGIN #{identifier} -->".html_safe + value + "<!-- END #{identifier} -->".html_safe
+        end
+
         value
       else
         ""
@@ -205,12 +185,16 @@ module ViewComponent
     #
     # When rendering the parent inside an .erb template, use `#render_parent` instead.
     def render_parent_to_string
-      target_render = self.class.instance_variable_get(:@__vc_ancestor_calls)[@__vc_parent_render_level]
-      @__vc_parent_render_level += 1
+      @__vc_parent_render_level ||= 0 # ensure a good starting value
 
-      target_render.bind_call(self, @__vc_requested_details)
-    ensure
-      @__vc_parent_render_level -= 1
+      begin
+        target_render = self.class.instance_variable_get(:@__vc_ancestor_calls)[@__vc_parent_render_level]
+        @__vc_parent_render_level += 1
+
+        target_render.bind_call(self, @__vc_requested_details)
+      ensure
+        @__vc_parent_render_level -= 1
+      end
     end
 
     # Optional content to be returned before the rendered template.
@@ -333,12 +317,12 @@ module ViewComponent
     # @return [String]
     def content
       @__vc_content_evaluated = true
-      return @__vc_content if @__vc_content != :unset
+      return @__vc_content if defined?(@__vc_content)
 
       @__vc_content =
         if __vc_render_in_block_provided?
           view_context.capture(self, &@__vc_render_in_block)
-        elsif __vc_content_set_by_with_content?
+        elsif __vc_content_set_by_with_content_defined?
           @__vc_content_set_by_with_content
         end
     end
@@ -347,7 +331,7 @@ module ViewComponent
     #
     # @return [Boolean]
     def content?
-      __vc_render_in_block_provided? || __vc_content_set_by_with_content?
+      __vc_render_in_block_provided? || __vc_content_set_by_with_content_defined?
     end
 
     private
@@ -355,15 +339,15 @@ module ViewComponent
     attr_reader :view_context
 
     def __vc_render_in_block_provided?
-      @view_context && @__vc_render_in_block
+      defined?(@view_context) && @view_context && @__vc_render_in_block
     end
 
-    def __vc_content_set_by_with_content?
-      !@__vc_content_set_by_with_content.nil?
+    def __vc_content_set_by_with_content_defined?
+      defined?(@__vc_content_set_by_with_content)
     end
 
     def content_evaluated?
-      @__vc_content_evaluated
+      defined?(@__vc_content_evaluated) && @__vc_content_evaluated
     end
 
     def maybe_escape_html(text)
@@ -390,26 +374,6 @@ module ViewComponent
       end
     end
 
-    # Set the controller used for testing components:
-    #
-    # ```ruby
-    # config.view_component.test_controller = "MyTestController"
-    # ```
-    #
-    # Defaults to `nil`. If this is falsy, `"ApplicationController"` is used. Can also be
-    # configured on a per-test basis using `with_controller_class`.
-    #
-
-    # Parent class for generated components
-    #
-    # ```ruby
-    # config.view_component.component_parent_class = "MyBaseComponent"
-    # ```
-    #
-    # Defaults to nil. If this is falsy, generators will use
-    # "ApplicationComponent" if defined, "ViewComponent::Base" otherwise.
-    #
-
     # Configuration for generators.
     #
     # All options under this namespace default to `false` unless otherwise
@@ -467,6 +431,18 @@ module ViewComponent
     # ```
     #
     #  Defaults to `false`.
+    #
+    # #### component_parent_class
+    #
+    # Parent class for generated components
+    #
+    # ```ruby
+    # config.view_component.generate.component_parent_class = "MyBaseComponent"
+    # ```
+    #
+    # Defaults to nil. If this is falsy, generators will use
+    # "ApplicationComponent" if defined, "ViewComponent::Base" otherwise.
+    #
 
     class << self
       # The file path of the component Ruby file.
@@ -575,7 +551,7 @@ module ViewComponent
         child.with_collection_parameter provided_collection_parameter
 
         if instance_methods(false).include?(:render_template_for)
-          vc_ancestor_calls = (!@__vc_ancestor_calls.nil?) ? @__vc_ancestor_calls.dup : []
+          vc_ancestor_calls = defined?(@__vc_ancestor_calls) ? @__vc_ancestor_calls.dup : []
 
           vc_ancestor_calls.unshift(instance_method(:render_template_for))
           child.instance_variable_set(:@__vc_ancestor_calls, vc_ancestor_calls)
@@ -624,38 +600,16 @@ module ViewComponent
       # end
       # ```
       #
-      # @deprecated Use the new component-local configuration option instead.
-      #
-      #   ```ruby
-      #   class MyComponent < ViewComponent::Base
-      #     configure_view_component do |config|
-      #       config.strip_trailing_whitespace = true
-      #     end
-      #   end
-      #   ```
-      #
       # @param value [Boolean] Whether to strip newlines.
       def strip_trailing_whitespace(value = true)
-        ViewComponent::Deprecation.deprecation_warning(
-          "strip_trailing_whitespace",
-          <<~DOC
-            Use the new component-local configuration option instead:
-
-            class #{self.class.name} < ViewComponent::Base
-              configure_view_component do |config|
-                config.strip_trailing_whitespace = #{value}
-              end
-            end
-          DOC
-        )
-        view_component_config.strip_trailing_whitespace = value
+        self.__vc_strip_trailing_whitespace = value
       end
 
       # Whether trailing whitespace will be stripped before compilation.
       #
       # @return [Boolean]
       def strip_trailing_whitespace?
-        view_component_config.strip_trailing_whitespace
+        __vc_strip_trailing_whitespace
       end
 
       # Ensure the component initializer accepts the

data/lib/view_component/compiler.rb

@@ -108,10 +108,7 @@ module ViewComponent
 
         errors << "Couldn't find a template file or inline render method for #{@component}." if @templates.empty?
 
-        # We currently allow components to have both an inline call method and a template for a variant, with the
-        # inline call method overriding the template. We should aim to change this in v4 to instead
-        # raise an error.
-        @templates.reject(&:inline_call?)
+        @templates
           .map { |template| [template.variant, template.format] }
           .tally
           .select { |_, count| count > 1 }

data/lib/view_component/config.rb

@@ -13,14 +13,8 @@ module ViewComponent
       def defaults
         ActiveSupport::OrderedOptions.new.merge!({
           generate: default_generate_options,
-          preview_controller: "ViewComponentsController",
-          preview_route: "/rails/view_components",
-          instrumentation_enabled: false,
-          component_parent_class: nil,
-          show_previews: Rails.env.development? || Rails.env.test?,
-          preview_paths: default_preview_paths,
-          test_controller: "ApplicationController",
-          default_preview_layout: nil
+          previews: default_previews_options,
+          instrumentation_enabled: false
         })
       end
 
@@ -84,7 +78,7 @@ module ViewComponent
       #
       # Required when there is more than one path defined in preview_paths.
       # Defaults to `""`. If this is blank, the generator will use
-      # `ViewComponent.config.preview_paths` if defined,
+      # `ViewComponent.config.previews.paths` if defined,
       # `"test/components/previews"` otherwise
       #
       # #### `#use_component_path_for_rspec_tests`
@@ -100,49 +94,46 @@ module ViewComponent
       # `app/views/components`, then the generator will create a new spec file
       # in `spec/views/components/` rather than the default `spec/components/`.
 
-      # @!attribute preview_controller
-      # @return [String]
-      # The controller used for previewing components.
-      # Defaults to `ViewComponentsController`.
-
-      # @!attribute preview_route
-      # @return [String]
-      # The entry route for component previews.
-      # Defaults to `"/rails/view_components"`.
+      # @!attribute previews
+      # @return [ActiveSupport::OrderedOptions]
+      # The subset of configuration options relating to previews.
+      #
+      # #### `#controller`
+      #
+      # The controller used for previewing components. Defaults to `ViewComponentsController`:
+      #
+      #     config.view_component.previews.controller = "MyPreviewController"
+      #
+      # #### `#route`
+      #
+      # The entry route for component previews. Defaults to `/rails/view_components`:
+      #
+      #     config.view_component.previews.route = "/my_previews"
+      #
+      # #### `#enabled`
+      #
+      # Whether component previews are enabled. Defaults to `true` in development and test environments:
+      #
+      #     config.view_component.previews.enabled = false
+      #
+      # #### `#default_layout`
+      #
+      # A custom default layout used for the previews index page and individual previews. Defaults to `false`:
+      #
+      #     config.view_component.previews.default_layout = false
+      #
 
       # @!attribute instrumentation_enabled
       # @return [Boolean]
       # Whether ActiveSupport notifications are enabled.
       # Defaults to `false`.
 
-      # @!attribute component_parent_class
-      # @return [String]
-      # The parent class from which generated components will inherit.
-      # Defaults to `nil`. If this is falsy, generators will use
-      # `"ApplicationComponent"` if defined, `"ViewComponent::Base"` otherwise.
-
-      # @!attribute show_previews
-      # @return [Boolean]
-      # Whether component previews are enabled.
-      # Defaults to `true` in development and test environments.
-
-      # @!attribute preview_paths
-      # @return [Array<String>]
-      # The locations in which component previews will be looked up.
-      # Defaults to `['test/components/previews']` relative to your Rails root.
-
       # @!attribute test_controller
       # @return [String]
       # The controller used for testing components.
       # Can also be configured on a per-test basis using `#with_controller_class`.
       # Defaults to `ApplicationController`.
 
-      # @!attribute default_preview_layout
-      # @return [String]
-      # A custom default layout used for the previews index page and individual
-      # previews.
-      # Defaults to `nil`. If this is falsy, `"component_preview"` is used.
-
       def default_preview_paths
         (default_rails_preview_paths + default_rails_engines_preview_paths).uniq
       end
@@ -173,6 +164,16 @@ module ViewComponent
         options.path = "app/components"
         options
       end
+
+      def default_previews_options
+        options = ActiveSupport::OrderedOptions.new
+        options.controller = "ViewComponentsController"
+        options.route = "/rails/view_components"
+        options.enabled = Rails.env.development? || Rails.env.test?
+        options.default_layout = false
+        options.paths = default_preview_paths
+        options
+      end
     end
 
     # @!attribute current

data/lib/view_component/engine.rb

@@ -11,7 +11,7 @@ module ViewComponent
     initializer "view_component.set_configs" do |app|
       options = app.config.view_component
 
-      %i[generate preview_controller preview_route].each do |config_option|
+      %i[generate previews].each do |config_option|
         options[config_option] ||= ViewComponent::Base.public_send(config_option)
       end
       options.instrumentation_enabled = false if options.instrumentation_enabled.nil?
@@ -19,7 +19,7 @@ module ViewComponent
 
       if options.show_previews
         # This is still necessary because when `config.view_component` is declared, `Rails.root` is unspecified.
-        options.preview_paths << "#{Rails.root}/test/components/previews" if defined?(Rails.root) && Dir.exist?(
+        options.previews.paths << "#{Rails.root}/test/components/previews" if defined?(Rails.root) && Dir.exist?(
           "#{Rails.root}/test/components/previews"
         )
       end
@@ -36,8 +36,8 @@ module ViewComponent
     initializer "view_component.set_autoload_paths" do |app|
       options = app.config.view_component
 
-      if options.show_previews && !options.preview_paths.empty?
-        paths_to_add = options.preview_paths - ActiveSupport::Dependencies.autoload_paths
+      if options.show_previews && !options.previews.paths.empty?
+        paths_to_add = options.previews.paths - ActiveSupport::Dependencies.autoload_paths
         ActiveSupport::Dependencies.autoload_paths.concat(paths_to_add) if paths_to_add.any?
       end
     end
@@ -90,17 +90,17 @@ module ViewComponent
 
       if options.show_previews
         app.routes.prepend do
-          preview_controller = options.preview_controller.sub(/Controller$/, "").underscore
+          preview_controller = options.previews.controller.sub(/Controller$/, "").underscore
 
           get(
-            options.preview_route,
+            options.previews.route,
             to: "#{preview_controller}#index",
             as: :preview_view_components,
             internal: true
           )
 
           get(
-            "#{options.preview_route}/*path",
+            "#{options.previews.route}/*path",
             to: "#{preview_controller}#previews",
             as: :preview_view_component,
             internal: true

data/lib/view_component/inline_template.rb

@@ -9,7 +9,7 @@ module ViewComponent # :nodoc:
       def method_missing(method, *args)
         return super if !method.end_with?("_template")
 
-        if @__vc_inline_template_defined
+        if defined?(@__vc_inline_template_defined) && @__vc_inline_template_defined
           raise MultipleInlineTemplatesError
         end
 
@@ -38,11 +38,11 @@ module ViewComponent # :nodoc:
       end
 
       def inline_template
-        @__vc_inline_template
+        @__vc_inline_template if defined?(@__vc_inline_template)
       end
 
       def __vc_inline_template_language
-        @__vc_inline_template_language
+        @__vc_inline_template_language if defined?(@__vc_inline_template_language)
       end
 
       def inherited(subclass)

data/lib/view_component/preview.rb

@@ -102,7 +102,7 @@ module ViewComponent # :nodoc:
       private
 
       def preview_paths
-        Base.preview_paths
+        Base.previews.paths
       end
     end
   end

data/lib/view_component/slot.rb

@@ -9,18 +9,13 @@ module ViewComponent
     attr_writer :__vc_component_instance, :__vc_content_block, :__vc_content
 
     def initialize(parent)
-      @content = nil
-      @__vc_component_instance = nil
-      @__vc_content = nil
-      @__vc_content_block = nil
-      @__vc_content_set_by_with_content = nil
       @parent = parent
     end
 
     def content?
-      return true if @__vc_content.present?
-      return true if @__vc_content_set_by_with_content.present?
-      return true if @__vc_content_block.present?
+      return true if defined?(@__vc_content) && @__vc_content.present?
+      return true if defined?(@__vc_content_set_by_with_content) && @__vc_content_set_by_with_content.present?
+      return true if defined?(@__vc_content_block) && @__vc_content_block.present?
       return false if !__vc_component_instance?
 
       @__vc_component_instance.content?
@@ -48,11 +43,11 @@ module ViewComponent
     # If there is no slot renderable, we evaluate the block passed to
     # the slot and return it.
     def to_s
-      return @content if !@content.nil?
+      return @content if defined?(@content)
 
       view_context = @parent.send(:view_context)
 
-      if !@__vc_content_block.nil? && !@__vc_content_set_by_with_content.nil? && !@__vc_content_set_by_with_content.nil?
+      if defined?(@__vc_content_block) && defined?(@__vc_content_set_by_with_content)
         raise DuplicateSlotContentError.new(self.class.name)
       end
 
@@ -60,7 +55,7 @@ module ViewComponent
         if __vc_component_instance?
           @__vc_component_instance.__vc_original_view_context = @parent.__vc_original_view_context
 
-          if !@__vc_content_block.nil?
+          if defined?(@__vc_content_block)
             # render_in is faster than `parent.render`
             @__vc_component_instance.render_in(view_context) do |*args|
               @__vc_content_block.call(*args)
@@ -68,11 +63,11 @@ module ViewComponent
           else
             @__vc_component_instance.render_in(view_context)
           end
-        elsif !@__vc_content.nil?
+        elsif defined?(@__vc_content)
           @__vc_content
-        elsif !@__vc_content_block.nil?
+        elsif defined?(@__vc_content_block)
           view_context.capture(&@__vc_content_block)
-        elsif !@__vc_content_set_by_with_content.nil?
+        elsif defined?(@__vc_content_set_by_with_content)
           @__vc_content_set_by_with_content
         end
 
@@ -113,7 +108,7 @@ module ViewComponent
     private
 
     def __vc_component_instance?
-      !@__vc_component_instance.nil?
+      defined?(@__vc_component_instance)
     end
   end
 end

data/lib/view_component/slotable.rb

@@ -214,7 +214,8 @@ module ViewComponent
       # Called by the compiler, as instance methods are not defined when slots are first registered
       def register_default_slots
         registered_slots.each do |slot_name, config|
-          config[:default_method] = instance_methods.find { |method_name| method_name == :"default_#{slot_name}" }
+          default_method_name = :"default_#{slot_name}"
+          config[:default_method] = instance_methods.find { |method_name| method_name == default_method_name }
 
           registered_slots[slot_name] = config
         end
@@ -420,6 +421,8 @@ module ViewComponent
         end
       end
 
+      @__vc_set_slots ||= {}
+
       if slot_definition[:collection]
         @__vc_set_slots[slot_name] ||= []
         @__vc_set_slots[slot_name].push(slot)
@@ -433,7 +436,7 @@ module ViewComponent
     def set_polymorphic_slot(slot_name, poly_type = nil, *args, **kwargs, &block)
       slot_definition = self.class.registered_slots[slot_name]
 
-      if !slot_definition[:collection] && @__vc_set_slots[slot_name]
+      if !slot_definition[:collection] && defined?(@__vc_set_slots) && @__vc_set_slots[slot_name]
         raise ContentAlreadySetForPolymorphicSlotError.new(slot_name)
       end
 

data/lib/view_component/test_helpers.rb

@@ -73,7 +73,7 @@ module ViewComponent
     # @param params [Hash] Parameters to be passed to the preview.
     # @return [Nokogiri::HTML5]
     def render_preview(name, from: __vc_test_helpers_preview_class, params: {})
-      previews_controller = __vc_test_helpers_build_controller(Rails.application.config.view_component.preview_controller.constantize)
+      previews_controller = __vc_test_helpers_build_controller(Rails.application.config.view_component.previews.controller.constantize)
 
       # From what I can tell, it's not possible to overwrite all request parameters
       # at once, so we set them individually here.
@@ -233,7 +233,20 @@ module ViewComponent
     #
     # @return [ActionController::Base]
     def vc_test_controller
-      @vc_test_controller ||= __vc_test_helpers_build_controller(Base.test_controller.constantize)
+      @vc_test_controller ||= __vc_test_helpers_build_controller(vc_test_controller_class)
+    end
+
+    # Set the controller used by `render_inline`:
+    #
+    # ```ruby
+    # def vc_test_controller_class
+    #   MyTestController
+    # end
+    # ```
+    def vc_test_controller_class
+      return @__vc_test_controller_class if defined?(@__vc_test_controller_class)
+
+      defined?(ApplicationController) ? ApplicationController : ActionController::Base
     end
 
     # Access the request used by `render_inline`:

data/lib/view_component/version.rb

@@ -5,7 +5,7 @@ module ViewComponent
     MAJOR = 4
     MINOR = 0
     PATCH = 0
-    PRE = "alpha5"
+    PRE = "alpha6"
 
     STRING = [MAJOR, MINOR, PATCH, PRE].compact.join(".")
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: view_component
 version: !ruby/object:Gem::Version
-  version: 4.0.0.alpha5
+  version: 4.0.0.alpha6
 platform: ruby
 authors:
 - ViewComponent Team
@@ -43,412 +43,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1'
-- !ruby/object:Gem::Dependency
-  name: allocation_stats
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: appraisal
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2'
-- !ruby/object:Gem::Dependency
-  name: benchmark-ips
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2'
-- !ruby/object:Gem::Dependency
-  name: better_html
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2'
-- !ruby/object:Gem::Dependency
-  name: capybara
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3'
-- !ruby/object:Gem::Dependency
-  name: cuprite
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: erb_lint
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: haml
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '6'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '6'
-- !ruby/object:Gem::Dependency
-  name: jbuilder
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2'
-- !ruby/object:Gem::Dependency
-  name: m
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1'
-- !ruby/object:Gem::Dependency
-  name: method_source
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1'
-- !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5'
-- !ruby/object:Gem::Dependency
-  name: puma
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '6'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '6'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13'
-- !ruby/object:Gem::Dependency
-  name: redis
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '7'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '7'
-- !ruby/object:Gem::Dependency
-  name: rubocop-md
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2'
-- !ruby/object:Gem::Dependency
-  name: selenium-webdriver
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4'
-- !ruby/object:Gem::Dependency
-  name: simplecov-console
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '1'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '1'
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '1'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '1'
-- !ruby/object:Gem::Dependency
-  name: slim
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5'
-- !ruby/object:Gem::Dependency
-  name: sprockets-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3'
-- !ruby/object:Gem::Dependency
-  name: standard
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1'
-- !ruby/object:Gem::Dependency
-  name: turbo-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2'
-- !ruby/object:Gem::Dependency
-  name: warning
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: yard-activesupport-concern
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '1'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '1'
-- !ruby/object:Gem::Dependency
-  name: yard
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '1'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '1'
-- !ruby/object:Gem::Dependency
-  name: propshaft
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1'
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -469,7 +63,6 @@ files:
 - lib/view_component/collection.rb
 - lib/view_component/compile_cache.rb
 - lib/view_component/compiler.rb
-- lib/view_component/component_local_config.rb
 - lib/view_component/config.rb
 - lib/view_component/configurable.rb
 - lib/view_component/deprecation.rb
@@ -481,7 +74,6 @@ files:
 - lib/view_component/request_details.rb
 - lib/view_component/slot.rb
 - lib/view_component/slotable.rb
-- lib/view_component/slotable_default.rb
 - lib/view_component/system_test_case.rb
 - lib/view_component/system_test_helpers.rb
 - lib/view_component/template.rb

data/lib/view_component/component_local_config.rb

@@ -1,60 +0,0 @@
-# frozen_string_literal: true
-
-module ViewComponent
-  module ComponentLocalConfig
-    class Configuration
-      def self.defaults
-        ActiveSupport::Configurable::Configuration[
-          strip_trailing_whitespace: false
-        ]
-      end
-
-      def initialize(config = defaults)
-        @config = config
-      end
-
-      delegate_missing_to :@config
-
-      def inheritable_copy
-        self.class.new(@config.inheritable_copy)
-      end
-
-      private
-
-      delegate :defaults, to: :class
-    end
-
-    extend ActiveSupport::Concern
-
-    included do
-      # :nocov:
-      def view_component_config
-        @__vc_config ||= self.class.view_component_config.inheritable_copy
-      end
-
-      private
-
-      def inherited(child)
-        child.instance_variable_set(:@__vc_config, nil)
-        super
-      end
-      # :nocov:
-    end
-
-    class_methods do
-      def view_component_config
-        @__vc_config ||= if respond_to?(:superclass) && superclass.respond_to?(:view_component_config)
-          superclass.view_component_config.inheritable_copy
-        else
-          # create a new "anonymous" class that will host the compiled reader methods
-          ViewComponent::ComponentLocalConfig::Configuration.new
-        end
-      end
-
-      def configure_view_component(&block)
-        view_component_config.instance_eval(&block)
-        view_component_config.compile_methods!
-      end
-    end
-  end
-end

data/lib/view_component/slotable_default.rb

@@ -1,18 +0,0 @@
-module ViewComponent
-  module SlotableDefault
-    def get_slot(slot_name)
-      return super unless !@__vc_set_slots[slot_name] && (default_method = registered_slots[slot_name][:default_method])
-
-      renderable_value = send(default_method)
-      slot = Slot.new(self)
-
-      if renderable_value.respond_to?(:render_in)
-        slot.__vc_component_instance = renderable_value
-      else
-        slot.__vc_content = renderable_value
-      end
-
-      slot
-    end
-  end
-end