view_component 3.23.2 → 4.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 79672f93bd1c3bfa2dae00890f833c5dfb63dec49585dd79453f6592f9f47520
-  data.tar.gz: e6fe55dfe963ce0e7f4d793c93b67aefa92c99ee834c17c35644a9ea8b746886
+  metadata.gz: b2f1a7d34956fc9ae629c0f0e710f4a7335b33ebc99f1c3eccafc41d19713524
+  data.tar.gz: efd4bec7d2425da171f89f28fbc1bfaf9f2cba94fd0f2a9cbce674830281938e
 SHA512:
-  metadata.gz: 311478a282f72c7b703594ec119dfc2686ec8cd3c6d6e97ff9fab9a32638e09eacefdc82a3808c581e48ab2af4cbfb26f66c7064cb614367cb4916fdf3b7df76
-  data.tar.gz: 3c059cb40bfa81c45a60bc9d107be8402923f92f0a8e1b50c6cdfcad88a4da6407244f1e5220d58f59a938c3d77e748ec22f360b8cf49041279616138ac4397d
+  metadata.gz: 5d0f5024d419a56b5e178f0cce3d77ac4a1ae2d4d3efc0ac5334e7b55a4dcb6cc7460aa4d60a47bce63918b0a452b53c5425297ef03da2ce074793407acef570
+  data.tar.gz: be1d649efec64995de234eb70998001d42cd9b0197bdce00ec5011d68cb2a2784925abf283b3f51c3986a55a446db3ba0c17cedf406c919e31b178ece2be6b51

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

@@ -8,20 +8,13 @@ module ViewComponent
       prepend_view_path File.expand_path("../../../views", __dir__)
 
       around_action :set_locale, only: :previews
-      before_action :require_local!, unless: :show_previews?
+      before_action :require_local!, unless: :previews_enabled?
 
-      content_security_policy(false) if respond_to?(:content_security_policy)
+      content_security_policy(false)
 
       # Including helpers here ensures that we're loading the
       # latest version of helpers if code-reloading is enabled
-      if include_all_helpers
-        helper :all
-      else
-        # :nocov:
-        # Always provide the #view_source helper
-        helper PreviewHelper
-        # :nocov:
-      end
+      helper :all if include_all_helpers
     end
 
     def index
@@ -54,12 +47,12 @@ module ViewComponent
 
     # :doc:
     def default_preview_layout
-      ViewComponent::Base.config.default_preview_layout
+      ViewComponent::Base.config.previews.default_layout
     end
 
     # :doc:
-    def show_previews?
-      ViewComponent::Base.config.show_previews
+    def previews_enabled?
+      ViewComponent::Base.config.previews.enabled
     end
 
     # :doc:
@@ -71,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
 
@@ -102,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

@@ -1,30 +1,36 @@
 # frozen_string_literal: true
 
+require "view_component/errors"
+
 class ViewComponentsSystemTestController < ActionController::Base # :nodoc:
-  before_action :validate_test_env
-  before_action :validate_file_path
+  if Rails.env.test?
+    before_action :validate_file_path
 
-  def self.temp_dir
-    @_tmpdir ||= FileUtils.mkdir_p("./tmp/view_components/").first
-  end
+    def self.temp_dir
+      @_tmpdir ||= FileUtils.mkdir_p("./tmp/view_components/").first
+    end
 
-  def system_test_entrypoint
-    render file: @path
-  end
+    rescue_from ViewComponent::SystemTestControllerNefariousPathError, with: :render_not_found
 
-  private
+    def system_test_entrypoint
+      render file: @path
+    end
 
-  def validate_test_env
-    raise ViewComponent::SystemTestControllerOnlyAllowedInTestError unless Rails.env.test?
-  end
+    private
+
+    def render_not_found
+      head :not_found
+    end
 
-  # Ensure that the file path is valid and doesn't target files outside
-  # the expected directory (e.g. via a path traversal or symlink attack)
-  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
+    # Ensure that the file path is valid and doesn't target files outside
+    # the expected directory (e.g. via a path traversal or symlink attack)
+    def validate_file_path
+      base_path = ::File.realpath(self.class.temp_dir)
+      @path = ::File.realpath(params.permit(:file)[:file], base_path)
+      allowed_prefix = "#{base_path}#{::File::SEPARATOR}"
+      unless @path == base_path || @path.start_with?(allowed_prefix)
+        raise ViewComponent::SystemTestControllerNefariousPathError
+      end
     end
   end
 end

data/app/views/test_mailer/test_asset_email.html.erb

@@ -0,0 +1 @@
+<%= render AssetComponent.new %>

data/app/views/test_mailer/test_url_email.html.erb

@@ -0,0 +1 @@
+<%= render(UrlForMailerComponent.new) %>

data/app/views/view_components/preview.html.erb

@@ -1,13 +1,5 @@
 <% if @render_args[:component] %>
-  <% if ViewComponent::Base.config.render_monkey_patch_enabled || Rails.version.to_f >= 6.1 %>
-    <%= render(@render_args[:component], @render_args[:args], &@render_args[:block]) %>
-  <% else %>
-    <%= render_component(@render_args[:component], &@render_args[:block]) %>
-  <% end %>
+  <%= render(@render_args[:component], @render_args[:args], &@render_args[:block]) %>
 <% else %>
   <%= render template: @render_args[:template], locals: @render_args[:locals] || {} %>
 <% end %>
-
-<% if ViewComponent::Base.config.show_previews_source %>
-  <%= preview_source %>
-<% end %>