phlex 2.1.3 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 58ef5e091c9feed2677149231356e32305898a8d2bb271a0e603bcc208ead0fd
-  data.tar.gz: bab9a697db8f529f0221afb1fd491e30d2f4b0c702a253f7a0446f8a075ddc82
+  metadata.gz: d3eae91fcc5ec985b668a5e016c518f6392cd91d6d155a1f60552282755ca0e7
+  data.tar.gz: 4bac6d025488edbc104135dc3417286cc4782d4f022caff2a8a414afa12d09c3
 SHA512:
-  metadata.gz: 1e92858e2c2a177a120579e7cbb4c7489456a8faa0a40ecbce9fe6070f7ef01ace1e4f13baf72a9f9baf841ed57ea9b74f9cf2aa262fc774eaa95178a9248b63
-  data.tar.gz: 8040edc5a9640fb638280bccb4e879ab97d855b739f5eab04fc7ffcf7fcb7d7ca50a06ae808c31e67f9fdb7c286062c35ff40483abfaf42ac9637e2abe32c67e
+  metadata.gz: 0a18175ffb32c8ae170f9fd2c7f4b990d39500cef81db66545c057f7ff6635a215ba257130c3715a82d1322666ec89badc9beb06fae3325d864a1630f685bea2
+  data.tar.gz: 4ee950b03d2d8f0b8efe085207ca42b139775dff4cc0a564661648995ef32f01fce22e84537194a7c37a6218031d9ab8a4ab7689b92bfeac53534aee4d2fc919

data/lib/phlex/csv.rb

@@ -13,6 +13,7 @@ class Phlex::CSV
 		@collection = collection
 		@_row_buffer = []
 		@_headers = []
+		@_row_appender = nil
 	end
 
 	attr_reader :collection
@@ -49,13 +50,7 @@ class Phlex::CSV
 			MESSAGE
 		end
 
-		each_item do |record|
-			if has_yielder
-				yielder(record) { |*a, **k| row = row_template(*a, **k) }
-			else
-				around_row(record)
-			end
-
+		row_appender = -> {
 			row = row_buffer
 
 			if first_row
@@ -108,13 +103,28 @@ class Phlex::CSV
 			buffer << "\n"
 
 			row_buffer.clear
+		}
+
+		if has_yielder
+			each_item do |record|
+				yielder(record) do |*a, **k|
+					row_template(*a, **k)
+					row_appender.call
+				end
+			end
+		else
+			@row_appender = row_appender
+			each_item do |record|
+				around_row(record)
+			end
 		end
 
 		buffer
 	end
 
-	def around_row(item)
-		row_template(item)
+	def around_row(...)
+		row_template(...)
+		@row_appender.call
 	end
 
 	def filename

data/lib/phlex/helpers.rb

@@ -26,6 +26,10 @@ module Phlex::Helpers
 					[old] + new.to_a
 				in [String, String]
 					"#{old} #{new}"
+				in [_, Hash]
+					{ _: old, **new }
+				in [Hash, _]
+					{ **old, _: new }
 				in [_, nil]
 					old
 				else

data/lib/phlex/html/standard_elements.rb

@@ -472,6 +472,13 @@ module Phlex::HTML::StandardElements
 	# [Spec](https://html.spec.whatwg.org/#the-select-element)
 	register_element def select(**attributes, &content) = nil
 
+	# [EXPERIMENTAL] Outputs a `<selectedcontent>` tag.
+	#
+	# [MDN Docs](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/selectedcontent)
+	# [Draft Spec](https://github.com/whatwg/html/pull/10633)
+	# [Can I Use?](https://caniuse.com/mdn-html_elements_selectedcontent)
+	register_element def selectedcontent(**attributes, &content) = nil
+
 	# Outputs a `<slot>` tag.
 	#
 	# [MDN Docs](https://developer.mozilla.org/docs/Web/HTML/Element/slot)

data/lib/phlex/html.rb

@@ -1,9 +1,6 @@
 # frozen_string_literal: true
 
 class Phlex::HTML < Phlex::SGML
-	autoload :StandardElements, "phlex/html/standard_elements"
-	autoload :VoidElements, "phlex/html/void_elements"
-
 	extend Phlex::SGML::Elements
 	include VoidElements, StandardElements
 
@@ -58,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.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    = [""]
@@ -22,11 +16,6 @@ class Phlex::SGML
 		end
 	end
 
