phlex 2.0.0.beta2 → 2.0.0.rc1

data/lib/phlex/html/void_elements.rb

@@ -2,71 +2,109 @@
 
 # Void HTML elements don't accept content and never have a closing tag.
 module Phlex::HTML::VoidElements
-	extend Phlex::Elements
+	extend Phlex::SGML::Elements
 
-	# @!method area(**attributes, &content)
-	# 	Outputs an `<area>` tag.
-	# 	@return [nil]
-	# 	@see https://developer.mozilla.org/docs/Web/HTML/Element/area
-	register_void_element :area
+	# Outputs an `<area>` tag.
+	# See https://developer.mozilla.org/docs/Web/HTML/Element/area
+	__register_void_element__ def area(
+		class: nil,
+		id: nil,
+		**attributes
+	) = nil
 
-	# @!method br(**attributes, &content)
-	# 	Outputs a `<br>` tag.
-	# 	@return [nil]
-	# 	@see https://developer.mozilla.org/docs/Web/HTML/Element/br
-	register_void_element :br
+	# Outputs a `<base>` tag.
+	# See https://developer.mozilla.org/en-US/docs/Web/HTML/Element/base
+	__register_void_element__ def base(
+		class: nil,
+		href: nil,
+		id: nil,
+		target: nil,
+		**attributes
+	) = nil
 
-	# @!method col(**attributes, &content)
-	# 	Outputs a `<col>` tag.
-	# 	@return [nil]
-	# 	@see https://developer.mozilla.org/docs/Web/HTML/Element/col
-	register_void_element :col
+	# Outputs a `<br>` tag.
+	# See https://developer.mozilla.org/docs/Web/HTML/Element/br
+	__register_void_element__ def br(
+		class: nil,
+		id: nil,
+		**attributes
+	) = nil
 
-	# @!method embed(**attributes, &content)
-	# 	Outputs an `<embed>` tag.
-	# 	@return [nil]
-	# 	@see https://developer.mozilla.org/docs/Web/HTML/Element/embed
-	register_void_element :embed
+	# Outputs a `<col>` tag.
+	# See https://developer.mozilla.org/docs/Web/HTML/Element/col
+	__register_void_element__ def col(
+		class: nil,
+		id: nil,
+		**attributes
+	) = nil
 
-	# @!method hr(**attributes, &content)
-	# 	Outputs an `<hr>` tag.
-	# 	@return [nil]
-	# 	@see https://developer.mozilla.org/docs/Web/HTML/Element/hr
-	register_void_element :hr
+	# Outputs an `<embed>` tag.
+	# See https://developer.mozilla.org/docs/Web/HTML/Element/embed
+	__register_void_element__ def embed(
+		class: nil,
+		id: nil,
+		**attributes
+	) = nil
 
-	# @!method img(**attributes, &content)
-	# 	Outputs an `<img>` tag.
-	# 	@return [nil]
-	# 	@see https://developer.mozilla.org/docs/Web/HTML/Element/img
-	register_void_element :img
+	# Outputs an `<hr>` tag.
+	# See https://developer.mozilla.org/docs/Web/HTML/Element/hr
+	__register_void_element__ def hr(
+		class: nil,
+		id: nil,
+		**attributes
+	) = nil
 
-	# @!method input(**attributes, &content)
-	# 	Outputs an `<input>` tag.
-	# 	@return [nil]
-	# 	@see https://developer.mozilla.org/docs/Web/HTML/Element/input
-	register_void_element :input
+	# Outputs an `<img>` tag.
+	# See https://developer.mozilla.org/docs/Web/HTML/Element/img
+	__register_void_element__ def img(
+		alt: nil,
+		class: nil,
+		id: nil,
+		src: nil,
+		**attributes
+	) = nil
 
-	# @!method link(**attributes, &content)
-	# 	Outputs a `<link>` tag.
-	# 	@return [nil]
-	# 	@see https://developer.mozilla.org/docs/Web/HTML/Element/link
-	register_void_element :link
+	# Outputs an `<input>` tag.
+	# See https://developer.mozilla.org/docs/Web/HTML/Element/input
+	__register_void_element__ def input(
+		class: nil,
+		id: nil,
+		name: nil,
+		type: nil,
+		**attributes
+	) = nil
 
-	# @!method meta(**attributes, &content)
-	# 	Outputs a `<meta>` tag.
-	# 	@return [nil]
-	# 	@see https://developer.mozilla.org/docs/Web/HTML/Element/meta
-	register_void_element :meta
+	# Outputs a `<link>` tag.
+	# See https://developer.mozilla.org/docs/Web/HTML/Element/link
+	__register_void_element__ def link(
+		class: nil,
+		id: nil,
+		**attributes
+	) = nil
 
-	# @!method source(**attributes, &content)
-	# 	Outputs a `<source>` tag.
-	# 	@return [nil]
-	# 	@see https://developer.mozilla.org/docs/Web/HTML/Element/source
-	register_void_element :source
+	# Outputs a `<meta>` tag.
+	# See https://developer.mozilla.org/docs/Web/HTML/Element/meta
+	__register_void_element__ def meta(
+		charset: nil,
+		class: nil,
+		id: nil,
+		name: nil,
+		**attributes
+	) = nil
 
-	# @!method track(**attributes, &content)
-	# 	Outputs a `<track>` tag.
-	# 	@return [nil]
-	# 	@see https://developer.mozilla.org/docs/Web/HTML/Element/track
-	register_void_element :track
+	# Outputs a `<source>` tag.
+	# See https://developer.mozilla.org/docs/Web/HTML/Element/source
+	__register_void_element__ def source(
+		class: nil,
+		id: nil,
+		**attributes
+	) = nil
+
+	# Outputs a `<track>` tag.
+	# See https://developer.mozilla.org/docs/Web/HTML/Element/track
+	__register_void_element__ def track(
+		class: nil,
+		id: nil,
+		**attributes
+	) = nil
 end

data/lib/phlex/html.rb

@@ -4,10 +4,7 @@ class Phlex::HTML < Phlex::SGML
 	autoload :StandardElements, "phlex/html/standard_elements"
 	autoload :VoidElements, "phlex/html/void_elements"
 
-	# A list of HTML attributes that have the potential to execute unsafe JavaScript.
-	UNSAFE_ATTRIBUTES = Set.new(%w[onabort onafterprint onbeforeprint onbeforeunload onblur oncanplay oncanplaythrough onchange onclick oncontextmenu oncopy oncuechange oncut ondblclick ondrag ondragend ondragenter ondragleave ondragover ondragstart ondrop ondurationchange onemptied onended onerror onfocus onhashchange oninput oninvalid onkeydown onkeypress onkeyup onload onloadeddata onloadedmetadata onloadstart onmessage onmousedown onmousemove onmouseout onmouseover onmouseup onmousewheel onoffline ononline onpagehide onpageshow onpaste onpause onplay onplaying onpopstate onprogress onratechange onreset onresize onscroll onsearch onseeked onseeking onselect onstalled onstorage onsubmit onsuspend ontimeupdate ontoggle onunload onvolumechange onwaiting onwheel srcdoc]).freeze
-
-	extend Phlex::Elements
+	extend Phlex::SGML::Elements
 	include VoidElements, StandardElements
 
 	# Output an HTML doctype.
@@ -41,7 +38,4 @@ class Phlex::HTML < Phlex::SGML
 	def content_type
 		"text/html"
 	end
-
-	# This should be extended after all method definitions
-	extend Phlex::ElementClobberingGuard
 end

data/lib/phlex/kit.rb

@@ -3,7 +3,9 @@
 module Phlex::Kit
 	module LazyLoader
 		def method_missing(name, ...)
-			if name[0] == name[0].upcase && __phlex_kit_constants__.include?(name) && __get_phlex_kit_constant__(name) && methods.include?(name)
+			mod = self.class
+
+			if name[0] == name[0].upcase && mod.constants.include?(name) && mod.const_get(name) && methods.include?(name)
 				public_send(name, ...)
 			else
 				super
@@ -11,7 +13,9 @@ module Phlex::Kit
 		end
 
 		def respond_to_missing?(name, include_private = false)
