lennarb 0.4.1 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0e395a91c3650883770feaf41c00a2be532f9ac0b3919a6ed26fcc4758ae3319
-  data.tar.gz: 25f09b0d53fb906eee6cd73197b970a01213a64ee4e8e0052e8bc73dca506d0b
+  metadata.gz: 00b277c3ca70e4b15e74cb88d343915623d6ae869d4c98b15f46cf6cd286821d
+  data.tar.gz: c539aa17c39cd2d861e2bfc16b8ae1b76c1d4e37304f95e918ded2235e8c7a82
 SHA512:
-  metadata.gz: 034171202b487ef2b9de9fd21995df2918f6e4da6427088c665644646f34e8d3d4e4238b8708de2fb89a3303fd9d3d3f334c8402ee66ba70fdb889f8be7eca00
-  data.tar.gz: 66308251d5eaf6361f8e4d464858a068dfeaa49051d2cfb1157e2ca52a21338639ba7af8ceb92bba15ca8bbed76124a493c30d58563b1c0403fc403c0946ad87
+  metadata.gz: ab79db446aab1914aa18146f5b0f8814c68296f04fc7b300af3ac9e0079b11f002b284402335a03acba3a2d63d039c54ce20396e84b1c60b3cc9dfadbeb5f860
+  data.tar.gz: d16922a8773b300d364c2db69b3925555dfa3d29f91a4018c2d887360dd0cdb36c5b9c3a0821a4b6044bb14586d739ae4ce98168e6bdcb9e9a6d82a494337fe0

data/changelog.md

@@ -5,6 +5,56 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [Unreleased]
+
+## [0.4.3] - 2024-04-01
+
+### Added
+
+### Remove
+
+- Remove `Lennarb::ApplicationBase` class from the project. Now, the `Lennarb` class is the main class of the project.
+
+### Changed
+
+- Improve performance of the RPS (Requests per second), memory and CPU usage.
+- Change the `finish` method from `Lennarb` class to call `halt(@res.finish)` method to finish the response.
+
+## [0.4.2] - 2024-08-02
+
+### Added
+
+- Add `header` and `options` methods to `Lennarb` and `Lennarb::ApplicatiobBase`.
+
+### Fix
+
+- Fix Content-Length header to be the length of the body in the response.
+
+## [0.4.1] - 2024-08-02
+
+### Change
+
+- Change behavior of `Lennarb::ApplicationBase` class to be the base class of the `Lennarb` class. Now, the `Lennarb` class is a subclass of `Lennarb::ApplicationBase` class.
+
+That permits to create a new application with the `Lennarb::ApplicationBase` class and use http methods to create the routes. Ex.
+
+```rb
+# app.rb
+
+require 'lennarb'
+
+class MyApp < Lennarb::ApplicationBase
+	get '/hello' do |req, res|
+		res.html('Hello World')
+	end
+end
+```
+
+### Removed
+
+- Remove `Lennarb::Application` module from the project. Now, the `Lennarb` class is the main class of the project.
+
+
 ## [0.4.0] - 2024-07-02
 
 ### Added

data/lib/lennarb/response.rb

@@ -80,7 +80,7 @@ class Lennarb
 		def write(str)
 			str = str.to_s
 			@length += str.bytesize
-			@headers[CONTENT_LENGTH] ||= @length.to_s
+			@headers[CONTENT_LENGTH] = @length.to_s
 			@body << str
 		end
 

data/lib/lennarb/router.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+# Released under the MIT License.
+# Copyright, 2023-2024, by Aristóteles Coutinho.
+
+class Lennarb
+	# This module must be included in the class that will use the router.
+	#
+	module Router
+		def self.included(base)
+			base.extend(ClassMethods)
+			base.instance_variable_set(:@router, Lennarb.new)
+			base.define_singleton_method(:router) do
+				base.instance_variable_get(:@router)
+			end
+		end
+
+		module ClassMethods
+			# Helper method to define a route
+			#
+			# returns [Lennarb] instance of the router
+			#
+			def route = router
+
+			# Use this in congi.ru to start the application
+			#
+			def app
+				router.freeze!
+				router
+			end
+		end
+	end
+end

data/lib/lennarb/version.rb

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

data/lib/lennarb.rb

@@ -15,6 +15,7 @@ require 'rack'
 require_relative 'lennarb/request'
 require_relative 'lennarb/response'
 require_relative 'lennarb/route_node'
+require_relative 'lennarb/router'
 require_relative 'lennarb/version'
 
 class Lennarb
@@ -27,7 +28,6 @@ class Lennarb
 	#
 	attr_reader :root
 
-	@routes = []
 	# Initialize the application
 	#
 	# @yield { ... } The application
@@ -55,19 +55,48 @@ class Lennarb
 	# @returns [Array] response
 	#
 	def call(env)
-		http_method = env.fetch('REQUEST_METHOD').to_sym
-		parts       = SplitPath[env.fetch('PATH_INFO')]
+		http_method = env[Rack::REQUEST_METHOD].to_sym
+		parts       = SplitPath[env[Rack::PATH_INFO]]
 
 		block, params = @root.match_route(parts, http_method)
 		return [404, { 'content-type' => 'text/plain' }, ['Not Found']] unless block
 
-		res = Response.new
-		req = Request.new(env, params)
-		instance_exec(req, res, &block)
+		@res = Response.new
+		req  = Request.new(env, params)
 
-		res.finish
+		catch(:halt) do
+			instance_exec(req, @res, &block)
+			finish!
+		end
 	end
 
+	# Finish the request
+	#
+	# @returns [Array] Response
+	#
+	def finish! = halt(@res.finish)
+
+	# Immediately stops the request and returns `response`
+	# as per Rack's specification.
+	#
+	#     halt([200, { "Content-Type" => "text/html" }, ["hello"]])
+	#     halt([res.status, res.headers, res.body])
+	#     halt(res.finish)
+	#
+	# @parameter [Array] response
+	#
+	# @returns [Array] response
+	#
+	def halt(response)
+		throw(:halt, response)
+	end
+
+	# Freeze the routes
+	#
+	# @returns [void]
+	#
+	def freeze! = @root.freeze
+
 	# Add a routes
 	#
 	# @parameter [String] path
@@ -75,11 +104,13 @@ class Lennarb
 	#
 	# @returns [void]
 	#
-	def get(path, &block)    = add_route(path, :GET, block)
-	def post(path, &block)   = add_route(path, :POST, block)
-	def put(path, &block)    = add_route(path, :PUT, block)
-	def patch(path, &block)  = add_route(path, :PATCH, block)
-	def delete(path, &block) = add_route(path, :DELETE, block)
+	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)
 
 	private
 
@@ -95,59 +126,4 @@ class Lennarb
 		parts = SplitPath[path]
 		@root.add_route(parts, http_method, block)
 	end
-
-	# Base class for Lennarb applications
-	#
-	class ApplicationBase < Lennarb
-		@routes = []
-
-		class << self
-			attr_reader :routes
-
-			# Add a route
-			#
-			# @parameter [String] path
-			# @parameter [Proc] block
-			#
-			# @returns [void]
-			#
-			%i[get post put patch delete].each do |http_method|
-				define_method(http_method) do |path, &block|
-					routes << { method: http_method, path:, proc: block }
-				end
-			end
-		end
-
-		# Inherited hook
-		#
-		# @parameter [Class] subclass
-		#
-		# @returns [void]
-		#
-		def self.inherited(subclass)
-			super
-			subclass.instance_variable_set(:@routes, routes.dup)
-		end
-
-		# Initialize the application
-		#
-		# @returns [ApplicationBase]
-		#
-		def initialize
-			super
-			setup_routes
-		end
-
-		private
-
-		# Setup the routes
-		#
-		# @returns [void]
-		#
-		def setup_routes
-			self.class.routes.each do |route_info|
-				__send__(route_info[:method], route_info[:path], &route_info[:proc])
-			end
-		end
-	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lennarb
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.4
 platform: ruby
 authors:
 - Aristóteles Coutinho
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-02-08 00:00:00.000000000 Z
+date: 2024-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -120,14 +120,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: '13.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: '13.1'
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
@@ -183,6 +183,7 @@ files:
 - lib/lennarb/request.rb
 - lib/lennarb/response.rb
 - lib/lennarb/route_node.rb
+- lib/lennarb/router.rb
 - lib/lennarb/version.rb
 - license.md
 - readme.md
@@ -210,7 +211,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.5
+rubygems_version: 3.5.3
 signing_key:
 specification_version: 4
 summary: A lightweight and experimental web framework for Ruby.