phlex-rails 0.5.0 → 0.6.0

data/lib/phlex/rails/html/append_method_added_warning.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Phlex
+	module Rails
+		module HTML
+			module AppendMethodAddedWarning
+				def method_added(name)
+					if name == :append || name == :safe_append
+						raise Phlex::NameError, "You shouldn't redefine the #{name} method as it's required for safe HTML output."
+					end
+
+					super
+				end
+			end
+		end
+	end
+end

data/lib/phlex/rails/html/class_methods.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Phlex
+	module Rails
+		module HTML
+			module ClassMethods
+				def render_in(...)
+					new.render_in(...)
+				end
+			end
+		end
+	end
+end

data/lib/phlex/rails/html/overrides.rb

@@ -0,0 +1,111 @@
+# frozen_string_literal: true
+
+module Phlex
+	module Rails
+		module HTML
+			module Overrides
+				def helpers
+					if defined?(ViewComponent::Base) && @_view_context.is_a?(ViewComponent::Base)
+						@_view_context.helpers
+					else
+						@_view_context
+					end
+				end
+
+				def render(renderable, *args, **kwargs, &block)
+					return super if renderable.is_a?(Phlex::HTML)
+					return super if renderable.is_a?(Class) && renderable < Phlex::HTML
+
+					@_target << @_view_context.render(renderable, *args, **kwargs, &block)
+
+					nil
+				end
+
+				def render_in(view_context, &block)
+					if block_given?
+						call(view_context: view_context) do |*args|
+							view_context.with_output_buffer(self) do
+								original_length = @_target.length
+
+								if args.length == 1 && Phlex::HTML === args[0]
+									output = yield(
+										args[0].unbuffered
+									)
+								else
+									output = yield(*args)
+								end
+
+								unchanged = (original_length == @_target.length)
+
+								if unchanged
+									if output.is_a?(ActiveSupport::SafeBuffer)
+										unsafe_raw(output)
+									else
+										text(output)
+									end
+								end
+							end
+
+							nil
+						end.html_safe
+					else
+						call(view_context: view_context).html_safe
+					end
+				end
+
+				def safe_append=(value)
+					return unless value
+
+					@_target << case value
+						when String then value
+						when Symbol then value.name
+						else value.to_s
+					end
+				end
+
+				def append=(value)
+					case value
+					when ActiveSupport::SafeBuffer
+						@_target << value
+					else
+						@_target << case value
+							when String then ERB::Util.html_escape(value)
+							when Symbol then ERB::Util.html_escape(value.name)
+							else ERB::Util.html_escape(value.to_s)
+						end
+					end
+				end
+
+				def capture
+					super&.html_safe
+				end
+
+				# Trick ViewComponent into thinking we're a ViewComponent to fix rendering output
+				def set_original_view_context(view_context)
+				end
+
+				private def yield_content(&block)
+					return unless block
+
+					case block.binding.receiver
+					when Phlex::HTML
+						super
+					else
+						@_view_context.with_output_buffer(self) { super }
+					end
+				end
+
+				private def yield_content_with_args(*args, &block)
+					return unless block
+
+					case block.binding.receiver
+					when Phlex::HTML
+						super
+					else
+						@_view_context.with_output_buffer(self) { super }
+					end
+				end
+			end
+		end
+	end
+end

data/lib/phlex/rails/layout.rb

@@ -1,17 +1,16 @@
 # frozen_string_literal: true
 
-module Phlex
-	module Rails
-		module Layout
-			include Helpers::CSPMetaTag
-			include Helpers::CSRFMetaTags
-			include Helpers::FaviconLinkTag
-			include Helpers::PreloadLinkTag
-			include Helpers::StylesheetLinkTag
-			include Helpers::ActionCableMetaTag
-			include Helpers::JavaScriptIncludeTag
-			include Helpers::JavaScriptImportmapTags
-			include Helpers::JavaScriptImportModuleTag
-		end
+module Phlex::Rails
+	module Layout
+		include Helpers::CSPMetaTag
+		include Helpers::CSRFMetaTags
+		include Helpers::FaviconLinkTag
+		include Helpers::PreloadLinkTag
+		include Helpers::StyleSheetLinkTag
+		include Helpers::ActionCableMetaTag
+		include Helpers::AutoDiscoveryLinkTag
+		include Helpers::JavaScriptIncludeTag
+		include Helpers::JavaScriptImportMapTags
+		include Helpers::JavaScriptImportModuleTag
 	end
 end

data/lib/phlex/rails/version.rb

@@ -2,6 +2,6 @@
 
 module Phlex
 	module Rails
-		VERSION = "0.5.0"
+		VERSION = "0.6.0"
 	end
 end

data/lib/phlex/rails.rb

@@ -7,19 +7,12 @@ module Phlex::Rails
 	Loader = Zeitwerk::Loader.new.tap do |loader|
 		loader.push_dir("#{__dir__}/rails", namespace: Phlex::Rails)
 		loader.inflector = Zeitwerk::GemInflector.new(__FILE__)
+		loader.inflector.inflect("html" => "HTML")
 		loader.setup
 	end
 
-	module AppendMethodAddedWarning
-		def method_added(name)
-			if name == :append || name == :safe_append
-				raise Phlex::NameError, "You shouldn't redefine the #{name} method as it's required for safe HTML output."
-			end
+	Phlex::HTML.prepend(Phlex::Rails::HTML::Overrides)
 
-			super
-		end
-	end
-
-	Phlex::HTML.prepend(Phlex::Rails::Renderable)
-	Phlex::HTML.extend(Phlex::Rails::AppendMethodAddedWarning)
+	Phlex::HTML.extend(Phlex::Rails::HTML::ClassMethods)
+	Phlex::HTML.extend(Phlex::Rails::HTML::AppendMethodAddedWarning)
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phlex-rails
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Joel Drapper
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-01-30 00:00:00.000000000 Z
+date: 2023-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: phlex
@@ -73,6 +73,7 @@ extra_rdoc_files: []
 files:
 - ".editorconfig"
 - ".rubocop.yml"
+- ".ruby-version"
 - Appraisals
 - CODE_OF_CONDUCT.md
 - CONTRIBUTING.md
@@ -101,11 +102,21 @@ files:
 - lib/install/phlex.rb
 - lib/phlex-rails.rb
 - lib/phlex/rails.rb
+- lib/phlex/rails/buffered.rb
+- lib/phlex/rails/buffered_checkbox_builder.rb
+- lib/phlex/rails/buffered_form_builder.rb
+- lib/phlex/rails/buffered_label_builder.rb
+- lib/phlex/rails/buffered_radio_button_builder.rb
 - lib/phlex/rails/engine.rb
 - lib/phlex/rails/form.rb
+- lib/phlex/rails/helper_macros.rb
 - lib/phlex/rails/helpers.rb
+- lib/phlex/rails/helpers/routes.rb
+- lib/phlex/rails/helpers/tag.rb
+- lib/phlex/rails/html/append_method_added_warning.rb
+- lib/phlex/rails/html/class_methods.rb
+- lib/phlex/rails/html/overrides.rb
 - lib/phlex/rails/layout.rb
-- lib/phlex/rails/renderable.rb
 - lib/phlex/rails/version.rb
 - lib/phlex/testing/rails/view_helper.rb
 - lib/tasks/phlex_tasks.rake
@@ -134,7 +145,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.3
+rubygems_version: 3.4.6
 signing_key:
 specification_version: 4
 summary: A Phlex adapter for Rails

data/lib/phlex/rails/renderable.rb

@@ -1,106 +0,0 @@
-# frozen_string_literal: true
-
-module Phlex
-	module Rails
-		module Renderable
-			def helpers
-				@_view_context
-			end
-
-			def render(renderable, *args, **kwargs, &block)
-				return super if renderable.is_a?(Phlex::HTML)
-				return super if renderable.is_a?(Class) && renderable < Phlex::HTML
-
-				@_target << @_view_context.render(renderable, *args, **kwargs, &block)
-
-				nil
-			end
-
-			def render_in(view_context, &block)
-				if block_given?
-					call(view_context: view_context) do |*args|
-						view_context.with_output_buffer(self) do
-							original_length = @_target.length
-
-							if args.length == 1 && Phlex::HTML === args[0]
-								output = yield(
-									args[0].unbuffered
-								)
-							else
-								output = yield(*args)
-							end
-
-							unchanged = (original_length == @_target.length)
-
-							if unchanged
-								if output.is_a?(ActiveSupport::SafeBuffer)
-									unsafe_raw(output)
-								else
-									text(output)
-								end
-							end
-						end
-
-						nil
-					end.html_safe
-				else
-					call(view_context: view_context).html_safe
-				end
-			end
-
-			def safe_append=(value)
-				return unless value
-
-				@_target << case value
-					when String then value
-					when Symbol then value.name
-					else value.to_s
-				end
-			end
-
-			def append=(value)
-				return unless value
-
-				if value.html_safe?
-					self.safe_append = value
-				else
-					@_target << case value
-						when String then ERB::Util.html_escape(value)
-						when Symbol then ERB::Util.html_escape(value.name)
-						else ERB::Util.html_escape(value.to_s)
-					end
-				end
-			end
-
-			def capture
-				super&.html_safe
-			end
-
-			# Trick ViewComponent into thinking we're a ViewComponent to fix rendering output
-			def set_original_view_context(view_context)
-			end
-
-			private def yield_content(&block)
-				return unless block
-
-				case block.binding.receiver
-				when Phlex::HTML
-					super
-				else
-					@_view_context.with_output_buffer(self) { super }
-				end
-			end
-
-			private def yield_content_with_args(*args, &block)
-				return unless block
-
-				case block.binding.receiver
-				when Phlex::HTML
-					super
-				else
-					@_view_context.with_output_buffer(self) { super }
-				end
-			end
-		end
-	end
-end