phlex 1.6.0 → 1.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eeac8033b47d1e0cf99832bc7a42a7777ca44643dd503f3cb08087666b08d4f7
-  data.tar.gz: 6f7e786e982dcc9133c40179d4bb582d9d45bb610814020e916a2afbf17cb0d0
+  metadata.gz: 85f8d8d06e49280c1fd480bf596fd6f13e76d9872fe363349e9e481d8c32fe44
+  data.tar.gz: 55b77a7f744a657406a84f98cc049d38b3a4631dd60d29b45a0d33022efb7695
 SHA512:
-  metadata.gz: 037caf900c1155b1e9095588a30dff67a7f224b6e16365d417dc7412e34822cb1368a194a4e48de65c20a838b91f671e7e53fca7a0f0e973852d84ebc7c03d3c
-  data.tar.gz: 85ad16185650ff8aa04831c745ac6709ae35913863af0fef5a70d671d75dbbdf389005db6480cb5c4533ad9e3106379cb6aa2015b64194ca78a2dd8b61cd3993
+  metadata.gz: a1628997a70876299299b3825bfb9da74be95703d7402898f57e550945eb1b35da61382237914729ab1f90faeca671d377b10c28ae3c22589afb8f23b5a4d0f4
+  data.tar.gz: 0e62cb5507038341d2f4ef8104fbf6cc79723032cb5b88510c5d44376ba4668b44571a047819b0f03b900abdd6d0c8f8585c369d0f1923db9482962e95d91393

data/.ruby-version

@@ -1 +1 @@
-3.2.1
+3.3.0

data/lib/phlex/element_clobbering_guard.rb

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

data/lib/phlex/elements.rb

@@ -5,45 +5,44 @@ if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("3.0")
 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 }
+	def registered_elements
+		@registered_elements ||= Concurrent::Map.new
 	end
 
 	def register_element(element, tag: element.name.tr("_", "-"))
 		class_eval(<<-RUBY, __FILE__, __LINE__ + 1)
 			# frozen_string_literal: true
 
-			def __phlex_#{element}__(**attributes, &block)
+
+			def #{element}(**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
 
 				nil
 			end
 
-			alias_method :_#{element}, :__phlex_#{element}__
-			alias_method :#{element}, :__phlex_#{element}__
-			private :__phlex_#{element}__
+			alias_method :_#{element}, :#{element}
 		RUBY
 
+		registered_elements[element] = tag
+
 		element
 	end
 
@@ -51,21 +50,23 @@ module Phlex::Elements
 		class_eval(<<-RUBY, __FILE__, __LINE__ + 1)
 			# frozen_string_literal: true
 
-			def __phlex_#{element}__(**attributes)
+			def #{element}(**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 :_#{element}, :#{element}
 		RUBY
 
+		registered_elements[element] = tag
+
 		element
 	end
 end

data/lib/phlex/sgml.rb

@@ -12,8 +12,6 @@ module Phlex
 				new(...).call
 			end
 
-			alias_method :render, :call
-
 			# Create a new instance of the component.
 			# @note The block will not be delegated to the initializer. Instead, it will be provided to `template` when rendering.
 			def new(*args, **kwargs, &block)
@@ -31,6 +29,17 @@ module Phlex
 				alias_method :__attributes__, :__final_attributes__
 				alias_method :call, :__final_call__
 			end
+
+			# @api private
+			def element_method?(method_name)
+				return false unless instance_methods.include?(method_name)
+
+				owner = instance_method(method_name).owner
+
+				return true if owner.is_a?(Phlex::Elements) && owner.registered_elements[method_name]
+
+				false
+			end
 		end
 
 		# Renders the view and returns the buffer. The default buffer is a mutable String.
@@ -52,7 +61,7 @@ module Phlex
 
 			around_template do
 				if block
-					if DeferredRender === self
+					if is_a?(DeferredRender)
 						__vanish__(self, &block)
 						template
 					else
@@ -118,11 +127,13 @@ module Phlex
 		# Output a whitespace character. This is useful for getting inline elements to wrap. If you pass a block, a whitespace will be output before and after yielding the block.
 		# @return [nil]
 		def whitespace
-			@_context.target << " "
+			target = @_context.target
+
+			target << " "
 
 			if block_given?
 				yield
-				@_context.target << " "
+				target << " "
 			end
 
 			nil
@@ -131,9 +142,11 @@ module Phlex
 		# Output an HTML comment.
 		# @return [nil]
 		def comment(&block)
-			@_context.target << "<!-- "
+			target = @_context.target
+
+			target << "<!-- "
 			yield_content(&block)
-			@_context.target << " -->"
+			target << " -->"
 
 			nil
 		end
@@ -210,10 +223,11 @@ module Phlex
 		private def yield_content
 			return unless block_given?
 
-			original_length = @_context.target.length
-			content = yield(self)
+			target = @_context.target
 
-			plain(content) if original_length == @_context.target.length
+			original_length = target.length
+			content = yield(self)
+			plain(content) if original_length == target.length
 
 			nil
 		end
@@ -223,9 +237,11 @@ module Phlex
 		private def yield_content_with_args(*args)
 			return unless block_given?
 
-			original_length = @_context.target.length
+			target = @_context.target
+
+			original_length = target.length
 			content = yield(*args)
-			plain(content) if original_length == @_context.target.length
+			plain(content) if original_length == target.length
 
 			nil
 		end
@@ -243,14 +259,6 @@ module Phlex
 				attributes = process_attributes(**attributes)
 			end
 
-			if attributes[:href]&.start_with?(/\s*javascript:/)
-				attributes.delete(:href)
-			end
-
-			if attributes["href"]&.start_with?(/\s*javascript:/)
-				attributes.delete("href")
-			end
-
 			buffer = +""
 			__build_attributes__(attributes, buffer: buffer)
 
@@ -268,8 +276,11 @@ module Phlex
 					else k.to_s
 				end
 
+				lower_name = name.downcase
+				next if lower_name == "href" && v.start_with?(/\s*javascript:/i)
+
 				# Detect unsafe attribute names. Attribute names are considered unsafe if they match an event attribute or include unsafe characters.
-				if HTML::EVENT_ATTRIBUTES[name] || name.match?(/[<>&"']/)
+				if HTML::EVENT_ATTRIBUTES[lower_name] || name.match?(/[<>&"']/)
 					raise ArgumentError, "Unsafe attribute name detected: #{k}."
 				end
 

data/lib/phlex/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Phlex
-	VERSION = "1.6.0"
+	VERSION = "1.6.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phlex
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.6.2
 platform: ruby
 authors:
 - Joel Drapper
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-03-08 00:00:00.000000000 Z
+date: 2024-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -117,7 +117,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.6
+rubygems_version: 3.5.6
 signing_key:
 specification_version: 4
 summary: A framework for building views in Ruby.