rack-http_router 0.0.32 → 0.0.34

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b8cff48c0ee5cfa89a5de1274be3303220345822527d05a090be207148a8b9b5
-  data.tar.gz: 60aa48e2d132770c406419b713582b0c7f88a5d833fbc48763a29ed8d58989b0
+  metadata.gz: 540161f25e3b163ac4fa031715aeb5fa88d08d18fa4e2064f531929a1cc5a71a
+  data.tar.gz: 4902e738c689c9e83d4fc8147da221187e86318a699545c6f81052d6d267d93a
 SHA512:
-  metadata.gz: 26edd2abbaff17cab89906192014d14e151aca4edd6f6cd7f81d8e8e2ed674d129e728ccdd87ff8e7557ba88ae1323084dca434b8fd06643f501a476cf9a46fc
-  data.tar.gz: 6ce7a9c0fd92aaa12e9a7065c28594b20ac9af89634e34cef962b421ae4c702863c917ce1154c55f0854e4e0108ec2bdc52ef40ee6d00d66f923a4406fc60aca
+  metadata.gz: a28d4e0c6173d667f69c11d48472e9c2766398aae894757fc2d8a87b3f3026d4c502c2a2a9d7582659fef5e7f8e31c1a0fe10af3f341b291757e8b2624cf87af
+  data.tar.gz: fe5f4cc387c3296b98ba1ec1e832cd8c8bed3ef44a64d25e772dedc5ec3095122f109b0233d1e65477692881e8a0fbfa75f937198812c57a81eee151999f9df0

data/lib/rack-http_router/action.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'erubi'
-require 'json'
+require 'oj'
 require 'rack'
 
 module Rack
@@ -21,7 +21,10 @@ module Rack
             Rack::HttpRouter::Action.view_response(
               a_path,
               a_view_params,
-              status: status, route: route
+              status: status,
+              config: config,
+              route: route,
+              db: db
             )
           end
 
@@ -31,7 +34,11 @@ module Rack
             Rack::HttpRouter::Action.view(
               a_path,
               a_view_params,
-              status: status, response_instance: response_instance, route: route
+              status: status,
+              config: config,
+              route: route,
+              db: db,
+              response_instance: response_instance
             )
           end
         end
@@ -86,12 +93,22 @@ module Rack
           Rack::Response.new(content, status, { 'Content-Type' => 'text/html' })
         end
 
-        def view_response(paths, view_params = {}, status: 200, route: nil)
+        def view_response(
+          paths,
+          view_params = {},
+          status: 200,
+          config: {},
+          route: nil,
+          db: nil
+        )
           view(
             paths,
             view_params,
-            status: status, response_instance: true,
-            route: route
+            status: status,
+            config: config,
+            route: route,
+            db: db,
+            response_instance: true
           )
         end
 
@@ -99,13 +116,15 @@ module Rack
           paths,
           view_params = {},
           status: 200,
-          response_instance: false,
-          route: nil
+          config: {},
+          route: nil,
+          db: nil,
+          response_instance: false
         )
           erb = if paths.is_a?(Array)
-                  paths.map { |path| erb("views/#{path}", route, view_params) }.join
+                  paths.map { |path| erb("#{config.dig(:views, :path) || "views"}/#{path}", config, route, db, view_params) }.join
                 else
-                  erb("views/#{paths}", route, view_params)
+                  erb("#{config.dig(:views, :path) || "views"}/#{paths}", config, route, db, view_params)
                 end
 
           if response_instance
@@ -120,12 +139,12 @@ module Rack
         end
 
         def json(content = {}, status: 200)
-          [status, { 'Content-Type' => 'application/json' }, [content.to_json]]
+          [status, { 'Content-Type' => 'application/json' }, [Oj.dump(content, mode: :compat)]]
         end
 
         def json_response(content = {}, status: 200)
           Rack::Response.new(
-            content.to_json,
+            Oj.dump(content, mode: :compat),
             status,
             { 'Content-Type' => 'application/json' }
           )
@@ -143,11 +162,13 @@ module Rack
           )
         end
 
-        def erb(path, _route, view_params = {})
+        # rubocop:disable Lint/UnusedMethodArgument
+        def erb(path, config, route, db, view_params = {})
           @view = OpenStruct.new(view_params)
 
           eval(Erubi::Engine.new(::File.read("#{path}.html.erb")).src)
         end
+        # rubocop:enable Lint/UnusedMethodArgument
 
         def redirect_response(url)
           Rack::Response.new(

data/lib/rack-http_router/router/build_request.rb

@@ -22,18 +22,20 @@ module Rack
         def update_request_params(request, route)
           splitted_request_path = request.path.split('/')
 
-          route
-            .splitted_path
-            .each
-            .with_index do |route_word, route_word_position|
-              if route_word.start_with?(':')
-                param = splitted_request_path[route_word_position]
-                param = param.to_i if is_a_integer_string?(param)
-
-                update_request_param(request, route_word, param)
-              end
+          i = 0
+
+          while i < route.splitted_path.size
+            route_word = route.splitted_path[i]
+            if route_word.start_with?(':')
+              param = splitted_request_path[i]
+              param = param.to_i if is_a_integer_string?(param)
+
+              update_request_param(request, route_word, param)
             end
 
+            i += 1
+          end
+
           request
         end
 

data/lib/rack-http_router/router/route.rb

@@ -4,14 +4,16 @@ module Rack
   class HttpRouter
     class Router
       class Route
-        attr_reader :endpoint, :splitted_path, :has_params
+        attr_reader :endpoint, :splitted_path, :has_params, :has_befores, :befores
 
-        def initialize(path, endpoint)
+        def initialize(path, endpoint, befores = [])
           @path = path
           @splitted_path = @path.split('/')
           @endpoint = endpoint
           @params = fetch_params
           @has_params = @params != []
+          @befores = befores
+          @has_befores = befores != []
         end
 
         def match?(env)

data/lib/rack-http_router/router.rb

@@ -20,6 +20,8 @@ module Rack
           end
         @config = config
         @scopes = []
+        @befores = []
+        @scopes_befores = {}
         @error = proc { |_req, e| raise e }
         @not_found = proc { [404, {}, ['Not found']] }
       end
@@ -32,29 +34,40 @@ module Rack
 
         return render_not_found(request_builder.call) if route_instance.nil?
 
-        if route_instance.endpoint.respond_to?(:call)
-          return route_instance.endpoint.call(
-            request_builder.call(route_instance)
-          )
-        end
+        rack_request = request_builder.call(route_instance)
 
-        if route_instance.endpoint.include?(Rack::HttpRouter::Action)
-          return route_instance.endpoint.new(route: @route, config: @config)
-            .call(request_builder.call(route_instance))
+        befores = route_instance.befores
+        before_result = nil
+        i = 0
+        while i < befores.size
+          before_result = call_endpoint(befores[i], rack_request)
+          return before_result unless before_result.is_a?(Rack::Request)
+
+          i += 1
         end
 
-        route_instance.endpoint.new.call(request_builder.call(route_instance))
+        call_endpoint(route_instance.endpoint, before_result || rack_request)
       rescue Exception => e
         @error.call(request_builder.call, e)
       end
 
+      def call_endpoint(endpoint, rack_request)
+        return endpoint.call(rack_request) if endpoint.respond_to?(:call)
+
+        if endpoint.include?(Rack::HttpRouter::Action)
+          return endpoint.new(route: @route, config: @config).call(rack_request)
+        end
+
+        endpoint.new.call(rack_request)
+      end
+
       def add(method, path, endpoint, as = nil)
         method = :get if method == :head
 
         path_with_scopes = "/#{@scopes.join('/')}#{put_path_slash(path)}"
         @route[as] = path_with_scopes if as
 
-        route_instance = Route.new(path_with_scopes, endpoint)
+        route_instance = Route.new(path_with_scopes, endpoint, @befores)
 
         if @scopes.size >= 1
           return push_to_scope(method.to_s.upcase, route_instance)
@@ -71,11 +84,15 @@ module Rack
         @error = endpoint
       end
 
-      def append_scope(name)
+      def append_scope(name, befores = [])
         @scopes.push(name)
+        befores = [befores] unless befores.is_a?(Array)
+        @befores.concat(befores)
+        @scopes_befores[name] = befores
       end
 
       def clear_last_scope
+        @befores -= @scopes_befores[@scopes.last]
         @scopes = @scopes.first(@scopes.size - 1)
       end
 
@@ -133,7 +150,7 @@ module Rack
           return @routes[env['REQUEST_METHOD']].dig(
             *(found_scopes << :__instances)
           )
-            .detect { |route_instance| route_instance.match?(env) }
+            &.detect { |route_instance| route_instance.match?(env) }
         end
 
         match_route(env, tail, found_scopes)

data/lib/rack-http_router.rb

@@ -29,8 +29,8 @@ module Rack
       @router.config[:db]
     end
 
-    def scope(name, &block)
-      @router.append_scope(name)
+    def scope(name, before: [], &block)
+      @router.append_scope(name, before)
       instance_eval(&block)
 
       @router.clear_last_scope

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rack-http_router
 version: !ruby/object:Gem::Version
-  version: 0.0.32
+  version: 0.0.34
 platform: ruby
 authors:
 - Henrique F. Teixeira
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-07-25 00:00:00.000000000 Z
+date: 2023-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erubi
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.12'
+- !ruby/object:Gem::Dependency
+  name: oj
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.15'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.15'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement