phlex 1.2.1 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d628d0e0b2f138923dd354f1b6b4ed47d7945d81bb95f8227978574d85d9a82f
-  data.tar.gz: 909df1cd689153a3ea83c7200d7af5c01aa1af0bba3a569eec825f3dc1b049f2
+  metadata.gz: 9cd9fd26d33fcf92978a26d9d94b81485871fa3f54c98639eb4ba5932960df84
+  data.tar.gz: c8f0ded1ee9cd43c12e8358af687b7fe4f21e732031ca4fb009020dfaaeb72b5
 SHA512:
-  metadata.gz: 78e83ee77668f41ed94742d45809f32a92ab8ecba22ea82ebdc2402d4ef52e2718ad157d723f730c2bc431ddc2f98749cdd5d5ed46b948bebf230c1cbf5adbe2
-  data.tar.gz: e234afec1c0a77095082136f870c326c8f15ff3c6fdc8b3369f7d034c6bbc053d6be245f5753b36b5d8a6bafcbbb100a3e562ed4968960a4ba902475dd6c8e07
+  metadata.gz: 890ccb499d210d332f5b2213bfdce51bd1e2212c550b20b0d9de3d1698205ca45b82e86e7850dc037e07a43e3da70a011e27d2310618f203882a00b32750704d
+  data.tar.gz: fd9794d862a27ddaafa53c1f0d5fcecd3a967391083e2073922a2e83cbc19db7f95f4d19dd5db64b3c186e5c1c6292a6cef71dc05842c7216bd1e9b07046edc8

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

@@ -126,12 +126,12 @@ module Phlex
 
 		EVENT_ATTRIBUTES = %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 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].to_h { [_1, true] }.freeze
 
+		UNBUFFERED_MUTEX = Mutex.new
+
 		extend Elements
 		include Helpers
 
 		class << self
-			attr_accessor :rendered_at_least_once
-
 			def call(...)
 				new(...).call
 			end
@@ -146,9 +146,30 @@ module Phlex
 					super
 				end
 			end
+
+			def rendered_at_least_once!
+				alias_method :__attributes__, :__final_attributes__
+				alias_method :call, :__final_call__
+			end
+
+			def __unbuffered_class__
+				UNBUFFERED_MUTEX.synchronize do
+					if defined? @unbuffered_class
+						@unbuffered_class
+					else
+						@unbuffered_class = Class.new(Unbuffered)
+					end
+				end
+			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 +197,6 @@ module Phlex
 				end
 			end
 
-			self.class.rendered_at_least_once = true
-
 			buffer
 		end
 
@@ -265,6 +284,10 @@ module Phlex
 			@_target = original_buffer
 		end
 
+		def unbuffered
+			self.class.__unbuffered_class__.new(self)
+		end
+
 		# Like `capture` but the output is vanished into a BlackHole buffer.
 		# Becuase the BlackHole does nothing with the output, this should be faster.
 		private def __vanish__(*args)
@@ -356,21 +379,23 @@ module Phlex
 		end
 
 		private def __attributes__(**attributes)
-			if attributes[:href]&.start_with?(/\s*javascript/)
+			__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/)
+			if attributes["href"]&.start_with?(/\s*javascript:/)
 				attributes.delete("href")
 			end
 
 			buffer = +""
 			__build_attributes__(attributes, buffer: buffer)
 
-			unless self.class.rendered_at_least_once
-				Phlex::ATTRIBUTE_CACHE[attributes.hash] = buffer.freeze
-			end
-
 			buffer
 		end
 

data/lib/phlex/unbuffered.rb

@@ -2,13 +2,6 @@
 
 module Phlex
 	class Unbuffered < BasicObject
-		CACHE = {}
-
-		def self.call(object)
-			decorator = CACHE[object.class.name] ||= ::Class.new(self)
-			decorator.new(object)
-		end
-
 		def initialize(object)
 			@object = object
 		end
@@ -24,37 +17,35 @@ module Phlex
 		define_method :__public_send__,
 			::Object.instance_method(:public_send)
 
-		define_method :__callee__,
-			::Object.instance_method(:__callee__)
-
 		def respond_to_missing?(...)
 			@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)
+				__public_send__(name, *args, **kwargs, &block)
 			else
 				super
 			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.1"
+	VERSION = "1.3.1"
 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.1
+  version: 1.3.1
 platform: ruby
 authors:
 - Joel Drapper
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-01-25 00:00:00.000000000 Z
+date: 2023-01-30 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

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