Direct buffering (#271)

Author: joeldrapper

app/components/nested_table.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+class Components::NestedTable < Phlex::HTML
+	def with_head(&)
+		@head = Components::NestedTable::RowContainer.new(tag: "thead", &)
+	end
+
+	def with_body(&)
+		@bodies << Components::NestedTable::RowContainer.new(tag: "tbody", &)
+	end
+
+	def with_foot(&)
+		@foot = Components::NestedTable::RowContainer.new(tag: "tfoot", &)
+	end
+
+	def initialize
+		@head = nil
+		@bodies = []
+		@foot = nil
+	end
+
+	def before_template(&)
+		capture(&)
+		super
+	end
+
+	def view_template(&)
+		div do
+			table(border: 2) do
+				render @head if @head
+				render @bodies
+				render @foot if @foot
+			end
+		end
+	end
+end

app/components/nested_table/cell.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+class Components::NestedTable::Cell < Phlex::HTML
+	include Phlex::Rails::Helpers::ContentTag
+
+	def view_template(&)
+		td do
+			yield
+		end
+	end
+end

app/components/nested_table/row.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+class Components::NestedTable::Row < Phlex::HTML
+	def initialize
+		@cells = []
+	end
+
+	def with_cell(&)
+		@cells << Components::NestedTable::Cell.new(&)
+	end
+
+	def before_template(&)
+		capture(&)
+		super
+	end
+
+	def view_template(&)
+		tr do
+			render @cells
+		end
+	end
+end

app/components/nested_table/row_container.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+class Components::NestedTable::RowContainer < Phlex::HTML
+	attr_accessor :tag
+
+	def initialize(tag: "tbody")
+		@tag = tag
+		@rows = []
+	end
+
+	def with_row(&)
+		@rows << Components::NestedTable::Row.new(&)
+	end
+
+	def with_content(&block)
+		@rows << block
+	end
+
+	def before_template(&)
+		capture(&)
+		super
+	end
+
+	def view_template
+		case @tag
+		when "thead"
+			thead { render @rows }
+		when "tbody"
+			tbody { render @rows }
+		when "tfoot"
+			tfoot { render @rows }
+		end
+	end
+end

app/view_components/nav_component.html.erb

@@ -1,10 +1,10 @@
 <h1>Before</h1>
 <%= render Components::Nav.new do |n| %>
-  <%= n.item("/") do %>
+  <% n.item("/") do %>
     Home
   <% end %>
-  <%= n.divider %>
-  <%= n.item("/about") do %>
+  <% n.divider %>
+  <% n.item("/about") do %>
     About
   <% end %>
 <% end %>

app/views/nav.html.erb

@@ -1,6 +1,6 @@
 <h1>Before</h1>
 <%= render Components::Nav.new do |n| %>
-  <%= n.item("/") do %>
+  <% n.item("/") do %>
     Home
   <% end %>
   <%= n.divider %>

app/views/nested_table.html.erb

@@ -0,0 +1,9 @@
+<%= render Components::NestedTable.new do |t| %>
+  <% t.with_body do |h| %>
+    <% h.with_row do |r| %>
+      <% r.with_cell do %>
+        HELLO WORLD
+      <% end %>
+    <% end %>
+  <% end %>
+<% end %>

app/views/table.html.erb

@@ -4,7 +4,7 @@
     <span><%= row[:name] %></span>
   <% end %>
 
-  <%= t.column("Email") do |row| %>
+  <% t.column("Email") do |row| %>
     <span><%= row[:email] %></span>
   <% end %>
 <% end %>

lib/phlex/rails.rb

@@ -7,19 +7,19 @@ module Rails
 		class HelpersCalledBeforeRenderError < StandardError; end
 
 		autoload :Buffered, "phlex/rails/buffered"
-		autoload :Unbuffered, "phlex/rails/unbuffered"
+		autoload :Decorator, "phlex/rails/decorator"
 
-		autoload :BufferedCheckboxBuilder, "phlex/rails/buffered_checkbox_builder"
-		autoload :BufferedFormBuilder, "phlex/rails/buffered_form_builder"
-		autoload :BufferedLabelBuilder, "phlex/rails/buffered_label_builder"
-		autoload :BufferedRadioButtonBuilder, "phlex/rails/buffered_radio_button_builder"
-
-		autoload :SGML, "phlex/rails/sgml"
-		autoload :HTML, "phlex/rails/html"
-		autoload :SVG, "phlex/rails/svg"
+		autoload :FormBuilder, "phlex/rails/form_builder"
+		autoload :LabelBuilder, "phlex/rails/label_builder"
+		autoload :CheckboxBuilder, "phlex/rails/checkbox_builder"
+		autoload :RadioButtonBuilder, "phlex/rails/radio_button_builder"
 
 		autoload :CSV, "phlex/rails/csv"
 
+		autoload :SVG, "phlex/rails/svg"
+		autoload :HTML, "phlex/rails/html"
+		autoload :SGML, "phlex/rails/sgml"
+
 		autoload :Helpers, "phlex/rails/helpers"
 		autoload :HelperMacros, "phlex/rails/helper_macros"
 
@@ -34,5 +34,7 @@ class HelpersCalledBeforeRenderError < StandardError; end
 	HTML.include(Phlex::Rails::HTML)
 	SVG.include(Phlex::Rails::SVG)
 
+	SGML::State.prepend(Phlex::Rails::SGML::State)
+
 	ActiveSupport::SafeBuffer.include(Phlex::SGML::SafeObject)
 end

lib/phlex/rails/buffered.rb

@@ -1,40 +1,7 @@
 # frozen_string_literal: true
 
-require "forwardable"
-
 module Phlex::Rails
 	class Buffered < BasicObject
-		extend ::Forwardable
-
-		def self.define_builder_yielding_method(method_name, builder)
-			class_eval(<<-RUBY, __FILE__, __LINE__ + 1)
-				# frozen_string_literal: true
-
-				def #{method_name}(*args, **kwargs, &block)
-					output = if block
-						@object.#{method_name}(*args, **kwargs) { |builder|
-							@component.capture do
-								yield(
-									::#{builder.name}.new(builder,
-										component: @component
-									)
-								)
-							end
-						}
-					else
-						@object.#{method_name}(*args, **kwargs)
-					end
-
-					case output
-					when ::ActiveSupport::SafeBuffer
-						@component.raw(output)
-					end
-
-					nil
-				end
-			RUBY
-		end
-
 		def initialize(object, component:)
 			@object = object
 			@component = component
