chespirito 0.0.2 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5d3588983bf384783e2066d7bb71175b0fafca6a17c35212526dbbc46f6a5209
-  data.tar.gz: a9a8a41c4bbe2113112cc81428b302427861c5dafab63344a6bb54339a270384
+  metadata.gz: c26d5cfd95f22fdb7fa89e0f16c36cc551f757c4009c42dbd36c95798f27c252
+  data.tar.gz: '09c340a8e1776bf4d33e578ba6475110d84703d2c5a0fc79b3bfff6f45859a75'
 SHA512:
-  metadata.gz: 85db7c0ac953324ed3c0102ec757af300384d1614a99446ed693f376444cf94dfa713ecca0a4cde330be3c0fd7cbc07628d542b571808e17434893fa6ece2a69
-  data.tar.gz: 0bf474e6e562247c38126250bf53b799c66f18a1aeeee451a43c6c5190c83ecc6e0b6156215fea01576269e67f22e9b42d1aa453f189bb8c3751f68fd9ec487f
+  metadata.gz: 75895b71b94768410da2bae31f1969dc7fde2b374c6d45ca9128049b97d7b3571163fe56ebb3f54a36f0f6c0b38cd178d9157dbba71abe403a30e8eeeb9c24d7
+  data.tar.gz: 21684e74e4478c61fe5f56b85c4a31d72e95489fb5a3ebb68a19cada1e46dca52b89e1aac2502632d15b85494cb66e6cc57b769196fe1b01f5649bfb2ea98617

data/README.md

