view_component 3.12.0 → 3.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c9624272c360c4807dd67cd51f1ac1c1ffa9eab79cfb77994768ef32c8cb6af0
-  data.tar.gz: f393224b193af373eef5333a35fc20ac8ca8d5501716d0c3a58aeea0ad56de61
+  metadata.gz: 7355cbed890e04169fee1c12513cd045bee0e912838c9d368be9317ee801bfcc
+  data.tar.gz: 76b95e2aab1e097356e06c4c6695a12a1fc0cc3344f3657c1bf42bcb587157cc
 SHA512:
-  metadata.gz: dfa57ba053fac0733672492bee096d2b009dea6e5931e38ecb300d7eabe4d90a73966d81373dc7bbc1f61bcf074fc2e803611eb6602554b649b9f54a9a4ea471
-  data.tar.gz: c8bf7fbbc161ce4030e7529bd7c5c7053d3c16f6c7f92a2816abce0727ceeacbce12d6b757faa107b3e24b92f6c423875afce3c50008d049aca45716c5be2dff
+  metadata.gz: f3f7b42ee9a138203348eb6a6560e0d67f041c0d66aaf5eb8465ac6f2ef506eab543a5c408f2a879c70228ae6bef029fc3a916f36344a8835bb8e9d29c4bf89b
+  data.tar.gz: cd8d3a36c04d72941503a255f0143d7ea6f5178364e20e1fac834a7e5ac683b0915588b14cda7c9025bc4ac4cba476c184780940606a968b5449167a9428440f

data/docs/CHANGELOG.md

@@ -10,6 +10,34 @@ nav_order: 5
 
 ## main
 
+## 3.13.0
+
+* Add ruby head and YJIT to CI.
+
+    *Reegan Viljoen*
+
+* Fixed a bug where inline templates where unable to remove trailing whitespace without throwing an error.
+
+    *Reegan Viljoen*
+
+* Fixed CI for Rails main.
+
+    *Reegan Viljoen*
+
+* Add `from:` option to `use_helpers` to allow for more flexible helper inclusion from modules.
+
+    *Reegan Viljoen*
+
+* Fixed ruby head matcher issue.
+
+    *Reegan Viljoen*
+
+## 3.12.1
+
+* Ensure content is rendered correctly for forwarded slots.
+
+    *Cameron Dutro*
+
 ## 3.12.0
 
 * Remove offline links from resources.
@@ -18,15 +46,15 @@ nav_order: 5
 
 * Fix templates not being correctly populated when caller location label has a prefix.
 
-On the upstream version of Ruby, method owners are now included in backtraces as prefixes. This caused the call stack filtering to not work as intended and thus `source_location` to be incorrect for child ViewComponents, consequently not populating templates correctly.
+  On the upstream version of Ruby, method owners are now included in backtraces as prefixes. This caused the call stack filtering to not work as intended and thus `source_location` to be incorrect for child ViewComponents, consequently not populating templates correctly.
 
     *Allan Pires, Jason Kim*
 
 * Use component path for generating RSpec files.
 
-When generating new RSpec files for components, the generator will use the `view_component_path` value in the config to decide where to put the new spec file. For instance, if the `view_component_path` option has been changed to `app/views/components`, the generator will put the spec file in `spec/views/components`. **If the `view_component_path` doesn't start with `app/`, then the generator will fall back to `spec/components/`.**
+  When generating new RSpec files for components, the generator will use the `view_component_path` value in the config to decide where to put the new spec file. For instance, if the `view_component_path` option has been changed to `app/views/components`, the generator will put the spec file in `spec/views/components`. **If the `view_component_path` doesn't start with `app/`, then the generator will fall back to `spec/components/`.**
 
-This feature is enabled via the `config.view_component.generate.use_component_path_for_rspec_tests` option, defaulting to `false`. The default will change to `true` in ViewComponent v4.
+  This feature is enabled via the `config.view_component.generate.use_component_path_for_rspec_tests` option, defaulting to `false`. The default will change to `true` in ViewComponent v4.
 
     *William Mathewson*
 
