phlex 1.2.2 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f62cc3d24a6690657b01ac0d35f0ee5ed669d4c374db0b1792e9178b10a01788
-  data.tar.gz: 17296d2f834f7d29e7f107da769971b985e812416479a5f9dd94074dec124147
+  metadata.gz: 8df07c966d273976d91feebba2528a5cdacb5bb28116af48a54f42a97128ad94
+  data.tar.gz: 638529d514e4d1938ec0c0bab224969cc16a252752da3e1ab67ae2f217f4ea3e
 SHA512:
-  metadata.gz: af0d4fa2c505788bb38e8988728d9b58469f7ba76b6cc0be52d378a5d9a50ecbd7402a3d068d1083872fb028499d6a6b334e0a52636edf2f0fc2c62703a3ccbf
-  data.tar.gz: 1ddbce1b9d3b01820292948f1813e6973897b9ebb4ae1cbb3d3fa9e643350784161a3a33193e82a12b097f6cca36815d8ed001575e4d63308e2ede6adf0071e3
+  metadata.gz: 3728d8501c975eef2caa6c8b7c78d98d0f4aa654a88787e13e58c608331112b06074a177f401f6691713e8bbc4eac863e2b318e6d58cc61a3bfa38319e69e82d
+  data.tar.gz: bfd075ce712b522da689ed643b9a52536a80a7e779b807e8994c00a623a9e45b8a051f2dc78166efeebed047f02cda97c10f70c8165b99325e9c0236937ab918

data/.ruby-version

@@ -1 +1 @@
-3.3.0
+3.2.0

data/README.md

@@ -1,6 +1,6 @@
 <a href="https://www.phlex.fun"><img alt="Phlex logo" src="phlex_logo.png" width="180" /></a>
 
-Phlex is a framework that lets you compose web views in pure Ruby.
+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 📗
 
@@ -12,13 +12,13 @@ If you run into any trouble, please [start a discussion](https://github.com/joel
 
 ### Community 🙌
 
-Everyone interacting in Phlex codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/joeldrapper/phlex/blob/main/CODE_OF_CONDUCT.md).
+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 can share that your company uses Phlex in production, please open a PR to list it here.*
+*If you’re using Phlex in production, please open a PR to list it here.*
 
 ### Sponsorship 💖
 

data/lib/phlex/deferred_render.rb

@@ -2,6 +2,6 @@
 
 module Phlex
 	module DeferredRender
-		include Experimental
+		# This module doesn't do anything. Phlex::HTML#call checks for its inclusion in the ancestry instead.
 	end
 end

data/lib/phlex/html.rb

@@ -130,8 +130,6 @@ module Phlex
 		include Helpers
 
 		class << self
-			attr_accessor :rendered_at_least_once
-
 			def call(...)
 				new(...).call
 			end
@@ -146,9 +144,20 @@ module Phlex
 					super
 				end
 			end
+
+			def rendered_at_least_once!
+				alias_method :__attributes__, :__final_attributes__
+				alias_method :call, :__final_call__
+			end
+		end
+
+		def call(...)
+			__final_call__(...).tap do
+				self.class.rendered_at_least_once!
+			end
 		end
 
-		def call(buffer = +"", view_context: nil, parent: nil, &block)
+		def __final_call__(buffer = +"", view_context: nil, parent: nil, &block)
 			@_target = buffer
 			@_view_context = view_context
 			@_parent = parent
@@ -176,8 +185,6 @@ module Phlex
 				end
 			end
 
-			self.class.rendered_at_least_once = true
-
 			buffer
 		end
 
@@ -356,12 +363,22 @@ module Phlex
 		end
 
 		private def __attributes__(**attributes)
-			buffer = +""
-			__build_attributes__(attributes, buffer: buffer)
-
-			unless self.class.rendered_at_least_once
+			__final_attributes__(**attributes).tap do |buffer|
 				Phlex::ATTRIBUTE_CACHE[attributes.hash] = buffer.freeze
 			end
+		end
+
+		private def __final_attributes__(**attributes)
+			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)
 
 			buffer
 		end
@@ -376,11 +393,8 @@ 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[lower_name] || name.match?(/[<>&"']/)
+				if HTML::EVENT_ATTRIBUTES[name] || name.match?(/[<>&"']/)
 					raise ArgumentError, "Unsafe attribute name detected: #{k}."
 				end
 

data/lib/phlex/unbuffered.rb

@@ -2,10 +2,10 @@
 
 module Phlex
 	class Unbuffered < BasicObject
-		CACHE = {}
+		CACHE = ::Concurrent::Map.new
 
 		def self.call(object)
-			decorator = CACHE[object.class.name] ||= ::Class.new(self)
+			decorator = CACHE.compute_if_absent(object.class.name) { ::Class.new(self) }
 			decorator.new(object)
 		end
 
@@ -31,10 +31,12 @@ module Phlex
 			@object.respond_to?(...)
 		end
 
-		def method_missing(name, *args, &block)
+		def method_missing(name, *args, **kwargs, &block)
 			if @object.respond_to?(name)
-				# If the object responds to this method, we want to define it by aliasing the __output_method__.
-				__class__.alias_method(name, :__output_method__)
+
+				__class__.define_method(name) do |*a, **k, &b|
+					@object.capture { @object.public_send(name, *a, **k, &b) }
+				end
 
 				# Now we've defined this missing method, we can call it.
 				__public_send__(name, *args, &block)
@@ -43,18 +45,17 @@ module Phlex
 			end
 		end
 
-		# This method is designed to be aliased and references the callee which is whatever alias you called.
-		def __output_method__(*args, &block)
-			@object.capture { @object.public_send(__callee__, *args, &block) }
+		# Forward some methods to the original underlying method
+		def call(...)
+			@object.call(...)
 		end
 
-		def __forward_method__(*args, &block)
-			@object.public_send(__callee__, *args, &block)
+		def send(...)
+			@object.send(...)
 		end
 
-		# Forward some methods to the original underlying method
-		alias_method :call, :__forward_method__
-		alias_method :send, :__forward_method__
-		alias_method :public_send, :__forward_method__
+		def public_send(...)
+			@object.public_send(...)
+		end
 	end
 end

data/lib/phlex/version.rb

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

data/lib/phlex.rb

@@ -2,6 +2,7 @@
 
 require "erb"
 require "zeitwerk"
+require "concurrent"
 
 module Phlex
 	Loader = Zeitwerk::Loader.for_gem(warn_on_extra_files: false).tap do |loader|
@@ -14,15 +15,5 @@ module Phlex
 	ArgumentError = Class.new(ArgumentError) { include Error }
 	NameError = Class.new(NameError) { include Error }
 
-	extend self
-
-	ATTRIBUTE_CACHE = {}
-
-	def configuration
-		@configuration ||= Configuration.new
-	end
-
-	def configure
-		yield configuration
-	end
+	ATTRIBUTE_CACHE = Concurrent::Map.new
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: phlex
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.3.0
 platform: ruby
 authors:
 - Joel Drapper
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-03-11 00:00:00.000000000 Z
+date: 2023-01-28 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: concurrent-ruby
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: zeitwerk
   requirement: !ruby/object:Gem::Requirement
@@ -50,14 +64,10 @@ files:
 - lib/phlex/black_hole.rb
 - lib/phlex/buffered.rb
 - lib/phlex/callable.rb
-- lib/phlex/collection.rb
-- lib/phlex/configuration.rb
 - lib/phlex/deferred_render.rb
 - lib/phlex/elements.rb
-- lib/phlex/experimental.rb
 - lib/phlex/helpers.rb
 - lib/phlex/html.rb
-- lib/phlex/table.rb
 - lib/phlex/testing/view_helper.rb
 - lib/phlex/unbuffered.rb
 - lib/phlex/version.rb
@@ -87,7 +97,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.6
+rubygems_version: 3.4.4
 signing_key:
 specification_version: 4
 summary: A framework for building views in Ruby.

data/lib/phlex/collection.rb

@@ -1,33 +0,0 @@
-# frozen_string_literal: true
-
-module Phlex
-	module Collection
-		include Experimental
-
-		def initialize(collection: nil, item: nil)
-			unless collection || item
-				raise ArgumentError, "You must pass a collection or an item as a keyword argument."
-			end
-
-			@collection = collection
-			@item = item
-		end
-
-		def template
-			@item ? item_template : collection_template { yield_items }
-		end
-
-		private def yield_items
-			if @item
-				raise ArgumentError, "You can only yield_items when rendering a collection. You are currently rendering an item."
-			end
-
-			@collection.each do |item|
-				@item = item
-				item_template
-			end
-
-			@item = nil
-		end
-	end
-end

data/lib/phlex/configuration.rb

@@ -1,13 +0,0 @@
-# frozen_string_literal: true
-
-module Phlex
-	class Configuration
-		attr_writer :experimental_warnings
-
-		def experimental_warnings
-			return @experimental_warnings if defined? @experimental_warnings
-
-			true
-		end
-	end
-end

data/lib/phlex/experimental.rb

@@ -1,13 +0,0 @@
-# frozen_string_literal: true
-
-module Phlex
-	module Experimental
-		def before_template
-			if Phlex.configuration.experimental_warnings
-				puts "Warning: #{self.class.name} is using experimental Phlex features that are subject to change."
-			end
-
-			super
-		end
-	end
-end

data/lib/phlex/table.rb

@@ -1,103 +0,0 @@
-# frozen_string_literal: true
-
-module Phlex
-	module Table
-		include Experimental
-		include Collection
-
-		module ClassMethods
-			attr_accessor :header
-
-			def property(header = nil, **attributes, &body)
-				if header.is_a?(String)
-					header_text = header
-					header = -> { head_header(scope: "col") { header_text } }
-				end
-
-				properties << {
-					header: header,
-					body: body,
-					attributes: attributes,
-				}
-			end
-
-			def properties
-				@properties ||= []
-			end
-		end
-
-		def self.included(child)
-			child.extend ClassMethods
-
-			child.alias_method :head, :thead
-			child.alias_method :body, :tbody
-			child.alias_method :foot, :tfoot
-
-			child.alias_method :row, :tr
-
-			child.alias_method :header, :th
-			child.alias_method :cell, :td
-
-			child.alias_method :head_row, :row
-			child.alias_method :body_row, :row
-			child.alias_method :foot_row, :row
-
-			child.alias_method :head_header, :header
-			child.alias_method :foot_header, :header
-
-			child.alias_method :head_cell, :cell
-			child.alias_method :body_cell, :cell
-			child.alias_method :foot_cell, :cell
-		end
-
-		private def properties
-			self.class.properties
-		end
-
-		private def collection_template(&block)
-			table do
-				head_template
-				body_template(&block)
-				foot_template
-			end
-		end
-
-		private def item_template
-			row_template
-		end
-
-		private def head_template
-			if self.class.properties.any? { |p| p[:header] }
-				head do
-					head_row do
-						self.class.properties.each do |property|
-							case property[:header]
-							when Proc
-								instance_exec(&property[:header])
-							when Symbol
-								send(property[:header])
-							end
-						end
-					end
-				end
-			end
-		end
-
-		private def body_template
-			body { yield_items }
-		end
-
-		private def foot_template
-		end
-
-		private def row_template
-			body_row do
-				self.class.properties.each do |property|
-					body_cell(**property[:attributes]) do
-						instance_exec(@item, &property[:body])
-					end
-				end
-			end
-		end
-	end
-end