Merge branch 'main' into active-scaffold-compat

Author: joelhawksley

Gemfile

@@ -21,7 +21,7 @@ group :development, :test do
   gem "cuprite"
   gem "dry-initializer", require: true
   gem "erb_lint"
-  gem "haml", "~> 6"
+  gem "haml", "~> 7"
   gem "jbuilder", "~> 2"
   gem "m", "~> 1"
   gem "method_source", "~> 1"

Gemfile.lock

@@ -141,7 +141,7 @@ GEM
       websocket-driver (~> 0.7)
     globalid (1.3.0)
       activesupport (>= 6.1)
-    haml (6.4.0)
+    haml (7.0.2)
       temple (>= 0.8.2)
       thor
       tilt
@@ -428,7 +428,7 @@ DEPENDENCIES
   cuprite
   dry-initializer
   erb_lint
-  haml (~> 6)
+  haml (~> 7)
   jbuilder (~> 2)
   m (~> 1)
   method_source (~> 1)

docs/CHANGELOG.md

@@ -14,6 +14,22 @@ nav_order: 6
 
     *David Löwenfels*
 
+* Add test to document the current behavior for resolving relative translation keys within partial blocks. When rendering a partial, relative translation keys are resolved relative to the partial's own path rather than the caller’s path. This test ensures that this behavior remains consistent.
+
+    *Oussama Hilal*
+
+* Allow I18n calls in `render?`.
+
+    *23tux*
+
+* ViewComponent now works without `rails` and `railties` gems loaded, enabling compatibility with Bridgetown 2.0.
+
+    *Tom Lord*
+
+* Capture partial block in the component's context, allowing access to the component instance inside the block.
+
+    *23tux*
+
 * Add `after_compile` class method hook to enable extensions to run logic after component compilation.
 
     *Jose Solás*

lib/view_component.rb

@@ -17,7 +17,7 @@ module ViewComponent
   autoload :Preview
   autoload :Translatable
 
-  if Rails.env.test?
+  if defined?(Rails.env) && Rails.env.test?
     autoload :TestHelpers
     autoload :SystemSpecHelpers
     autoload :SystemTestHelpers

lib/view_component/base.rb

@@ -46,7 +46,7 @@ def config
     end
 
     include ActionView::Helpers
-    include Rails.application.routes.url_helpers if defined?(Rails) && Rails.application
+    include Rails.application.routes.url_helpers if defined?(Rails.application.routes)
     include ERB::Escape
     include ActiveSupport::CoreExt::ERBUtil
 
@@ -131,15 +131,14 @@ def render_in(view_context, &block)
 
       @__vc_content_evaluated = false
       @__vc_render_in_block = block
+      @view_context.instance_variable_set(:@virtual_path, virtual_path)
 
       before_render
 
       if render?
         value = nil
 
         @output_buffer.with_buffer do
-          @view_context.instance_variable_set(:@virtual_path, virtual_path)
-
           rendered_template =
             around_render do
               render_template_for(@__vc_requested_details).to_s
@@ -260,14 +259,17 @@ def render(options = {}, args = {}, &block)
         @view_context.render(options, args, &block)
       elsif block
         __vc_original_view_context.render(options, args) do
+          # capture the block output in the view context of the component
+          output = capture(&block)
+
           # Partials are rendered to their own buffer and do not append to the
           # original @output_buffer we retain a reference to in #render_in. This
           # is a problem since the block passed to us here in the #render method
           # is evaluated within the context of ViewComponent::Base, and thus
           # appends to the original @output_buffer. To avoid this, we evaluate the
           # block in the view context instead, which will append to the output buffer
           # created for the partial.
-          __vc_original_view_context.instance_exec(&block)
+          __vc_original_view_context.capture { output }
         end
       else
         __vc_original_view_context.render(options, args)
@@ -301,7 +303,7 @@ def helpers
       @__vc_helpers ||= __vc_original_view_context || controller.view_context
     end
 
-    if ::Rails.env.development? || ::Rails.env.test?
+    if defined?(Rails.env) && (::Rails.env.development? || ::Rails.env.test?)
       # @private
       def method_missing(method_name, *args) # rubocop:disable Style/MissingRespondToMissing
         super
@@ -330,7 +332,7 @@ def view_cache_dependencies
       []
     end
 
-    if Rails::VERSION::MAJOR == 7 && Rails::VERSION::MINOR == 1
+    if defined?(Rails::VERSION) && Rails::VERSION::MAJOR == 7 && Rails::VERSION::MINOR == 1
       # Rails expects us to define `format` on all renderables,
       # but we do not know the `format` of a ViewComponent until runtime.
       def format

lib/view_component/collection.rb

@@ -20,7 +20,7 @@ def each(&block)
       components.each(&block)
     end
 
-    if Rails::VERSION::MAJOR == 7 && Rails::VERSION::MINOR == 1
+    if defined?(Rails::VERSION) && Rails::VERSION::MAJOR == 7 && Rails::VERSION::MINOR == 1
       # Rails expects us to define `format` on all renderables,
       # but we do not know the `format` of a ViewComponent until runtime.
       def format

lib/view_component/config.rb

@@ -163,7 +163,7 @@ 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.enabled = defined?(Rails.env) && (Rails.env.development? || Rails.env.test?)
         options.default_layout = nil
         options.paths = default_preview_paths
         options

test/sandbox/app/components/partial_with_yield_and_method_call_component.html.erb

@@ -0,0 +1,3 @@
+<%= render "shared/yielding_partial" do %>
+  <%= world %>
+<% end %>

test/sandbox/app/components/partial_with_yield_and_method_call_component.rb

@@ -0,0 +1,5 @@
+class PartialWithYieldAndMethodCallComponent < ViewComponent::Base
+  def world
+    "world"
+  end
+end

test/sandbox/app/components/relative_translation_partial_block_component.html.erb

@@ -0,0 +1,3 @@
+<%= render "shared/partial" do %>
+  <%= t(".title") %>
+<% end %>