phlex 2.1.0 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b8db189359fc8003771075a598fbeed0c2205ca52604fd829d77afe3c0b3a467
-  data.tar.gz: e5446344e9a83c982fdfa94d4d31abd4b7511858704cc2e9f9d285ad9740b9c3
+  metadata.gz: bec8e4750b58937139e2cd64d5890a406f537b925995588c23d336340e998f46
+  data.tar.gz: 722c0d77adc2cf4d3110bc2653a7e5dced17554f8d0b102acb8e178a873b5d1d
 SHA512:
-  metadata.gz: db1c7e4b591440cea077fb99285552f443301564b293f2a0cf0098750d514af3ac48684d820398ac588570ba71f6f1c1284b72c3b32d6f54f48d20c457a476eb
-  data.tar.gz: fb9ff7728339e8edbcae2b9031c41f77ae2d28e68963b8c27368575d44a20935ff6393730d180579bb29d9a3786e43c1c6388223d0115b17c6d35b31245b64ff
+  metadata.gz: a2a6ea6722f8576a413d60f4918c7505069c24a5f1c26a0ff2514d5a1b03206b64688d8ba41b7457f51070ac710dfe0dabe7f5818e139c0cfffde1e513da1244
+  data.tar.gz: 52f9f64241f7d957b7e25dabb8598a4bd1c2a343a3c2a0dd2264bc23dc6d057c272d2b1bae772b80d9dbe071af3cc46f21b1480dabf414c154f17789dbda368d

data/lib/phlex/csv.rb

@@ -168,7 +168,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 +186,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 +196,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/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,6 +5,17 @@ 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
 
+	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
+
 	autoload :Elements, "phlex/sgml/elements"
 	autoload :SafeObject, "phlex/sgml/safe_object"
 	autoload :SafeValue, "phlex/sgml/safe_value"
@@ -29,6 +40,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 +217,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 +298,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 +333,8 @@ class Phlex::SGML
 				end
 			end
 		end
+
+		nil
 	end
 
 	def json_escape(string)
@@ -308,15 +357,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
 

data/lib/phlex/version.rb

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

data/lib/phlex.rb

@@ -8,7 +8,6 @@ module Phlex
 
 	autoload :Kit, "phlex/kit"
 	autoload :FIFO, "phlex/fifo"
-	autoload :Vanish, "phlex/vanish"
 	autoload :Helpers, "phlex/helpers"
 	autoload :FIFOCacheStore, "phlex/fifo_cache_store"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phlex
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.2
 platform: ruby
 authors:
 - Joel Drapper
 - Will Cosgrove
 bindir: bin
 cert_chain: []
-date: 2025-03-05 00:00:00.000000000 Z
+date: 2025-03-18 00:00:00.000000000 Z
 dependencies: []
 description: Build HTML, SVG and CSV views with Ruby classes.
 email:
@@ -40,7 +40,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:

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