phlex-rails 2.2.0 → 2.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 71a32954103b5c02b51eeca080da623dd195fa81d75692823e361dc73bc6bb5d
-  data.tar.gz: 1247c896da04bfa891c7c3248501bbc72887372e421aebb323aa4fe6421e68c9
+  metadata.gz: 9833f000bf407634ea999f7b955fc28d07eac72c08bec5a5b24b3d130c316f7c
+  data.tar.gz: 63a7fbadbb139a20b88bb29357ce0e7de92b7fdb646e6bb5725297f9d1a4da6c
 SHA512:
-  metadata.gz: 99403500fa902e18fafe2dae465a86305580e3716398b4e9641e61ac06f63659a0719edee0d8ffaf3d05bf423bc2b803e42e3f36d2b13302eda0b21533825aa6
-  data.tar.gz: 8ae27f352e991178c12d35a790f420a65486b856661efa44476f9bdfe010360585637b64fe61c7c43c35e2c0a695eecfa6b0e3348163628a683a95bcb014ada9
+  metadata.gz: fd2f0e2c6617bbc1e8295797e3423cfa9ece08146615285a4a34d8151880eab8486c3fef8e7e95d5e00ff7cf59578a2bf10bed3b2a207a2e934d452c8afbdf82
+  data.tar.gz: 216394696ba7284cdb784b15396d320a5cbfe87c95de53eadc0d489172fd20f14a89f24c8973f892973d806370cc5510ea7de4cb314ec480d7e696b2d472d42e

data/lib/generators/phlex/base_generator.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Phlex::Generators
+	class BaseGenerator < ::Rails::Generators::NamedBase
+		def self.set_source_root(file_name, dir)
+			if File.exist?(
+				Rails.root.join("lib/generators/phlex/templates", file_name)
+			)
+
+				source_root Rails.root.join("lib/generators/phlex/templates")
+			else
+				source_root File.expand_path("templates", dir)
+			end
+		end
+	end
+end

data/lib/generators/phlex/component/component_generator.rb

@@ -1,16 +1,14 @@
 # frozen_string_literal: true
 
+require_relative "../base_generator"
+
 module Phlex::Generators
-	class ComponentGenerator < ::Rails::Generators::NamedBase
-		source_root File.expand_path("templates", __dir__)
+	class ComponentGenerator < BaseGenerator
+		set_source_root "component.rb.erb", __dir__
 
 		def create_component
-			template "component.rb.erb", File.join(
-				destination_root,
-				"app/components",
-				class_path,
-				"#{file_name}.rb"
-			)
+			@component_path = File.join("app", "components", class_path, "#{file_name}.rb")
+			template "component.rb.erb", File.join(destination_root, @component_path)
 		end
 	end
 end

data/lib/generators/phlex/component/templates/component.rb.erb

@@ -3,6 +3,6 @@
 class Components::<%= class_name %> < Components::Base
   def view_template
     h1 { "<%= class_name %>" }
-    p { "Find me in <%= @path %>" }
+    p { "Find me in <%= @component_path %>" }
   end
 end

data/lib/generators/phlex/install/templates/base_component.rb.erb

@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
 class Components::Base < Phlex::HTML
-  include Components
-
   # Include any helpers you want to be available across all components
   include Phlex::Rails::Helpers::Routes
 

data/lib/generators/phlex/view/templates/view.rb.erb

@@ -3,6 +3,6 @@
 class Views::<%= "#{namespace}::" if namespaced? %><%= class_name %> < Views::Base
   def view_template
     h1 { "<%= class_name %>" }
-    p { "Find me in <%= @path %>" }
+    p { "Find me in <%= @view_path %>" }
   end
 end

data/lib/generators/phlex/view/view_generator.rb

@@ -1,16 +1,14 @@
 # frozen_string_literal: true
 
+require_relative "../base_generator"
+
 module Phlex::Generators
-	class ViewGenerator < ::Rails::Generators::NamedBase
-		source_root File.expand_path("templates", __dir__)
+	class ViewGenerator < BaseGenerator
+		set_source_root "view.rb.erb", __dir__
 
 		def create_view
-			template "view.rb.erb", File.join(
-				destination_root,
-				"app/views",
-				class_path,
-				"#{file_name}.rb"
-			)
+			@view_path = File.join("app", "views", class_path, "#{file_name}.rb")
+			template "view.rb.erb", File.join(destination_root, @view_path)
 		end
 	end
 end

data/lib/phlex/rails/buffered.rb

@@ -1,12 +1,28 @@
 # frozen_string_literal: true
 
 module Phlex::Rails
+	def Buffered(type)
+		-> (value) { Phlex::Rails::Buffered === value && type === value.unwrap }
+	end
+
 	class Buffered < BasicObject
 		def initialize(object, component:)
 			@object = object
 			@component = component
 		end
 
+		define_method :send, ::Kernel.instance_method(:send)
+		define_method :class, ::Kernel.instance_method(:class)
+		define_method :is_a?, ::Kernel.instance_method(:is_a?)
+
+		def inspect
+			"Phlex::Rails::Buffered(#{@object.inspect})"
+		end
+
+		def unwrap
+			@object
+		end
+
 		def respond_to_missing?(...)
 			@object.respond_to?(...)
 		end

data/lib/phlex/rails/builder.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+class Phlex::Rails::Builder < BasicObject
+	def initialize(object, component:)
+		@object = object
+		@component = component
+	end
+
+	define_method :send, ::Kernel.instance_method(:send)
+
+	def respond_to_missing?(method_name, include_private = false)
+		@object.respond_to?(method_name, include_private)
+	end
+
+	def method_missing(*, **, &block)
+		output = if block
+			@object.public_send(*, **) do |builder|
+				yield ::Phlex::Rails::Builder.new(builder, component: @component)
+			end
+		else
+			@object.public_send(*, **)
+		end
+
+		case output
+		when ::ActiveSupport::SafeBuffer
+			@component.raw(output)
+		else
+			output
+		end
+	end
+end

data/lib/phlex/rails/helper_macros.rb

@@ -33,14 +33,14 @@ module Phlex::Rails::HelperMacros
 		RUBY
 	end
 
-	def register_builder_yielding_helper(method_name, builder)
+	def register_builder_yielding_helper(method_name)
 		class_eval(<<-RUBY, __FILE__, __LINE__ + 1)
 			# frozen_string_literal: true
 
 			def #{method_name}(*args, **kwargs)
 				output = if block_given?
 					view_context.#{method_name}(*args, **kwargs) { |builder|
-					yield #{builder.name}.new(builder, component: self)
+					yield Phlex::Rails::Builder.new(builder, component: self)
 					}
 				else
 					view_context.#{method_name}(*args, **kwargs)

data/lib/phlex/rails/helpers/{check_box.rb → checkbox.rb}

@@ -1,8 +1,11 @@
 # frozen_string_literal: true
 
-module Phlex::Rails::Helpers::CheckBox
+module Phlex::Rails::Helpers::Checkbox
 	extend Phlex::Rails::HelperMacros
 
+	# [Rails Docs](https://api.rubyonrails.org/classes/ActionView/Helpers/FormHelper.html#method-i-checkbox)
+	register_output_helper def checkbox(...) = nil
+
 	# [Rails Docs](https://api.rubyonrails.org/classes/ActionView/Helpers/FormHelper.html#method-i-check_box)
 	register_output_helper def check_box(...) = nil
 end

data/lib/phlex/rails/helpers/{check_box_tag.rb → checkbox_tag.rb}

@@ -1,8 +1,11 @@
 # frozen_string_literal: true
 
-module Phlex::Rails::Helpers::CheckBoxTag
+module Phlex::Rails::Helpers::CheckboxTag
 	extend Phlex::Rails::HelperMacros
 
+	# [Rails Docs](https://api.rubyonrails.org/classes/ActionView/Helpers/FormTagHelper.html#method-i-checkbox_tag)
+	register_output_helper def checkbox_tag(...) = nil
+
 	# [Rails Docs](https://api.rubyonrails.org/classes/ActionView/Helpers/FormTagHelper.html#method-i-check_box_tag)
 	register_output_helper def check_box_tag(...) = nil
 end

data/lib/phlex/rails/helpers/{collection_check_boxes.rb → collection_checkboxes.rb}

@@ -1,8 +1,11 @@
 # frozen_string_literal: true
 
-module Phlex::Rails::Helpers::CollectionCheckBoxes
+module Phlex::Rails::Helpers::CollectionCheckboxes
 	extend Phlex::Rails::HelperMacros
 
+	# [Rails Docs](https://api.rubyonrails.org/classes/ActionView/Helpers/FormOptionsHelper.html#method-i-collection_checkboxes)
+	register_builder_yielding_helper def collection_checkboxes(...) = nil
+
 	# [Rails Docs](https://api.rubyonrails.org/classes/ActionView/Helpers/FormOptionsHelper.html#method-i-collection_check_boxes)
-	register_builder_yielding_helper def collection_check_boxes(...) = nil, Phlex::Rails::CheckboxBuilder
+	register_builder_yielding_helper def collection_check_boxes(...) = nil
 end

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

@@ -4,5 +4,5 @@ module Phlex::Rails::Helpers::CollectionRadioButtons
 	extend Phlex::Rails::HelperMacros
 
 	# [Rails Docs](https://api.rubyonrails.org/classes/ActionView/Helpers/FormOptionsHelper.html#method-i-collection_radio_buttons)
-	register_builder_yielding_helper def collection_radio_buttons(...) = nil, Phlex::Rails::RadioButtonBuilder
+	register_builder_yielding_helper def collection_radio_buttons(...) = nil
 end

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

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+module Phlex::Rails::Helpers::ContentSecurityPolicyNonce
+	extend Phlex::Rails::HelperMacros
+
+	# [Rails Docs](https://api.rubyonrails.org/classes/ActionDispatch/ContentSecurityPolicy/Request.html#method-i-content_security_policy_nonce)
+	register_value_helper def content_security_policy_nonce(...) = nil
+end

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

@@ -4,5 +4,5 @@ module Phlex::Rails::Helpers::Fields
 	extend Phlex::Rails::HelperMacros
 
 	# [Rails Docs](https://api.rubyonrails.org/classes/ActionView/Helpers/FormHelper.html#method-i-fields)
-	register_builder_yielding_helper def fields(...) = nil, Phlex::Rails::FormBuilder
+	register_builder_yielding_helper def fields(...) = nil
 end

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

@@ -4,5 +4,5 @@ module Phlex::Rails::Helpers::FieldsFor
 	extend Phlex::Rails::HelperMacros
 
 	# [Rails Docs](https://api.rubyonrails.org/classes/ActionView/Helpers/FormHelper.html#method-i-fields_for)
-	register_builder_yielding_helper def fields_for(...) = nil, Phlex::Rails::FormBuilder
+	register_builder_yielding_helper def fields_for(...) = nil
 end

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

@@ -4,5 +4,5 @@ module Phlex::Rails::Helpers::FormFor
 	extend Phlex::Rails::HelperMacros
 
 	# [Rails Docs](https://api.rubyonrails.org/classes/ActionView/Helpers/FormHelper.html#method-i-form_for)
-	register_builder_yielding_helper def form_for(...) = nil, Phlex::Rails::FormBuilder
+	register_builder_yielding_helper def form_for(...) = nil
 end

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

@@ -4,5 +4,5 @@ module Phlex::Rails::Helpers::FormWith
 	extend Phlex::Rails::HelperMacros
 
 	# [Rails Docs](https://api.rubyonrails.org/classes/ActionView/Helpers/FormHelper.html#method-i-form_with)
