phlex 1.3.1 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9cd9fd26d33fcf92978a26d9d94b81485871fa3f54c98639eb4ba5932960df84
-  data.tar.gz: c8f0ded1ee9cd43c12e8358af687b7fe4f21e732031ca4fb009020dfaaeb72b5
+  metadata.gz: a8a6c8dfab161746b6b4e04d403fead1f2477f195ff27e72365838f169ecc287
+  data.tar.gz: e9e9da3414eba5fc53d5440b16c0eecf47d4fc5d09a178fe44c9acab3f554119
 SHA512:
-  metadata.gz: 890ccb499d210d332f5b2213bfdce51bd1e2212c550b20b0d9de3d1698205ca45b82e86e7850dc037e07a43e3da70a011e27d2310618f203882a00b32750704d
-  data.tar.gz: fd9794d862a27ddaafa53c1f0d5fcecd3a967391083e2073922a2e83cbc19db7f95f4d19dd5db64b3c186e5c1c6292a6cef71dc05842c7216bd1e9b07046edc8
+  metadata.gz: 043c059dd8ce067a50df40c293d61475892acc934a4efdd18bedae7094ebaea3c9dd11a4bc5e5b7779120d38966964a2725dcd17de3dca2de48c50e837e2e8fd
+  data.tar.gz: 00edaf160d669c8f62f40c4f66faf17a6b76b2428648be0d7c7977ad629b119a146cfacffc8636312f87e46b77cdfc3074fe39ade0b4ff45ee10e874f0459a31

data/.rubocop.yml

@@ -5,27 +5,5 @@ inherit_from:
 AllCops:
   TargetRubyVersion: 2.7
 
-Style/PercentLiteralDelimiters:
-  Enabled: false
-
-Layout/CaseIndentation:
-  Enabled: false
-
-Style/StringConcatenation:
-  Enabled: false
-
-Style/CaseEquality:
-  Enabled: false
-
-Security/Eval:
-  Enabled: false
-
-Style/MethodCallWithoutArgsParentheses:
-  Enabled: false
-
-Style/MixinUsage:
-  Enabled: false
-
-Style/AccessModifierDeclarations:
-  Enabled: true
-  EnforcedStyle: inline
+Style/ExplicitBlockArgument:
+  Enabled: false

data/.ruby-version

@@ -1 +1 @@
-3.2.0
+3.2.1

data/Gemfile

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

data/README.md

