syntropy 0.27.5 → 0.27.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f5c258eb1b8a3c19dc13f545ffe5af87763e48d461d96dd9c3a1d11aa211ccf7
-  data.tar.gz: 0cf9bb42be816f61316084483284417f13e07a17771a3c4ea3ad23e34df8f30a
+  metadata.gz: dec1337a818afc63d7160fe0aa771dfd12c0128c69307ebb9a2d87a8f4410d7d
+  data.tar.gz: dc4dccd65ac6dfacd5d16cd8b2294a7a52f07727fccf5c41da27a259bc9ab4c2
 SHA512:
-  metadata.gz: 82e2c6c9e36b63baa98a3bf31de19c543e9f748a2b1b636146bc12c4525a61df2acc5f605b787677967f679b5a39cdfdf7c0b13a97f6317797e8c1fac3fca657
-  data.tar.gz: fc27a9f9a452420a265e9f00261be025e70b8f47e97d21055706533bc543906ba74c43ddbd8903da1637ff8a3b46f6f89aabeaf07787537ef1a31bd30e6ce1c7
+  metadata.gz: 589ac7d942379ceef292ba87eeee8cc01329eeb8abc8b627d8259fe02b7ec3e455b3c55fb956b438b0261564c47d122d87b4b759d8e42fe91719d526ad475846
+  data.tar.gz: dc6b9a9a530525f73e443cb407bdeb487c063fb6d7bafd4992144d3e22f8e92362c2b9e290f0b050b28e6f8b40468c6ad23786d8aa56d0900e71fce926dcbfe2

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+# 0.27.7 2025-11-03
+
+- Update UringMachine, TP2
+- Optimize router generated code
+
+# 0.27.6 2025-10-30
+
+- Redirect automatically on trailing slash
+
 # 0.27.5 2025-10-28
 
 - Update Papercraft

data/lib/syntropy/app.rb

@@ -64,8 +64,14 @@ module Syntropy
     # @param req [Qeweney::Request] HTTP request
     # @return [void]
     def call(req)
-      route = @router_proc.(req.path, req.route_params)
-      raise Syntropy::Error.not_found('Not found') if !route
+      path = req.path
+      route = @router_proc.(path, req.route_params)
+      if !route
+        if (m = path.match(/^(.+)\/$/))
+          return req.redirect(m[1], Qeweney::Status::MOVED_PERMANENTLY)
+        end
+        raise Syntropy::Error.not_found('Not found')
+      end
 
       req.route = route
       proc = route[:proc] ||= compute_route_proc(route)
@@ -74,7 +80,7 @@ module Syntropy
       @logger&.error(
         message: "Error while serving request: #{e.message}",
         method: req.method,
-        path: req.path,
+        path: path,
         error: e
       ) if Error.log_error?(e)
       error_handler = get_error_handler(route)

data/lib/syntropy/routing_tree.rb

@@ -548,22 +548,30 @@ module Syntropy
         end
       end
 
-      # Get next segment
-      emit_code_line(buffer, "#{ws}case (p = parts[#{segment_idx}])")
+      return if !entry[:target] && !entry[:children]
 
-      # In case of no next segment
-      emit_code_line(buffer, "#{ws}when nil")
-      if entry[:target]
+      if entry[:target] && entry[:handle_subtree] && !entry[:children]
         map = entry[:static] ? '@static_map' : '@dynamic_map'
-        emit_code_line(buffer, "#{ws}  return #{map}[#{entry[:path].inspect}]")
-      else
-        emit_code_line(buffer, "#{ws}  return nil")
+        emit_code_line(buffer, "#{ws}return #{map}[#{entry[:path].inspect}]")
+        return
       end
 
+      case_buffer = +''
+      if entry[:target]
+        emit_code_line(case_buffer, "#{ws}when nil")
+        map = entry[:static] ? '@static_map' : '@dynamic_map'
+        emit_code_line(case_buffer, "#{ws}  return #{map}[#{entry[:path].inspect}]")
+      end
       if entry[:children]
-        emit_routing_tree_entry_children_clauses(buffer:, entry:, indent:, segment_idx:)
+        emit_routing_tree_entry_children_clauses(buffer: case_buffer, entry:, indent:, segment_idx:)
+      end
+
+      # Get next segment
+      if !case_buffer.empty?
+        emit_code_line(buffer, "#{ws}case (p = parts[#{segment_idx}])")
+        buffer << case_buffer
+        emit_code_line(buffer, "#{ws}end")
       end
-      emit_code_line(buffer, "#{ws}end")
     end
 
     # Returns the first target found in the given entry's subtree.
@@ -607,6 +615,7 @@ module Syntropy
       ws = ' ' * (indent * 2)
 
       param_entry = entry[:children]['[]']
+      when_count = 0
       entry[:children].each do |k, child_entry|
         # skip if wildcard entry (treated in else clause below)
         next if k == '[]'
@@ -626,19 +635,33 @@ module Syntropy
           child_path = child_entry[:path]
           route_value = "@dynamic_map[#{child_path.inspect}]"
           emit_code_line(buffer, "#{ws}  return #{route_value}#{if_clause}")
+          when_count += 1
 
         elsif has_children
           # otherwise look at the next segment
           next if is_void_route?(child_entry) && !param_entry
 
-          emit_code_line(buffer, "#{ws}when #{k.inspect}")
-          visit_routing_tree_entry(buffer:, entry: child_entry, indent: indent + 1, segment_idx: segment_idx + 1)
+          when_buffer = +''
+          visit_routing_tree_entry(buffer: when_buffer, entry: child_entry, indent: indent + 1, segment_idx: segment_idx + 1)
+          if when_buffer.empty? && param_entry
+            emit_code_line(when_buffer, "#{ws}  return nil")
+          end
+          if !when_buffer.empty?
+            emit_code_line(buffer, "#{ws}when #{k.inspect}")
+            buffer << when_buffer
+            when_count += 1
+          end
         end
       end
 
       # parametric route
       if param_entry
-        emit_code_line(buffer, "#{ws}else")
+        if when_count == 0
+          emit_code_line(buffer, "#{ws}when p")
+        else
+          emit_code_line(buffer, "#{ws}else")
+        end
+
         emit_code_line(buffer, "#{ws}  params[#{param_entry[:param].inspect}] = p")
         visit_routing_tree_entry(buffer:, entry: param_entry, indent: indent + 1, segment_idx: segment_idx + 1)
       # wildcard route

data/lib/syntropy/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Syntropy
-  VERSION = '0.27.5'
+  VERSION = '0.27.7'
 end

data/syntropy.gemspec

@@ -25,8 +25,8 @@ Gem::Specification.new do |s|
   s.add_dependency 'json',          '~>2.15.1'
   s.add_dependency 'papercraft',    '~>3.1.0'
   s.add_dependency 'qeweney',       '~>0.24'
-  s.add_dependency 'tp2',           '~>0.19.1'
-  s.add_dependency 'uringmachine',  '~>0.19'
+  s.add_dependency 'tp2',           '~>0.19.2'
+  s.add_dependency 'uringmachine',  '~>0.19.1'
 
   s.add_dependency 'listen',        '~>3.9.0'
   s.add_dependency 'logger',        '~>1.7.0'

data/test/test_app.rb

@@ -122,6 +122,12 @@ class AppTest < Minitest::Test
     assert_equal Status::INTERNAL_SERVER_ERROR, req.response_status
   end
 
+  def test_automatic_redirect_on_trailing_slash    
+    req = make_request(':method' => 'GET', ':path' => '/test/rss/')
+    assert_equal Status::MOVED_PERMANENTLY, req.response_status
+    assert_equal '/test/rss', req.response_headers['Location']
+  end
+
   def test_app_file_watching
     @machine.sleep 0.3
 

data/test/test_routing_tree.rb

@@ -569,6 +569,4 @@ class RoutingTreeWildcardIndexTest < Minitest::Test
     route = router.('/docs/bars/about', {})
     assert_nil route
   end
-
-
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: syntropy
 version: !ruby/object:Gem::Version
-  version: 0.27.5
+  version: 0.27.7
 platform: ruby
 authors:
 - Sharon Rosner
@@ -71,28 +71,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.19.1
+        version: 0.19.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.19.1
+        version: 0.19.2
 - !ruby/object:Gem::Dependency
   name: uringmachine
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.19'
+        version: 0.19.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.19'
+        version: 0.19.1
 - !ruby/object:Gem::Dependency
   name: listen
   requirement: !ruby/object:Gem::Requirement