phlex 1.0.0.rc1 → 1.0.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3d4cbcb774d4dca95d1cb9740c0a002fd394c6887dec1e1cabe543c87f94308b
-  data.tar.gz: 1df41572816aefd255defc3ceace6e4c5eaeb5f462d26e2605fc751a4ea3d3d0
+  metadata.gz: 72f6baa9bd23ce981517a40897f2bb63a1cbd60fbc87bb127883e8eeb36cc302
+  data.tar.gz: 5abc8c59a81cdff51f5da9250a28d9cc42308b467aa662b155fb1d28eca4a1c2
 SHA512:
-  metadata.gz: 589006a44bc566ce1e1dfc90f1e05e9b3f6c7871c9686ba3670fd36b68b1318449b05cc2268c865b89779126092065a7d69cde793d753ea8d7dcaf268d8e1e9e
-  data.tar.gz: c7a960b66cd78bb9605cb37408bc6a044167ec912a249b40e46e58dd07e398e5a122737a28246e3eac2945a65156b72e57fb35096069719be3c4faa72b007ef7
+  metadata.gz: 8db8f9df3da1f218bd2029ea22414ea53a910de8b1810d71c70a0e9022a1353dd69557c91eb1ffee5355733c0d8d6878aae9379a75ee0eaa76d05c6ee20abb8e
+  data.tar.gz: 8027722c6fd1592c86f5fa6150814206a007c12a810985c72231195dcb0089aa34fd91a5addbeb9c14a8137a5a2f3fe984c07f554ee6504a4b4c25d6dd216046

data/Gemfile

@@ -10,6 +10,7 @@ gem "sus"
 gem "syntax_suggest"
 gem "zeitwerk"
 gem "benchmark-ips"
+gem "erb"
 
 group :test do
 	gem "i18n"

data/lib/phlex/helpers.rb

@@ -5,27 +5,38 @@ if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("3.0")
 end
 
 module Phlex::Helpers
-	private
-
 	def tokens(*tokens, **conditional_tokens)
 		conditional_tokens.each do |condition, token|
-			case condition
-			when Symbol then next unless send(condition)
-			when Proc then next unless condition.call
-			else raise ArgumentError,
-				"The class condition must be a Symbol or a Proc."
+			truthy = case condition
+				when Symbol then send(condition)
+				when Proc then condition.call
+				else raise ArgumentError, "The class condition must be a Symbol or a Proc."
 			end
 
-			case token
-			when Symbol then tokens << token.name
+			if truthy
+				case token
+					when Hash then _append_token(tokens, token[:then])
+					else _append_token(tokens, token)
+				end
+			else
+				case token
+					when Hash then _append_token(tokens, token[:else])
+				end
+			end
+		end
+
+		tokens.join(" ")
+	end
+
+	def _append_token(tokens, token)
+		case token
+			when nil then nil
 			when String then tokens << token
+			when Symbol then tokens << token.name
 			when Array then tokens.concat(token)
 			else raise ArgumentError,
 				"Conditional classes must be Symbols, Strings, or Arrays of Symbols or Strings."
-			end
 		end
-
-		tokens.compact.join(" ")
 	end
 
 	def classes(*tokens, **conditional_tokens)

data/lib/phlex/html.rb

@@ -183,14 +183,13 @@ module Phlex
 		end
 
 		def text(content)
-			case content
-			when String
-				@_target << CGI.escape_html(content)
-			when Symbol
-				@_target << CGI.escape_html(content.name)
-			when Integer, Float
-				@_target << CGI.escape_html(content.to_s)
-			end
+			@_target << ERB::Util.html_escape(
+				case content
+					when String then content
+					when Symbol then content.name
+					else content.to_s
+				end
+			)
 
 			nil
 		end
@@ -264,11 +263,11 @@ module Phlex
 			if unchanged
 				case content
 				when String
-					@_target << CGI.escape_html(content)
+					@_target << ERB::Util.html_escape(content)
 				when Symbol
-					@_target << CGI.escape_html(content.name)
+					@_target << ERB::Util.html_escape(content.name)
 				when Integer, Float
-					@_target << CGI.escape_html(content.to_s)
+					@_target << ERB::Util.html_escape(content.to_s)
 				end
 			end
 
@@ -309,13 +308,13 @@ module Phlex
 				when true
 					buffer << " " << name
 				when String
-					buffer << " " << name << '="' << CGI.escape_html(v) << '"'
+					buffer << " " << name << '="' << ERB::Util.html_escape(v) << '"'
 				when Symbol
-					buffer << " " << name << '="' << CGI.escape_html(v.name) << '"'
+					buffer << " " << name << '="' << ERB::Util.html_escape(v.name) << '"'
 				when Hash
 					_build_attributes(v.transform_keys { "#{k}-#{_1.name.tr('_', '-')}" }, buffer: buffer)
 				else
-					buffer << " " << name << '="' << CGI.escape_html(v.to_s) << '"'
+					buffer << " " << name << '="' << ERB::Util.html_escape(v.to_s) << '"'
 				end
 			end
 

data/lib/phlex/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Phlex
-	VERSION = "1.0.0.rc1"
+	VERSION = "1.0.0.rc2"
 end

data/lib/phlex.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "cgi"
+require "erb"
 require "zeitwerk"
 
 module Phlex

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phlex
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc1
+  version: 1.0.0.rc2
 platform: ruby
 authors:
 - Joel Drapper
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-11-25 00:00:00.000000000 Z
+date: 2022-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: zeitwerk