lennarb 1.2.0 → 1.4.0

data/lib/lennarb/response.rb

@@ -1,140 +1,133 @@
-# frozen_string_literal: true
-
-# Released under the MIT License.
-# Copyright, 2023-2024, by Aristóteles Coutinho.
-
 class Lennarb
-	class Response
-		# @!attribute [rw] status
-		#  @returns [Integer]
-		#
-		attr_accessor :status
-
-		# @!attribute [r] body
-		#  @returns [Array]
-		#
-		attr_reader :body
-
-		# @!attribute [r] headers
-		#  @returns [Hash]
-		#
-		attr_reader :headers
-
-		# @!attribute [r] length
-		#  @returns [Integer]
-		#
-		attr_reader :length
-
-		# Constants
-		#
-		LOCATION = 'location'
-		private_constant :LOCATION
-
-		CONTENT_TYPE = 'content-type'
-		private_constant :CONTENT_TYPE
-
-		CONTENT_LENGTH = 'content-length'
-		private_constant :CONTENT_LENGTH
-
-		ContentType = { HTML: 'text/html', TEXT: 'text/plain', JSON: 'application/json' }.freeze
-		private_constant :ContentType
-
-		# Initialize the response object
-		#
-		# @returns [Response]
-		#
-		def initialize
-			@status = 404
-			@headers = {}
-			@body    = []
-			@length  = 0
-		end
-
-		# Set the response header
-		#
-		# @parameter [String] key
-		#
-		# @returns [String] value
-		#
-		def [](key)
-			@headers[key]
-		end
-
-		# Get the response header
-		#
-		# @parameter [String] key
-		# @parameter [String] value
-		#
-		# @returns [String] value
-		#
-		def []=(key, value)
-			@headers[key] = value
-		end
-
-		# Write to the response body
-		#
-		# @parameter [String] str
-		#
-		# @returns [String] str
-		#
-		def write(str)
-			str = str.to_s
-			@length += str.bytesize
-			@headers[CONTENT_LENGTH] = @length.to_s
-			@body << str
-		end
-
-		# Set the response type to text
-		#
-		# @parameter [String] str
-		#
-		# @returns [String] str
-		#
-		def text(str)
-			@headers[CONTENT_TYPE] = ContentType[:TEXT]
-			write(str)
-		end
-
-		# Set the response type to html
-		#
-		# @parameter [String] str
-		#
-		# @returns [String] str
-		#
-		def html(str)
-			@headers[CONTENT_TYPE] = ContentType[:HTML]
-			write(str)
-		end
-
-		# Set the response type to json
-		#
-		# @parameter [String] str
-		#
-		# @returns [String] str
-		#
-		def json(str)
-			@headers[CONTENT_TYPE] = ContentType[:JSON]
-			write(str)
-		end
-
-		# Redirect the response
-		#
-		# @parameter [String] path
-		# @parameter [Integer] status, default: 302
-		#
-		def redirect(path, status = 302)
-			@headers[LOCATION] = path
-			@status = status
-
-			throw :halt, finish
-		end
-
-		# Finish the response
-		#
-		# @returns [Array] response
-		#
-		def finish
-			[@status, @headers, @body]
-		end
-	end
+  class Response
+    # @!attribute [rw] status
+    #  @returns [Integer]
+    #
+    attr_accessor :status
+
+    # @!attribute [r] body
+    #  @returns [Array]
+    #
+    attr_reader :body
+
+    # @!attribute [r] headers
+    #  @returns [Hash]
+    #
+    attr_reader :headers
+
+    # @!attribute [r] length
+    #  @returns [Integer]
+    #
+    attr_reader :length
+
+    # Constants
+    #
+    LOCATION = "location"
+    private_constant :LOCATION
+
+    CONTENT_TYPE = "content-type"
+    private_constant :CONTENT_TYPE
+
+    CONTENT_LENGTH = "content-length"
+    private_constant :CONTENT_LENGTH
+
+    ContentType = {HTML: "text/html", TEXT: "text/plain", JSON: "application/json"}.freeze
+    # Initialize the response object
+    #
+    # @returns [Response]
+    #
+    def initialize
+      @status = 404
+      @headers = {}
+      @body = []
+      @length = 0
+    end
+
+    # Set the response header
+    #
+    # @parameter [String] key
+    #
+    # @returns [String] value
+    #
+    def [](key)
+      @headers[key]
+    end
+
+    # Get the response header
+    #
+    # @parameter [String] key
+    # @parameter [String] value
+    #
+    # @returns [String] value
+    #
+    def []=(key, value)
+      @headers[key] = value
+    end
+
+    # Write to the response body
+    #
+    # @parameter [String] str
+    #
+    # @returns [String] str
+    #
+    def write(str)
+      str = str.to_s
+      @length += str.bytesize
+      @headers[CONTENT_LENGTH] = @length.to_s
+      @body << str
+    end
+
+    # Set the response type to text
+    #
+    # @parameter [String] str
+    #
+    # @returns [String] str
+    #
+    def text(str)
+      @headers[CONTENT_TYPE] = ContentType[:TEXT]
+      write(str)
+    end
+
+    # Set the response type to html
+    #
+    # @parameter [String] str
+    #
+    # @returns [String] str
+    #
+    def html(str)
+      @headers[CONTENT_TYPE] = ContentType[:HTML]
+      write(str)
+    end
+
+    # Set the response type to json
+    #
+    # @parameter [String] str
+    #
+    # @returns [String] str
+    #
+    def json(str)
+      @headers[CONTENT_TYPE] = ContentType[:JSON]
+      write(str)
+    end
+
+    # Redirect the response
+    #
+    # @parameter [String] path
+    # @parameter [Integer] status, default: 302
+    #
+    def redirect(path, status = 302)
+      @headers[LOCATION] = path
+      @status = status
+
+      throw :halt, finish
+    end
+
+    # Finish the response
+    #
+    # @returns [Array] response
+    #
+    def finish
+      [@status, @headers, @body]
+    end
+  end
 end

