phlex 1.3.2 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fe4d886672079338214f95fb037805836bfae5e975c549153ffbabeef2d1cd35
-  data.tar.gz: 4e88e58ab6351024d738b07a4dc7231837462b09396f55fa7cec6904f32b031d
+  metadata.gz: 647e5f1a1f3beb8dd596cb87a5fb848f07e8e87e28ce705f3d1c93d8c9cfe9ac
+  data.tar.gz: d2b327f45d36a44069cf6dd9de03310918f56647bc1a40c6eb675837eb1cb653
 SHA512:
-  metadata.gz: 386ab00e03abeb9a752d91ca025c21765bce174a375326544170be5ff032e5ed7289b114981871482baccc46024d9d31cacad64db564d45129b1b182938b349a
-  data.tar.gz: 7557c4583e78b49421ca301982b0ee5f8b0dab478075a6882b8040bace46e6dd5f49e81a401f5e3101f42380898e00ddbac7e5a864ce269710415febf8514ac3
+  metadata.gz: '0387ae5e9183fb312619950e5a5a6d75d1383c58e46be6f389e781a5cbdf2b3658efc4cbd298eb7b9d1ad0f9042c857ecc11c3812a2bd1600ee04a79f9fc1d8a'
+  data.tar.gz: 6159fbe6ac1f52baf8924e9309a43ae252a47655f7feaf380787fb4d5a56e83380154dd906e8a964b0754fa0f4827e3e3b028ca9f4a03ded5aace8431edf0452

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/Gemfile

@@ -7,9 +7,7 @@ gemspec
 
 gem "rubocop"
 gem "sus"
-gem "zeitwerk"
 gem "benchmark-ips"
-gem "erb"
 
 group :test do
 	gem "i18n"

data/README.md