@@ -43,3 +43,4 @@ Thanks [Logology](https://www.logology.co) for sponsoring our logo.
 - [hoshi](https://github.com/pete/hoshi)
 - [hyperstack](https://github.com/hyperstack-org/hyperstack)
 - [clearwater](https://github.com/clearwater-rb/clearwater)
+- [paggio](https://github.com/opal/paggio)

data/fixtures/view_helper.rb

@@ -13,4 +13,10 @@ module ViewHelper
 			Class.new(Phlex::HTML, &block)
 		end
 	end
+
+	def svg_view(&block)
+		let :view do
+			Class.new(Phlex::SVG, &block)
+		end
+	end
 end

data/lib/phlex/black_hole.rb

@@ -1,15 +1,13 @@
 # frozen_string_literal: true
 
-module Phlex
-	module BlackHole
-		extend self
+module Phlex::BlackHole
+	extend self
 
-		def <<(anything)
-			self
-		end
+	def <<(anything)
+		self
+	end
 
-		def length
-			0
-		end
+	def length
+		0
 	end
 end

data/lib/phlex/callable.rb

@@ -1,9 +1,7 @@
 # frozen_string_literal: true
 
-module Phlex
-	module Callable
-		def to_proc
-			method(:call).to_proc
-		end
+module Phlex::Callable
+	def to_proc
+		method(:call).to_proc
 	end
 end

data/lib/phlex/deferred_render.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-module Phlex
-	module DeferredRender
-		# This module doesn't do anything. Phlex::HTML#call checks for its inclusion in the ancestry instead.
-	end
+module Phlex::DeferredRender
+	# This module doesn't do anything. Phlex::HTML#call checks for its inclusion in the ancestry instead.
 end

data/lib/phlex/elements.rb

@@ -1,57 +1,63 @@
 # frozen_string_literal: true
 
 if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("3.0")
-	using Overrides::Symbol::Name
+	using Phlex::Overrides::Symbol::Name
 end
 
-module Phlex
-	module Elements
-		def register_element(element, tag: element.name.tr("_", "-"))
-			class_eval(<<-RUBY, __FILE__, __LINE__ + 1)
-        # frozen_string_literal: true
-
-        def #{element}(**attributes, &block)
-          if attributes.length > 0
-            if block_given?
-              @_target << "<#{tag}" << (Phlex::ATTRIBUTE_CACHE[attributes.hash] || __attributes__(**attributes)) << ">"
-              yield_content(&block)
-              @_target << "</#{tag}>"
-            else
-              @_target << "<#{tag}" << (Phlex::ATTRIBUTE_CACHE[attributes.hash] || __attributes__(**attributes)) << "></#{tag}>"
-            end
-          else
-            if block_given?
-              @_target << "<#{tag}>"
-              yield_content(&block)
-              @_target << "</#{tag}>"
-            else
-              @_target << "<#{tag}></#{tag}>"
-            end
-          end
-
-          nil
-        end
-
-				alias_method :_#{element}, :#{element}
-			RUBY
-		end
-
-		def register_void_element(element, tag: element.name.tr("_", "-"))
-			class_eval(<<-RUBY, __FILE__, __LINE__ + 1)
-        # frozen_string_literal: true
-
-        def #{element}(**attributes)
-          if attributes.length > 0
-            @_target << "<#{tag}" << (Phlex::ATTRIBUTE_CACHE[attributes.hash] || __attributes__(**attributes)) << ">"
-          else
-            @_target << "<#{tag}>"
-          end
-
-          nil
-        end
-
-				alias_method :_#{element}, :#{element}
-			RUBY
-		end
+module Phlex::Elements
+	def register_element(element, tag: element.name.tr("_", "-"))
+		class_eval(<<-RUBY, __FILE__, __LINE__ + 1)
+			# frozen_string_literal: true
+
+			def #{element}(**attributes, &block)
+				if attributes.length > 0
+					if block_given?
+						@_target << "<#{tag}" << (Phlex::ATTRIBUTE_CACHE[attributes.hash] || __attributes__(**attributes)) << ">"
+						yield_content(&block)
+						@_target << "</#{tag}>"
+					else
+						@_target << "<#{tag}" << (Phlex::ATTRIBUTE_CACHE[attributes.hash] || __attributes__(**attributes)) << "></#{tag}>"
+					end
+				else
+					if block_given?
+						@_target << "<#{tag}>"
+						yield_content(&block)
+						@_target << "</#{tag}>"
+					else
+						@_target << "<#{tag}></#{tag}>"
+					end
+				end
+
+				nil
+			end
+
+			alias_method :_#{element}, :#{element}
+		RUBY
+
+		self::REGISTERED_ELEMENTS[element] = tag
+
+		element
+	end
+
+	def register_void_element(element, tag: element.name.tr("_", "-"))
+		class_eval(<<-RUBY, __FILE__, __LINE__ + 1)
+			# frozen_string_literal: true
+
+			def #{element}(**attributes)
+				if attributes.length > 0
+					@_target << "<#{tag}" << (Phlex::ATTRIBUTE_CACHE[attributes.hash] || __attributes__(**attributes)) << ">"
+				else
+					@_target << "<#{tag}>"
+				end
+
+				nil
+			end
+
+			alias_method :_#{element}, :#{element}
+		RUBY
+
+		self::REGISTERED_ELEMENTS[element] = tag
+
+		element
 	end
 end

data/lib/phlex/helpers.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("3.0")
-	using Overrides::Symbol::Name
+	using Phlex::Overrides::Symbol::Name
 end
 
 module Phlex::Helpers
@@ -25,7 +25,10 @@ module Phlex::Helpers
 			end
 		end
 
-		tokens.join(" ")
+		tokens = tokens.select(&:itself).join(" ")
+		tokens.strip!
+		tokens.gsub!(/\s+/, " ")
+		tokens
 	end
 
 	private def __append_token__(tokens, token)