phlex 2.0.0.beta2 → 2.0.0.rc2

data/lib/phlex/svg.rb

@@ -5,9 +5,6 @@ class Phlex::SVG < Phlex::SGML
 
 	include StandardElements
 
-	# This should be extended after all method definitions
-	extend Phlex::ElementClobberingGuard
-
 	def content_type
 		"image/svg+xml"
 	end

data/lib/phlex/{black_hole.rb → vanish.rb}

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # @api private
-module Phlex::BlackHole
+module Phlex::Vanish
 	extend self
 
 	def <<(anything)

data/lib/phlex/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Phlex
-	VERSION = "2.0.0.beta2"
+	VERSION = "2.0.0.rc2"
 end

data/lib/phlex.rb

@@ -5,29 +5,26 @@ require "set"
 
 module Phlex
 	autoload :ArgumentError, "phlex/errors/argument_error"
-	autoload :DoubleRenderError, "phlex/errors/double_render_error"
-	autoload :BlackHole, "phlex/black_hole"
 	autoload :CSV, "phlex/csv"
-	autoload :Callable, "phlex/callable"
-	autoload :Context, "phlex/context"
-	autoload :DeferredRender, "phlex/deferred_render"
-	autoload :ElementClobberingGuard, "phlex/element_clobbering_guard"
-	autoload :Elements, "phlex/elements"
+	autoload :DoubleRenderError, "phlex/errors/double_render_error"
 	autoload :Error, "phlex/error"
 	autoload :FIFO, "phlex/fifo"
+	autoload :FIFOCacheStore, "phlex/fifo_cache_store"
 	autoload :HTML, "phlex/html"
 	autoload :Helpers, "phlex/helpers"
 	autoload :Kit, "phlex/kit"
 	autoload :NameError, "phlex/errors/name_error"
+	autoload :NullCacheStore, "phlex/null_cache_store"
 	autoload :SGML, "phlex/sgml"
 	autoload :SVG, "phlex/svg"
+	autoload :Vanish, "phlex/vanish"
 
 	Escape = ERB::Escape
-	ATTRIBUTE_CACHE = FIFO.new
-	SUPPORTS_FIBER_STORAGE = RUBY_ENGINE == "ruby"
 	Null = Object.new.freeze
 
+	DEPLOY_KEY = Process.clock_gettime(Process::CLOCK_MONOTONIC, :millisecond)
 	CACHED_FILES = Set.new
+	ATTRIBUTE_CACHE = FIFO.new
 
 	def self.__expand_attribute_cache__(file_path)
 		unless CACHED_FILES.include?(file_path)
@@ -35,6 +32,17 @@ module Phlex
 			Phlex::ATTRIBUTE_CACHE.expand(File.size(file_path))
 		end
 	end
+
+	def self.eager_load
+		queue = [self]
+
+		while (mod = queue.shift)
+			mod.constants.each do |const_name|
+				const = mod.const_get(const_name)
+				queue << const if Module === const
+			end
+		end
+	end
 end
 
 def 💪

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: phlex
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta2
+  version: 2.0.0.rc2
 platform: ruby
 authors:
 - Joel Drapper
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-14 00:00:00.000000000 Z
+date: 2025-02-10 00:00:00.000000000 Z
 dependencies: []
 description: A high-performance view framework optimised for fun.
 email:
@@ -20,25 +19,24 @@ files:
 - LICENSE.txt
 - README.md
 - lib/phlex.rb
-- lib/phlex/black_hole.rb
-- lib/phlex/context.rb
 - lib/phlex/csv.rb
-- lib/phlex/deferred_render.rb
-- lib/phlex/element_clobbering_guard.rb
-- lib/phlex/elements.rb
 - lib/phlex/error.rb
 - lib/phlex/errors/argument_error.rb
 - lib/phlex/errors/double_render_error.rb
 - lib/phlex/errors/name_error.rb
 - lib/phlex/fifo.rb
+- lib/phlex/fifo_cache_store.rb
 - lib/phlex/helpers.rb
 - lib/phlex/html.rb
 - lib/phlex/html/standard_elements.rb
 - lib/phlex/html/void_elements.rb
 - lib/phlex/kit.rb
+- lib/phlex/null_cache_store.rb
 - lib/phlex/sgml.rb
+- lib/phlex/sgml/elements.rb
 - lib/phlex/sgml/safe_object.rb
 - lib/phlex/sgml/safe_value.rb
+- lib/phlex/sgml/state.rb
 - lib/phlex/svg.rb
 - lib/phlex/svg/standard_elements.rb
 - lib/phlex/testing.rb
@@ -46,6 +44,7 @@ files:
 - lib/phlex/testing/nokogiri.rb
 - lib/phlex/testing/nokolexbor.rb
 - lib/phlex/testing/sgml.rb
+- lib/phlex/vanish.rb
 - lib/phlex/version.rb
 homepage: https://www.phlex.fun
 licenses:
@@ -56,7 +55,6 @@ metadata:
   changelog_uri: https://github.com/phlex-ruby/phlex/blob/main/CHANGELOG.md
   funding_uri: https://github.com/sponsors/joeldrapper
   rubygems_mfa_required: 'true'
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -64,15 +62,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.3.1
+      version: '3.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.18
-signing_key:
+rubygems_version: 3.6.2
 specification_version: 4
 summary: A fun framework for building views in Ruby.
 test_files: []

data/lib/phlex/context.rb

@@ -1,59 +0,0 @@
-# frozen_string_literal: true
-
-# @api private
-class Phlex::Context
-	def initialize(user_context = {})
-		@buffer = +""
-		@capturing = false
-		@user_context = user_context
-		@fragments = nil
-		@in_target_fragment = false
-		@halt_signal = nil
-	end
-
-	attr_accessor :buffer, :capturing, :user_context, :in_target_fragment
-
-	attr_reader :fragments
-
-	def target_fragments(fragments)
-		@fragments = fragments.to_h { |it| [it, true] }
-	end
-
-	def around_render
-		return yield if !@fragments || @halt_signal
-
-		catch do |signal|
-			@halt_signal = signal
-			yield
-		end
-	end
-
-	def begin_target(id)
-		@in_target_fragment = id
-	end
-
-	def end_target
-		@fragments.delete(@in_target_fragment)
-		@in_target_fragment = false
-		throw @halt_signal if @fragments.length == 0
-	end
-
-	def capturing_into(new_buffer)
-		original_buffer = @buffer
-		original_capturing = @capturing
-		original_fragments = @fragments
-
-		begin
-			@buffer = new_buffer
-			@capturing = true
-			@fragments = nil
-			yield
-		ensure
-			@buffer = original_buffer
-			@capturing = original_capturing
-			@fragments = original_fragments
-		end
-
-		new_buffer
-	end
-end

data/lib/phlex/deferred_render.rb

@@ -1,29 +0,0 @@
-# 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 view_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,18 +0,0 @@
-# frozen_string_literal: true
-
-# @api private
-module Phlex::ElementClobberingGuard
-	def method_added(method_name)
-		if method_name[0] == "_" && __element_method__?(method_name[1..].to_sym)
-			raise Phlex::NameError.new("👋 Redefining the method `#{name}##{method_name}` is not a good idea.")
-		elsif method_name == :view_template
-			location = instance_method(method_name).source_location[0]
-
-			if location[0] in "/" | "."
-				Phlex.__expand_attribute_cache__(location)
-			end
-		else
-			super
-		end
-	end
-end

data/lib/phlex/elements.rb

@@ -1,172 +0,0 @@
-# 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 ||= {}
-	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
-
-			def #{method_name}(**attributes)
-				context = @_context
-				buffer = context.buffer
-				fragment = context.fragments
-				target_found = false
-				block_given = block_given?
-
-				if fragment
-					return if fragment.length == 0 # we found all our fragments already
-
-					id = attributes[:id]
-
-					if !context.in_target_fragment
-					  if fragment[id]
-							context.begin_target(id)
-							target_found = true
-						else
-							yield(self) if block_given
-							return nil
-						end
-					end
-				end
-
-				if attributes.length > 0 # with attributes
-					if block_given # with content block
-						buffer << "<#{tag}" << (Phlex::ATTRIBUTE_CACHE[attributes] ||= __attributes__(attributes)) << ">"
-
-						original_length = buffer.bytesize
-						content = yield(self)
-						if original_length == buffer.bytesize
-							case content
-							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)
-								end
-							end
-						end
-
-						buffer << "</#{tag}>"
-					else # without content
-						buffer << "<#{tag}" << (::Phlex::ATTRIBUTE_CACHE[attributes] ||= __attributes__(attributes)) << "></#{tag}>"
-					end
-				else # without attributes
-					if block_given # with content block
-						buffer << "<#{tag}>"
-
-						original_length = buffer.bytesize
-						content = yield(self)
-						if original_length == buffer.bytesize
-							case content
-							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)
-								end
-							end
-						end
-
-						buffer << "</#{tag}>"
-					else # without content
-						buffer << "<#{tag}></#{tag}>"
-					end
-				end
-
-				#{'flush' if tag == 'head'}
-
-				context.end_target if target_found
-
-				nil
-			end
-
-			alias_method :_#{method_name}, :#{method_name}
-		RUBY
-
-		registered_elements[method_name] = tag
-
-		method_name
-	end
-
-	# @api private
-	def register_void_element(method_name, tag: method_name.name.tr("_", "-"))
-		class_eval(<<-RUBY, __FILE__, __LINE__ + 1)
-			# frozen_string_literal: true
-
-			def #{method_name}(**attributes)
-				context = @_context
-				buffer = context.buffer
-				fragment = context.fragments
-
-				if fragment
-					return if fragment.length == 0 # we found all our fragments already
-
-					id = attributes[:id]
-
-					if !context.in_target_fragment
-					  if fragment[id]
-							context.begin_target(id)
-							target_found = true
-						else
-							return nil
-						end
-					end
-				end
-
-				if attributes.length > 0 # with attributes
-					buffer << "<#{tag}" << (::Phlex::ATTRIBUTE_CACHE[attributes] ||= __attributes__(attributes)) << ">"
-				else # without attributes
-					buffer << "<#{tag}>"
-				end
-
-				context.end_target if target_found
-
-				nil
-			end
-
-			alias_method :_#{method_name}, :#{method_name}
-		RUBY
-
-		registered_elements[method_name] = tag
-
-		method_name
-	end
-end