lennarb 0.6.1 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d9cfd70e5b40a64d96f5cd52b748c32a36b796c43e6d490b4df64bc5fae3c781
-  data.tar.gz: ffc4abf90906f7378879a0d342e74922c01c6ae9d6d59855128d4fd3ec11d40c
+  metadata.gz: 9732dfc70b838e4871ffee4a196c8641639e29787f716310ba0d447e90470dd0
+  data.tar.gz: '085874f1f8e722aa6e5a8a422422970a66d8bb9e26c24653614571ee1e053c81'
 SHA512:
-  metadata.gz: 6d1e7a05a3e931a3163b4103d9900c36163e72e738e0435bc4396fb5f3aeb3c6d044edbdfd8a7fde7512265df91d86dc01a719b7b58ffdf7dc10698a69c1016c
-  data.tar.gz: 75c64ac16b3fd3599e78c6a9dd04c951137d11b64b11685af4f9d7d0626331aa554564d8786914d129b93e128ebaa54015f0098b75626e5c74bd347e7ece2861
+  metadata.gz: c484091928ee8a7d3a75bb7b3279a6915151e2dd9ea01c1d968bec78f4bcdaef166d452e7ba554b0c552ce89b4541cb46a8babbcfe5a1b3c21f88410f5ecf8bd
+  data.tar.gz: bb3103c9a7ab43ab5e643c2ec2285acf5127d5fc7d0ec4e8060424468cea94f7d0995eabbed43bbf06deac0aa70f4613a4cbf140e0b002f56381363544a3420e

data/lib/lennarb/application/base.rb

@@ -43,7 +43,7 @@ class Lennarb
 					subclass.instance_variable_set(:@_before_hooks, Lennarb::RouteNode.new)
 				end
 
-				def get(path, &) = @_route.get(path, &)
+				def get(...)     = @_route.get(...)
 				def put(...)     = @_route.put(...)
 				def post(...)    = @_route.post(...)
 				def head(...)    = @_route.head(...)
@@ -172,13 +172,21 @@ class Lennarb
 				#
 				def redirect(path, status = 302) = throw :halt, [status, { 'location' => path }, []]
 
-				# To use a plugin
+				# Include a plugin in the application
 				#
-				# @parameter [String | Symbol] plugin_name
+				# @parameter [String] plugin_name
+				# @parameter [Array] args
+				# @parameter [Block] block
 				#
 				# @returns [void]
 				#
-				def plugin(plugin_name) = @_route.plugin(plugin_name)
+				def plugin(plugin_name, *, &)
+					@_route.plugin(plugin_name, *, &)
+					plugin_module = @_route.class::Plugin.load(plugin_name)
+
+					include plugin_module::InstanceMethods if plugin_module.const_defined?(:InstanceMethods)
+					extend plugin_module::ClassMethods     if plugin_module.const_defined?(:ClassMethods)
+				end
 
 				private
 

data/lib/lennarb/plugin.rb

@@ -7,14 +7,29 @@ class Lennarb
 	module Plugin
 		@plugins = {}
 
+		# Register a plugin
+		#
+		# @parameter [String] name
+		# @parameter [Module] mod
+		#
+		# @returns [void]
+		#
 		def self.register(name, mod)
 			@plugins[name] = mod
 		end
 
+		# Load a plugin
+		#
+		# @parameter [String] name
+		#
+		# @returns [Module] plugin
+		#
 		def self.load(name)
-			@plugins[name] || raise("Plugin #{name} did not register itself correctly")
+			@plugins[name] || raise(LennarbError, "Plugin #{name} did not register itself correctly")
 		end
 
+		# @returns [Hash] plugins
+		#
 		def self.plugins = @plugins
 	end
 end

data/lib/lennarb/route_node.rb

@@ -5,23 +5,24 @@
 
 class Lennarb
 	class RouteNode
-		attr_accessor :children, :blocks, :param_key
+		attr_accessor :static_children, :dynamic_children, :blocks, :param_key
 
-		# Initialize the route node
+		# Initializes the RouteNode class.
 		#
 		# @return [RouteNode]
 		#
 		def initialize
-			@children  = {}
-			@blocks    = {}
-			@param_key = nil
+			@blocks           = {}
+			@param_key        = nil
+			@static_children  = {}
+			@dynamic_children = {}
 		end
 
 		# Add a route to the route node
 		#
-		# @parameter [Array] parts
-		# @parameter [String] http_method
-		# @parameter [Proc] block
+		# @parameter parts       [Array<String>] The parts of the route
+		# @parameter http_method [Symbol] The HTTP method of the route
+		# @parameter block       [Proc] The block to be executed when the route is matched
 		#
 		# @return [void]
 		#
@@ -30,44 +31,42 @@ class Lennarb
 
 			parts.each do |part|
 				if part.start_with?(':')
-					key = :param
-					current_node.children[key] ||= RouteNode.new
-					current_node = current_node.children[key]
-					current_node.param_key = part[1..].to_sym
+					param_sym = part[1..].to_sym
+					current_node.dynamic_children[param_sym] ||= RouteNode.new
+					dynamic_node = current_node.dynamic_children[param_sym]
+					dynamic_node.param_key = param_sym
+					current_node = dynamic_node
 				else