@@ -45,18 +12,15 @@ def respond_to_missing?(...)
 		end
 
 		def method_missing(*, **, &block)
-			output = if block
-				@object.public_send(*, **) { |*a| @component.capture(*a, &block) }
+			if block
+				@component.raw(
+					@object.public_send(*, **) { |*a| @component.capture(*a, &block) }
+				)
 			else
-				@object.public_send(*, **)
+				@component.raw(
+					@object.public_send(*, **)
+				)
 			end
-
-			case output
-			when ::ActiveSupport::SafeBuffer
-				@component.raw(output)
-			end
-
-			nil
 		end
 	end
 end

lib/phlex/rails/buffered_checkbox_builder.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+class Phlex::Rails::CheckboxBuilder < Phlex::Rails::Decorator
+	def text(...) = @object.text(...)
+	def value(...) = @object.value(...)
+	def object(...) = @object.object(...)
+
+	output def label(...) = nil
+	output def checkbox(...) = nil
+end

lib/phlex/rails/buffered_form_builder.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+class Phlex::Rails::Decorator < BasicObject
+	def self.output(method_name)
+		class_eval(<<~RUBY, __FILE__, __LINE__ + 1)
+			def #{method_name}(...)
+				@component.raw(
+					@object.#{method_name}(...)
+				)
+			end
+		RUBY
+	end
+
+	def initialize(object, component:)
+		@object = object
+		@component = component
+	end
+
+	def respond_to_missing?(method_name, include_private = false)
+		@object.respond_to?(method_name, include_private)
+	end
+
+	def method_missing(...)
+		@object.public_send(...)
+	end
+end