rackr 0.0.45 → 0.0.46

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b44fd42881233909b8fc9239a9d235c53644bc12bc40c34cf94baf66d73d2f9d
-  data.tar.gz: 7be5769d84a9cb8e7163da17c694481a1412ff9a26d9063fc4894fa647cb291d
+  metadata.gz: a1bf9fdde553e48bee0e503f8a570d877b026d35c5dc6747aaa4c96dec9f692e
+  data.tar.gz: 046d0e28e5f71f518a109402b93c2215e75355c85365d44c6b6e148ab92eae06
 SHA512:
-  metadata.gz: 5d5e78dcd9c0650ccf13d53ba4c3975c128b0f3b1143d0765fd2788a390f9daed89824ab6a70a892a6d9388ec00a44ff577407e75d1b517d505f664037148dab
-  data.tar.gz: 5371f8525a097bd4cc86b6ffcd0be75baf999a13488412eb66c13a8e7e599b65f4b633fb0df04ce2a863c1f787e9ce4b11eaa618b8e3d83e6256fca826b91e61
+  metadata.gz: 0141e4fb96aecd7c62e07a7161c60ac06520ac2259f92629de25858f9d4ab5ba1e3b14666394aa7aca772be1cef74a5a0d8b58afd7c2870f773d6f8e2c69f71f
+  data.tar.gz: bc9cccbdcab47f5cca73bff2e081b6f1e22fe08731331e0e75d33df11a9639df71abf1a20a62ee1c2cfb3e006de1a1a8db24560f9f14137eeecd6e0f50cb6805

data/lib/rackr/action.rb

@@ -8,10 +8,10 @@ class Rackr
   module Action
     def self.included(base)
       base.class_eval do
-        attr_reader :route, :config, :db if self != Rackr
+        attr_reader :routes, :config, :db if self != Rackr
 
-        def initialize(route: nil, config: nil)
-          @route = route
+        def initialize(routes: nil, config: nil)
+          @routes = routes
           @config = config
           @db = config[:db]
         end
@@ -22,7 +22,7 @@ class Rackr
             a_view_params,
             status: status,
             config: config,
-            route: route,
+            routes: routes,
             db: db
           )
         end
@@ -35,7 +35,7 @@ class Rackr
             a_view_params,
             status: status,
             config: config,
-            route: route,
+            routes: routes,
             db: db,
             response_instance: response_instance
           )
@@ -93,7 +93,7 @@ class Rackr
         view_params = {},
         status: 200,
         config: {},
-        route: nil,
+        routes: nil,
         db: nil
       )
         view(
@@ -101,7 +101,7 @@ class Rackr
           view_params,
           status: status,
           config: config,
-          route: route,
+          routes: routes,
           db: db,
           response_instance: true
         )
@@ -112,7 +112,7 @@ class Rackr
         view_params = {},
         status: 200,
         config: {},
-        route: nil,
+        routes: nil,
         db: nil,
         response_instance: false
       )
@@ -138,7 +138,7 @@ class Rackr
           ].join,
           view_params,
           config: config,
-          route: route,
+          routes: routes,
           db: db
         )
 
@@ -194,7 +194,7 @@ class Rackr
       end
 
       # rubocop:disable Lint/UnusedMethodArgument
-      def erb(content, view_params = {}, config: nil, route: nil, db: nil)
+      def erb(content, view_params = {}, config: nil, routes: nil, db: nil)
         @view = OpenStruct.new(view_params)
 
         eval(Erubi::Engine.new(content).src)

data/lib/rackr/router/build_request.rb

@@ -3,8 +3,9 @@
 class Rackr
   class Router
     class BuildRequest
-      def initialize(env)
+      def initialize(env, spplited_request_path)
         @env = env
+        @spplited_request_path = spplited_request_path
       end
 
       def call(route = nil)
@@ -19,14 +20,12 @@ class Rackr
       private
 
       def update_request_params(request, route)
-        splitted_request_path = request.path.split('/')
-
         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 = @spplited_request_path[i]
             param = param.to_i if is_a_integer_string?(param)
 
             update_request_param(request, route_word, param)

data/lib/rackr/router/route.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 class Rackr
   class Router
     class Route
@@ -21,10 +19,11 @@ class Rackr
         @has_befores = befores != []
         @afters = afters
         @has_afters = afters != []
+        @path_regex = /\A#{path.gsub(/(:\w+)/, '([^/]+)')}\z/
       end
 
       def match?(env)
-        return match_with_params?(env) if @has_params
+        return env['PATH_INFO'].match?(@path_regex) if @has_params
 
         env['PATH_INFO'] == @path
       end
@@ -34,25 +33,6 @@ class Rackr
       def fetch_params
         @splitted_path.select { |value| value.start_with? ':' }
       end