data/lib/lennarb/route_node.rb

@@ -1,84 +1,61 @@
-# frozen_string_literal: true
-
-# Released under the MIT License.
-# Copyright, 2023-2024, by Aristóteles Coutinho.
-
 class Lennarb
-	class RouteNode
-		attr_accessor :static_children, :dynamic_children, :blocks, :param_key
-
-		# Initializes the RouteNode class.
-		#
-		# @return [RouteNode]
-		#
-		def initialize
-			@blocks           = {}
-			@param_key        = nil
-			@static_children  = {}
-			@dynamic_children = {}
-		end
-
-		# Add a route to the route node
-		#
-		# @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]
-		#
-		def add_route(parts, http_method, block)
-			current_node = self
-
-			parts.each do |part|
-				if part.start_with?(':')
-					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
-					current_node.static_children[part] ||= RouteNode.new
-					current_node = current_node.static_children[part]
-				end
-			end
-
-			current_node.blocks[http_method] = block
-		end
-
-		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..]
-
-				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
-
-				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
-
-			[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
+  class RouteNode
+    attr_accessor :static_children, :dynamic_children, :blocks, :param_key
+
+    def initialize
+      @blocks = {}
+      @param_key = nil
+      @static_children = {}
+      @dynamic_children = {}
+    end
+
+    def add_route(parts, http_method, block)
+      current_node = self
+
+      parts.each do |part|
+        if part.start_with?(":")
+          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
+          current_node.static_children[part] ||= RouteNode.new
+          current_node = current_node.static_children[part]
+        end
+      end
+
+      current_node.blocks[http_method] = block
+    end
+
+    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..]
+
+        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
+
+        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
+
+      [nil, nil]
+    end
+
+    def merge!(other)
+      static_children.merge!(other.static_children)
+      dynamic_children.merge!(other.dynamic_children)
+      blocks.merge!(other.blocks)
+    end
+  end
 end

data/lib/lennarb/version.rb

@@ -1,10 +1,5 @@
-# frozen_string_literal: true
-
-# Released under the MIT License.
-# Copyright, 2023-2024, by Aristóteles Coutinho.
-
 class Lennarb
-	VERSION = '1.2.0'
+  VERSION = "1.4.0"
 
-	public_constant :VERSION
+  public_constant :VERSION
 end

data/lib/lennarb.rb

@@ -1,144 +1,72 @@
-# frozen_string_literal: true
-
-# Released under the MIT License.
-# Copyright, 2023-2024, by Aristóteles Coutinho.
-
 # Core extensions
 #
-require 'pathname'
-require 'rack'
+require "pathname"
+require "rack"
+require "bundler"
 
-# Base class for Lennarb
-#
-require_relative 'lennarb/application/base'
-require_relative 'lennarb/plugin'
-require_relative 'lennarb/request'
-require_relative 'lennarb/response'
-require_relative 'lennarb/route_node'
-require_relative 'lennarb/version'
+require_relative "lennarb/request"
+require_relative "lennarb/response"
+require_relative "lennarb/route_node"
+require_relative "lennarb/version"
+require_relative "lennarb/constansts"
 
 class Lennarb
-	# Error class
-	#
-	class LennarbError < StandardError; end
-
-	# @attribute [r] root
-	# @returns [RouteNode]
-	#
-	attr_reader :_root
+  class LennarbError < StandardError; end
 
