chespirito 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5d3588983bf384783e2066d7bb71175b0fafca6a17c35212526dbbc46f6a5209
-  data.tar.gz: a9a8a41c4bbe2113112cc81428b302427861c5dafab63344a6bb54339a270384
+  metadata.gz: 8c4d6e5d80eb4af70ff671777425f063aa79ea43125e68c453ddb1be96f14abd
+  data.tar.gz: 0bb3fcbd997da246fa75b009517a8b53c8e57dffd2cd539db9c925179c5ba33f
 SHA512:
-  metadata.gz: 85db7c0ac953324ed3c0102ec757af300384d1614a99446ed693f376444cf94dfa713ecca0a4cde330be3c0fd7cbc07628d542b571808e17434893fa6ece2a69
-  data.tar.gz: 0bf474e6e562247c38126250bf53b799c66f18a1aeeee451a43c6c5190c83ecc6e0b6156215fea01576269e67f22e9b42d1aa453f189bb8c3751f68fd9ec487f
+  metadata.gz: ed1632d57adc92b16534f172e79de97003a3a97bb1698d330d0517de467722cb495993b563a9ae203f51000d2a58ccd8f64514a86b02d5a2d882effce6ea2852
+  data.tar.gz: 1f850630a40f3da4f642d30f3ce4ee0b81143889ecd47ee3cad57aa11b587cce30c6e8c119305f3e638403cbdfae6238739dd135b80295c2636381397a918beb

data/chespirito.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name        = 'chespirito'
-  spec.version     = '0.0.2'
+  spec.version     = '0.0.3'
   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,17 +15,19 @@ 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 = dispatch(request)
 
     [
       response.status,

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

@@ -30,5 +30,11 @@ module Chespirito
         cookies: rack_request.cookies
       )
     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.3
 platform: ruby
 authors:
 - Leandro Proença
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-05-23 00:00:00.000000000 Z
+date: 2022-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -53,7 +53,10 @@ 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

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