@@ -50,7 +78,7 @@ This feature is enabled via the `config.view_component.generate.use_component_pa
 
 * Include ViewComponent::UseHelpers by default.
 
-      *Reegan Viljoen*
+    *Reegan Viljoen*
 
 * Bump `puma` in Gemfile.lock.
 

data/lib/view_component/compiler.rb

@@ -247,9 +247,9 @@ module ViewComponent
 
     def compiled_inline_template(template)
       handler = ActionView::Template.handler_for_extension(template.language)
-      template.rstrip! if component_class.strip_trailing_whitespace?
+      template = template.source.dup
 
-      compile_template(template.source, handler)
+      compile_template(template, handler)
     end
 
     def compiled_template(file_path)

data/lib/view_component/instrumentation.rb

@@ -16,7 +16,7 @@ module ViewComponent # :nodoc:
           identifier: self.class.identifier
         }
       ) do
-        super(view_context, &block)
+        super
       end
     end
 

data/lib/view_component/slot.rb

@@ -57,7 +57,17 @@ module ViewComponent
 
           if defined?(@__vc_content_block)
             # render_in is faster than `parent.render`
-            @__vc_component_instance.render_in(view_context, &@__vc_content_block)
+            @__vc_component_instance.render_in(view_context) do |*args|
+              return @__vc_content_block.call(*args) if @__vc_content_block&.source_location.nil?
+
+              block_context = @__vc_content_block.binding.receiver
+
+              if block_context.class < ActionView::Base
+                block_context.capture(*args, &@__vc_content_block)
+              else
+                @__vc_content_block.call(*args)
+              end
+            end
           else
             @__vc_component_instance.render_in(view_context)
           end

data/lib/view_component/use_helpers.rb

@@ -4,17 +4,27 @@ module ViewComponent::UseHelpers
   extend ActiveSupport::Concern
 
   class_methods do
-    def use_helpers(*args)
-      args.each do |helper_method|
-        class_eval(<<-RUBY, __FILE__, __LINE__ + 1)
-          def #{helper_method}(*args, &block)
-            raise HelpersCalledBeforeRenderError if view_context.nil?
-            __vc_original_view_context.#{helper_method}(*args, &block)
-          end
-        RUBY
+    def use_helpers(*args, from: nil)
+      args.each { |helper_method| use_helper(helper_method, from: from) }
+    end
+
+    def use_helper(helper_method, from: nil)
+      class_eval(<<-RUBY, __FILE__, __LINE__ + 1)
+        def #{helper_method}(*args, &block)
+          raise HelpersCalledBeforeRenderError if view_context.nil?
+
+          #{define_helper(helper_method: helper_method, source: from)}
+        end
+      RUBY
+      ruby2_keywords(helper_method) if respond_to?(:ruby2_keywords, true)
+    end
+
+    private
+
+    def define_helper(helper_method:, source:)
+      return "__vc_original_view_context.#{helper_method}(*args, &block)" unless source.present?
 
-        ruby2_keywords(helper_method) if respond_to?(:ruby2_keywords, true)
-      end
+      "#{source}.instance_method(:#{helper_method}).bind(self).call(*args, &block)"
     end
   end
 end

data/lib/view_component/version.rb

@@ -3,7 +3,7 @@
 module ViewComponent
   module VERSION
     MAJOR = 3
-    MINOR = 12
+    MINOR = 13
     PATCH = 0
     PRE = nil
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: view_component
 version: !ruby/object:Gem::Version
-  version: 3.12.0
+  version: 3.13.0
 platform: ruby
 authors:
 - ViewComponent Team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-04-12 00:00:00.000000000 Z
+date: 2024-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -561,7 +561,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.4
+rubygems_version: 3.5.3
 signing_key:
 specification_version: 4
 summary: A framework for building reusable, testable & encapsulated view components