-	# @attribute [r] applied_plugins
-	# @returns [Array]
-	#
-	attr_reader :_applied_plugins
-
-	# Initialize the application
-	#
-	# @yield { ... } The application
-	#
-	# @returns [Lennarb]
-	#
-	def initialize
-		@_root = RouteNode.new
-		@_applied_plugins = []
-		yield self if block_given?
-	end
+  def initialize
+    @_mutex ||= Mutex.new
+    yield self if block_given?
+  end
 
-	# Split a path into parts
-	#
-	# @parameter [String] path
-	#
-	# @returns [Array] parts. Ex. ['users', ':id']
-	#
-	SplitPath = ->(path) { path.split('/').reject(&:empty?) }
-	private_constant :SplitPath
+  HTTP_METHODS.each do |http_method|
+    define_method(http_method.downcase) do |path, &block|
+      add_route(path, http_method, block)
+    end
+  end
 
-	# Call the application
-	#
-	# @parameter [Hash] env
-	#
-	# @returns [Array] response
-	#
-	def call(env)
-		http_method = env[Rack::REQUEST_METHOD].to_sym
-		parts       = SplitPath[env[Rack::PATH_INFO]]
+  def root
+    @root ||= RouteNode.new
+  end
 
-		block, params = @_root.match_route(parts, http_method)
-		return [404, { 'content-type' => 'text/plain' }, ['Not Found']] unless block
+  def app
+    @app ||= begin
+      request_handler = ->(env) { process_request(env) }
 
-		@res = Response.new
-		req  = Request.new(env, params)
+      Rack::Builder.app do
+        run request_handler
+      end
+    end
+  end
 
-		catch(:halt) do
-			instance_exec(req, @res, &block)
-			@res.finish
-		end
-	end
+  def initializer!
+    Bundler.require(:default, ENV["LENNA_ENV"] || "development")
 
-	# Freeze the routes
-	#
-	# @returns [void]
-	#
-	def freeze! = @_root.freeze
+    root.freeze
+    app.freeze
+  end
 
-	# Add a routes
-	#
-	# @parameter [String] path
-	# @parameter [Proc] block
-	#
-	# @returns [void]
-	#
-	def get(path, &block)     = add_route(path, :GET, block)
-	def put(path, &block)     = add_route(path, :PUT, block)
-	def post(path, &block)    = add_route(path, :POST, block)
-	def head(path, &block)    = add_route(path, :HEAD, block)
-	def patch(path, &block)   = add_route(path, :PATCH, block)
-	def delete(path, &block)  = add_route(path, :DELETE, block)
-	def options(path, &block) = add_route(path, :OPTIONS, block)
+  def call(env) = @_mutex.synchronize { app.call(env) }
 
-	# Add plugin to extend the router
-	#
-	# @parameter [String] plugin_name
-	# @parameter [args]  *args
-	# @parameter [Block] block
-	#
-	# @returns [void]
-	#
-	def plugin(plugin_name, *, &)
-		return if @_applied_plugins.include?(plugin_name)
+  def add_route(path, http_method, block)
+    parts = path.split("/").reject(&:empty?)
+    root.add_route(parts, http_method, block)
+  end
 
-		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)
+  private def process_request(env)
+    http_method = env[Rack::REQUEST_METHOD].to_sym
+    parts = env[Rack::PATH_INFO].split("/").reject(&:empty?)
 
-		@_applied_plugins << plugin_name
-	end
+    block, params = root.match_route(parts, http_method)
+    return [404, {"content-type" => Response::ContentType[:TEXT]}, ["Not Found"]] unless block
 
-	# 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)
+    res = Response.new
+    req = Request.new(env, params)
 
-		@_root.merge!(other._root)
+    catch(:halt) do
+      instance_exec(req, res, &block)
+      res.finish
+    end
+  rescue => e
+    [500, {"content-type" => Response::ContentType[:TEXT]}, ["Internal Server Error - #{e.message}"]]
   end
-
-	private
-
-	# Add a route
-	#
-	# @parameter [String] path
-	# @parameter [String] http_method
-	# @parameter [Proc] block
-	#
-	# @returns [void]
-	#
-	def add_route(path, http_method, block)
-		parts = SplitPath[path]
-		@_root.add_route(parts, http_method, block)
-	end
 end

data/license.md

@@ -1,7 +1,6 @@
 # MIT License
 
-Copyright, 2023-2024, by Aristóteles Coutinho.  
-Copyright, 2023, by aristotelesbr.  
+Copyright (c) 2023-2025 Aristótels Coutinho
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal