phlex 2.4.0.beta2 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 01002f30f11a82c8fce49ec63ce50cd3947c40a50d66c9fd02123c87a89f434c
-  data.tar.gz: 0b40acfa20d82bf9c7e6bb68c8aeca447731d56436b2876750bfc669e9ba52a4
+  metadata.gz: d7204ba8933eeeba6ac827d6a8f965f8a69a5d63245538a882f579881a1a4f3a
+  data.tar.gz: c0d11845eb37d6a14cd6c750972a7d898a63ba7062ddcf14f2e024e5785c20fb
 SHA512:
-  metadata.gz: 68d5a712386d7da44bb013ee956dde702d6e9f68e1cc237aac8a706a27cbff312dfd81a03405c9330f3109b87e7ff312711cf07a2e022ae1a256d984d60062cb
-  data.tar.gz: 9dd429c7d0a3d0b962ca1d6b653abd79260134c743f6322e87e90d3af200b188695cf8a2e3a6588ba2d731f6227f0c1ef1bb45b1bfd37f9ae2d6b02764a93d3a
+  metadata.gz: 33797f2a30f72abc79d5161e4d3006e38023450c0b4eee03018c19e545307c8344e4e085aeabd590184550ec1f1505e6681e943e1af2ab1bf5faf7f0392abcc1
+  data.tar.gz: 6ffe9a663d9be2d87d73992640c803107f26671598e058c843db8786678eee53bab16605e046af350ec0c6c9c0f5c5a5e7fe2860402f43da9727e3d54eee5e7b

data/lib/phlex/compiler/method_compiler.rb

@@ -462,7 +462,7 @@ module Phlex::Compiler
 			when Refract::AssocNode
 				(Refract::StringNode === value.key || Refract::SymbolNode === value.key) && static_attribute_value_literal?(value.value)
 			when Refract::CallNode
-				if value in { receiver: Prism::ConstantReadNode[name: :Set]| Prism::ConstantPathNode[name: :Set, parent: nil], name: :[] }
+				if value in { receiver: Prism::ConstantReadNode[name: :Set] | Prism::ConstantPathNode[name: :Set, parent: nil], name: :[] }
 					value.arguments.arguments.all? { |n| static_token_value_literal?(n) }
 				else
 					false

data/lib/phlex/compiler.rb

@@ -5,8 +5,6 @@ require "refract"
 
 module Phlex::Compiler
 	MAP = {}
-	DEPENDENCIES = {}
-
 	Error = Class.new(StandardError)
 
 	Concat = Data.define(:node) do

data/lib/phlex/fifo.rb

@@ -36,7 +36,7 @@ class Phlex::FIFO
 			@bytesize += value.bytesize
 
 			while @bytesize > @max_bytesize
-				k, v = @store.shift
+				_k, v = @store.shift
 				@bytesize -= v[1].bytesize
 			end
 		end

data/lib/phlex/kit.rb

@@ -63,8 +63,8 @@ module Phlex::Kit
 				end
 
 				define_singleton_method(name) do |*args, **kwargs, &block|
-					component, fiber_id = Thread.current[:__phlex_component__]
-					if (component && fiber_id == Fiber.current.object_id)
+					component = Thread.current[:__phlex_component__]
+					if component
 						component.instance_exec do
 							constant = me.const_get(name)
 							render(constant.new(*args, **kwargs), &block)

data/lib/phlex/sgml/attributes.rb

@@ -53,7 +53,11 @@ module Phlex::SGML::Attributes
 			when Phlex::SGML::SafeObject
 				v.to_s.gsub('"', """)
 			else
-				raise Phlex::ArgumentError.new("Invalid attribute value for #{k}: #{v.inspect}.")
+				if v.respond_to?(:to_h)
+					generate_nested_attributes(v.to_h, "#{name}-", buffer)
+				else
+					raise Phlex::ArgumentError.new("Invalid attribute value for #{k}: #{v.inspect}.")
+				end
 			end
 
 			lower_name = name.downcase

data/lib/phlex/sgml.rb

@@ -2,17 +2,6 @@
 
 # **Standard Generalized Markup Language** for behaviour common to {HTML} and {SVG}.
 class Phlex::SGML
-	ERBCompiler = ERB::Compiler.new("<>").tap do |compiler|
-		compiler.pre_cmd    = [""]
-		compiler.put_cmd    = "@_state.buffer.<<"
-		compiler.insert_cmd = "__implicit_output__"
-		compiler.post_cmd   = ["nil"]
-
-		def compiler.add_insert_cmd(out, content)
-			out.push("#{@insert_cmd}((#{content}))")
-		end
-	end
-
 	include Phlex::Helpers
 
 	class << self
@@ -32,40 +21,6 @@ class Phlex::SGML
 				super
 			end
 		end
-
-		def erb(method_name, erb = nil, locals: nil, &block)
-			loc = caller_locations(1, 1)[0]
-			path = loc.path.delete_suffix(".rb")
-			file = loc.path
-			line = loc.lineno - 1
-
-			unless erb
-				method_path = "#{path}/#{method_name}.html.erb"
-				sidecar_path = "#{path}.html.erb"
-
-				if File.exist?(method_path)
-					erb = File.read(method_path)
-					file = method_path
-					line = 1
-				elsif method_name == :view_template && File.exist?(sidecar_path)
-					erb = File.read(sidecar_path)
-					file = sidecar_path
-					line = 1
-				else
-					raise Phlex::RuntimeError.new(<<~MESSAGE)
-						No ERB template found for #{method_name}
-					MESSAGE
-				end
-			end
-
-			code, _enc = ERBCompiler.compile(erb)
-
-			class_eval(<<~RUBY, file, line)
-				def #{method_name} #{locals}
-					#{code}
-				end
-			RUBY
-		end
 	end
 
 	def view_template
@@ -105,7 +60,8 @@ class Phlex::SGML
 
 		block ||= @_content_block
 
-		Thread.current[:__phlex_component__] = [self, Fiber.current.object_id].freeze
+		previous_phlex_component = Thread.current[:__phlex_component__]
+		Thread.current[:__phlex_component__] = self
 
 		state.around_render(self) do
 			before_template(&block)
@@ -127,7 +83,7 @@ class Phlex::SGML
 			after_template(&block)
 		end
 	ensure
-		Thread.current[:__phlex_component__] = [parent, Fiber.current.object_id].freeze
+		Thread.current[:__phlex_component__] = previous_phlex_component
 	end
 
 	def context

data/lib/phlex/version.rb

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

data/lib/ruby_lsp/phlex/addon.rb

@@ -41,6 +41,8 @@ module RubyLsp
 							RubyIndexer::Entry::BlockParameter.new(name: :content),
 						]),
 					], visibility: :public, comments: "Outputs a `<#{tag_name}>` tag.")
+				else
+					# no-op
 				end
 			end
 		end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: phlex
 version: !ruby/object:Gem::Version
-  version: 2.4.0.beta2
+  version: 2.4.0
 platform: ruby
 authors:
 - Joel Drapper
@@ -99,7 +99,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.7
+rubygems_version: 4.0.3
 specification_version: 4
 summary: Object-oriented views in Ruby.
 test_files: []