-	register_builder_yielding_helper def form_with(...) = nil, Phlex::Rails::FormBuilder
+	register_builder_yielding_helper def form_with(...) = nil
 end

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module Phlex::Rails::Helpers::JavascriptImportModuleTag
+module Phlex::Rails::Helpers::JavaScriptImportModuleTag
 	extend Phlex::Rails::HelperMacros
 
 	# [Rails Docs](https://github.com/rails/importmap-rails)

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module Phlex::Rails::Helpers::JavascriptImportmapTags
+module Phlex::Rails::Helpers::JavaScriptImportmapTags
 	extend Phlex::Rails::HelperMacros
 
 	# [Rails Docs](https://github.com/rails/importmap-rails)

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module Phlex::Rails::Helpers::JavascriptIncludeTag
+module Phlex::Rails::Helpers::JavaScriptIncludeTag
 	extend Phlex::Rails::HelperMacros
 
 	# [Rails Docs](https://api.rubyonrails.org/classes/ActionView/Helpers/AssetTagHelper.html#method-i-javascript_include_tag)

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module Phlex::Rails::Helpers::JavascriptPath
+module Phlex::Rails::Helpers::JavaScriptPath
 	extend Phlex::Rails::HelperMacros
 
 	# [Rails Docs](https://api.rubyonrails.org/classes/ActionView/Helpers/AssetUrlHelper.html#method-i-javascript_path)

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module Phlex::Rails::Helpers::JavascriptTag
+module Phlex::Rails::Helpers::JavaScriptTag
 	extend Phlex::Rails::HelperMacros
 
 	# [Rails Docs](https://api.rubyonrails.org/classes/ActionView/Helpers/JavaScriptHelper.html#method-i-javascript_tag)

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module Phlex::Rails::Helpers::JavascriptURL
+module Phlex::Rails::Helpers::JavaScriptURL
 	extend Phlex::Rails::HelperMacros
 
 	# [Rails Docs](https://api.rubyonrails.org/classes/ActionView/Helpers/AssetUrlHelper.html#method-i-javascript_url)

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

@@ -4,5 +4,5 @@ module Phlex::Rails::Helpers::Label
 	extend Phlex::Rails::HelperMacros
 
 	# [Rails Docs](https://api.rubyonrails.org/classes/ActionView/Helpers/FormHelper.html#method-i-label)
-	register_builder_yielding_helper def label(...) = nil, Phlex::Rails::LabelBuilder
+	register_builder_yielding_helper def label(...) = nil
 end

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

@@ -4,5 +4,17 @@ module Phlex::Rails::Helpers::OptionsForSelect
 	extend Phlex::Rails::HelperMacros
 
 	# [Rails Docs](https://api.rubyonrails.org/classes/ActionView/Helpers/FormOptionsHelper.html#method-i-options_for_select)
-	register_output_helper def options_for_select(...) = nil
+	def options_for_select(*args, **kwargs, &block)
+		output = if block
+			view_context.options_for_select(*args, **kwargs) { |*args| capture(*args, &block) }
+		else
+			view_context.options_for_select(*args, **kwargs)
+		end
+
+		raw(output)
+
+		Phlex::Rails::Never.new do
+			raise Phlex::ArgumentError.new("You can’t use the return value of options_for_select as an argument to another helper in Phlex. Instead, pass a block and call options_for_select inside that block, since options_for_select outputs HTML directly. Alternatively, you can pass your options value to the select helper, skipping the options_for_select helper altogether.")
+		end
+	end
 end

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

@@ -4,5 +4,17 @@ module Phlex::Rails::Helpers::OptionsFromCollectionForSelect
 	extend Phlex::Rails::HelperMacros
 
 	# [Rails Docs](https://api.rubyonrails.org/classes/ActionView/Helpers/FormOptionsHelper.html#method-i-options_from_collection_for_select)
-	register_output_helper def options_from_collection_for_select(...) = nil
+	def options_from_collection_for_select(*args, **kwargs, &block)
+		output = if block
+			view_context.options_from_collection_for_select(*args, **kwargs) { |*args| capture(*args, &block) }
+		else
+			view_context.options_from_collection_for_select(*args, **kwargs)
+		end
+
+		raw(output)
+
+		Phlex::Rails::Never.new do
+			raise Phlex::ArgumentError.new("You can’t use the return value of options_from_collection_for_select as an argument to another helper in Phlex. Instead, pass a block and call options_from_collection_for_select inside that block, since options_from_collection_for_select outputs HTML directly.")
+		end
+	end
 end

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module Phlex::Rails::Helpers::PathToJavascript
+module Phlex::Rails::Helpers::PathToJavaScript
 	extend Phlex::Rails::HelperMacros
 
 	# [Rails Docs](https://api.rubyonrails.org/classes/ActionView/Helpers/AssetUrlHelper.html#method-i-path_to_javascript)

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module Phlex::Rails::Helpers::PathToStylesheet
+module Phlex::Rails::Helpers::PathToStyleSheet
 	extend Phlex::Rails::HelperMacros
 
 	# [Rails Docs](https://api.rubyonrails.org/classes/ActionView/Helpers/AssetUrlHelper.html#method-i-path_to_stylesheet)

data/lib/phlex/rails/helpers/{rich_text_area.rb → rich_textarea.rb}

@@ -3,6 +3,9 @@
 module Phlex::Rails::Helpers::RichTextArea
 	extend Phlex::Rails::HelperMacros
 
+	# [Rails Docs](https://api.rubyonrails.org/classes/ActionView/Helpers/FormHelper.html#method-i-rich_textarea)
+	register_output_helper def rich_textarea(...) = nil
+
 	# [Rails Docs](https://api.rubyonrails.org/classes/ActionView/Helpers/FormHelper.html#method-i-rich_text_area)
 	register_output_helper def rich_text_area(...) = nil
 end

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

@@ -4,5 +4,15 @@ module Phlex::Rails::Helpers::SelectTag
 	extend Phlex::Rails::HelperMacros
 
 	# [Rails Docs](https://api.rubyonrails.org/classes/ActionView/Helpers/FormTagHelper.html#method-i-select_tag)
-	register_output_helper def select_tag(...) = nil
+	# register_output_helper def select_tag(...) = nil
+
+	def select_tag(name, *, **, &block)
+		output = if block
+			view_context.select_tag(name, capture(&block), *, **)
+		else
+			view_context.select_tag(name, *, **)
+		end
+
+		raw(output)
+	end
 end

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module Phlex::Rails::Helpers::StylesheetLinkTag
+module Phlex::Rails::Helpers::StyleSheetLinkTag
 	extend Phlex::Rails::HelperMacros
 
 	# [Rails Docs](https://api.rubyonrails.org/classes/ActionView/Helpers/AssetTagHelper.html#method-i-stylesheet_link_tag)

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module Phlex::Rails::Helpers::StylesheetPath
+module Phlex::Rails::Helpers::StyleSheetPath
 	extend Phlex::Rails::HelperMacros
 
 	# [Rails Docs](https://api.rubyonrails.org/classes/ActionView/Helpers/AssetUrlHelper.html#method-i-stylesheet_path)

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module Phlex::Rails::Helpers::StylesheetURL
+module Phlex::Rails::Helpers::StyleSheetURL
 	extend Phlex::Rails::HelperMacros
 
 	# [Rails Docs](https://api.rubyonrails.org/classes/ActionView/Helpers/AssetUrlHelper.html#method-i-stylesheet_url)

data/lib/phlex/rails/helpers/{text_area.rb → textarea.rb}

@@ -3,6 +3,9 @@
 module Phlex::Rails::Helpers::TextArea
 	extend Phlex::Rails::HelperMacros
 
+	# [Rails Docs](https://api.rubyonrails.org/classes/ActionView/Helpers/FormHelper.html#method-i-textarea)
+	register_output_helper def textarea(...) = nil
+
 	# [Rails Docs](https://api.rubyonrails.org/classes/ActionView/Helpers/FormHelper.html#method-i-text_area)
 	register_output_helper def text_area(...) = nil
 end

data/lib/phlex/rails/helpers/{text_area_tag.rb → textarea_tag.rb}

@@ -3,6 +3,9 @@
 module Phlex::Rails::Helpers::TextAreaTag
 	extend Phlex::Rails::HelperMacros
 
+	# [Rails Docs](https://api.rubyonrails.org/classes/ActionView/Helpers/FormTagHelper.html#method-i-textarea_tag)
+	register_output_helper def textarea_tag(...) = nil
+
 	# [Rails Docs](https://api.rubyonrails.org/classes/ActionView/Helpers/FormTagHelper.html#method-i-text_area_tag)
 	register_output_helper def text_area_tag(...) = nil
 end

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module Phlex::Rails::Helpers::URLToJavascript
+module Phlex::Rails::Helpers::URLToJavaScript
 	extend Phlex::Rails::HelperMacros
 
 	# [Rails Docs](https://api.rubyonrails.org/classes/ActionView/Helpers/AssetUrlHelper.html#method-i-url_to_javascript)

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module Phlex::Rails::Helpers::URLToStylesheet
+module Phlex::Rails::Helpers::URLToStyleSheet
 	extend Phlex::Rails::HelperMacros
 
 	# [Rails Docs](https://api.rubyonrails.org/classes/ActionView/Helpers/AssetUrlHelper.html#method-i-url_to_stylesheet)