-
-      def match_with_params?(env)
-        splitted_request_path = env['PATH_INFO'].split('/')
-
-        return false if @splitted_path.size != splitted_request_path.size
-
-        matched_path_pieces =
-          @splitted_path
-          .map
-          .with_index do |segment, i|
-            if segment.start_with?(':')
-              true
-            else
-              splitted_request_path[i] == segment
-            end
-          end
-
-        !matched_path_pieces.include?(false)
-      end
     end
   end
 end

data/lib/rackr/router.rb

@@ -7,14 +7,14 @@ require_relative 'router/build_request'
 class Rackr
   class Router
     attr_writer :not_found
-    attr_reader :route, :config
+    attr_reader :routes, :config
 
     def initialize(config = {}, before: [], after: [])
-      @routes = {}
+      @instance_routes = {}
       %w[GET POST DELETE PUT TRACE OPTIONS PATCH].each do |method|
-        @routes[method] = { __instances: [] }
+        @instance_routes[method] = { __instances: [] }
       end
-      @route =
+      @routes =
         Hash.new do |_hash, key|
           raise(Errors::UndefinedNamedRouteError, "Undefined named route: '#{key}'")
         end
@@ -28,10 +28,13 @@ class Rackr
       @branches_named_as = {}
       @error = proc { |_req, e| raise e }
       @not_found = proc { [404, {}, ['Not found']] }
+      @splitted_request_path = []
     end
 
     def call(env)
-      request_builder = BuildRequest.new(env)
+      @splitted_request_path = env['PATH_INFO'].split('/')
+
+      request_builder = BuildRequest.new(env, @splitted_request_path)
       env['REQUEST_METHOD'] = 'GET' if env['REQUEST_METHOD'] == 'HEAD'
 
       route_instance = match_route(env)
@@ -90,7 +93,7 @@ class Rackr
 
       return push_to_branch(method.to_s.upcase, route_instance) if @branches.size >= 1
 
-      @routes[method.to_s.upcase][:__instances].push(route_instance)
+      @instance_routes[method.to_s.upcase][:__instances].push(route_instance)
     end
 
     def add_not_found(endpoint)
@@ -111,6 +114,8 @@ class Rackr
       Errors.check_callbacks(branch_befores, name)
       Errors.check_callbacks(branch_afters, name)
 
+      name = ":#{name}" if name.is_a? Symbol
+
       @branches.push(name)
 
       branch_befores = ensure_array(branch_befores)
@@ -138,7 +143,7 @@ class Rackr
       return endpoint.call(content) if endpoint.respond_to?(:call)
 
       if endpoint.include?(Rackr::Action) || endpoint.include?(Rackr::Callback)
-        return endpoint.new(route: @route, config: @config).call(content)
+        return endpoint.new(routes: @routes, config: @config).call(content)
       end
 
       endpoint.new.call(content)
@@ -155,12 +160,12 @@ class Rackr
       nameds_as = [@nameds_as.last].push(as).compact
       return if nameds_as.empty?
 
-      @route[nameds_as.join('_').to_sym] = path_with_branches
+      @routes[nameds_as.join('_').to_sym] = path_with_branches
     end
 
     def push_to_branch(method, route_instance)
       branches_with_slash = @branches + %i[__instances]
-      push_it(@routes[method], *branches_with_slash, route_instance)
+      push_it(@instance_routes[method], *branches_with_slash, route_instance)
     end
 
     def push_it(hash, first_key, *rest_keys, val)
@@ -186,18 +191,18 @@ class Rackr
     end
 
     def match_route(env, last_tail = nil, found_branches = [])
-      routes =
+      instance_routes =
         if last_tail.nil?
-          last_tail = env['PATH_INFO'].split('/').drop(1)
+          last_tail = @splitted_request_path.drop(1)
 
-          @routes[env['REQUEST_METHOD']]
+          @instance_routes[env['REQUEST_METHOD']]
         else
-          @routes[env['REQUEST_METHOD']].dig(*found_branches)
+          @instance_routes[env['REQUEST_METHOD']].dig(*found_branches)
         end
 
       segment, *tail = last_tail
 
-      routes.each do |branch, _v|
+      instance_routes.each do |branch, _v|
         next if branch == :__instances
 
         if segment == branch || branch.start_with?(':')
@@ -207,7 +212,7 @@ class Rackr
       end
 
       if tail.empty? || found_branches == []
-        return @routes[env['REQUEST_METHOD']].dig(
+        return @instance_routes[env['REQUEST_METHOD']].dig(
           *(found_branches << :__instances)
         )
           &.detect { |route_instance| route_instance.match?(env) }

data/lib/rackr.rb

@@ -19,8 +19,8 @@ class Rackr
     @router
   end
 
-  def route
-    @router.route
+  def routes
+    @router.routes
   end
 
   def config

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rackr
 version: !ruby/object:Gem::Version
-  version: 0.0.45
+  version: 0.0.46
 platform: ruby
 authors:
 - Henrique F. Teixeira