phlex 2.2.2 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1ad9e30b1fc9db64488ae58d78b09bb2c8cd57db032da7e28dff9e9c2c035677
-  data.tar.gz: 343cf214ef539fac85e35d63bdfa39e104a7902d8765a7c10f6fc26d3d5704f4
+  metadata.gz: 43c33e9802643a8519ff45f208bccd4d8f6430cd642187e75ca2c7a8dbba7ea2
+  data.tar.gz: 8963d6c803fe8b20fc7143a5ff3c447f99a420b0ceb8556e697e844b2782a9f5
 SHA512:
-  metadata.gz: 9d554ae1c210699c059d848ebe22d1f06939c93123f160be75b51eebd90271fefdd813093676fb570a8e23c9d6d58932be38a57b330f710f292f34cbd6452ef1
-  data.tar.gz: 5d5794df169f3a98c7c1de9cde0c75e2fb268c5eeaf9c6e74f731665cb52823dc972ef288589acefcdbae7907f7f1a57a0f2b59a6e933a5ac2c6b6d5dcd54e2f
+  metadata.gz: cfd387e534c132acb663c28b3e5e1c28cba54251d1fc3ed1c1ceb649cd41825b243e6eb54eeb32f91934fc3493f8d473cd73f1d036995a97a09f2211b6b0ce61
+  data.tar.gz: 0b5f88d2d1f291719e61494a9027dd47e20a33eabe8987f01e4492ec0d16f01b1029177b5c8116402bf00f02f3d14f81f9604289ced1cd216cd05373f7db7220

data/lib/phlex/csv.rb

@@ -139,32 +139,30 @@ class Phlex::CSV
 		","
 	end
 
-	private
-
-	def column(header = nil, value)
+	private def column(header = nil, value)
 		@_row_buffer << [header, value]
 	end
 
-	def each_item(&)
+	private def each_item(&)
 		collection.each(&)
 	end
 
 	# Override and set to `false` to disable rendering headers.
-	def render_headers?
+	private def render_headers?
 		true
 	end
 
 	# Override and set to `true` to strip leading and trailing whitespace from values.
-	def trim_whitespace?
+	private def trim_whitespace?
 		false
 	end
 
 	# Override and set to `false` to disable CSV injection escapes or `true` to enable.
-	def escape_csv_injection?
+	private def escape_csv_injection?
 		UNDEFINED
 	end
 
-	def __escape__(buffer, value, escape_csv_injection:, strip_whitespace:, escape_regex:)
+	private def __escape__(buffer, value, escape_csv_injection:, strip_whitespace:, escape_regex:)
 		value = case value
 		when String
 			value
@@ -218,12 +216,12 @@ class Phlex::CSV
 	end
 
 	# Handle legacy `view_template` method
-	def respond_to_missing?(method_name, include_private)
+	private def respond_to_missing?(method_name, include_private)
 		(method_name == :row_template && respond_to?(:view_template)) || super
 	end
 
 	# Handle legacy `view_template` method
-	def method_missing(method_name, ...)
+	private def method_missing(method_name, ...)
 		if method_name == :row_template && respond_to?(:view_template)
 			warn "Deprecated: Use `row_template` instead of `view_template` in Phlex CSVs."
 			self.class.alias_method :row_template, :view_template
@@ -233,7 +231,7 @@ class Phlex::CSV
 		end
 	end
 
-	def ensure_escape_csv_injection_configured!
+	private def ensure_escape_csv_injection_configured!
 		if escape_csv_injection? == UNDEFINED
 			raise <<~MESSAGE
 				You need to define `escape_csv_injection?` in #{self.class.name}.

data/lib/phlex/fifo_cache_store.rb

@@ -28,9 +28,7 @@ class Phlex::FIFOCacheStore
 		@fifo.clear
 	end
 
-	private
-
-	def map_key(value)
+	private def map_key(value)
 		case value
 		when Array
 			value.map { |it| map_key(it) }

data/lib/phlex/helpers.rb

@@ -2,9 +2,7 @@
 
 # @api private
 module Phlex::Helpers
-	private
-
-	def mix(*args)
+	private def mix(*args)
 		args.each_with_object({}) do |object, result|
 			result.merge!(object) do |_key, old, new|
 				case [old, new].freeze
@@ -43,7 +41,7 @@ module Phlex::Helpers
 		end
 	end
 
-	def grab(**bindings)
+	private def grab(**bindings)
 		if bindings.size > 1
 			bindings.values
 		else

data/lib/phlex/html.rb

@@ -55,7 +55,7 @@ class Phlex::HTML < Phlex::SGML
 			raise Phlex::ArgumentError.new("Expected the tag name to be a Symbol.")
 		end
 
-		if (tag = StandardElements.__registered_elements__[name]) || ((tag = name.name.tr("_", "-")).include?("-") && tag.match?(/\A[a-z0-9-]+\z/))
+		if (tag = StandardElements.__registered_elements__[name]) || (tag = name.name.tr("_", "-")).include?("-")
 			if attributes.length > 0 # with attributes
 				if block_given # with content block
 					buffer << "<#{tag}" << (Phlex::ATTRIBUTE_CACHE[attributes] ||= __attributes__(attributes)) << ">"

data/lib/phlex/sgml/elements.rb

@@ -1,6 +1,41 @@
 # frozen_string_literal: true
 
 module Phlex::SGML::Elements
+	COMMA_SEPARATED_TOKENS = {
+		img: <<~RUBY,
+			if Array === (srcset_attribute = attributes[:srcset])
+				attributes[:srcset] = __nested_tokens__(srcset_attribute, ", ")
+			end
+		RUBY
+		link: <<~RUBY,
+			if Array === (media_attribute = attributes[:media])
+				attributes[:media] = __nested_tokens__(media_attribute, ", ")
+			end
+
+			if Array === (sizes_attribute = attributes[:sizes])
+				attributes[:sizes] = __nested_tokens__(sizes_attribute, ", ")
+			end
+
+			if Array === (imagesrcset_attribute = attributes[:imagesrcset])
+				rel_attribute = attributes[:rel] || attributes["rel"]
+				as_attribute = attributes[:as] || attributes["as"]
+
+				if ("preload" == rel_attribute || :preload == rel_attribute) && ("image" == as_attribute || :image == as_attribute)
+					attributes[:imagesrcset] = __nested_tokens__(imagesrcset_attribute, ", ")
+				end
+			end
+		RUBY
+		input: <<~RUBY,
+			if Array === (accept_attribute = attributes[:accept])
+				type_attribute = attributes[:type] || attributes["type"]
+
+				if "file" == type_attribute || :file == type_attribute
+					attributes[:accept] = __nested_tokens__(accept_attribute, ", ")
+				end
+			end
+		RUBY
+	}.freeze
+
 	def __registered_elements__
 		@__registered_elements__ ||= {}
 	end
@@ -23,6 +58,7 @@ module Phlex::SGML::Elements
 					if block_given # with content block
 						buffer << "<#{tag}"
 						begin
+							#{COMMA_SEPARATED_TOKENS[method_name]}
 							buffer << (Phlex::ATTRIBUTE_CACHE[attributes] ||= __attributes__(attributes))
 						ensure
 							buffer << ">"
@@ -53,6 +89,7 @@ module Phlex::SGML::Elements
 					else # without content
 						buffer << "<#{tag}"
 						begin
+							#{COMMA_SEPARATED_TOKENS[method_name]}
 							buffer << (::Phlex::ATTRIBUTE_CACHE[attributes] ||= __attributes__(attributes))
 						ensure
 							buffer << "></#{tag}>"
@@ -114,6 +151,7 @@ module Phlex::SGML::Elements
 				if attributes.length > 0 # with attributes
 					buffer << "<#{tag}"
 					begin
+						#{COMMA_SEPARATED_TOKENS[method_name]}
 						buffer << (::Phlex::ATTRIBUTE_CACHE[attributes] ||= __attributes__(attributes))
 					ensure
 						buffer << ">"

data/lib/phlex/sgml.rb

@@ -3,13 +3,7 @@
 # **Standard Generalized Markup Language** for behaviour common to {HTML} and {SVG}.
 class Phlex::SGML
 	UNSAFE_ATTRIBUTES = Set.new(%w[srcdoc sandbox http-equiv]).freeze
-	REF_ATTRIBUTES = Set.new(%w[href src action formaction lowsrc dynsrc background ping xlinkhref]).freeze
-	NAMED_CHARACTER_REFERENCES = {
-		"colon" => ":",
-		"tab" => "\t",
-		"newline" => "\n",
-	}.freeze
-	UNSAFE_ATTRIBUTE_NAME_CHARS = %r([<>&"'/=\s\x00])
+	REF_ATTRIBUTES = Set.new(%w[href src action formaction lowsrc dynsrc background ping]).freeze
 
 	ERBCompiler = ERB::Compiler.new("<>").tap do |compiler|
 		compiler.pre_cmd    = [""]
@@ -31,7 +25,7 @@ class Phlex::SGML
 		end
 
 		# Create a new instance of the component.
-		# @note The block will not be delegated {#initialize}. Instead, it will be sent to {#template} when rendering.
+		# @note The block will not be delegated to {#initialize}. Instead, it will be sent to {#view_template} when rendering.
 		def new(*a, **k, &block)
 			if block
 				object = super(*a, **k, &nil)
@@ -290,12 +284,12 @@ class Phlex::SGML
 		location = caller_locations(1, 1)[0]
 
 		full_key = [
-			app_version_key,                                    # invalidates the key when deploying new code in case of changes
+			app_version_key,                                   # invalidates the key when deploying new code in case of changes
 			self.class.name,                                   # prevents collisions between classes
 			(self.class.object_id if enable_cache_reloading?), # enables reloading
 			location.base_label,                               # prevents collisions between different methods
 			location.lineno,                                   # prevents collisions between different lines
-			cache_key,                                        # allows for custom cache keys
+			cache_key,                                         # allows for custom cache keys
 		].freeze
 
 		low_level_cache(full_key, **, &content)
@@ -342,52 +336,50 @@ class Phlex::SGML
 		ERB::Util.json_escape(string)
 	end
 
-	private
-
 	# Override this method to use a different deployment key.
-	def app_version_key
+	private def app_version_key
 		Phlex::DEPLOYED_AT
 	end
 
 	# Override this method to use a different cache store.
-	def cache_store
+	private def cache_store
 		raise "Cache store not implemented."
 	end
 
-	def enable_cache_reloading?
+	private def enable_cache_reloading?
 		false
 	end
 
-	def vanish(...)
+	private def vanish(...)
 		capture(...)
 		nil
 	end
 
-	def render?
+	private def render?
 		true
 	end
 
-	def format_object(object)
+	private def format_object(object)
 		case object
 		when Float, Integer
 			object.to_s
 		end
 	end
 
-	def around_template
+	private def around_template
 		yield
 		nil
 	end
 
-	def before_template
+	private def before_template
 		nil
 	end
 
-	def after_template
+	private def after_template
 		nil
 	end
 
-	def __yield_content__
+	private def __yield_content__
 		return unless block_given?
 
 		buffer = @_state.buffer
@@ -399,7 +391,7 @@ class Phlex::SGML
 		nil
 	end
 
-	def __yield_content_with_no_yield_args__
+	private def __yield_content_with_no_yield_args__
 		return unless block_given?
 
 		buffer = @_state.buffer
@@ -411,7 +403,7 @@ class Phlex::SGML
 		nil
 	end
 
-	def __yield_content_with_args__(*a)
+	private def __yield_content_with_args__(*a)
 		return unless block_given?
 
 		buffer = @_state.buffer
@@ -423,7 +415,7 @@ class Phlex::SGML
 		nil
 	end
 
-	def __implicit_output__(content)
+	private def __implicit_output__(content)
 		state = @_state
 		return true unless state.should_render?
 
@@ -448,7 +440,7 @@ class Phlex::SGML
 	end
 
 	# same as __implicit_output__ but escapes even `safe` objects
-	def __text__(content)
+	private def __text__(content)
 		state = @_state
 		return true unless state.should_render?
 
@@ -470,7 +462,7 @@ class Phlex::SGML
 		true
 	end
 
-	def __attributes__(attributes, buffer = +"")
+	private def __attributes__(attributes, buffer = +"")
 		attributes.each do |k, v|
 			next unless v
 
@@ -489,6 +481,10 @@ class Phlex::SGML
 				v.name.tr("_", "-").gsub('"', "&quot;")
 			when Integer, Float
 				v.to_s
+			when Date
+				v.iso8601
+			when Time
+				v.respond_to?(:iso8601) ? v.iso8601 : v.strftime("%Y-%m-%dT%H:%M:%S%:z")
 			when Hash
 				case k
 				when :style
@@ -524,9 +520,7 @@ class Phlex::SGML
 				if value != true && REF_ATTRIBUTES.include?(normalized_name)
 					case value
 					when String
-						decoded_value = decode_html_character_references(value)
-
-						if decoded_value.downcase.delete("^a-z:").start_with?("javascript:")
+						if value.downcase.delete("^a-z:").start_with?("javascript:")
 							# We just ignore these because they were likely not specified by the developer.
 							next
 						end
@@ -544,7 +538,7 @@ class Phlex::SGML
 				end
 			end
 
-			if name.match?(UNSAFE_ATTRIBUTE_NAME_CHARS)
+			if name.match?(/[<>&"']/)
 				raise Phlex::ArgumentError.new("Unsafe attribute name detected: #{k}.")
 			end
 
@@ -565,7 +559,7 @@ class Phlex::SGML
 
 	# Provides the nested-attributes case for serializing out attributes.
 	# This allows us to skip many of the checks the `__attributes__` method must perform.
-	def __nested_attributes__(attributes, base_name, buffer = +"")
+	private def __nested_attributes__(attributes, base_name, buffer = +"")
 		attributes.each do |k, v|
 			next unless v
 
@@ -580,7 +574,7 @@ class Phlex::SGML
 					else raise Phlex::ArgumentError.new("Attribute keys should be Strings or Symbols")
 				end
 
-				if name.match?(UNSAFE_ATTRIBUTE_NAME_CHARS)
+				if name.match?(/[<>&"']/)
 					raise Phlex::ArgumentError.new("Unsafe attribute name detected: #{k}.")
 				end
 			end
@@ -614,7 +608,7 @@ class Phlex::SGML
 		end
 	end
 
-	def __nested_tokens__(tokens)
+	private def __nested_tokens__(tokens, sep = " ")
 		buffer = +""
 
 		i, length = 0, tokens.length
@@ -625,28 +619,28 @@ class Phlex::SGML
 			case token
 			when String
 				if i > 0
-					buffer << " " << token
+					buffer << sep << token
 				else
 					buffer << token
 				end
 			when Symbol
 				if i > 0
-					buffer << " " << token.name.tr("_", "-")
+					buffer << sep << token.name.tr("_", "-")
 				else
 					buffer << token.name.tr("_", "-")
 				end
 			when Integer, Float, Phlex::SGML::SafeObject
 				if i > 0
-					buffer << " " << token.to_s
+					buffer << sep << token.to_s
 				else
 					buffer << token.to_s
 				end
 			when Array
 				if token.length > 0
 					if i > 0
-						buffer << " " << __nested_tokens__(token)
+						buffer << sep << __nested_tokens__(token, sep)
 					else
-						buffer << __nested_tokens__(token)
+						buffer << __nested_tokens__(token, sep)
 					end
 				end
 			when nil
@@ -661,29 +655,8 @@ class Phlex::SGML
 		buffer.gsub('"', "&quot;")
 	end
 
-	private def decode_html_character_references(value)
-		value
-			.gsub(/&#x([0-9a-f]+);?/i) {
-				begin
-					[$1.to_i(16)].pack("U*")
-				rescue
-					""
-				end
-			}
-			.gsub(/&#(\d+);?/) {
-				begin
-					[$1.to_i].pack("U*")
-				rescue
-					""
-				end
-			}
-			.gsub(/&([a-z][a-z0-9]+);?/i) {
-				NAMED_CHARACTER_REFERENCES[$1.downcase] || ""
-			}
-	end
-
 	# Result is **unsafe**, so it should be escaped!
-	def __styles__(styles)
+	private def __styles__(styles)
 		case styles
 		when Array, Set
 			styles.filter_map do |s|

data/lib/phlex/svg.rb

@@ -41,7 +41,7 @@ class Phlex::SVG < Phlex::SGML
 			raise Phlex::ArgumentError.new("Expected the tag name to be a Symbol.")
 		end
 
-		if (tag = StandardElements.__registered_elements__[name]) || ((tag = name.name.tr("_", "-")).include?("-") && tag.match?(/\A[a-z0-9-]+\z/))
+		if (tag = StandardElements.__registered_elements__[name]) || (tag = name.name.tr("_", "-")).include?("-")
 			if attributes.length > 0 # with attributes
 				if block_given # with content block
 					buffer << "<#{tag}" << (Phlex::ATTRIBUTE_CACHE[attributes] ||= __attributes__(attributes)) << ">"

data/lib/phlex/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Phlex
-	VERSION = "2.2.2"
+	VERSION = "2.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phlex
 version: !ruby/object:Gem::Version
-  version: 2.2.2
+  version: 2.3.0
 platform: ruby
 authors:
 - Joel Drapper
 - Will Cosgrove
 bindir: bin
 cert_chain: []
-date: 2026-02-06 00:00:00.000000000 Z
+date: 2025-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: zeitwerk