@@ -10,6 +10,17 @@ Documentation can be found at [www.phlex.fun](https://www.phlex.fun).
 
 If you run into any trouble, please [start a discussion](https://github.com/joeldrapper/phlex/discussions/new), or [open an issue](https://github.com/joeldrapper/phlex/issues/new) if you think you’ve found a bug.
 
+### Ecosystem 🌱
+- [joeldrapper/phlex-rails](https://github.com/joeldrapper/phlex-rails) — Ruby on Rails integration
+- [joeldrapper/phlex.fun](https://github.com/joeldrapper/phlex.fun) — Docs Website
+- [joeldrapper/phlex-markdown](https://github.com/joeldrapper/phlex-markdown) — Markdown to HTML using Phlex
+- [joeldrapper/phlex-compiler](https://github.com/joeldrapper/phlex-compiler) — A compiler for Phlex
+- [joeldrapper/phlex-translation](https://github.com/joeldrapper/phlex-translation) — I18n Support for Phlex 
+- [joeldrapper/phlex-testing-nokogiri](https://github.com/joeldrapper/phlex-testing-nokogiri) — Nokogiri support
+- [joeldrapper/phlex-testing-capybara](https://github.com/joeldrapper/phlex-testing-capybara) — Capybara support
+- [marcoroth/phlexing](https://github.com/marcoroth/phlexing) — ERB → Phlex converter
+- [ViewComponent/lookbook](https://github.com/ViewComponent/lookbook) — Document and preview Phlex components in Rails (v2 beta only)
+
 ### Community 🙌
 
 Everyone interacting in Phlex codebases, issue trackers or chat rooms is expected to follow the [code of conduct](https://github.com/joeldrapper/phlex/blob/main/CODE_OF_CONDUCT.md).
@@ -43,3 +54,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,21 @@
 # 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 dup
+		self
+	end
 
-		def length
-			0
-		end
+	def clear
+		self
 	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/element_clobbering_guard.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Phlex
+	module ElementClobberingGuard
+		def method_added(method_name)
+			if method_name[0] == "_" && private_instance_methods.include?(:"__phlex#{method_name}__")
+				raise NameError, "👋 Redefining the method `#{name}##{method_name}` is not a good idea."
+			end
+
+			super
+		end
+	end
+end

data/lib/phlex/elements.rb

@@ -1,61 +1,71 @@
 # 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
-
-			Phlex::HTML::STANDARD_ELEMENTS[element] = tag
-		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
-
-			Phlex::HTML::VOID_ELEMENTS[element] = tag
-		end
+module Phlex::Elements
+	private def slow_registered_elements
+		private_instance_methods
+			.lazy
+			.map(&:to_s)
+			.select { |m| m.start_with?("__phlex_") }
+			.map { |m| m[8...-2].to_sym }
+	end
+
+	def register_element(element, tag: element.name.tr("_", "-"))
+		class_eval(<<-RUBY, __FILE__, __LINE__ + 1)
+			# frozen_string_literal: true
+
+			def __phlex_#{element}__(**attributes, &block)
+				if attributes.length > 0 # with attributes
+					if block_given? # with content block
+						@_target << "<#{tag}" << (Phlex::ATTRIBUTE_CACHE[respond_to?(:process_attributes) ? (attributes.hash + self.class.hash) : attributes.hash] || __attributes__(**attributes)) << ">"
+						yield_content(&block)
+						@_target << "</#{tag}>"
+					else # without content block
+						@_target << "<#{tag}" << (Phlex::ATTRIBUTE_CACHE[respond_to?(:process_attributes) ? (attributes.hash + self.class.hash) : attributes.hash] || __attributes__(**attributes)) << "></#{tag}>"
+					end
+				else # without attributes
+					if block_given? # with content block
+						@_target << "<#{tag}>"
+						yield_content(&block)
+						@_target << "</#{tag}>"
+					else # without content block
+						@_target << "<#{tag}></#{tag}>"
+					end
+				end
+
+				nil
+			end
+
+			alias_method :_#{element}, :__phlex_#{element}__
+			alias_method :#{element}, :__phlex_#{element}__
+			private :__phlex_#{element}__
+		RUBY
+
+		element
+	end
+
+	def register_void_element(element, tag: element.name.tr("_", "-"))
+		class_eval(<<-RUBY, __FILE__, __LINE__ + 1)
+			# frozen_string_literal: true
+
+			def __phlex_#{element}__(**attributes)
+				if attributes.length > 0 # with attributes
+					@_target << "<#{tag}" << (Phlex::ATTRIBUTE_CACHE[respond_to?(:process_attributes) ? (attributes.hash + self.class.hash) : attributes.hash] || __attributes__(**attributes)) << ">"
+				else # without attributes
+					@_target << "<#{tag}>"
+				end
+
+				nil
+			end
+
+			alias_method :_#{element}, :__phlex_#{element}__
+			alias_method :#{element}, :__phlex_#{element}__
+			private :__phlex_#{element}__
+		RUBY
+
+		element
 	end
 end

data/lib/phlex/helpers.rb

@@ -1,10 +1,11 @@
 # 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
+	# @return [String]
 	private def tokens(*tokens, **conditional_tokens)
 		conditional_tokens.each do |condition, token|
 			truthy = case condition
@@ -25,9 +26,13 @@ module Phlex::Helpers
 			end
 		end
 
-		tokens.join(" ")
+		tokens = tokens.select(&:itself).join(" ")
+		tokens.strip!
+		tokens.gsub!(/\s+/, " ")
+		tokens
 	end
 
+	# @api private
 	private def __append_token__(tokens, token)
 		case token
 			when nil then nil
@@ -39,6 +44,7 @@ module Phlex::Helpers
 		end
 	end
 
+	# @return [Hash]
 	private def classes(*tokens, **conditional_tokens)
 		tokens = self.tokens(*tokens, **conditional_tokens)
 
@@ -49,6 +55,7 @@ module Phlex::Helpers
 		end
 	end
 
+	# @return [Hash]
 	private def mix(*args)
 		args.each_with_object({}) do |object, result|
 			result.merge!(object) do |_key, old, new|

data/lib/phlex/html/standard_elements.rb

@@ -189,13 +189,6 @@ module Phlex::HTML::StandardElements
 	# 	@see https://developer.mozilla.org/docs/Web/HTML/Element/form
 	register_element :form, tag: "form"
 
-	# @!method g(**attributes, &content)
-	# 	Outputs a <code>g</code> tag
-	# 	@return [nil]
-	# 	@see https://developer.mozilla.org/en-US/docs/Web/SVG/Element/g
-	# 	@todo move this to SVG
-	register_element :g, tag: "g"
-
 	# @!method h1(**attributes, &content)
 	# 	Outputs an <code>h1</code> tag
 	# 	@return [nil]
@@ -377,13 +370,6 @@ module Phlex::HTML::StandardElements
 	# 	@see https://developer.mozilla.org/docs/Web/HTML/Element/p
 	register_element :p, tag: "p"
 
-	# @!method path(**attributes, &content)
-	# 	Outputs a <code>path</code> tag
-	# 	@return [nil]
-	# 	@see https://developer.mozilla.org/en-US/docs/Web/SVG/Element/path
-	# 	@todo move this to SVG
-	register_element :path, tag: "path"
-
 	# @!method picture(**attributes, &content)
 	# 	Outputs a <code>picture</code> tag
 	# 	@return [nil]