-					key = part
-					current_node.children[key] ||= RouteNode.new
-					current_node = current_node.children[key]
+					current_node.static_children[part] ||= RouteNode.new
+					current_node = current_node.static_children[part]
 				end
 			end
 
 			current_node.blocks[http_method] = block
 		end
 
-		# Match a route to the route node
-		#
-		# @parameter [Array] parts
-		# @parameter [String] http_method
-		#
-		# @return [Array]
-		#
-		def match_route(parts, http_method)
-			current_node = self
-			params = {}
+		def match_route(parts, http_method, params: {})
+			if parts.empty?
+				return [blocks[http_method], params] if blocks[http_method]
+			else
+				part = parts.first
+				rest = parts[1..]
 
-			parts.each do |part|
-				return [nil, nil] unless current_node.children.key?(part) || current_node.children[:param]
+				if static_children.key?(part)
+					result_block, result_params = static_children[part].match_route(rest, http_method, params:)
+					return [result_block, result_params] if result_block
+				end
 
-				if current_node.children.key?(part)
-					current_node = current_node.children[part]
-				else
-					param_node = current_node.children[:param]
-					params[param_node.param_key] = part
-					current_node = param_node
+				dynamic_children.each_value do |dyn_node|
+					new_params = params.dup
+					new_params[dyn_node.param_key] = part
+					result_block, result_params = dyn_node.match_route(rest, http_method, params: new_params)
+
+					return [result_block, result_params] if result_block
 				end
 			end
 
-			[current_node.blocks[http_method], params]
+			[nil, nil]
 		end
 	end
 end

data/lib/lennarb/version.rb

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

data/lib/lennarb.rb

@@ -27,6 +27,11 @@ class Lennarb
 	#
 	attr_reader :_root
 
+	# @attribute [r] applied_plugins
+	# @returns [Array]
+	#
+	attr_reader :_applied_plugins
+
 	# Initialize the application
 	#
 	# @yield { ... } The application
@@ -35,6 +40,7 @@ class Lennarb
 	#
 	def initialize
 		@_root = RouteNode.new
+		@_applied_plugins = []
 		yield self if block_given?
 	end
 
@@ -90,15 +96,23 @@ class Lennarb
 	def delete(path, &block)  = add_route(path, :DELETE, block)
 	def options(path, &block) = add_route(path, :OPTIONS, block)
 
-	# Register a plugin
+	# Add plugin to extend the router
 	#
-	# @parameter [String | Symbol] plugin_name
+	# @parameter [String] plugin_name
+	# @parameter [args]  *args
+	# @parameter [Block] block
 	#
 	# @returns [void]
 	#
-	def plugin(plugin_name)
-		plugin_module = Lennarb::Plugin.load(plugin_name)
-		extend plugin_module
+	def plugin(plugin_name, *, &)
+		return if @_applied_plugins.include?(plugin_name)
+
+		plugin_module = Plugin.load(plugin_name)
+		extend plugin_module::InstanceMethods         if defined?(plugin_module::InstanceMethods)
+		self.class.extend plugin_module::ClassMethods if defined?(plugin_module::ClassMethods)
+		plugin_module.setup(self.class, *, &)         if plugin_module.respond_to?(:setup)
+
+		@_applied_plugins << plugin_name
 	end
 
 	private

data/readme.md

@@ -40,6 +40,8 @@ Plese see [Performance](https://aristotelesbr.github.io/lennarb/guides/performan
 
   - [Performance](https://aristotelesbr.github.io/lennarb/guides/performance/index.html) - The **Lennarb** is very fast. The following benchmarks were performed on a MacBook Pro (Retina, 13-inch, Early 2013) with 2,7 GHz Intel Core i7 and 8 GB 1867 MHz DDR3. Based on [jeremyevans/r10k](https://github.com/jeremyevans/r10k) using the following [template build](static/r10k/build/lennarb.rb).
 
+  - [Plugin](https://aristotelesbr.github.io/lennarb/guides/plugin/index.html) - You can create your plugins to extend the functionality of the framework.
+
   - [Response](https://aristotelesbr.github.io/lennarb/guides/response/index.html) - This is the response guide.
     The `res` object is used to send a response to the client. The Lennarb use a custom response object to send responses to the client. The `res` object is an instance of `Lennarb::Response`.
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lennarb
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 1.0.1
 platform: ruby
 authors:
 - Aristóteles Coutinho
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-05-17 00:00:00.000000000 Z
+date: 2024-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -115,33 +115,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '6.4'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: rack-test
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '13.1'
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '13.1'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
-  name: rack-test
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '13.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '13.1'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -192,7 +192,7 @@ homepage: https://aristotelesbr.github.io/lennarb
 licenses:
 - MIT
 metadata:
-  allowed_push_host: https://rubygems.org/gems/lennarb
+  allowed_push_host: https://rubygems.org
   changelog_uri: https://github.com/aristotelesbr/lennarb/blob/master/changelog.md
   homepage_uri: https://aristotelesbr.github.io/lennarb
   rubygems_mfa_required: 'true'
@@ -212,7 +212,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.9
+rubygems_version: 3.5.11
 signing_key:
 specification_version: 4
 summary: A lightweight and experimental web framework for Ruby.