phlex 2.0.0.beta1 → 2.0.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fd808f50305105b7fb8cde4624804427da99fa7a3e59a20f6442e1db35e0983d
-  data.tar.gz: f3e7f7b703a27e3a00bbea42749e4682ac0255a3c3c12abca5c94f90de1be23c
+  metadata.gz: 46379514e0705957409d87f74668c2f012e03d5a48fe14f41b4100172b0672c0
+  data.tar.gz: c4ddfa6b1c8eabfc66534abb52ca6fbe543db4d41ddf529b50fc8d0cd3393f63
 SHA512:
-  metadata.gz: d66595c47ec3704a3b06c619e2fe8697252a8e9f5566be7c0c8082c06c69a46361686135411f04268854a1a087a78b24e072e7ca4fa98fd23b64dfaa147f6f07
-  data.tar.gz: e93c80673a2ca16d9585d76b8c348ec0a7ddf04013720d083dc064b432aaf7f1642bbe5a6b8622fea6c18eb453f663de0d36929bd903f3b40a7f243987a46dee
+  metadata.gz: 9aa416b84741e68ee9429b11c2cd2fc9dc2986ae4cc15eefff126b5f53e177aad9129cdc1349e827e54aef5c5a26f08f12017e3d200b98c5930130c4c13883fc
+  data.tar.gz: fc0cd1de6ab7d6a6f1b76447fad84a263c9cda0ce7e0a9f4313b579c38b7246a4704a02fd183bc0b29bdc171f374070aed0e0c2933f6e06388e58696f58f2565

data/lib/phlex/element_clobbering_guard.rb

@@ -6,9 +6,11 @@ module Phlex::ElementClobberingGuard
 		if method_name[0] == "_" && __element_method__?(method_name[1..].to_sym)
 			raise Phlex::NameError.new("👋 Redefining the method `#{name}##{method_name}` is not a good idea.")
 		elsif method_name == :view_template
-			Phlex.__expand_attribute_cache__(
-				instance_method(method_name).source_location[0],
-			)
+			location = instance_method(method_name).source_location[0]
+
+			if location[0] in "/" | "."
+				Phlex.__expand_attribute_cache__(location)
+			end
 		else
 			super
 		end

data/lib/phlex/elements.rb

@@ -64,23 +64,23 @@ module Phlex::Elements
 						if original_length == buffer.bytesize
 							case content
 							when String
-								buffer << Phlex::Escape.html_escape(content)
+								buffer << ::Phlex::Escape.html_escape(content)
 							when Symbol
-								buffer << Phlex::Escape.html_escape(content.name)
+								buffer << ::Phlex::Escape.html_escape(content.name)
 							when nil
 								nil
-							when Phlex::SGML::SafeObject
+							when ::Phlex::SGML::SafeObject
 								buffer << content.to_s
 							else
 								if (formatted_object = format_object(content))
-									buffer << Phlex::Escape.html_escape(formatted_object)
+									buffer << ::Phlex::Escape.html_escape(formatted_object)
 								end
 							end
 						end
 
 						buffer << "</#{tag}>"
 					else # without content
-						buffer << "<#{tag}" << (Phlex::ATTRIBUTE_CACHE[attributes] ||= __attributes__(attributes)) << "></#{tag}>"
+						buffer << "<#{tag}" << (::Phlex::ATTRIBUTE_CACHE[attributes] ||= __attributes__(attributes)) << "></#{tag}>"
 					end
 				else # without attributes
 					if block_given # with content block
@@ -91,16 +91,16 @@ module Phlex::Elements
 						if original_length == buffer.bytesize
 							case content
 							when String
-								buffer << Phlex::Escape.html_escape(content)
+								buffer << ::Phlex::Escape.html_escape(content)
 							when Symbol
-								buffer << Phlex::Escape.html_escape(content.name)
+								buffer << ::Phlex::Escape.html_escape(content.name)
 							when nil
 								nil
-							when Phlex::SGML::SafeObject
+							when ::Phlex::SGML::SafeObject
 								buffer << content.to_s
 							else
 								if (formatted_object = format_object(content))
-									buffer << Phlex::Escape.html_escape(formatted_object)
+									buffer << ::Phlex::Escape.html_escape(formatted_object)
 								end
 							end
 						end
@@ -152,7 +152,7 @@ module Phlex::Elements
 				end
 
 				if attributes.length > 0 # with attributes
-					buffer << "<#{tag}" << (Phlex::ATTRIBUTE_CACHE[attributes] ||= __attributes__(attributes)) << ">"
+					buffer << "<#{tag}" << (::Phlex::ATTRIBUTE_CACHE[attributes] ||= __attributes__(attributes)) << ">"
 				else # without attributes
 					buffer << "<#{tag}>"
 				end

data/lib/phlex/helpers.rb

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

data/lib/phlex/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Phlex
-	VERSION = "2.0.0.beta1"
+	VERSION = "2.0.0.beta2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phlex
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta1
+  version: 2.0.0.beta2
 platform: ruby
 authors:
 - Joel Drapper
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-12 00:00:00.000000000 Z
+date: 2024-09-14 00:00:00.000000000 Z
 dependencies: []
 description: A high-performance view framework optimised for fun.
 email: