phlex 1.6.0 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eeac8033b47d1e0cf99832bc7a42a7777ca44643dd503f3cb08087666b08d4f7
-  data.tar.gz: 6f7e786e982dcc9133c40179d4bb582d9d45bb610814020e916a2afbf17cb0d0
+  metadata.gz: 5c0002c77419906adab684bd6e3bcb0ad2d5b7084aeb4e62f89c4f15a1da6001
+  data.tar.gz: dea42d460e9cce5f3a4001dbe5d6cbfd155f2bafe725ed0a21f3bfc9bb050a39
 SHA512:
-  metadata.gz: 037caf900c1155b1e9095588a30dff67a7f224b6e16365d417dc7412e34822cb1368a194a4e48de65c20a838b91f671e7e53fca7a0f0e973852d84ebc7c03d3c
-  data.tar.gz: 85ad16185650ff8aa04831c745ac6709ae35913863af0fef5a70d671d75dbbdf389005db6480cb5c4533ad9e3106379cb6aa2015b64194ca78a2dd8b61cd3993
+  metadata.gz: 22d4b19c21a14a60f8ff8cb2418bea2d553768b219cc9d491b44181580af17f4aeb804e0e4e0a875f959c74ab96b556f95fc5958e5ff4423f893cd7f07498a99
+  data.tar.gz: 8512284569af79d553d74e16539292f1e68d10aad9224f0c1ec9698ef6d38c025bf20aa3a6c8b0db3533e21c03978980472d7c016148a9605e6fbf72caa0f0fe

data/.ruby-version

@@ -1 +1 @@
-3.2.1
+3.2.2

data/.yardopts

@@ -0,0 +1 @@
+--private --no-private --hide-api private --markup markdown

data/CHANGELOG.md

