async-service 0.2.1 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4ab5e7d4ee86d20db8effcf473f60b83a0f2d969b5ef3c461fe7479a2dcc3803
-  data.tar.gz: 2e72c469ad515af58898dd4a96c7622b613022b7aef631531ba4fb9b65556606
+  metadata.gz: 383a3a329442a291c3ec373e55626e1a10ab01e237aa545787f7282c8bace859
+  data.tar.gz: 0b3436a1ccf535c15fcd90b59b77dbc3e2638170496a2c7d8298d76134edb3a3
 SHA512:
-  metadata.gz: a1c95132372c7a4abf787b76364a92a32cd459909040472d1dbaafad47751254a88a637a1ef7c2d19cae001cb27f4f38f42e5edfec4af280dc09592909f3bb36
-  data.tar.gz: 9170e30dd17d228c110a7b411df61ee55206f9f67ca0ec50ee2005848d17e47afdcf72c5547934c2f8d3dde6682b29ca7e6d0e43b6f1018abf5c04d6ae3e5c93
+  metadata.gz: f419c921dec91bd81a3b0a51e08471017fd3d8a31fb3fcfdf0abb0c53eb044b131f190be5a93f33b37d0a2eee3c4935ce55e3ce67bc3217db01b818abaa5fe24
+  data.tar.gz: 84decffdf10d7e0dc269f812e83dc5a780615a6d90ff51237743f1ffa48fd96e7b436516ecc4b1c14ea7ec8b0b379a2e8c613ef3affa0da3bf1b3f4f3103754c

data/lib/async/service/environment.rb

@@ -7,120 +7,123 @@ module Async
 	module Service
 		class Environment
 			class Builder < BasicObject
-				def self.for(initial, block)
-					builder = self.new(initial.dup)
+				def self.wrap(hash, facet = ::Module.new)
+					hash.each do |key, value|
+						if value.is_a?(::Proc)
+							facet.define_method(key, &value)
+						else
+							facet.define_method(key){value}
+						end
+					end
+					
+					return facet
+				end
+				
+				def self.for(facet = ::Module.new, &block)
+					builder = self.new(facet)
 					
-					builder.instance_exec(&block) if block
+					builder.instance_exec(&block) if block_given?
 					
-					return builder
+					return facet
 				end
 				
-				def initialize(cache = ::Hash.new)
-					@cache = cache
+				def initialize(facet = ::Module.new)
+					@facet = facet
 				end
 				
 				def include(target)
-					target.each do |key, value|
-						@cache[key] = value
+					if target.class == ::Module
+						@facet.include(target)
+					elsif target.respond_to?(:included)
+						target.included(@facet)
+					else
+						::Kernel.raise ::ArgumentError, "Cannot include #{target.inspect} into #{@facet.inspect}!"
 					end
 				end
 				
 				def method_missing(name, argument = nil, &block)
-					previous = @cache[name]
-					
 					if block
-						if block.arity == 0
-							@cache[name] = block
-						else
-							# Bind the |previous| argument to the block:
-							@cache[name] = ::Kernel.lambda{self.instance_exec(previous, &block)}
-						end
-					elsif previous.is_a?(::Array)
-						@cache[name] = previous + argument
-					elsif previous.is_a?(::Hash)
-						@cache[name] = previous.merge(argument)
+						@facet.define_method(name, &block)
 					else
-						@cache[name] = argument
+						@facet.define_method(name){argument}
 					end
 				end
+			end
+			
+			def self.build(**values, &block)
+				if values.any?
+					environment = Environment.new(Builder.wrap(values))
+				end
 				
-				def to_h
-					@cache
+				if block_given?
+					environment = Environment.new(Builder.for(&block), environment)
 				end
+				
+				return environment
 			end
 			
-			def initialize(**initial, &block)
-				@block = block
-				@initial = initial
+			def initialize(facet = ::Module.new, parent = nil)
+				@facet = facet
+				@parent = parent
 			end
 			
-			def builder
-				Builder.for(@initial, @block)
+			def included(target)
+				@parent&.included(target)
+				target.include(@facet)
 			end
 			
-			# An evaluator is lazy read-only view of an environment. It allows for the evaluation of procs and other dynamic values.
-			# Those values are cached, and thus the evaluator is not thread safe.
-			class Evaluator < BasicObject
-				def initialize(source)
-					@source = source
-					@cache = {}
-				end
-				
-				def inspect
-					"#<#{Evaluator} #{@source}>"
-				end
-				
-				private def __evaluate__(value)
-					case value
-					when ::Array
-						value.collect{|item| __evaluate__(item)}
-					when ::Hash
-						value.transform_values{|item| __evaluate__(item)}
-					# when ::Symbol
-					# 	self[value]
-					when ::Proc
-						__evaluate__(instance_exec(&value))
-					else
-						value
+			# An evaluator is lazy read-only view of an environment. It memoizes all method calls.
+			class Evaluator
+				def self.wrap(environment)
+					evaluator = ::Class.new(self)
+					
+					facet = ::Module.new
+					environment.included(facet)
+					
+					evaluator.include(facet)
+					
+					# Memoize all instance methods:
+					facet.instance_methods.each do |name|
+						evaluator.define_method(name) do
+							@cache[name] ||= super()
+						end
 					end
-				end
-				
-				def [](key)
-					@cache.fetch(key) do
-						@cache[key] = __evaluate__(@source[key])
+					
+					evaluator.define_method(:keys) do
+						facet.instance_methods
 					end
+					
+					return evaluator.new
 				end
 				
-				def respond_to?(name, include_all = false)
-					@source.key?(name) || super
+				def initialize
+					@cache = {}
 				end
 				
-				def method_missing(name, ...)
-					if @source.key?(name)
-						self[name]
-					else
-						super
-					end
+				def inspect
+					"#<#{Evaluator} #{self.keys}>"
 				end
 				
 				def to_h
 					# Ensure all keys are evaluated:
-					@source.each_key{|key| self[key]}
+					self.keys.each do |name|
+						self.__send__(name)
+					end
 					
 					return @cache
 				end
 				
+				def [](key)
+					self.__send__(key)
+				end
+				
 				def key?(key)
-					@source.key?(key)
+					self.keys.include?(key)
 				end
 			end
 			
 			def evaluator
-				Evaluator.new(builder.to_h)
-			end
-			
-			def each(&block)
-				builder.to_h.each(&block)
+				return Evaluator.wrap(self)
 			end
 			
 			def to_h

data/lib/async/service/loader.rb

@@ -44,7 +44,7 @@ module Async
 			
 			# Create an environment.
 			def environment(**initial, &block)
-				Environment.new(**initial, &block)
+				Environment.build(**initial, &block)
 			end
 			
 			# Define a host with the specified name.

data/lib/async/service/version.rb

@@ -5,6 +5,6 @@
 
 module Async
 	module Service
-		VERSION = "0.2.1"
+		VERSION = "0.3.1"
 	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: async-service
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.1
 platform: ruby
 authors:
 - Samuel Williams
@@ -37,7 +37,7 @@ cert_chain:
   Q2K9NVun/S785AP05vKkXZEFYxqG6EW012U4oLcFl5MySFajYXRYbuUpH6AY+HP8
   voD0MPg1DssDLKwXyt1eKD/+Fq0bFWhwVM/1XiAXL7lyYUyOq24KHgQ2Csg=
   -----END CERTIFICATE-----
-date: 2024-02-20 00:00:00.000000000 Z
+date: 2024-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async