@@ -8,12 +8,13 @@
 [![Ruby Style Guide](https://img.shields.io/badge/code_style-rubocop-brightgreen.svg)](https://github.com/rubocop/rubocop)
 [![Ruby Style Guide](https://img.shields.io/badge/code_style-community-brightgreen.svg)](https://rubystyle.guide)
 ```
-  ______  __    __   _______     _______..______    __  .______       __  .___________.  ______
- /      ||  |  |  | |   ____|   /       ||   _  \  |  | |   _  \     |  | |           | /  __  \
-|  ,----'|  |__|  | |  |__     |   (----`|  |_)  | |  | |  |_)  |    |  | `---|  |----`|  |  |  |
-|  |     |   __   | |   __|     \   \    |   ___/  |  | |      /     |  |     |  |     |  |  |  |
-|  `----.|  |  |  | |  |____.----)   |   |  |      |  | |  |\  \----.|  |     |  |     |  `--'  |
- \______||__|  |__| |_______|_______/    | _|      |__| | _| `._____||__|     |__|      \______/
+       ( )                         _        _ ( )_
+   ___ | |__     __    ___  _ _   (_) _ __ (_)| ,_)   _
+ /'___)|  _ `\ /'__`\/',__)( '_`\ | |( '__)| || |   /'_`\
+( (___ | | | |(  ___/\__, \| (_) )| || |   | || |_ ( (_) )
+`\____)(_) (_)`\____)(____/| ,__/'(_)(_)   (_)`\__)`\___/'
+                           | |
+                           (_)
 ```
 
 [chespirito](https://rubygems.org/gems/chespirito) is a dead simple, yet Rack-compatible, web framework written in Ruby.
@@ -54,6 +55,7 @@ Usage: make <target>
 ## Boostrapping an application using Chespirito and Adelnor
 
 1. Install the gems:
+
 ```bash
 $ gem install chespirito adelnor
 ```
@@ -89,7 +91,7 @@ class HelloController < Chespirito::Controller
 end
 ```
 
-4. Run the app using Adelnor (or you can choose other web server like Puma, Unicorn, etc):
+4. Run the app using Adelnor (or you can choose another web server like Puma, Unicorn, etc):
 
 ```ruby
 Adelnor::Server.run MyApp.application, 3000
@@ -99,4 +101,4 @@ Adelnor::Server.run MyApp.application, 3000
 
 ----
 
-[ASCII art generator](http://patorjk.com/software/taag/#p=display&f=Graffiti&t=Type%20Something%20)
+[ASCII art generator](http://www.network-science.de/ascii/)

data/chespirito.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name        = 'chespirito'
-  spec.version     = '0.0.2'
+  spec.version     = '0.0.4'
   spec.summary     = 'Chespirito Ruby web framework'
   spec.description = 'A dead simple, yet Rack-compatible, web framework written in Ruby'
   spec.authors     = ['Leandro Proença']

data/lib/chespirito/app.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require_relative './request'
-require_relative './router'
+require_relative './routes/router'
 
 module Chespirito
   class App
@@ -15,23 +15,25 @@ module Chespirito
       new.tap { |app| yield(app) }
     end
 
-    def register_route(*attrs)
-      attrs => [verb, path, trait]
-
+    def register_route(verb, path, trait)
       @router.register_route(verb, path, trait)
     end
 
-    def lookup(request) = @router.lookup(request)
+    def register_system_route(key, trait)
+      @router.register_system_route(key, trait)
+    end
+
+    def dispatch(request) = @router.dispatch(request)
 
     def call(env)
-    request  = ::Chespirito::Request.build(env)
-    response = lookup(request)
-
-    [
-      response.status,
-      response.headers,
-      [response.body]
-    ]
+      request  = ::Chespirito::Request.build(env)
+      response = dispatch(request)
+
+      [
+        response.status,
+        response.headers,
+        [response.body]
+      ]
     end
   end
 

data/lib/chespirito/controller.rb

@@ -11,7 +11,7 @@ module Chespirito
       @response = ::Chespirito::Response.new
     end
 
-    def self.dispatch(action, request)
+    def self.process(action, request)
       new(request)
         .tap  { |controller| controller.send(action.to_sym) }
         .then { |controller| controller.response }

data/lib/chespirito/request.rb

@@ -2,6 +2,7 @@
 
 require 'rack'
 require 'json'
+require 'cgi'
 
 module Chespirito
   class Request
@@ -19,7 +20,9 @@ module Chespirito
     def self.build(env)
       rack_request = Rack::Request.new(env)
 
-      body_params = rack_request.post? ? (JSON.parse(rack_request.body.read) rescue {}) : {}
+      body_params = rack_request.post? ? parse_body_params(rack_request.body.read, 
+                                                           rack_request.env['Content-Type']) : {}
+
       params = rack_request.params.merge(body_params)
 
       new(
@@ -30,5 +33,23 @@ module Chespirito
         cookies: rack_request.cookies
       )
     end
+
+    def self.parse_body_params(body_data, content_type)
+      case content_type
+      in 'application/json'; JSON.parse(body_data)
+      in 'application/x-www-form-urlencoded'
+        CGI.unescape(body_data).split('&').each_with_object({}) do |param, hash|
+          key, value = param.split('=')
+          hash[key] = value
+        end
+      else {}
+      end
+    end
+
+    def add_param!(name, value)
+      @params ||= {}
+
+      @params[name] = value
+    end
   end
 end

data/lib/chespirito/routes/route.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Chespirito
+  class Route
+    attr_reader :verb, :path, :controller_klass, :action
+
+    def initialize(*attrs)
+      @verb, @path, @trait = attrs
+      @controller_klass, @action = @trait
+    end
+
+    def key = "#{@verb} #{@path}"
+  end
+
+  class SystemRoute
+    attr_reader :key, :controller_klass, :action
+
+    def initialize(*attrs)
+      @key, @trait = attrs
+      @controller_klass, @action = @trait
+    end
+  end
+end

data/lib/chespirito/routes/route_constraint_checker.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+require_relative './route_utils'
+
+module Chespirito
+  class RouteConstraintChecker
+    def initialize(request)
+      @request = request
+    end
+
+    def match_route?(route)
+      return false unless route.respond_to?(:path)
+      return false if route_constraints(route).empty?
+
+      route_constraints(route).size == request_constraints(route).size
+    end
+
+    def extract_params(route)
+      return {} unless route.respond_to?(:path)
+      return {} unless match_route?(route)
+
+      route_constraints(route)
+        .zip(request_constraints(route))
+        .to_h
+    end
+
+    def route_constraints(route)   = RouteUtils.constraints(route.path)
+    def request_constraints(route) = request_parts - route_parts(route)
+
+    def route_parts(route) = RouteUtils.parts(route.path)
+    def request_parts      = RouteUtils.words(@request.path)
+  end
+end

data/lib/chespirito/routes/route_utils.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Chespirito
+  class RouteUtils
+    class << self
+      def words(path)        = path.split("/").delete_if(&:empty?)
+      def constraints(path)  = words(path).select(&method(:constraint?)).map(&method(:remove_colon))
+      def parts(path)        = words(path).select(&method(:part?))
+      def part?(word)        = !constraint?(word)
+      def constraint?(word)  = word.start_with?(":")
+      def remove_colon(word) = word.gsub(":", '')
+    end
+  end
+end

data/lib/chespirito/routes/router.rb

@@ -0,0 +1,65 @@
+# frozen_string_literal: true
+
+require_relative './route'
+require_relative './route_constraint_checker'
+require_relative '../response'
+
+module Chespirito
+  class Router
+    def initialize
+      @routes = {}
+    end
+
+    def register_route(*attrs)
+      route = Route.new(*attrs)
+
+      @routes[route.key] = route
+    end
+
+    def register_system_route(*attrs)
+      route = SystemRoute.new(*attrs)
+
+      @routes[route.key] = route
+    end
+
+    def dispatch(request)
+      route = route_for(request)
+      return not_found_response unless route
+
+      route
+        .controller_klass
+        .process(route.action, request)
+    end
+
+    def route_for(request)
+      simple_route(request) || constraint_route(request) || not_found_route
+    end
+
+    def simple_route(request)
+      @routes["#{request.verb} #{request.path}"]
+    end
+
+    def constraint_route(request)
+      constraint_checker = RouteConstraintChecker.new(request)
+
+      route = @routes.values.find(&constraint_checker.method(:match_route?))
+      return unless route
+
+      route.tap do
+        constraint_checker
+          .extract_params(route)
+          .each { |(name, value)| request.add_param!(name, value) }
+      end
+    end
+
+    def not_found_route = @routes['404'] || @routes[:not_found]
+
+    def not_found_response
+      ::Chespirito::Response.new.tap do |response|
+        response.status  = 404
+        response.headers = {}
+        response.body    = ''
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chespirito
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.4
 platform: ruby
 authors:
 - Leandro Proença
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-23 00:00:00.000000000 Z
+date: 2023-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -53,12 +53,15 @@ files:
 - lib/chespirito/controller.rb
 - lib/chespirito/request.rb
 - lib/chespirito/response.rb
-- lib/chespirito/router.rb
+- lib/chespirito/routes/route.rb
+- lib/chespirito/routes/route_constraint_checker.rb
+- lib/chespirito/routes/route_utils.rb
+- lib/chespirito/routes/router.rb
 homepage: https://github.com/leandronsp/chespirito
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -73,8 +76,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.3
-signing_key: 
+rubygems_version: 3.4.10
+signing_key:
 specification_version: 4
 summary: Chespirito Ruby web framework
 test_files: []

data/lib/chespirito/router.rb

@@ -1,34 +0,0 @@
-# frozen_string_literal: true
-
-require_relative './request'
-require_relative './response'
-
-module Chespirito
-  class Router
-    def initialize
-      @routes = {}
-    end
-
-    def register_route(verb, path, trait)
-      @routes[route_key(verb, path)] = trait
-    end
-
-    def lookup(request)
-      controller_klass, action = @routes[route_key(request.verb, request.path)]
-
-      return not_found_response unless controller_klass
-
-      controller_klass.dispatch(action, request)
-    end
-
-    def route_key(verb, path) = "#{verb} #{path}"
-
-    def not_found_response
-      ::Chespirito::Response.new.tap do |response|
-        response.status  = 404
-        response.headers = {}
-        response.body    = ''
-      end
-    end
-  end
-end