Merge pull request #226 from phlex-ruby/unbuffered-bug

Fix unbuffered bug

Author: joeldrapper

lib/phlex/rails/sgml.rb

@@ -55,33 +55,20 @@ def render(*args, **kwargs, &block)
 					nil
 				end
 
-				def render_in(view_context, &block)
+				def render_in(view_context, &erb)
 					fragments = if view_context.request && (fragment_header = view_context.request.headers["X-Fragment"])
 						fragment_header.split
 					end
 
-					if block_given?
-						call(view_context:, fragments:) do |*args|
-							original_length = @_context.target.bytesize
-
-							if args.length == 1 && Phlex::SGML === args[0] && !block.source_location&.[](0)&.end_with?(".rb")
-								output = view_context.capture(
-									Phlex::Rails::Unbuffered.new(args[0]),
-									&block
-								)
+					if erb
+						call(view_context:, fragments:) { |*args|
+							if args.length == 1 && Phlex::SGML === args[0] && !erb.source_location&.[](0)&.end_with?(".rb")
+								unbuffered = Phlex::Rails::Unbuffered.new(args[0])
+								raw(helpers.capture(unbuffered, &erb))
 							else
-								output = view_context.capture(*args, &block)
-							end
-
-							unchanged = (original_length == @_context.target.bytesize)
-
-							if unchanged
-								case output
-								when ActiveSupport::SafeBuffer
-									@_context.target << output
-								end
+								raw(helpers.capture(*args, &erb))
 							end
-						end.html_safe
+						}.html_safe
 					else
 						call(view_context:, fragments:).html_safe
 					end

lib/phlex/rails/testing.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 require "phlex/rails"
 require "phlex/testing"
@@ -13,5 +14,5 @@ def controller
 end
 
 Phlex::Testing::SGML.include(
-	Phlex::Testing::RailsContext
+	Phlex::Testing::RailsContext,
 )

lib/phlex/rails/unbuffered.rb

@@ -1,59 +1,51 @@
 # frozen_string_literal: true
 
 # @api private
-class Phlex::Rails::Unbuffered < BasicObject
-	def initialize(object)
-		@object = object
+class Phlex::Rails::Unbuffered
+	def initialize(component)
+		@component = component
 	end
 
-	def inspect
-		"Unbuffered(#{@object.class.name})[object: #{@object.inspect}]"
-	end
-
-	define_method :__class__,
-		::Object.instance_method(:class)
-
 	def respond_to_missing?(...)
-		@object.respond_to?(...)
+		@component.respond_to?(...)
 	end
 
-	def method_missing(name, ...)
-		if @object.respond_to?(name)
-			__class__.define_method(name) do |*a, **k, &b|
-				@object.capture do
-					if b
-						@object.public_send(name, *a, **k) do |*aa|
-							if aa.length == 1 && ::Phlex::SGML === aa[0]
-								@object.helpers.capture(
-									::Phlex::Rails::Unbuffered.new(aa[0]),
-									&b
-								)
-							else
-								@object.helpers.capture(*aa, &b)
-							end
-						end
-					else
-						@object.public_send(name, *a, **k)
+	def method_missing(method_name, *, &erb)
+		if @component.respond_to?(method_name)
+			output = @component.capture do
+				if erb
+					@component.public_send(method_name, *) do
+						@component.raw(
+							@component.helpers.capture(
+								&erb
+							),
+						)
 					end
+				else # no erb block
+					@component.public_send(
+						method_name,
+						*,
+					)
 				end
 			end
-
-			__send__(name, ...)
 		else
 			super
 		end
 	end
 
-	# Forward some methods to the original underlying object
+	def inspect
+		"Unbuffered(#{@component.inspect})"
+	end
+
 	def call(...)
-		@object.call(...)
+		@component.call(...)
 	end
 
 	def send(...)
-		@object.__send__(...)
+		@component.__send__(...)
 	end
 
 	def public_send(...)
-		@object.public_send(...)
+		@component.public_send(...)
 	end
 end

test/dummy/app/controllers/rendering_controller.rb

@@ -8,4 +8,7 @@ def partial_from_phlex
 	def view_component_from_phlex
 		render Rendering::ViewComponentFromPhlex.new
 	end
+
+	def phlex_component_from_erb
+	end
 end

test/dummy/app/views/components/card.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+class Card < ApplicationComponent
+	def view_template(&)
+		article(class: "card", &)
+	end
+
+	def title(&)
+		h1(class: "title", &)
+	end
+end

test/dummy/app/views/rendering/phlex_component_from_erb.html.erb

@@ -0,0 +1,9 @@
+<div class="outside">
+	<%= render Card.new do |t| %>
+		<div class="inside">
+			<%= t.title do %>
+				<strong class="inside-slot">Hi</strong>
+			<% end %>
+		</div>
+	<% end %>
+</div>

test/dummy/config/routes.rb

@@ -20,4 +20,5 @@
 
 	get "/rendering/partial_from_phlex", to: "rendering#partial_from_phlex"
 	get "/rendering/view_component_from_phlex", to: "rendering#view_component_from_phlex"
+	get "/rendering/phlex_component_from_erb", to: "rendering#phlex_component_from_erb"
 end

test/phlex/render_test.rb

@@ -14,4 +14,10 @@ class RenderTest < ActionDispatch::IntegrationTest
 		assert_response :success
 		assert_select "#phlex", "Rendered from Phlex"
 	end
+
+	test "rendering Phlex component from ERB view" do
+		get "/rendering/phlex_component_from_erb"
+		assert_response :success
+		assert_select ".outside .card .inside .title .inside-slot", "Hi"
+	end
 end