lennarb 0.4.4 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 00b277c3ca70e4b15e74cb88d343915623d6ae869d4c98b15f46cf6cd286821d
-  data.tar.gz: c539aa17c39cd2d861e2bfc16b8ae1b76c1d4e37304f95e918ded2235e8c7a82
+  metadata.gz: 888f84e566de65f5c87013ff56ac3fe485f59acba6f1cc39862178894cf101fa
+  data.tar.gz: 8703693e316b83f747f927c23b07d56f6dd571f813d8c00901432cf6c941d1f2
 SHA512:
-  metadata.gz: ab79db446aab1914aa18146f5b0f8814c68296f04fc7b300af3ac9e0079b11f002b284402335a03acba3a2d63d039c54ce20396e84b1c60b3cc9dfadbeb5f860
-  data.tar.gz: d16922a8773b300d364c2db69b3925555dfa3d29f91a4018c2d887360dd0cdb36c5b9c3a0821a4b6044bb14586d739ae4ce98168e6bdcb9e9a6d82a494337fe0
+  metadata.gz: bc83791eb32ad87b5aa772f375b048829d794d35bdea5c5d1d083dc4a2e8b27560b313c79f51ca7a3a7084d73cc4ddeb9fb17a29a33a211bd53db57090af791a
+  data.tar.gz: a1fb09a73e8610d562cb4f4ea5e2ce1a07ffa68f4574363f07700b0e1004823fb5f1003d6cf6276fec2eb0002894ddf4dce7c7e4c4b55773bbb729a96ec74f4c

data/changelog.md

@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.4.4] - 2024-04-02
+
+### Added
+
+- Add `Lennarb::Router` module to manage the routes in the project. Now, the `Lennarb` class is the main class of the project.
+
 ## [0.4.3] - 2024-04-01
 
 ### Added

data/lib/lennarb/application/base.rb

@@ -0,0 +1,236 @@
+# frozen_string_literal: true
+
+# Released under the MIT License.
+# Copyright, 2023-2024, by Aristóteles Coutinho.
+
+class Lennarb
+	module Application
+		class Base
+			# @attribute [r] _route
+			# @returns [RouteNode]
+			#
+			# @attribute [r] _middlewares
+			# @returns [Array]
+			#
+			# @attribute [r] _global_after_hooks
+			# @returns [Array]
+			#
+			# @attribute [r] _global_before_hooks
+			# @returns [Array]
+			#
+			# @attribute [r] _after_hooks
+			# @returns [RouteNode]
+			#
+			# @attribute [r] _before_hooks
+			# @returns [RouteNode]
+			#
+			attr_accessor :_route, :_global_after_hooks, :_global_before_hooks, :_after_hooks, :_before_hooks
+
+			# Initialize the Application
+			#
+			# @returns [Base]
+			#
+			def self.inherited(subclass)
+				subclass.instance_variable_set(:@_route, Lennarb.new)
+				subclass.instance_variable_set(:@_middlewares, [])
+				subclass.instance_variable_set(:@_global_after_hooks, [])
+				subclass.instance_variable_set(:@_global_before_hooks, [])
+				subclass.instance_variable_set(:@_after_hooks, Lennarb::RouteNode.new)
+				subclass.instance_variable_set(:@_before_hooks, Lennarb::RouteNode.new)
+			end
+
+			def self.get(...)     = @_route.get(...)
+			def self.put(...)     = @_route.put(...)
+			def self.post(...)    = @_route.post(...)
+			def self.head(...)    = @_route.head(...)
+			def self.match(...)   = @_route.match(...)
+			def self.patch(...)   = @_route.patch(...)
+			def self.delete(...)  = @_route.delete(...)
+			def self.options(...) = @_route.options(...)
+
+			# @returns [Array] middlewares
+			def self.middlewares = @_middlewares
+
+			# Use a middleware
+			#
+			# @parameter [Object] middleware
+			# @parameter [Array] args
+			# @parameter [Block] block
+			#
+			# @returns [Array] middlewares
+			#
+			def self.use(middleware, *args, &block)
+				@_middlewares << [middleware, args, block]
+			end
+
+			# Add a before hook
+			#
+			# @parameter [String] path
+			# @parameter [Block] block
+			#
+			def self.before(path = nil, &block)
+				if path
+					parts = path.split('/').reject(&:empty?)
+					@_before_hooks.add_route(parts, :before, block)
+				else
+					@_global_before_hooks << block
+				end
+			end
+
+			# Add a after hook
+			#
+			# @parameter [String] path
+			# @parameter [Block] block
+			#
+			def self.after(path = nil, &block)
+				if path
+					parts = path.split('/').reject(&:empty?)
+					@_after_hooks.add_route(parts, :after, block)
+				else
+					@_global_after_hooks << block
+				end
+			end
+
+			# Call the application
+			#
+			# @parameter [Hash] env
+			#
+			# @returns [Array] response
+			#
+			def self.call(env)
+				response =
+					catch(:halt) do
+						execute_hooks(@_before_hooks, env, :before)
+
+						res = @_route.call(env)
+
+						execute_hooks(@_after_hooks, env, :after)
+						res
+					end
+
+				case response
+				in [404 | 404, _, _] if html_request?(env) && File.exist?('public/404.html')
+					env['PATH_INFO'] = '/404.html'
+					Rack::Static.new(-> { response }, urls: ['/404.html'], root: 'public').call(env)
+				in [404 | 404, _, _] then response
+				else
+					response.is_a?(Array) ? response : response.finish
+				end
+			end
+
+			# Run the Application
+			#
+			# @returns [Base] self
+			#
+			# When you use this method, the application will be frozen. And you can't add more routes after that.
+			# This method is used to run the application in a Rack server so, you can use the `rackup` command to run the application.
+			# Ex. rackup -p 3000
+			# This command will use the following middleware:
+			#  - Rack::ShowExceptions
+			#  - Rack::Lint
+			#  - Rack::MethodOverride
+			#  - Rack::Head
+			#  - Rack::ContentLength
+			#  - Rack::Static
+			#
+			def self.run!
+				stack = Rack::Builder.new
+
+				use Rack::ShowExceptions
+				use Rack::Lint
+				use Rack::MethodOverride
+				use Rack::Head
+				use Rack::ContentLength
+				use Rack::Static,
+								root: 'public',
+								urls: ['/404.html'],
+								header_rules: [
+									[200, %w[html], { 'content-type' => 'text/html; charset=utf-8' }]
+								]
+
+				middlewares.each do |(middleware, args, block)|
+					stack.use(middleware, *args, &block)
+				end
+
+				stack.run @_route
+
+				@_route.freeze!
+
+				@_route = stack.to_app.freeze
+
+				self
+			end
+
+			# Redirect to a path
+			#
+			# @parameter [String] path
+			# @parameter [Integer] status default is 302
+			# @parameter [Hash] env (optional)
+			#
+			def self.redirect(path, status = 302, _env = nil)
+				response = Rack::Response.new([], status, 'location' => path)
+				throw :halt, response.finish
+			end
+
+			# Execute the hooks
+			#
+			# @parameter [RouteNode] hook_route
+			# @parameter [Hash] env
+			# @parameter [Symbol] action
+			#
+			# @returns [void]
+			#
+			def self.execute_hooks(hook_route, env, action)
+				execute_global_hooks(env, action)
+
+				execute_route_hooks(hook_route, env, action)
+			end
+
+			# Execute the global hooks
+			#
+			# @parameter [Hash] env
+			# @parameter [Symbol] action
+			#
+			# @returns [void]
+			#
+			def self.execute_global_hooks(env, action)
+				global_hooks = action == :before ? @_global_before_hooks : @_global_after_hooks
+				global_hooks.each { |hook| hook.call(env) }
+			end
+
+			# Execute the route hooks
+			#
+			# @parameter [RouteNode] hook_route
+			# @parameter [Hash] env
+			# @parameter [Symbol] action
+			#
+			# @returns [void]
+			#
+			def self.execute_route_hooks(hook_route, env, action)
+				parts = parse_path(env)
+				return unless parts
+
+				block, = hook_route.match_route(parts, action)
+				block&.call(env)
+			end
+
+			# Parse the path
+			#
+			# @parameter [Hash] env
+			#
+			# @returns [Array] parts
+			#
+			def self.parse_path(env) = env[Rack::PATH_INFO]&.split('/')&.reject(&:empty?)
+
+			# Check if the request is a HTML request
+			#
+			# @parameter [Hash] env
+			#
+			# @returns [Boolean]
+			#
+			def self.html_request?(env) = env['HTTP_ACCEPT']&.include?('text/html')
+
+			private_class_method :execute_hooks, :execute_global_hooks, :execute_route_hooks, :parse_path, :html_request?
+		end
+	end
+end

data/lib/lennarb/response.rb

@@ -125,6 +125,8 @@ class Lennarb
 		def redirect(path, status = 302)
 			@headers[LOCATION] = path
 			@status = status
+
+			throw :halt, finish
 		end
 
 		# Finish the response

data/lib/lennarb/version.rb

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

data/lib/lennarb.rb

@@ -12,10 +12,10 @@ require 'rack'
 
 # Base class for Lennarb
 #
+require_relative 'lennarb/application/base'
 require_relative 'lennarb/request'
 require_relative 'lennarb/response'
 require_relative 'lennarb/route_node'
-require_relative 'lennarb/router'
 require_relative 'lennarb/version'
 
 class Lennarb
@@ -26,7 +26,7 @@ class Lennarb
 	# @attribute [r] root
 	# @returns [RouteNode]
 	#
-	attr_reader :root
+	attr_reader :_root
 
 	# Initialize the application
 	#
@@ -35,7 +35,7 @@ class Lennarb
 	# @returns [Lennarb]
 	#
 	def initialize
-		@root = RouteNode.new
+		@_root = RouteNode.new
 		yield self if block_given?
 	end
 
@@ -58,7 +58,7 @@ class Lennarb
 		http_method = env[Rack::REQUEST_METHOD].to_sym
 		parts       = SplitPath[env[Rack::PATH_INFO]]
 
-		block, params = @root.match_route(parts, http_method)
+		block, params = @_root.match_route(parts, http_method)
 		return [404, { 'content-type' => 'text/plain' }, ['Not Found']] unless block
 
 		@res = Response.new
@@ -66,36 +66,15 @@ class Lennarb
 
 		catch(:halt) do
 			instance_exec(req, @res, &block)
-			finish!
+			@res.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
+	def freeze! = @_root.freeze
 
 	# Add a routes
 	#
@@ -124,6 +103,6 @@ class Lennarb
 	#
 	def add_route(path, http_method, block)
 		parts = SplitPath[path]
-		@root.add_route(parts, http_method, block)
+		@_root.add_route(parts, http_method, block)
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lennarb
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.5.0
 platform: ruby
 authors:
 - Aristóteles Coutinho
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-04-03 00:00:00.000000000 Z
+date: 2024-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -44,6 +44,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.8
+- !ruby/object:Gem::Dependency
+  name: rack-protection
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
+- !ruby/object:Gem::Dependency
+  name: rack-session
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: bake
   requirement: !ruby/object:Gem::Requirement
@@ -180,10 +208,10 @@ files:
 - changelog.md
 - exe/lenna
 - lib/lennarb.rb
+- lib/lennarb/application/base.rb
 - 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
@@ -211,7 +239,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.3
+rubygems_version: 3.5.9
 signing_key:
 specification_version: 4
 summary: A lightweight and experimental web framework for Ruby.

data/lib/lennarb/router.rb

@@ -1,33 +0,0 @@
-# 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