RubyGems - rackr - Versions diffs - 0.0.59 → 0.0.61 - Mend

rackr 0.0.59 → 0.0.61

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (5) hide show

checksums.yaml +4 -4
data/lib/rackr/router/errors/dev_html.rb +46 -58
data/lib/rackr/router.rb +15 -7
data/lib/rackr.rb +1 -1
metadata +2 -22

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f0717bfcd3ef76fb167d5d9c607677f2519aaefea78e1824e10722d8ab4880af
-  data.tar.gz: d188f6a38ad01a10263d2d7595b92082efec01a51fd228936453766de782e81f
+  metadata.gz: 958ebe9d9710051bd7966c749bde46693f549b69161f8c2e5fb65df7904defbc
+  data.tar.gz: ce2f52c33670ca35905baad636f541c55d6928dcbdca222fee53e08198f51e62
 SHA512:
-  metadata.gz: 1e94b33c2376a0cd03cd2e893f6b9bae62fb9ab84623e807b8a7f4cefd56c81173a3b530eee305faf471687e467e41221584fe74fbf97fd2bb6b535e9cfaf6b6
-  data.tar.gz: 425c353eb81a4831e0e0bcdf208cc4cb07eadbeaa593e5dca0029e063a17b91cf482528ad0eedde2a5622672ef3c04f4a3214d827ba3a64f79d75fcaa91de46b
+  metadata.gz: 9c54346652bd2b53f1edf2442407c33b443304762e67f368d80d1a98545557c2de26becb6164dc56739c81f5eae680feaf0a5ce09c6476028a4960da390f0fb9
+  data.tar.gz: 2c8f9223a603858d38af27d78ffb3d6123186d3302ab79bc86de33ee87848ffc179f1e6a9bd115db15c6b317c9289eaa165653deaaa881baaab5c236ee99dbc3

data/lib/rackr/router/errors/dev_html.rb CHANGED Viewed

@@ -1,79 +1,68 @@
 # frozen_string_literal: true
-require 'html_slice'
 class Rackr
   class Router
     module Errors
       class DevHtml
         include Rackr::Action
-        include ::HtmlSlice
         def call(env)
-          html_layout do
-            tag :head do
-              title 'Application error'
-              _ '<style>
-                    html * { padding:0; margin:0; }
-                    body * { padding:10px 20px; }
-                    body * * { padding:0; }
-                    body { font:small sans-serif; }
-                    body>div { border-bottom:1px solid #ddd; }
-                    h1 { font-weight:normal; }
-                    h2 { margin-bottom:.8em; }
-                    h2 span { font-size:80%; color:#666; font-weight:normal; }
-                    #summary { background: #ffc; }
-                    #summary h2 { font-weight: normal; color: #666; }
-                    pre {
-                      background: #f8f8f8;
-                      padding: 1em;
-                      margin-bottom: 1em;
-                    }
-              </style>'
-            end
-            tag :body do
-              div id: 'summary' do
-                h1 env['error'].class.to_s
-                if env['error'].message.size > 1000
-                  h2 "#{env['error'].message.slice(0, 1000)} ..."
-                else
-                  h2 env['error'].message
-                end
-              end
-              div id: 'backtrace' do
-                backtrace(env)
-              end
-            end
-          end
+          render(html: <<-HTML
+            <!DOCTYPE html>
+            <html>
+            <head>
+              <title>Application error</title>
+              <style>
+                html * { padding:0; margin:0; }
+                body * { padding:10px 20px; }
+                body * * { padding:0; }
+                body { font:small sans-serif; }
+                body>div { border-bottom:1px solid #ddd; }
+                h1 { font-weight:normal; }
+                h2 { margin-bottom:.8em; }
+                h2 span { font-size:80%; color:#666; font-weight:normal; }
+                #summary { background: #ffc; }
+                #summary h2 { font-weight: normal; color: #666; }
+                #backtrace { background: #eee; }
+                pre {
+                  background: #ddd;
+                  padding: 1em;
+                  margin-bottom: 1em;
+                }
+                p {
+                  font-family: monospace;
+                }
+              </style>
+            </head>
+            <body>
+              <div id="summary">
+                <h1>#{env['error'].class}</h1>
+                <h2>#{env['error'].message.size > 1000 ? "#{env['error'].message.slice(0, 1000)} ..." : env['error'].message}</h2>
+              </div>
+              <div id="backtrace">
+                #{backtrace(env)}
+              </div>
+            </body>
+            </html>
+          HTML
+                )
         end
         def backtrace(env)
           first, *tail = env['error'].backtrace
-          h2 do
-            _ 'Traceback '
-            span '(innermost first)'
-          end
-          tag :p, first, class: 'first-p'
-          br
+          traceback = String.new("<h2>Traceback <span>(innermost first)</span></h2>")
+          traceback << "<p class=\"first-p\">#{first}</p><br/>"
           line_number = extract_line_number(first)
-          match = first.match(%r{^(/[\w/.-]+)})
+          match = first.match(%r{^(/[[\w/.-]]+)})
           file_path = (match ? match[1] : nil)
           unless file_path.nil?
-            lines = []
-            File.open(file_path) do |file|
-              lines = file.readlines
-            end
-            lines.map!.with_index do |line, i|
-              "#{i + 1}: #{line} \n"
-            end
-            tag :pre, slice_around_index(lines, line_number).join('').chomp
+            lines = File.readlines(file_path).map.with_index { |line, i| "#{i + 1}: #{line}" }
+            traceback << "<pre>#{slice_around_index(lines, line_number).join('')}</pre>"
           end
-          tag :p, tail.join("\n")
+          traceback << "<p>#{tail.join("<br>")}</p>"
+          traceback
         end
         def extract_line_number(input)
@@ -89,7 +78,6 @@ class Rackr
           start_index = [index - 2, 0].max
           end_index = [index + 2, array.size - 1].min
-          # Slice the array
           array[start_index..end_index]
         end
       end

data/lib/rackr/router.rb CHANGED Viewed

@@ -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

data/lib/rackr.rb CHANGED Viewed

@@ -66,7 +66,7 @@ class Rackr
     const_name = name.to_s.capitalize
     id ||= :id
-    scope name do
+    scope name.to_s do
       get Object.const_get("Actions::#{const_name}::Index") if Object.const_defined?("Actions::#{const_name}::Index")
       get 'new', Object.const_get("Actions::#{const_name}::New") if Object.const_defined?("Actions::#{const_name}::New")
       post Object.const_get("Actions::#{const_name}::Index") if Object.const_defined?("Actions::#{const_name}::Index")

metadata CHANGED Viewed

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: rackr
 version: !ruby/object:Gem::Version
-  version: 0.0.59
+  version: 0.0.61
 platform: ruby
 authors:
 - Henrique F. Teixeira
 bindir: bin
 cert_chain: []
-date: 2025-03-31 00:00:00.000000000 Z
+date: 2025-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erubi
@@ -57,26 +57,6 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '4.0'
-- !ruby/object:Gem::Dependency
-  name: html_slice
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '1.0'
 description: A complete, simple and easy web micro-framework.
 email: hriqueft@gmail.com
 executables: []