@@ -0,0 +1,25 @@
+# Changelog
+
+All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## 1.7.0
+
+### Added
+
+- Experimental Smart chunking.
+
+### Changed
+
+- Improved YARD documentation, which is now available here https://rubydoc.info/gems/phlex
+- `SGML#render` can now render lambdas with zero or one arguments. Previously, it could only render lambdas with exactly one argument, although it could always render Procs with any number of arguments. When an argument is accepted, the `self` of the component rendering it is yielded to the Proc.
+- Raise an error when outputting an unknown object using `SGML#plain`.
+- Raise an error when using attribute keys that aren't Strings or Symbols.
+- Support Array and Set values for HTML/SVG attributes.
+
+### Removed
+
+- Removed the `menuitem` element as it's a deprecated HTML element.
+
+***
+
+Before this changelog was introduced, changes were logged in the [release notes](https://github.com/phlex-ruby/phlex/releases).

data/Gemfile

@@ -8,6 +8,7 @@ gemspec
 gem "rubocop"
 gem "sus"
 gem "benchmark-ips"
+gem "yard"
 
 group :test do
 	gem "i18n"

data/README.md

@@ -1,47 +1,6 @@
-<a href="https://www.phlex.fun"><img alt="Phlex logo" src="phlex_logo.png" width="180" /></a>
+<a href="https://www.phlex.fun"><img alt="Phlex logo" src="https://www.phlex.fun/assets/logo.png" width="180" /></a>
 
-Phlex lets you compose web views in pure Ruby. It’s super-fast, thread-safe and supports TruffleRuby v22.2+, JRuby v9.2+ and MRI v2.7+.
-
-### Documentation 📗
-
-Documentation can be found at [www.phlex.fun](https://www.phlex.fun).
-
-### Support ✋
-
-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).
-
-### Who uses Phlex?
-
-- [Clearscope](https://www.clearscope.io)
-
-*If you’re using Phlex in production, please open a PR to list it here.*
-
-### Sponsorship 💖
-
-Maintaining a library is a lot of work. If your company benefits from this work or is likely to benefit from it in the future, please consider [sponsorship](https://github.com/sponsors/joeldrapper). Phlex is actively developed and maintained by **[Joel Drapper](https://github.com/sponsors/joeldrapper)**.
-
-### Security 🚨
-
-If you’ve found a potential security issue, please email [security@phlex.fun](mailto:security@phlex.fun).
-
-### Thanks 🙏
-
-Thanks [Logology](https://www.logology.co) for sponsoring our logo.
+Phlex lets you compose web views in pure Ruby — kind of like JSX, but not really anything like JSX. It’s super-fast, thread-safe and supports TruffleRuby v22.2+, JRuby v9.2+ and MRI v2.7+. Phlex currently supports [HTML](https://rubydoc.info/gems/phlex/Phlex/HTML) and [SVG](https://rubydoc.info/gems/phlex/Phlex/SVG) views, and we’re exploring JSON and XML.
 
 ### Prior Art 🎨
 
@@ -55,3 +14,4 @@ Thanks [Logology](https://www.logology.co) for sponsoring our logo.
 - [hyperstack](https://github.com/hyperstack-org/hyperstack)
 - [clearwater](https://github.com/clearwater-rb/clearwater)
 - [paggio](https://github.com/opal/paggio)
+- [Inesita](https://github.com/inesita-rb/inesita)

data/lib/phlex/black_hole.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+# @api private
 module Phlex::BlackHole
 	extend self
 

data/lib/phlex/callable.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+# @api private
 module Phlex::Callable
 	def to_proc
 		method(:call).to_proc

data/lib/phlex/context.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+# @api private
 class Phlex::Context
 	def initialize
 		@target = +""

data/lib/phlex/deferred_render.rb

@@ -1,5 +1,29 @@
 # frozen_string_literal: true
 
+# Include this module into an {HTML} or {SVG} component to make it yield the content block before calling {#template}.
+# @example
+# 	class Tabs < Phlex::HTML
+# 		include DeferredRender
+#
+# 		Tab = Data.define(:name, :content)
+#
+# 		def initialize
+# 			@tabs = []
+# 		end
+#
+# 		def template
+# 			@tabs.each { |t| a { t.name } }
+# 			@tabs.each { |t| article(&t.content) }
+# 		end
+#
+# 		def tab(name, &content)
+# 			@tabs << Tab.new(name, content)
+# 		end
+# 	end
 module Phlex::DeferredRender
 	# This module doesn't do anything. Phlex::HTML#call checks for its inclusion in the ancestry instead.
+
+	# @!method template
+	# @abstract Override to define your own template.
+	# @note {DeferredRender} templates do not receive the content block. Instead, it is yielded in advance.
 end

data/lib/phlex/element_clobbering_guard.rb

@@ -1,12 +1,11 @@
 # 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
-
+# @api private
+module Phlex::ElementClobberingGuard
+	def method_added(method_name)
+		if method_name[0] == "_" && element_method?(method_name[1..].to_sym)
+			raise Phlex::NameError, "👋 Redefining the method `#{name}##{method_name}` is not a good idea."
+		else
 			super
 		end
 	end

data/lib/phlex/elements.rb

@@ -4,68 +4,96 @@ if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("3.0")
 	using Phlex::Overrides::Symbol::Name
 end
 
+# Extending this module provides the {register_element} macro for registering your own custom elements. It's already extended by {HTML} and {SVG}.
+# @example
+# 	module MyCustomElements
+# 		extend Phlex::Elements
+#
+# 		register_element :trix_editor
+# 	end
+#
+# 	class MyComponent < Phlex::HTML
+# 		include MyCustomElements
+#
+# 		def template
+# 			trix_editor
+# 		end
+# 	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 }
+	# @api private
+	def registered_elements
+		@registered_elements ||= Concurrent::Map.new
 	end
 
-	def register_element(element, tag: element.name.tr("_", "-"))
+	# Register a custom element. This macro defines an element method for the current class and descendents only. There is no global element registry.
+	# @param method_name [Symbol]
+	# @param tag [String] the name of the tag, otherwise this will be the method name with underscores replaced with dashes.
+	# @return [Symbol] the name of the method created
+	# @note The methods defined by this macro depend on other methods from {SGML} so they should always be mixed into an {HTML} or {SVG} component.
+	# @example Register the custom element `<trix-editor>`
+	# 	register_element :trix_editor
+	def register_element(method_name, tag: nil)
+		tag ||= method_name.name.tr("_", "-")
+
 		class_eval(<<-RUBY, __FILE__, __LINE__ + 1)
 			# frozen_string_literal: true
 
-			def __phlex_#{element}__(**attributes, &block)
+			def #{method_name}(**attributes, &block)
+				target = @_context.target
+
 				if attributes.length > 0 # with attributes
 					if block_given? # with content block
-						@_context.target << "<#{tag}" << (Phlex::ATTRIBUTE_CACHE[respond_to?(:process_attributes) ? (attributes.hash + self.class.hash) : attributes.hash] || __attributes__(**attributes)) << ">"
+						target << "<#{tag}" << (Phlex::ATTRIBUTE_CACHE[respond_to?(:process_attributes) ? (attributes.hash + self.class.hash) : attributes.hash] || __attributes__(**attributes)) << ">"
 						yield_content(&block)
-						@_context.target << "</#{tag}>"
+						target << "</#{tag}>"
 					else # without content block
-						@_context.target << "<#{tag}" << (Phlex::ATTRIBUTE_CACHE[respond_to?(:process_attributes) ? (attributes.hash + self.class.hash) : attributes.hash] || __attributes__(**attributes)) << "></#{tag}>"
+						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
-						@_context.target << "<#{tag}>"
+						target << "<#{tag}>"
 						yield_content(&block)
-						@_context.target << "</#{tag}>"
+						target << "</#{tag}>"
 					else # without content block
-						@_context.target << "<#{tag}></#{tag}>"
+						target << "<#{tag}></#{tag}>"
 					end
 				end
 
+				#{'flush' if tag == 'head'}
+
 				nil
 			end
 
-			alias_method :_#{element}, :__phlex_#{element}__
-			alias_method :#{element}, :__phlex_#{element}__
-			private :__phlex_#{element}__
+			alias_method :_#{method_name}, :#{method_name}
 		RUBY
 
-		element
+		registered_elements[method_name] = tag
+
+		method_name
 	end
 
-	def register_void_element(element, tag: element.name.tr("_", "-"))
+	# @api private
+	def register_void_element(method_name, tag: method_name.name.tr("_", "-"))
 		class_eval(<<-RUBY, __FILE__, __LINE__ + 1)
 			# frozen_string_literal: true
 
-			def __phlex_#{element}__(**attributes)
+			def #{method_name}(**attributes)
+				target = @_context.target
+
 				if attributes.length > 0 # with attributes
-					@_context.target << "<#{tag}" << (Phlex::ATTRIBUTE_CACHE[respond_to?(:process_attributes) ? (attributes.hash + self.class.hash) : attributes.hash] || __attributes__(**attributes)) << ">"
+					target << "<#{tag}" << (Phlex::ATTRIBUTE_CACHE[respond_to?(:process_attributes) ? (attributes.hash + self.class.hash) : attributes.hash] || __attributes__(**attributes)) << ">"
 				else # without attributes
-					@_context.target << "<#{tag}>"
+					target << "<#{tag}>"
 				end
 
 				nil
 			end
 
-			alias_method :_#{element}, :__phlex_#{element}__
-			alias_method :#{element}, :__phlex_#{element}__
-			private :__phlex_#{element}__
+			alias_method :_#{method_name}, :#{method_name}
 		RUBY
 
-		element
+		registered_elements[method_name] = tag
+
+		method_name
 	end
 end

data/lib/phlex/helpers.rb

@@ -5,8 +5,24 @@ if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("3.0")
 end
 
 module Phlex::Helpers
+	private
+
+	# Tokens
 	# @return [String]
-	private def tokens(*tokens, **conditional_tokens)
+	# @example With Proc conditions
+	# 	tokens(
+	# 		-> { true } => "a",
+	# 		-> { false } => "b"
+	# 	)
+	# @example With method conditions
+	# 	tokens(
+	# 		active?: "active"
+	# 	)
+	# @example With else condition
+	# 	tokens(
+	# 		active?: { then: "active", else: "inactive" }
+	# 	)
+	def tokens(*tokens, **conditional_tokens)
 		conditional_tokens.each do |condition, token|
 			truthy = case condition
 				when Symbol then send(condition)
@@ -33,7 +49,7 @@ module Phlex::Helpers
 	end
 
 	# @api private
-	private def __append_token__(tokens, token)
+	def __append_token__(tokens, token)
 		case token
 			when nil then nil
 			when String then tokens << token
@@ -44,8 +60,9 @@ module Phlex::Helpers
 		end
 	end
 
+	# Like {#tokens} but returns a {Hash} where the tokens are the value for `:class`.
 	# @return [Hash]
-	private def classes(*tokens, **conditional_tokens)
+	def classes(*tokens, **conditional_tokens)
 		tokens = self.tokens(*tokens, **conditional_tokens)
 
 		if tokens.empty?
@@ -56,7 +73,7 @@ module Phlex::Helpers
 	end
 
 	# @return [Hash]
-	private def mix(*args)
+	def mix(*args)
 		args.each_with_object({}) do |object, result|
 			result.merge!(object) do |_key, old, new|
 				case new