view_component 3.0.0.rc3 → 3.0.0.rc5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f88375c08b20eb604992d315362fbdf6e0654fd87d7766d1ac404daecb1b57c9
-  data.tar.gz: 5f37ce63b609f5ff542a7e7c4629c952e3a02fc4e2ffc83df28aee86ff5d40cd
+  metadata.gz: 3746041e156447e727a9974ad435795bd08333c13f6004ba5a03f629764d301d
+  data.tar.gz: 47e3d85474b5cb69fbc12abb48a59a85776f14475508ff55f40f672f393bd309
 SHA512:
-  metadata.gz: 425107ab124527b5199b4174437c17a0f2dae4447b77a9393f68dd8c7a88517e25a3100fa0ed4cf6190d7e3b38390c6fd5cf48718753a53169f72dfe50ae5d12
-  data.tar.gz: b1642a727d8a586d8dec7a2e7075b570f5ccb20cee0b3c41037ac0b119adc6261ca1d1fb1dea0558f4bb40a0a45ba73b111ce4816a85be6798e3fb2bfaf76daf
+  metadata.gz: cc5edccc814c845eb63ce951e621365ec9ec3013363b32b0bc5f05db8a0fb15ea26688eae22f54fcc17bbc477c5e93350cd0b3fbf3af9bd1e27f1f3f9e53cbec
+  data.tar.gz: d87a2ee301acf5b4e67ec159bc3433ce2d46da343de5da26af975314b862b4befbfdd247a0046239b99bb322e26b4062625073424ba0fd7e54a1e973a2d56ebd

data/app/controllers/view_components_system_test_controller.rb

@@ -1,11 +1,13 @@
 # frozen_string_literal: true
 
 class ViewComponentsSystemTestController < ActionController::Base # :nodoc:
-  TEMP_DIR = FileUtils.mkdir_p("./tmp/view_components/").first
-
   before_action :validate_test_env
   before_action :validate_file_path
 
+  def self.temp_dir
+    @_tmpdir ||= FileUtils.mkdir_p("./tmp/view_components/").first
+  end
+
   def system_test_entrypoint
     render file: @path
   end
@@ -19,7 +21,7 @@ class ViewComponentsSystemTestController < ActionController::Base # :nodoc:
   # 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(TEMP_DIR)
+    base_path = ::File.realpath(self.class.temp_dir)
     @path = ::File.realpath(params.permit(:file)[:file], base_path)
     unless @path.start_with?(base_path)
       raise ArgumentError, "Invalid file path"

data/docs/CHANGELOG.md

@@ -10,6 +10,28 @@ nav_order: 5
 
 ## main
 
