phlex-rails 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7235a9f512ec98cba7ac0c7b433c6b8862a79393d7759283f9374c2de12cbc30
-  data.tar.gz: 63090c17e5a2996f2dce0da406fb97a3e58a43bfdc7799120cef331f3eea5133
+  metadata.gz: 407ff3d219b8d6ec6bbe429422b18125dde3f9cfb73ec756bad2ab4f08953083
+  data.tar.gz: b0e4f337a9626bf67a5e4dfd4172648cf69c264008fde9a5e3c1b456b98d7e72
 SHA512:
-  metadata.gz: 3f6488be48a2585d14065193a5c15b8c96218926f1617ece544062fc2d6957a4ab0a43f4d9a46ce610ff5c2cc883c40547af9764699444976755df67784dc55f
-  data.tar.gz: 1154d9f20816c76a233b4d83e919189a7c020fa0b7e364c113ab496867b40d33e19d6516571c7237baa11ce96de78bbcbcc2522f4acc614e8d6122f1227dfc9b
+  metadata.gz: b4e29f9f569bc0259d037d7b8a6e3ee8fb267d8210b2faf1e0a952d25275419e27c9621b615aad8be7d3f5531872848a63e46fdeb1a3ec8506e9babc5b27b1af
+  data.tar.gz: 4440057f8e253c7f0f78dbd41e4f92c6a8e4faeeac4cb339fbc26d09bc7bafa72302d2f2bc066b8879579b4dc3c053ba07f301622a8801d9a635a216f0ef2ac3

data/lib/phlex/rails/form.rb

@@ -29,7 +29,7 @@ module Phlex
 				input(
 					name: "authenticity_token",
 					type: "hidden",
-					value: @_view_context.form_authenticity_token
+					value: helpers.form_authenticity_token
 				)
 			end
 
@@ -42,11 +42,11 @@ module Phlex
 			end
 
 			def url
-				@_view_context.url_for(@model)
+				helpers.url_for(@model)
 			end
 
 			def field_name(*field)
-				@_view_context.field_name(ActiveModel::Naming.param_key(@model.class), *field)
+				helpers.field_name(ActiveModel::Naming.param_key(@model.class), *field)
 			end
 
 			input_field :url_field, type: "url"

data/lib/phlex/rails/helpers.rb

@@ -5,7 +5,7 @@ module Phlex
 		module Helpers
 			module CSPMetaTag
 				def csp_meta_tag(...)
-					if (output = @_view_context.csp_meta_tag(...))
+					if (output = helpers.csp_meta_tag(...))
 						@_target << output
 					end
 				end
@@ -13,7 +13,7 @@ module Phlex
 
 			module CSRFMetaTags
 				def csrf_meta_tags
-					if (output = @_view_context.csrf_meta_tags)
+					if (output = helpers.csrf_meta_tags)
 						@_target << output
 					end
 				end
@@ -21,7 +21,7 @@ module Phlex
 
 			module ActionCableMetaTag
 				def action_cable_meta_tag
-					if (output = @_view_context.action_cable_meta_tag)
+					if (output = helpers.action_cable_meta_tag)
 						@_target << output
 					end
 				end
@@ -67,7 +67,7 @@ module Phlex
 				end
 
 				def form_with(*args, **kwargs, &block)
-					@_target << @_view_context.form_with(*args, **kwargs) { |form|
+					@_target << helpers.form_with(*args, **kwargs) { |form|
 						capture do
 							yield(
 								BufferedFormWith.new(form, buffer: @_target)
@@ -79,7 +79,7 @@ module Phlex
 
 			module StylesheetLinkTag
 				def stylesheet_link_tag(...)
-					if (output = @_view_context.stylesheet_link_tag(...))
+					if (output = helpers.stylesheet_link_tag(...))
 						@_target << output
 					end
 				end
@@ -87,7 +87,7 @@ module Phlex
 
 			module FaviconLinkTag
 				def favicon_link_tag(...)
-					if (output = @_view_context.favicon_link_tag(...))
+					if (output = helpers.favicon_link_tag(...))
 						@_target << output
 					end
 				end
@@ -95,7 +95,7 @@ module Phlex
 
 			module ImageTag
 				def image_tag(...)
-					if (output = @_view_context.image_tag(...))
+					if (output = helpers.image_tag(...))
 						@_target << output
 					end
 				end
@@ -103,7 +103,7 @@ module Phlex
 
 			module AudioTag
 				def audio_tag(...)
-					if (output = @_view_context.audio_tag(...))
+					if (output = helpers.audio_tag(...))
 						@_target << output
 					end
 				end
@@ -111,7 +111,7 @@ module Phlex
 
 			module VideoTag
 				def video_tag(...)
-					if (output = @_view_context.video_tag(...))
+					if (output = helpers.video_tag(...))
 						@_target << output
 					end
 				end
@@ -119,7 +119,7 @@ module Phlex
 
 			module PreloadLinkTag
 				def preload_link_tag(...)
-					if (output = @_view_context.preload_link_tag(...))
+					if (output = helpers.preload_link_tag(...))
 						@_target << output
 					end
 				end
@@ -127,7 +127,7 @@ module Phlex
 
 			module JavaScriptIncludeTag
 				def javascript_include_tag(...)
-					if (output = @_view_context.javascript_include_tag(...))
+					if (output = helpers.javascript_include_tag(...))
 						@_target << output
 					end
 				end
@@ -135,7 +135,7 @@ module Phlex
 
 			module JavaScriptImportmapTags
 				def javascript_importmap_tags(...)
-					if (output = @_view_context.javascript_importmap_tags(...))
+					if (output = helpers.javascript_importmap_tags(...))
 						@_target << output
 					end
 				end
@@ -143,7 +143,7 @@ module Phlex
 
 			module JavaScriptImportModuleTag
 				def javascript_import_module_tag(...)
-					if (output = @_view_context.javascript_import_module_tag(...))
+					if (output = helpers.javascript_import_module_tag(...))
 						@_target << output
 					end
 				end
@@ -151,7 +151,7 @@ module Phlex
 
 			module ContentFor
 				def content_for(slot, &block)
-					@_view_context.content_for(slot, capture(&block))
+					helpers.content_for(slot, capture(&block))
 				end
 			end
 		end

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,112 @@
+# 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)
+					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
+end

data/lib/phlex/rails/version.rb

@@ -2,6 +2,6 @@
 
 module Phlex
 	module Rails
-		VERSION = "0.5.0"
+		VERSION = "0.5.1"
 	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.5.1
 platform: ruby
 authors:
 - Joel Drapper
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-01-30 00:00:00.000000000 Z
+date: 2023-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: phlex
@@ -104,8 +104,10 @@ files:
 - lib/phlex/rails/engine.rb
 - lib/phlex/rails/form.rb
 - lib/phlex/rails/helpers.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

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