rackr 0.0.46 → 0.0.48

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a1bf9fdde553e48bee0e503f8a570d877b026d35c5dc6747aaa4c96dec9f692e
-  data.tar.gz: 046d0e28e5f71f518a109402b93c2215e75355c85365d44c6b6e148ab92eae06
+  metadata.gz: 17ea0ba90cd0ee285862c06535ce35a2965a475e0e46994057c40af7631fd082
+  data.tar.gz: 858b1c9b70af9a250ecf46cb7bc7020735bccf6d2c9da9948dc2b60038ce939d
 SHA512:
-  metadata.gz: 0141e4fb96aecd7c62e07a7161c60ac06520ac2259f92629de25858f9d4ab5ba1e3b14666394aa7aca772be1cef74a5a0d8b58afd7c2870f773d6f8e2c69f71f
-  data.tar.gz: bc9cccbdcab47f5cca73bff2e081b6f1e22fe08731331e0e75d33df11a9639df71abf1a20a62ee1c2cfb3e006de1a1a8db24560f9f14137eeecd6e0f50cb6805
+  metadata.gz: e3ac8005daa702a46140afeec59bb7cd2f339c6a12dce1468ca8e3c4b447b68ac00068b76807594365db54bc32a0d7ca219d42389098c0fac7d3b53346eb4856
+  data.tar.gz: 57059e5130445514fc26f7972ed9c972835798e666a262372b2f5e1797e938ba01aa5a68649ebcff431afa149e2069b7646212eb6a4ba1a939e35e347b2aca2f

data/lib/rackr/router.rb

@@ -14,18 +14,20 @@ class Rackr
       %w[GET POST DELETE PUT TRACE OPTIONS PATCH].each do |method|
         @instance_routes[method] = { __instances: [] }
       end
-      @routes =
-        Hash.new do |_hash, key|
+      http_methods = HTTP_METHODS.map { |m| m.downcase.to_sym }
+      @routes = Struct.new(*http_methods).new
+      http_methods.each do |method|
+        @routes.send("#{method}=", Hash.new do |_hash, key|
           raise(Errors::UndefinedNamedRouteError, "Undefined named route: '#{key}'")
-        end
+        end)
+      end
+
       @config = config
       @branches = []
       @befores = ensure_array(before)
       @branches_befores = {}
       @afters = ensure_array(after)
       @branches_afters = {}
-      @nameds_as = []
-      @branches_named_as = {}
       @error = proc { |_req, e| raise e }
       @not_found = proc { [404, {}, ['Not found']] }
       @splitted_request_path = []
@@ -81,7 +83,7 @@ class Rackr
       method = :get if method == :head
 
       path_with_branches = "/#{@branches.join('/')}#{put_path_slash(path)}"
-      add_named_route(path_with_branches, as)
+      add_named_route(method, path_with_branches, as)
 
       route_instance =
         Route.new(
@@ -108,9 +110,8 @@ class Rackr
       @error = endpoint
     end
 
-    def append_branch(name, branch_befores: [], branch_afters: [], as: nil)
+    def append_branch(name, branch_befores: [], branch_afters: [])
       Errors.check_branch_name(name)
-      Errors.check_as(as, @branches.join('/'))
       Errors.check_callbacks(branch_befores, name)
       Errors.check_callbacks(branch_afters, name)
 
@@ -125,15 +126,11 @@ class Rackr
       branch_afters = ensure_array(branch_afters)
       @afters.concat(branch_afters)
       @branches_afters[name] = branch_afters
-
-      @nameds_as.push(as)
-      @branches_named_as[name] = as
     end
 
     def clear_last_branch
       @befores -= @branches_befores[@branches.last]
       @afters -= @branches_afters[@branches.last]
-      @nameds_as -= [@branches_named_as[@branches.last]]
       @branches = @branches.first(@branches.size - 1)
     end
 
@@ -156,11 +153,12 @@ class Rackr
       [list]
     end
 
-    def add_named_route(path_with_branches, as)
-      nameds_as = [@nameds_as.last].push(as).compact
-      return if nameds_as.empty?
+    def add_named_route(method, path_with_branches, as)
+      return @routes.send(method.downcase)[:root] = path_with_branches if path_with_branches == '/'
+      return @routes.send(method.downcase)[as] = path_with_branches unless as.nil?
 
-      @routes[nameds_as.join('_').to_sym] = path_with_branches
+      key = path_with_branches.sub("/","").gsub(":","").gsub("/","_")
+      @routes.send(method.downcase)["#{key}".to_sym] = path_with_branches
     end
 
     def push_to_branch(method, route_instance)

data/lib/rackr.rb

@@ -7,6 +7,8 @@ require_relative 'rackr/callback'
 class Rackr
   class NotFound < StandardError; end
 
+  HTTP_METHODS = %w[GET POST DELETE PUT TRACE OPTIONS PATCH]
+
   include Action
 
   def initialize(config = {}, before: [], after: [])
@@ -31,12 +33,11 @@ class Rackr
     @router.config[:db]
   end
 
-  def r(name, before: [], after: [], as: nil, &block)
+  def r(name, before: [], after: [], &block)
     @router.append_branch(
       name,
       branch_befores: before,
       branch_afters: after,
-      as: as
     )
     instance_eval(&block)
 
@@ -59,8 +60,11 @@ class Rackr
     end
   end
 
-  %w[GET POST DELETE PUT TRACE OPTIONS PATCH].each do |http_method|
-    define_method(http_method.downcase.to_sym) do |path = '', endpoint = -> {}, as: nil, before: nil, after: nil, &block|
+  HTTP_METHODS.each do |http_method|
+    define_method(http_method.downcase.to_sym) do |*params, before: [], after: [], as: nil, &block|
+      path = params[0] || ''
+      endpoint = params[1] || ''
+
       if block.respond_to?(:call)
         @router.add(
           http_method,
@@ -71,6 +75,11 @@ class Rackr
           route_afters: after
         )
       else
+        if path.is_a?(Module) && path.include?(Action)
+          endpoint = path
+          path = ''
+        end
+
         @router.add(
           http_method,
           path,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rackr
 version: !ruby/object:Gem::Version
-  version: 0.0.46
+  version: 0.0.48
 platform: ruby
 authors:
 - Henrique F. Teixeira
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-26 00:00:00.000000000 Z
+date: 2024-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erubi
@@ -75,7 +75,7 @@ homepage: https://github.com/henrique-ft/rackr
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -90,8 +90,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.3
-signing_key: 
+rubygems_version: 3.5.16
+signing_key:
 specification_version: 4
 summary: A complete http router solution that fit well with pure rack apps.
 test_files: []