rackr 0.0.58 → 0.0.60

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5014c37c092dde5f043f96ff04bef8c53fdd9bc2df76233a23a0a8dd957be3f1
-  data.tar.gz: 0cab424f6b8edb7f5e12ea2cfd05c7ac00be0df6c240affaacb57df2ca972040
+  metadata.gz: 56bb48ce2a38e77c44d84d7ee7537b144bff11293a6162750d497a392d5a2d6d
+  data.tar.gz: 1698e4e88202736612dfcb27d974f414eaf6dbafd62c40433fd33472b638e53e
 SHA512:
-  metadata.gz: 7664d3fa655aea2dcbde6b9456bfd2e6ea0c2876cf47d060cc808519276b8e8e7244493360a2912449573fc422c15390a4afbe201c90c46311879065e9b4227a
-  data.tar.gz: 1582549edba2bbca7dca30635106faed13cf28b01ef6941b31ebe745711494d91fab86ce3d4a76e115e56f9a5a141e73860a4f67ab3fc7b6836342d1a255363a
+  metadata.gz: 68e05e6048d84a6fdf937d6950f15b2d19d9a510e79aaa4a2bb6e375a19fd6b16788172b66e2b3752293eca89218600b319dfd146657e40fd893a619ba7a6083
+  data.tar.gz: 2d2cb75c23f21f1d317496e6cf066c74e20f7d13cdf199f754571ba03e77fcd5a72bf253f798fa1dd24a1c434614e8b790652bad8f53591fc374d5043ebfbdbf

data/lib/rackr/action.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require 'byebug'
 require 'erubi'
 require 'oj'
 require 'rack'
@@ -8,17 +7,17 @@ require 'rack'
 class Rackr
   module Action
     RENDER = {
-      html: lambda do |val, **opts|
-        [opts[:status] || 200, { 'content-type' => 'text/html' }.merge(opts[:headers] || {}), [val]]
+      html: lambda do |val, status: 200, headers: {}, html: nil|
+        [status, { 'content-type' => 'text/html', 'content-length' => val.bytesize.to_s }.merge(headers), [val]]
       end,
-      text: lambda do |val, **opts|
-        [opts[:status] || 200, { 'content-type' => 'text/plain' }.merge(opts[:headers] || {}), [val]]
+      text: lambda do |val, status: 200, headers: {}, text: nil|
+        [status, { 'content-type' => 'text/plain', 'content-length' => val.bytesize.to_s }.merge(headers), [val]]
       end,
-      json: lambda do |val, **opts|
+      json: lambda do |val, status: 200, headers: {}, json: nil|
         val = Oj.dump(val, mode: :compat) unless val.is_a?(String)
-        [opts[:status] || 200, { 'content-type' => 'application/json' }.merge(opts[:headers] || {}), [val]]
+        [status, { 'content-type' => 'application/json', 'content-length' => val.bytesize.to_s }.merge(headers), [val]]
       end
-    }
+    }.freeze
 
     def self.included(base)
       base.class_eval do
@@ -34,7 +33,7 @@ class Rackr
           type = opts.keys.first
           content = opts[type]
 
-          Rackr::Action::RENDER[type]&.(content, **opts) || _render_view(content, **opts)
+          Rackr::Action::RENDER[type]&.call(content, **opts) || _render_view(content, **opts)
         end
 
         def view_response(
@@ -93,7 +92,8 @@ class Rackr
             )
           end
 
-          [status, { 'content-type' => 'text/html' }.merge(headers), [parsed_erb]]
+          [status, { 'content-type' => 'text/html', 'content-length' => parsed_erb.bytesize.to_s }.merge(headers),
+           [parsed_erb]]
         end
 
         def load_json(val)
@@ -103,7 +103,8 @@ class Rackr
         end
 
         def html_response(content = '', status: 200, headers: {})
-          Rack::Response.new(content, status, { 'content-type' => 'text/html' }.merge(headers))
+          Rack::Response.new(content, status,
+                             { 'content-type' => 'text/html', 'content-length' => content.bytesize.to_s }.merge(headers))
         end
 
         def json_response(content = {}, status: 200, headers: {})
@@ -111,7 +112,7 @@ class Rackr
           Rack::Response.new(
             content,
             status,
-            { 'content-type' => 'application/json' }.merge(headers)
+            { 'content-type' => 'application/json', 'content-length' => content.bytesize.to_s }.merge(headers)
           )
         end
 
@@ -119,7 +120,7 @@ class Rackr
           Rack::Response.new(
             content,
             status,
-            { 'content-type' => 'text/plain' }.merge(headers)
+            { 'content-type' => 'text/plain', 'content-length' => content.bytesize.to_s }.merge(headers)
           )
         end
 

data/lib/rackr/router.rb

@@ -200,6 +200,12 @@ class Rackr
     end
 
     def match_route(request_method)
+      find_instance_in_scope = proc do |request_method, found_scopes|
+        @instance_routes[request_method].dig(
+          *(found_scopes + [:__instances])
+        )&.detect { |route_instance| route_instance.match?(@current_request_path_info) }
+      end
+
       last_tail = @splitted_request_path_info.drop(1)
       found_scopes = []
 
@@ -217,10 +223,7 @@ class Rackr
             instance_routes = @instance_routes[request_method].dig(*found_scopes)
             break
           elsif scope.start_with?(':')
-            found_route = @instance_routes[request_method].dig(
-              *(found_scopes + [:__instances])
-            )&.detect { |route_instance| route_instance.match?(@current_request_path_info) }
-
+            found_route = find_instance_in_scope.(request_method, found_scopes)
             return found_route if found_route
 
             found_scopes << scope
@@ -230,9 +233,14 @@ class Rackr
         end
       end
 
-      @instance_routes[request_method].dig(
-        *(found_scopes + [:__instances])
-      )&.detect { |route_instance| route_instance.match?(@current_request_path_info) }
+      result_route = find_instance_in_scope.(request_method, found_scopes)
+
+      if result_route == nil && !found_scopes.empty?
+        found_scopes.shift
+        result_route = find_instance_in_scope.(request_method, found_scopes)
+      end
+
+      result_route
     end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: rackr
 version: !ruby/object:Gem::Version
-  version: 0.0.58
+  version: 0.0.60
 platform: ruby
 authors:
 - Henrique F. Teixeira
 bindir: bin
 cert_chain: []
-date: 2025-03-30 00:00:00.000000000 Z
+date: 2025-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erubi