-			if name[0] == name[0].upcase && __phlex_kit_constants__.include?(name) && __get_phlex_kit_constant__(name) && methods.include?(name)
+			mod = self.class
+
+			if name[0] == name[0].upcase && mod.constants.include?(name) && mod.const_get(name) && methods.include?(name)
 				true
 			else
 				super
@@ -19,20 +23,24 @@ module Phlex::Kit
 		end
 	end
 
-	include LazyLoader
-
 	def self.extended(mod)
 		mod.include(LazyLoader)
-		mod.define_method(:__phlex_kit_constants__) { mod.__phlex_kit_constants__ }
-		mod.define_method(:__get_phlex_kit_constant__) { |name| mod.__get_phlex_kit_constant__(name) }
 	end
 
-	def __phlex_kit_constants__
-		constants
+	def method_missing(name, ...)
+		if name[0] == name[0].upcase && constants.include?(name) && const_get(name) && methods.include?(name)
+			public_send(name, ...)
+		else
+			super
+		end
 	end
 
-	def __get_phlex_kit_constant__(name)
-		const_get(name)
+	def respond_to_missing?(name, include_private = false)
+		if name[0] == name[0].upcase && constants.include?(name) && const_get(name) && methods.include?(name)
+			true
+		else
+			super
+		end
 	end
 
 	def const_added(name)
@@ -44,14 +52,18 @@ module Phlex::Kit
 		if Class === constant && constant < Phlex::SGML
 			constant.include(self)
 
+			constant = nil
+
 			define_method(name) do |*args, **kwargs, &block|
 				constant = me.const_get(name)
 				render(constant.new(*args, **kwargs), &block)
 			end
 
 			define_singleton_method(name) do |*args, **kwargs, &block|
-				if (component = Fiber[:__phlex_component__])
+				component, fiber_id = Thread.current[:__phlex_component__]
+				if (component && fiber_id == Fiber.current.object_id)
 					component.instance_exec do
+						constant = me.const_get(name)
 						render(constant.new(*args, **kwargs), &block)
 					end
 				else

data/lib/phlex/{elements.rb → sgml/elements.rb}

@@ -1,33 +1,10 @@
 # frozen_string_literal: true
 
-# 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 view_template
-# 			trix_editor
-# 		end
-# 	end
-module Phlex::Elements
-	# @api private
-	def registered_elements
-		@registered_elements ||= {}
+module Phlex::SGML::Elements
+	def __registered_elements__
+		@__registered_elements__ ||= {}
 	end
 
-	# 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: method_name.name.tr("_", "-"))
 		class_eval(<<-RUBY, __FILE__, __LINE__ + 1)
 			# frozen_string_literal: true
@@ -63,14 +40,14 @@ module Phlex::Elements
 						content = yield(self)
 						if original_length == buffer.bytesize
 							case content
+							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 nil
 								nil
-							when ::Phlex::SGML::SafeObject
-								buffer << content.to_s
 							else
 								if (formatted_object = format_object(content))
 									buffer << ::Phlex::Escape.html_escape(formatted_object)
@@ -90,14 +67,14 @@ module Phlex::Elements
 						content = yield(self)
 						if original_length == buffer.bytesize
 							case content
+							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 nil
 								nil
-							when ::Phlex::SGML::SafeObject
-								buffer << content.to_s
 							else
 								if (formatted_object = format_object(content))
 									buffer << ::Phlex::Escape.html_escape(formatted_object)
@@ -117,17 +94,14 @@ module Phlex::Elements
 
 				nil
 			end
-
-			alias_method :_#{method_name}, :#{method_name}
 		RUBY
 
-		registered_elements[method_name] = tag
+		__registered_elements__[method_name] = tag
 
 		method_name
 	end
 
-	# @api private
-	def register_void_element(method_name, tag: method_name.name.tr("_", "-"))
+	def __register_void_element__(method_name, tag: method_name.name.tr("_", "-"))
 		class_eval(<<-RUBY, __FILE__, __LINE__ + 1)
 			# frozen_string_literal: true
 
@@ -165,7 +139,7 @@ module Phlex::Elements
 			alias_method :_#{method_name}, :#{method_name}
 		RUBY
 
-		registered_elements[method_name] = tag
+		__registered_elements__[method_name] = tag
 
 		method_name
 	end