+## v3.0.0.rc5
+
+* Fix bug where `mkdir_p` failed due to incorrect permissions.
+
+    *Joel Hawksley*
+
+* Check for inline `erb_template` calls when deciding whether or not to compile a component's superclass.
+
+    *Justin Kenyon*
+
+* Protect against `SystemStackError` if `CaptureCompatibility` module is included more than once.
+
+    *Cameron Dutro*
+
+## v3.0.0.rc4
+
+Run into an issue with this release candidate? [Let us know](https://github.com/ViewComponent/view_component/issues/1629).
+
+* Add `TestHelpers#vc_test_request`.
+
+    *Joel Hawksley*
+
 ## v3.0.0.rc3
 
 Run into an issue with this release candidate? [Let us know](https://github.com/ViewComponent/view_component/issues/1629).

data/lib/view_component/capture_compatibility.rb

@@ -17,6 +17,8 @@ module ViewComponent
   # the `capture` logic to the ViewComponent that created the block.
   module CaptureCompatibility
     def self.included(base)
+      return if base < InstanceMethods
+
       base.class_eval do
         alias_method :original_capture, :capture
       end

data/lib/view_component/compiler.rb

@@ -285,8 +285,7 @@ module ViewComponent
     end
 
     def should_compile_superclass?
-      development? &&
-        templates.empty? &&
+      development? && templates.empty? && !has_inline_template? &&
         !(
           component_class.instance_methods(false).include?(:call) ||
             component_class.private_instance_methods(false).include?(:call)

data/lib/view_component/system_test_helpers.rb

@@ -12,7 +12,7 @@ module ViewComponent
     def with_rendered_component_path(fragment, layout: false, &block)
       file = Tempfile.new(
         ["rendered_#{fragment.class.name}", ".html"],
-        ViewComponentsSystemTestController::TEMP_DIR
+        ViewComponentsSystemTestController.temp_dir
       )
       begin
         file.write(vc_test_controller.render_to_string(html: fragment.to_html.html_safe, layout: layout))

data/lib/view_component/test_helpers.rb

@@ -157,23 +157,23 @@ module ViewComponent
     #
     # @param path [String] The path to set for the current request.
     def with_request_url(path)
-      old_request_path_info = __vc_test_helpers_request.path_info
-      old_request_path_parameters = __vc_test_helpers_request.path_parameters
-      old_request_query_parameters = __vc_test_helpers_request.query_parameters
-      old_request_query_string = __vc_test_helpers_request.query_string
+      old_request_path_info = vc_test_request.path_info
+      old_request_path_parameters = vc_test_request.path_parameters
+      old_request_query_parameters = vc_test_request.query_parameters
+      old_request_query_string = vc_test_request.query_string
       old_controller = defined?(@vc_test_controller) && @vc_test_controller
 
       path, query = path.split("?", 2)
-      __vc_test_helpers_request.path_info = path
-      __vc_test_helpers_request.path_parameters = Rails.application.routes.recognize_path_with_request(__vc_test_helpers_request, path, {})
-      __vc_test_helpers_request.set_header("action_dispatch.request.query_parameters", Rack::Utils.parse_nested_query(query))
-      __vc_test_helpers_request.set_header(Rack::QUERY_STRING, query)
+      vc_test_request.path_info = path
+      vc_test_request.path_parameters = Rails.application.routes.recognize_path_with_request(vc_test_request, path, {})
+      vc_test_request.set_header("action_dispatch.request.query_parameters", Rack::Utils.parse_nested_query(query))
+      vc_test_request.set_header(Rack::QUERY_STRING, query)
       yield
     ensure
-      __vc_test_helpers_request.path_info = old_request_path_info
-      __vc_test_helpers_request.path_parameters = old_request_path_parameters
-      __vc_test_helpers_request.set_header("action_dispatch.request.query_parameters", old_request_query_parameters)
-      __vc_test_helpers_request.set_header(Rack::QUERY_STRING, old_request_query_string)
+      vc_test_request.path_info = old_request_path_info
+      vc_test_request.path_parameters = old_request_path_parameters
+      vc_test_request.set_header("action_dispatch.request.query_parameters", old_request_query_parameters)
+      vc_test_request.set_header(Rack::QUERY_STRING, old_request_query_string)
       @vc_test_controller = old_controller
     end
 
@@ -192,11 +192,19 @@ module ViewComponent
       @vc_test_controller ||= __vc_test_helpers_build_controller(Base.test_controller.constantize)
     end
 
-    # Note: We prefix private methods here to prevent collisions in consumer's tests.
-    private
-
-    def __vc_test_helpers_request
-      @__vc_test_helpers_request ||=
+    # Access the request used by `render_inline`:
+    #
+    # ```ruby
+    # test "component does not render in Firefox" do
+    #   request.env["HTTP_USER_AGENT"] = "Mozilla/5.0"
+    #   render_inline(NoFirefoxComponent.new)
+    #   refute_component_rendered
+    # end
+    # ```
+    #
+    # @return [ActionDispatch::TestRequest]
+    def vc_test_request
+      @vc_test_request ||=
         begin
           out = ActionDispatch::TestRequest.create
           out.session = ActionController::TestSession.new
@@ -204,8 +212,11 @@ module ViewComponent
         end
     end
 
+    # Note: We prefix private methods here to prevent collisions in consumer's tests.
+    private
+
     def __vc_test_helpers_build_controller(klass)
-      klass.new.tap { |c| c.request = __vc_test_helpers_request }.extend(Rails.application.routes.url_helpers)
+      klass.new.tap { |c| c.request = vc_test_request }.extend(Rails.application.routes.url_helpers)
     end
 
     def __vc_test_helpers_preview_class

data/lib/view_component/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: view_component
 version: !ruby/object:Gem::Version
-  version: 3.0.0.rc3
+  version: 3.0.0.rc5
 platform: ruby
 authors:
 - ViewComponent Team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-08 00:00:00.000000000 Z
+date: 2023-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport