lennarb 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8d16bb4723ee094f4db857aec2049a2bede8d109d7b35f12297f75ca117ac60c
-  data.tar.gz: 8b908cc5d30da126c249eecbfeb419c68f64e306c018d68a3c897ac26f84722d
+  metadata.gz: fd399f9aecbae5c09d1928317826fd82c62207a36d76ad6a1591a7757811d6e4
+  data.tar.gz: 3f1ecf28399eeb28a8d739e50ffc01ecd0ae7328057c4132f15e6a12b65cd1e9
 SHA512:
-  metadata.gz: b0455253e9ec8e0e684a7dce3d37b7d50e7480971c10f62ec1cecf822471732230e5fbccfaf7bf894585a63e47fcc7bae0020f465f22e3af90d4942d6f95c18c
-  data.tar.gz: 2566e0d474c8b82c7a5607d16b69de2489133760732c9fa6ac9b8f7ab8bc7a36b38d40041f80ecfb4a61702280524d129c82cd4d5a67a1a7066cee37a521c218
+  metadata.gz: b32f1d120bfd85de2512721631c90e95aa32622dfd69e41e90ce66f7d61b22db235b30c5de8329bfd1669dc4ca9b880bcb858068246362422e0c0b545b1e29af
+  data.tar.gz: 28e13690c911ddb81d97c9e4fab95c270eb7e0367d2a26ea89b959252b3a449d611cb9dc067d0428e8959aa2beb96a9e9f3240462c97fbe480aecfd47ae169fd

data/lib/lennarb/application/base.rb

@@ -32,9 +32,10 @@ class Lennarb
 			#
 			# @returns [Base]
 			#
-
 			class << self
 				def inherited(subclass)
+          super
+          _applications << subclass
 					subclass.instance_variable_set(:@_route, Lennarb.new)
 					subclass.instance_variable_set(:@_middlewares, [])
 					subclass.instance_variable_set(:@_global_after_hooks, [])
@@ -51,9 +52,23 @@ class Lennarb
 				def patch(...)   = @_route.patch(...)
 				def delete(...)  = @_route.delete(...)
 				def options(...) = @_route.options(...)
-
+          
 				# @returns [Array] middlewares
-				def middlewares = @_middlewares
+				#
+				def _middlewares = @_middlewares ||= []
+
+				# @returns [Array] applications
+				#
+				def _applications = @_applications ||= []
+
+				# Mount a controller
+				#
+				# @parameter [Class] controller
+				#
+				def mount(controller_class)
+					_applications << controller_class
+					puts "Mounted controller: #{controller_class}"
+				end
 
 				# Use a middleware
 				#
@@ -117,10 +132,26 @@ class Lennarb
 					use Rack::Head
 					use Rack::ContentLength
 
-					middlewares.each do |(middleware, args, block)|
+					_middlewares.each do |(middleware, args, block)|
 						stack.use(middleware, *args, &block)
 					end
 
+					_applications.each do |app|
+						app_route = app.instance_variable_get(:@_route)
+
+						app_after_hooks = app.instance_variable_get(:@_after_hooks) 
+						app_before_hooks = app.instance_variable_get(:@_before_hooks)
+						global_after_hooks = app.instance_variable_get(:@_global_after_hooks)
+						global_before_hooks = app.instance_variable_get(:@_global_before_hooks)
+
+						@_route.merge!(app_route)
+						@_before_hooks.merge!(app_before_hooks)
+						@_after_hooks.merge!(app_after_hooks)
+
+						@_global_before_hooks.concat(global_before_hooks)
+						@_global_after_hooks.concat(global_after_hooks)
+					end
+
 					stack.run ->(env) do
 						catch(:halt) do
 							execute_hooks(@_before_hooks, env, :before)
@@ -137,7 +168,6 @@ class Lennarb
 					end
 
 					@_route.freeze!
-
 					stack.to_app
 				end
 

data/lib/lennarb/route_node.rb

@@ -68,5 +68,17 @@ class Lennarb
 
 			[nil, nil]
 		end
+
+		# Merge the other RouteNode into the current one
+		#
+		# @parameter other [RouteNode] The other RouteNode to merge into the current one
+		#
+		# @return [void]
+		#
+		def merge!(other)
+			self.static_children.merge!(other.static_children)
+			self.dynamic_children.merge!(other.dynamic_children)
+			self.blocks.merge!(other.blocks)
+		end
 	end
 end

data/lib/lennarb/version.rb

@@ -4,7 +4,7 @@
 # Copyright, 2023-2024, by Aristóteles Coutinho.
 
 class Lennarb
-	VERSION = '1.1.0'
+	VERSION = '1.2.0'
 
 	public_constant :VERSION
 end

data/lib/lennarb.rb

@@ -115,6 +115,18 @@ class Lennarb
 		@_applied_plugins << plugin_name
 	end
 
+	# Merge the other RouteNode into the current one
+	#
+	# @parameter other [RouteNode] The other RouteNode to merge into the current one
+	#
+	# @return [void]
+	#
+	def merge!(other)
+		raise "Expected a Lennarb instance, got #{other.class}" unless other.is_a?(Lennarb)
+
+		@_root.merge!(other._root)
+  end
+
 	private
 
 	# Add a route

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lennarb
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Aristóteles Coutinho
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-10-07 00:00:00.000000000 Z
+date: 2024-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize