rack-http_router 0.0.33 → 0.0.35

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c0c64f3cfa73ac4138ffda97860742253fe931eb53de45281627a58def572c54
-  data.tar.gz: 369489457adc954e84ffb7fd8c30eb9cfdea5ec3e44e64eda8a310df04779928
+  metadata.gz: 4e7eb090e26635738162faa639dae1abd812fe0b5491f4767ae3bdfd8f8db36e
+  data.tar.gz: cf2d047dd885c51b8e45506835d03890502ab98a801065953cf06a2e516969e6
 SHA512:
-  metadata.gz: 796e12240f741f5b5f771a0b97b433a79f1c2d28a0d72d6db27470d78f22ddcbcb4a20207665912af65ab6351ffd1e7b26c2901366c7553a2b8842e0bb82d1d9
-  data.tar.gz: 858a3256bbe6f8e2910a5934b7fe71f2d83276e30a0735e769f83f7d1d72aded1d45d3587ca0c6c1e7c9a07c857b92bd6d32ce8d8422cf3a7a05463606969ed5
+  metadata.gz: a79812b7fb6d9d93f78d3e4dae086ee14e39036a6f0a82b946d6c68b0b0b3de3f9e0945e6fedad92efb51ccb2d4665bdfdc565cd4e9718efe400fe449a17152a
+  data.tar.gz: f5619bcb193f626bbc0b191798391b63e02a5eb98e04da9f63775f2e69665d502b92536dd5c6dee56feefbeed894132334abc1fcddef9bf10b4accd2ecf0da89

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
@@ -44,6 +44,10 @@ module Rack
         end
       end
 
+      def assign(obj, hash)
+        Rack::HttpRouter::Action.assign(obj, hash)
+      end
+
       def html(content, status: 200)
         Rack::HttpRouter::Action.html(content, status: status)
       end
@@ -85,6 +89,14 @@ module Rack
       end
 
       class << self
+        def assign(obj, hash)
+          hash.each do |k, v|
+            obj.define_singleton_method(k) { v }
+          end
+
+          obj
+        end
+
         def html(content, status: 200)
           [status, { 'Content-Type' => 'text/html' }, [content]]
         end
@@ -122,9 +134,9 @@ module Rack
           response_instance: false
         )
           erb = if paths.is_a?(Array)
-                  paths.map { |path| erb("views/#{path}", config, route, db, view_params) }.join
+                  paths.map { |path| erb("#{config.dig(:views, :path) || "views"}/#{path}", config, route, db, view_params) }.join
                 else
-                  erb("views/#{paths}", config, route, db, view_params)
+                  erb("#{config.dig(:views, :path) || "views"}/#{paths}", config, route, db, view_params)
                 end
 
           if response_instance
@@ -139,12 +151,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' }
           )

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.33
+  version: 0.0.35
 platform: ruby
 authors:
 - Henrique F. Teixeira
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-07-28 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