release 3.5.0 (#1808)

* release 3.5.0

* Fix inline render_parent tests

Author: camertron

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    view_component (3.4.0)
+    view_component (3.5.0)
       activesupport (>= 5.2.0, < 8.0)
       concurrent-ruby (~> 1.0)
       method_source (~> 1.0)

docs/CHANGELOG.md

@@ -10,6 +10,8 @@ nav_order: 5
 
 ## main
 
+## 3.5.0
+
 * Add Skroutz to users list.
 
     *Chris Nitsas*

docs/_data/library.yml

@@ -1 +1 @@
-version: 3.4.0
+version: 3.5.0

docs/guide/templates.md

@@ -143,26 +143,13 @@ class MyComponent < ViewComponent::Base
 end
 ```
 
-Finally, `#render_parent` also works inside `#call` methods:
+Keep in mind that `#render_parent` doesn't return a string. If a string is desired, eg. inside a `#call` method, call `#render_parent_to_string` instead. For example:
 
 ```ruby
 class MyComponent < ViewComponent::Base
   def call
     content_tag("div") do
-      render_parent
-    end
-  end
-end
-```
-
-When composing `#call` methods, keep in mind that `#render_parent` does not return a string. If a string is desired, call `#render_parent_to_string` instead. For example:
-
-```ruby
-class MyComponent < ViewComponent::Base
-  # "phone" variant
-  def call_phone
-    content_tag("div") do
-      "<div>#{render_parent_to_string}</div>"
+      render_parent_to_string
     end
   end
 end

lib/view_component/base.rb

@@ -127,17 +127,8 @@ def render_in(view_context, &block)
     # parent template considering the current variant and emits the result without
     # double-rendering.
     def render_parent
-      @__vc_parent_render_level ||= 0 # ensure a good starting value
-
-      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_variant)
-        nil
-      ensure
-        @__vc_parent_render_level -= 1
-      end
+      render_parent_to_string
+      nil
     end
 
     # Renders the parent component to a string and returns it. This method is meant
@@ -151,7 +142,16 @@ def render_parent
     #
     # When rendering the parent inside an .erb template, use `#render_parent` instead.
     def render_parent_to_string
-      capture { render_parent }
+      @__vc_parent_render_level ||= 0 # ensure a good starting value
+
+      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_variant)
+      ensure
+        @__vc_parent_render_level -= 1
+      end
     end
 
     # Optional content to be returned after the rendered template.

lib/view_component/version.rb

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

test/sandbox/app/components/inline_level1_component.rb

@@ -2,6 +2,8 @@
 
 class InlineLevel1Component < ViewComponent::Base
   def call
-    content_tag(:div, class: "level1-component")
+    content_tag(:div, class: "level1-component") do
+      "Level 1 component"
+    end
   end
 end

test/sandbox/app/components/inline_level2_component.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
-class InlineLevel2Component < Level2Component
+class InlineLevel2Component < InlineLevel1Component
   def call
-    "<div level2-component base>#{render_parent_to_string}</div>"
+    "<div class='level2-component base'>#{render_parent_to_string}</div>".html_safe
   end
 
   def call_variant
-    "<div level2-component variant>#{render_parent_to_string}</div>"
+    "<div class='level2-component variant'>#{render_parent_to_string}</div>".html_safe
   end
 end

test/sandbox/app/components/inline_level3_component.rb

@@ -1,15 +1,15 @@
 # frozen_string_literal: true
 
-class InlineLevel3Component < Level2Component
+class InlineLevel3Component < InlineLevel2Component
   def call
     content_tag(:div, class: "level3-component base") do
-      render_parent
+      render_parent_to_string
     end
   end
 
   def call_variant
     content_tag(:div, class: "level3-component variant") do
-      render_parent
+      render_parent_to_string
     end
   end
 end