phlex-rails 2.0.0.beta2 → 2.0.0.rc2

data/lib/phlex/rails/helpers/utf8_enforcer_tag.rb

@@ -3,7 +3,5 @@
 module Phlex::Rails::Helpers::UTF8EnforcerTag
 	extend Phlex::Rails::HelperMacros
 
-	# @!method utf8_enforcer_tag(...)
-	# 	@return [nil]
-	register_output_helper :utf8_enforcer_tag
+	register_output_helper def utf8_enforcer_tag(...) = nil
 end

data/lib/phlex/rails/helpers/video_path.rb

@@ -3,6 +3,5 @@
 module Phlex::Rails::Helpers::VideoPath
 	extend Phlex::Rails::HelperMacros
 
-	# @!method video_path(...)
-	register_value_helper :video_path
+	register_value_helper def video_path(...) = nil
 end

data/lib/phlex/rails/helpers/video_tag.rb

@@ -3,7 +3,5 @@
 module Phlex::Rails::Helpers::VideoTag
 	extend Phlex::Rails::HelperMacros
 
-	# @!method video_tag(...)
-	# 	@return [nil]
-	register_output_helper :video_tag
+	register_output_helper def video_tag(...) = nil
 end

data/lib/phlex/rails/helpers/video_url.rb

@@ -3,6 +3,5 @@
 module Phlex::Rails::Helpers::VideoURL
 	extend Phlex::Rails::HelperMacros
 
-	# @!method video_url(...)
-	register_value_helper :video_url
+	register_value_helper def video_url(...) = nil
 end

data/lib/phlex/rails/helpers/week_field.rb

@@ -3,7 +3,5 @@
 module Phlex::Rails::Helpers::WeekField
 	extend Phlex::Rails::HelperMacros
 
-	# @!method week_field(...)
-	# 	@return [nil]
-	register_output_helper :week_field
+	register_output_helper def week_field(...) = nil
 end

data/lib/phlex/rails/helpers/week_field_tag.rb

@@ -3,7 +3,5 @@
 module Phlex::Rails::Helpers::WeekFieldTag
 	extend Phlex::Rails::HelperMacros
 
-	# @!method week_field_tag(...)
-	# 	@return [nil]
-	register_output_helper :week_field_tag
+	register_output_helper def week_field_tag(...) = nil
 end

data/lib/phlex/rails/helpers/weekday_options_for_select.rb

@@ -3,7 +3,5 @@
 module Phlex::Rails::Helpers::WeekdayOptionsForSelect
 	extend Phlex::Rails::HelperMacros
 
-	# @!method weekday_options_for_select(...)
-	# 	@return [nil]
-	register_output_helper :weekday_options_for_select
+	register_output_helper def weekday_options_for_select(...) = nil
 end

data/lib/phlex/rails/helpers/weekday_select.rb

@@ -3,7 +3,5 @@
 module Phlex::Rails::Helpers::WeekdaySelect
 	extend Phlex::Rails::HelperMacros
 
-	# @!method weekday_select(...)
-	# 	@return [nil]
-	register_output_helper :weekday_select
+	register_output_helper def weekday_select(...) = nil
 end

data/lib/phlex/rails/helpers/with_output_buffer.rb

@@ -3,7 +3,5 @@
 module Phlex::Rails::Helpers::WithOutputBuffer
 	extend Phlex::Rails::HelperMacros
 
-	# @!method with_output_buffer(...)
-	# 	@return [nil]
-	register_output_helper :with_output_buffer
+	register_output_helper def with_output_buffer(...) = nil
 end

data/lib/phlex/rails/helpers/word_wrap.rb

@@ -3,6 +3,5 @@
 module Phlex::Rails::Helpers::WordWrap
 	extend Phlex::Rails::HelperMacros
 
-	# @!method word_wrap(...)
-	register_value_helper :word_wrap
+	register_value_helper def word_wrap(...) = nil
 end

data/lib/phlex/rails/layout.rb

@@ -46,7 +46,7 @@ module Phlex::Rails
 		end
 
 		def render(view_context = nil, *args, **kwargs, &block)
-			if @_context
+			if @_state
 				super
 			else
 				call(view_context:) do |yielded|

data/lib/phlex/rails/partial.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+class Phlex::Rails::Partial
+	def initialize(path, *args, **kwargs, &block)
+		@path = path
+		@args = args
+		@kwargs = kwargs
+		@block = block
+	end
+
+	def render_in(view_context, &block)
+		block ||= @block
+		view_context.render(@path, *@args, **@kwargs, &block)
+	end
+end

data/lib/phlex/rails/sgml.rb

@@ -10,11 +10,25 @@ module Phlex
 			end
 
 			module Overrides
+				class HelpersCalledBeforeRenderError < StandardError; end
+
+				def partial(*, **, &block)
+					if block
+						Phlex::Rails::Partial.new(*, **) { capture(&block) }
+					else
+						Phlex::Rails::Partial.new(*, **)
+					end
+				end
+
 				def helpers
-					if defined?(ViewComponent::Base) && ViewComponent::Base === @_view_context
-						@_view_context.helpers
+					unless @_state && (view_context = @_state.view_context)
+						raise HelpersCalledBeforeRenderError.new("Do not use rails helpers until after the view has been rendered.") unless view_context
+					end
+
+					if defined?(ViewComponent::Base) && ViewComponent::Base === view_context
+						view_context.helpers
 					else
-						@_view_context
+						view_context
 					end
 				end
 
@@ -29,19 +43,13 @@ module Phlex
 					when Enumerable
 						return super unless ActiveRecord::Relation === renderable
 					when nil
-						partial = kwargs.delete(:partial)
-
-						if partial # this is a hack to get around https://github.com/rails/rails/issues/51015
-							return raw(
-								@_view_context.render(partial, **kwargs) do |*yielded_args|
-									capture(*yielded_args, &block)
-								end,
-							)
-						end
+						return super if kwargs.length == 0
 					end
 
+					return super if args.length == 0 && kwargs.length == 0
+
 					output = if block
-						@_view_context.render(*args, **kwargs) do |*yielded_args|
+						@_state.view_context.render(*args, **kwargs) do |*yielded_args|
 							if yielded_args.length == 1 && defined?(ViewComponent::Base) && ViewComponent::Base === yielded_args[0]
 								capture(Phlex::Rails::Buffered.new(yielded_args[0], view: self), &block)
 							else
@@ -49,19 +57,15 @@ module Phlex
 							end
 						end
 					else
-						@_view_context.render(*args, **kwargs)
+						@_state.view_context.render(*args, **kwargs)
 					end
 
 					raw(output)
 				end
 
 				def render_in(view_context, &erb)
-					fragments = if view_context.request && (fragment_header = view_context.request.headers["X-Fragment"])
-						fragment_header.split
-					end
-
 					if erb
-						call(view_context:, fragments:) { |*args|
+						call(view_context:) { |*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))
@@ -70,7 +74,7 @@ module Phlex
 							end
 						}.html_safe
 					else
-						call(view_context:, fragments:).html_safe
+						call(view_context:).html_safe
 					end
 				end
 

data/lib/phlex/rails/testing.rb

@@ -13,6 +13,6 @@ module Phlex::Testing::RailsContext
 	end
 end
 
-Phlex::Testing::SGML.include(
+Phlex::Testing::SGML.prepend(
 	Phlex::Testing::RailsContext,
 )

data/lib/phlex/rails/unbuffered.rb

@@ -6,17 +6,27 @@ class Phlex::Rails::Unbuffered
 		@component = component
 	end
 
+	def inspect
+		"Unbuffered(#{@component.inspect})"
+	end
+
+	def public_send(...)
+		@component.public_send(...)
+	end
+
 	def respond_to_missing?(...)
 		@component.respond_to?(...)
 	end
 
 	def method_missing(method_name, *, **, &erb)
-		if @component.respond_to?(method_name)
-			output = @component.capture do
+		component = @component
+
+		if component.respond_to?(method_name)
+			output = component.capture do
 				if erb
-					@component.public_send(method_name, *, **) do |*a, **kw|
-						@component.raw(
-							@component.helpers.capture(
+					component.public_send(method_name, *, **) do |*a, **kw|
+						component.raw(
+							component.helpers.capture(
 								*a,
 								**kw,
 								&erb
@@ -24,27 +34,11 @@ class Phlex::Rails::Unbuffered
 						)
 					end
 				else # no erb block
-					@component.public_send(method_name, *, **)
+					component.public_send(method_name, *, **)
 				end
 			end
 		else
 			super
 		end
 	end
-
-	def inspect
-		"Unbuffered(#{@component.inspect})"
-	end
-
-	def call(...)
-		@component.call(...)
-	end
-
-	def send(...)
-		@component.__send__(...)
-	end
-
-	def public_send(...)
-		@component.public_send(...)
-	end
 end

data/lib/phlex/rails/version.rb

@@ -2,6 +2,6 @@
 
 module Phlex
 	module Rails
-		VERSION = "2.0.0.beta2"
+		VERSION = "2.0.0.rc2"
 	end
 end

data/lib/phlex/rails.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require "phlex"
-require "phlex/rails/engine"
 
 module Phlex
 	module Rails
@@ -11,12 +10,12 @@ module Phlex
 		autoload :BufferedLabelBuilder, "phlex/rails/buffered_label_builder"
 		autoload :BufferedRadioButtonBuilder, "phlex/rails/buffered_radio_button_builder"
 		autoload :CSV, "phlex/rails/csv"
-		autoload :FragmentFinder, "phlex/rails/fragment_finder"
+		autoload :HTML, "phlex/rails/html"
 		autoload :HelperFinder, "phlex/rails/helper_finder"
 		autoload :HelperMacros, "phlex/rails/helper_macros"
 		autoload :Helpers, "phlex/rails/helpers"
-		autoload :HTML, "phlex/rails/html"
 		autoload :Layout, "phlex/rails/layout"
+		autoload :Partial, "phlex/rails/partial"
 		autoload :SGML, "phlex/rails/sgml"
 		autoload :Streaming, "phlex/rails/streaming"
 		autoload :Unbuffered, "phlex/rails/unbuffered"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phlex-rails
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta2
+  version: 2.0.0.rc2
 platform: ruby
 authors:
 - Joel Drapper
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-14 00:00:00.000000000 Z
+date: 2025-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: phlex
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0.beta2
+        version: 2.0.0.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0.beta2
+        version: 2.0.0.rc2
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
@@ -33,7 +33,7 @@ dependencies:
         version: '6.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '8'
+        version: '9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -43,7 +43,7 @@ dependencies:
         version: '6.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '8'
+        version: '9'
 description: A high-performance view framework optimised for fun.
 email:
 - joel@drapper.me
@@ -72,8 +72,6 @@ files:
 - lib/phlex/rails/buffered_label_builder.rb
 - lib/phlex/rails/buffered_radio_button_builder.rb
 - lib/phlex/rails/csv.rb
-- lib/phlex/rails/engine.rb
-- lib/phlex/rails/fragment_finder.rb
 - lib/phlex/rails/helper_finder.rb
 - lib/phlex/rails/helper_macros.rb
 - lib/phlex/rails/helpers.rb
@@ -277,6 +275,7 @@ files:
 - lib/phlex/rails/helpers/word_wrap.rb
 - lib/phlex/rails/html.rb
 - lib/phlex/rails/layout.rb
+- lib/phlex/rails/partial.rb
 - lib/phlex/rails/sgml.rb
 - lib/phlex/rails/streaming.rb
 - lib/phlex/rails/testing.rb

data/lib/phlex/rails/engine.rb

@@ -1,10 +0,0 @@
-# frozen_string_literal: true
-
-require "rails/engine"
-
-module Phlex
-	module Rails
-		class Engine < ::Rails::Engine
-		end
-	end
-end

data/lib/phlex/rails/fragment_finder.rb

@@ -1,28 +0,0 @@
-# frozen_string_literal: true
-
-module Phlex::Rails::FragmentFinder
-	extend self
-
-	Parser = if defined?(Nokolexbor)
-		Nokolexbor
-	else
-		require "nokogiri"
-		Nokogiri::HTML
-	end
-
-	def extract(html, ids)
-		parsed = Parser.parse(html)
-		selector = ids.map { |id| "##{id}" }.join(", ")
-
-		result = +""
-
-		ids.count.times do
-			if (fragment = parsed.at_css(selector))
-				result << fragment.to_s
-				fragment.remove
-			end
-		end
-
-		result
-	end
-end