Restore safe values should be raw (#854)

#792 added this feature, but #846 removed it. This restores the ability to render safe content without needing to call `raw`. Fixes #851
phlex-ruby · Feb 12, 2025 · fca8fc4 · fca8fc4
1 parent 6dd6864
commit fca8fc4
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/lib/phlex/sgml/elements.rb b/lib/phlex/sgml/elements.rb
@@ -27,14 +27,14 @@ def #{method_name}(**attributes)
 						content = yield(self)
 						if original_length == buffer.bytesize
 							case content
-							when nil
-								nil
+							when ::Phlex::SGML::SafeObject
+								buffer << content.to_s
 							when String
 								buffer << ::Phlex::Escape.html_escape(content)
 							when Symbol
 								buffer << ::Phlex::Escape.html_escape(content.name)
-							when ::Phlex::SGML::SafeObject
-								buffer << content.to_s
+							when nil
+								nil
 							else
 								if (formatted_object = format_object(content))
 									buffer << ::Phlex::Escape.html_escape(formatted_object)
@@ -54,14 +54,14 @@ def #{method_name}(**attributes)
 						content = yield(self)
 						if original_length == buffer.bytesize
 							case content
-							when nil
-								nil
+							when ::Phlex::SGML::SafeObject
+								buffer << content.to_s
 							when String
 								buffer << ::Phlex::Escape.html_escape(content)
 							when Symbol
 								buffer << ::Phlex::Escape.html_escape(content.name)
-							when ::Phlex::SGML::SafeObject
-								buffer << content.to_s
+							when nil
+								nil
 							else
 								if (formatted_object = format_object(content))
 									buffer << ::Phlex::Escape.html_escape(formatted_object)