-	autoload :Elements, "phlex/sgml/elements"
-	autoload :SafeObject, "phlex/sgml/safe_object"
-	autoload :SafeValue, "phlex/sgml/safe_value"
-	autoload :State, "phlex/sgml/state"
-
 	include Phlex::Helpers
 
 	class << self
@@ -529,9 +518,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
@@ -549,7 +536,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
 
@@ -574,14 +561,20 @@ class Phlex::SGML
 		attributes.each do |k, v|
 			next unless v
 
-			name = case k
-				when String then k
-				when Symbol then k.name.tr("_", "-")
-				else raise Phlex::ArgumentError.new("Attribute keys should be Strings or Symbols")
-			end
+			if (root_key = (:_ == k))
+				name = ""
+				original_base_name = base_name
+				base_name = base_name.delete_suffix("-")
+			else
+				name = case k
+					when String then k
+					when Symbol then k.name.tr("_", "-")
+					else raise Phlex::ArgumentError.new("Attribute keys should be Strings or Symbols")
+				end
 
-			if name.match?(UNSAFE_ATTRIBUTE_NAME_CHARS)
-				raise Phlex::ArgumentError.new("Unsafe attribute name detected: #{k}.")
+				if name.match?(/[<>&"']/)
+					raise Phlex::ArgumentError.new("Unsafe attribute name detected: #{k}.")
+				end
 			end
 
 			case v
@@ -605,6 +598,10 @@ class Phlex::SGML
 				raise Phlex::ArgumentError.new("Invalid attribute value #{v.inspect}.")
 			end
 
+			if root_key
+				base_name = original_base_name
+			end
+
 			buffer
 		end
 	end
@@ -656,27 +653,6 @@ 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)
 		case styles

data/lib/phlex/svg.rb

@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
 class Phlex::SVG < Phlex::SGML
-	autoload :StandardElements, "phlex/svg/standard_elements"
-
 	include StandardElements
 
 	# Returns the string "image/svg+xml"
@@ -43,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.1.3"
+	VERSION = "2.2.0"
 end

data/lib/phlex.rb

@@ -2,25 +2,22 @@
 
 require "erb"
 require "set"
+require "zeitwerk"
 
 module Phlex
-	autoload :VERSION, "phlex/version"
-
-	autoload :Kit, "phlex/kit"
-	autoload :FIFO, "phlex/fifo"
-	autoload :Helpers, "phlex/helpers"
-	autoload :FIFOCacheStore, "phlex/fifo_cache_store"
-
-	autoload :CSV, "phlex/csv"
-	autoload :SVG, "phlex/svg"
-	autoload :HTML, "phlex/html"
-	autoload :SGML, "phlex/sgml"
-
-	autoload :Error, "phlex/error"
-	autoload :NameError, "phlex/errors/name_error"
-	autoload :RuntimeError, "phlex/errors/runtime_error"
-	autoload :ArgumentError, "phlex/errors/argument_error"
-	autoload :DoubleRenderError, "phlex/errors/double_render_error"
+	Loader = Zeitwerk::Loader.for_gem.tap do |loader|
+		loader.push_dir("lib/phlex/errors", namespace: Phlex)
+		loader.inflector.inflect(
+			"csv" => "CSV",
+			"fifo" => "FIFO",
+			"fifo_cache_store" => "FIFOCacheStore",
+			"html" => "HTML",
+			"sgml" => "SGML",
+			"svg" => "SVG",
+		)
+
+		loader.setup
+	end
 
 	Escape = ERB::Escape
 
@@ -35,17 +32,6 @@ module Phlex
 		end
 	end
 
-	def self.eager_load
-		queue = [self]
-
-		while (mod = queue.shift)
-			mod.constants.each do |const_name|
-				const = mod.const_get(const_name)
-				queue << const if Module === const
-			end
-		end
-	end
-
 	# Generate an HTML string using Phlex’ HTML DSL
 	def self.html(&block)
 		HTML.call do |component|

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: phlex
 version: !ruby/object:Gem::Version
-  version: 2.1.3
+  version: 2.2.0
 platform: ruby
 authors:
 - Joel Drapper
 - Will Cosgrove
 bindir: bin
 cert_chain: []
-date: 2026-02-06 00:00:00.000000000 Z
-dependencies: []
+date: 2025-04-04 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: zeitwerk
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Build HTML, SVG and CSV views with Ruby classes.
 email:
 - joel@drapper.me