phlex 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b8db189359fc8003771075a598fbeed0c2205ca52604fd829d77afe3c0b3a467
-  data.tar.gz: e5446344e9a83c982fdfa94d4d31abd4b7511858704cc2e9f9d285ad9740b9c3
+  metadata.gz: d3eae91fcc5ec985b668a5e016c518f6392cd91d6d155a1f60552282755ca0e7
+  data.tar.gz: 4bac6d025488edbc104135dc3417286cc4782d4f022caff2a8a414afa12d09c3
 SHA512:
-  metadata.gz: db1c7e4b591440cea077fb99285552f443301564b293f2a0cf0098750d514af3ac48684d820398ac588570ba71f6f1c1284b72c3b32d6f54f48d20c457a476eb
-  data.tar.gz: fb9ff7728339e8edbcae2b9031c41f77ae2d28e68963b8c27368575d44a20935ff6393730d180579bb29d9a3786e43c1c6388223d0115b17c6d35b31245b64ff
+  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
@@ -168,7 +178,9 @@ class Phlex::CSV
 			value = value.strip
 
 			if escape_csv_injection
-				if FORMULA_PREFIXES_MAP[value.getbyte(0)]
+				if value.empty?
+					buffer << value
+				elsif FORMULA_PREFIXES_MAP[value.getbyte(0)]
 					value.gsub!('"', '""')
 					buffer << '"\'' << value << '"'
 				elsif value.match?(escape_regex)
@@ -184,7 +196,9 @@ class Phlex::CSV
 			if escape_csv_injection
 				first_byte = value.getbyte(0)
 
-				if FORMULA_PREFIXES_MAP[first_byte]
+				if value.empty?
+					buffer << '""'
+				elsif FORMULA_PREFIXES_MAP[first_byte]
 					buffer << '"\'' << value.gsub('"', '""') << '"'
 				elsif value.match?(escape_regex)
 					buffer << '"' << value.gsub('"', '""') << '"'
@@ -192,7 +206,9 @@ class Phlex::CSV
 					buffer << value
 				end
 			else # not escaping CSV injection
-				if value.match?(escape_regex)
+				if value.empty?
+					buffer << '""'
+				elsif value.match?(escape_regex)
 					buffer << '"' << value.gsub('"', '""') << '"'
 				else
 					buffer << value

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
 

data/lib/phlex/sgml/state.rb

@@ -14,16 +14,7 @@ class Phlex::SGML::State
 
 	attr_accessor :capturing, :user_context
 
-	attr_reader :fragments, :fragment_depth, :output_buffer
-
-	def buffer
-		case @buffer
-		when Proc
-			@buffer.call
-		else
-			@buffer
-		end
-	end
+	attr_reader :fragments, :fragment_depth, :output_buffer, :buffer
 
 	def around_render(component)
 		stack = @stack
@@ -85,17 +76,23 @@ class Phlex::SGML::State
 	end
 
 	def caching(&)
-		buffer = +""
-		@cache_stack.push([buffer, {}].freeze)
-		capturing_into(buffer, &)
-		@cache_stack.pop
+		result = nil
+
+		capture do
+			@cache_stack.push([buffer, {}].freeze)
+			yield
+			result = @cache_stack.pop
+		end
+
+		result
 	end
 
 	def caching?
 		@cache_stack.length > 0
 	end
 
-	def capturing_into(new_buffer)
+	def capture
+		new_buffer = +""
 		original_buffer = @buffer
 		original_capturing = @capturing
 		original_fragments = @fragments

data/lib/phlex/sgml.rb

@@ -5,10 +5,16 @@ 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]).freeze
 
-	autoload :Elements, "phlex/sgml/elements"
-	autoload :SafeObject, "phlex/sgml/safe_object"
-	autoload :SafeValue, "phlex/sgml/safe_value"
-	autoload :State, "phlex/sgml/state"
+	ERBCompiler = ERB::Compiler.new("<>").tap do |compiler|
+		compiler.pre_cmd    = [""]
+		compiler.put_cmd    = "@_state.buffer.<<"
+		compiler.insert_cmd = "__implicit_output__"
+		compiler.post_cmd   = ["nil"]
+
+		def compiler.add_insert_cmd(out, content)
+			out.push("#{@insert_cmd}((#{content}))")
+		end
+	end
 
 	include Phlex::Helpers
 
@@ -29,6 +35,40 @@ class Phlex::SGML
 				super
 			end
 		end
+
+		def erb(method_name, erb = nil, locals: nil, &block)
+			loc = caller_locations(1, 1)[0]
+			path = loc.path.delete_suffix(".rb")
+			file = loc.path
+			line = loc.lineno - 1
+
+			unless erb
+				method_path = "#{path}/#{method_name}.html.erb"
+				sidecar_path = "#{path}.html.erb"
+
+				if File.exist?(method_path)
+					erb = File.read(method_path)
+					file = method_path
+					line = 1
+				elsif method_name == :view_template && File.exist?(sidecar_path)
+					erb = File.read(sidecar_path)
+					file = sidecar_path
+					line = 1
+				else
+					raise Phlex::RuntimeError.new(<<~MESSAGE)
+						No ERB template found for #{method_name}
+					MESSAGE
+				end
+			end
+
+			code, _enc = ERBCompiler.compile(erb)
+
+			class_eval(<<~RUBY, file, line)
+				def #{method_name} #{locals}
+					#{code}
+				end
+			RUBY
+		end
 	end
 
 	def view_template
@@ -172,9 +212,9 @@ class Phlex::SGML
 		return "" unless block
 
 		if args.length > 0
-			@_state.capturing_into(+"") { __yield_content_with_args__(*args, &block) }
+			@_state.capture { __yield_content_with_args__(*args, &block) }
 		else
-			@_state.capturing_into(+"") { __yield_content__(&block) }
+			@_state.capture { __yield_content__(&block) }
 		end
 	end
 
@@ -253,6 +293,8 @@ class Phlex::SGML
 		].freeze
 
 		low_level_cache(full_key, **, &content)
+
+		nil
 	end
 
 	# Cache a block of content where you control the entire cache key.
@@ -286,6 +328,8 @@ class Phlex::SGML
 				end
 			end
 		end
+
+		nil
 	end
 
 	def json_escape(string)
@@ -308,15 +352,8 @@ class Phlex::SGML
 		false
 	end
 
-	def vanish(*args)
-		return unless block_given?
-
-		if args.length > 0
-			@_state.capturing_into(Phlex::Vanish) { yield(*args) }
-		else
-			@_state.capturing_into(Phlex::Vanish) { yield(self) }
-		end
-
+	def vanish(...)
+		capture(...)
 		nil
 	end
 
@@ -524,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?(/[<>&"']/)
-				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
@@ -555,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

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"

data/lib/phlex/version.rb

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

data/lib/phlex.rb

@@ -2,26 +2,22 @@
 
 require "erb"
 require "set"
+require "zeitwerk"
 
 module Phlex
-	autoload :VERSION, "phlex/version"
-
-	autoload :Kit, "phlex/kit"
-	autoload :FIFO, "phlex/fifo"
-	autoload :Vanish, "phlex/vanish"
-	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
 
@@ -36,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.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Joel Drapper
 - Will Cosgrove
 bindir: bin
 cert_chain: []
-date: 2025-03-05 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
@@ -40,7 +54,6 @@ files:
 - lib/phlex/sgml/state.rb
 - lib/phlex/svg.rb
 - lib/phlex/svg/standard_elements.rb
-- lib/phlex/vanish.rb
 - lib/phlex/version.rb
 homepage: https://www.phlex.fun
 licenses:
@@ -65,7 +78,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 3.6.6
 specification_version: 4
 summary: Object-oriented views in Ruby.
 test_files: []

data/lib/phlex/vanish.rb

@@ -1,22 +0,0 @@
-# frozen_string_literal: true
-
-# @api private
-module Phlex::Vanish
-	extend self
-
-	def <<(anything)
-		self
-	end
-
-	def bytesize
-		0
-	end
-
-	def dup
-		self
-	end
-
-	def clear
-		self
-	end
-end