ruby_routes 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4017abab11dd0945bcfe1659b2ed1456c2cf82a8993db55d094d283c48c8ebd0
-  data.tar.gz: 07f0aba728bf81cdfdc245e20a212f1775b2314a826c88f0e25b8ff2b608c195
+  metadata.gz: fb6b2a38cb8f31bb3e79fa66dbbb1a0620c6eec1f668680e152efe38e7926b42
+  data.tar.gz: db5d62093e15a422d85e6c7ec373327ca1f37fd24f7b851c12bdb2f70cf81622
 SHA512:
-  metadata.gz: a4aa77ba441b9e87cdcb31cae5b5f12babaf93396e400723d5f845392ac132520c4398e19d49d0755e05fc305791b54a3676a460ba8c73cd4b5ee55647fb2589
-  data.tar.gz: a3b883c253731dfad5eaf34a28fb89684d0f9fa921127f6e428225743a93d87934508e49f59c3710964cc8a444b729f9278872aa8d991c4302abbb7ff8645b66
+  metadata.gz: 7e84488c6309cea2dab99be9a350139f2042f3d9601e4a0d1d20eb3d66c5530934f2c4f0c5b384dec7fa3095802f4d710ab2cc4f1a0158486cd5bba618995801
+  data.tar.gz: 0fda0c79e0a935ba9227faba495030c9ff2144ebcc289969eed0a0eb95596d0d69289d1a12b160ef37c18d4021fd5ae172c12b7db48b3beeddb32435e6a2d7ad

data/lib/ruby_routes/constant.rb

@@ -1,3 +1,4 @@
+require_relative 'segments/base_segment'
 require_relative 'segments/dynamic_segment'
 require_relative 'segments/static_segment'
 require_relative 'segments/wildcard_segment'

data/lib/ruby_routes/radix_tree.rb

@@ -36,8 +36,13 @@ module RubyRoutes
     end
 
     def find(path, method, params_out = nil)
+      # Handle nil path and method cases
+      path ||= ''
+      method = method.to_s.upcase if method
+      # Strip query string before matching
+      clean_path = path.split('?', 2).first || ''
       # Fast path: root route
-      if path == '/' || path.empty?
+      if clean_path == '/' || clean_path.empty?
         handler = @root.get_handler(method)
         if @root.is_endpoint && handler
           return [handler, params_out || {}]
@@ -46,7 +51,7 @@ module RubyRoutes
         end
       end
 
-      segments = split_path_cached(path)
+      segments = split_path_cached(clean_path)
       current = @root
       params = params_out || {}
       params.clear if params_out

data/lib/ruby_routes/route.rb

@@ -1,6 +1,7 @@
 require 'uri'
 require 'timeout'
 require 'set'
+require 'rack'
 require_relative 'route/small_lru'
 
 module RubyRoutes
@@ -33,6 +34,7 @@ module RubyRoutes
 
     def extract_params(request_path, parsed_qp = nil)
       path_params = extract_path_params_fast(request_path)
+
       return EMPTY_HASH unless path_params
 
       # Use optimized param building
@@ -103,7 +105,7 @@ module RubyRoutes
     ROOT_PATH = '/'.freeze
     UNRESERVED_RE = /\A[a-zA-Z0-9\-._~]+\z/.freeze
     QUERY_CACHE_SIZE = 128
-    
+
     # Common HTTP methods - interned for performance
     HTTP_GET = 'GET'.freeze
     HTTP_POST = 'POST'.freeze
@@ -220,17 +222,14 @@ module RubyRoutes
       return EMPTY_HASH if @compiled_segments.empty? && request_path == ROOT_PATH
       return nil if @compiled_segments.empty?
 
-      # Fast path normalization
       path_parts = split_path_fast(request_path)
-      
-      # Check if we have a wildcard/splat segment
+
+      # Check for wildcard/splat segment
       has_splat = @compiled_segments.any? { |seg| seg[:type] == :splat }
-      
+
       if has_splat
-        # For wildcard routes, path can have more parts than segments
         return nil if path_parts.size < @compiled_segments.size - 1
       else
-        # For non-wildcard routes, size must match exactly
         return nil if @compiled_segments.size != path_parts.size
       end
 
@@ -238,8 +237,8 @@ module RubyRoutes
     end
 
     def split_path_fast(request_path)
-      # Optimized path splitting
-      path = request_path
+      # Remove query string before splitting
+      path = request_path.split('?', 2).first
       path = path[1..-1] if path.start_with?('/')
       path = path[0...-1] if path.end_with?('/') && path != ROOT_PATH
       path.empty? ? [] : path.split('/')
@@ -268,7 +267,7 @@ module RubyRoutes
       return @defaults if params.empty?
 
       merged = get_thread_local_merged_hash
-      
+
       # Merge defaults first if they exist
       merged.update(@defaults) unless @defaults.empty?
 
@@ -279,7 +278,7 @@ module RubyRoutes
         # Fallback for older Ruby versions
         params.each { |k, v| merged[k.to_s] = v }
       end
-      
+
       merged
     end
 
@@ -307,7 +306,7 @@ module RubyRoutes
 
       # Pre-allocate array for parts to avoid string buffer operations
       parts = []
-      
+
       @compiled_segments.each do |seg|
         case seg[:type]
         when :static
@@ -340,10 +339,13 @@ module RubyRoutes
     # Fast segment encoding with caching for common values
     def encode_segment_fast(str)
       return str if UNRESERVED_RE.match?(str)
-      
+
       # Cache encoded segments to avoid repeated encoding
       @encoding_cache ||= {}
-      @encoding_cache[str] ||= URI.encode_www_form_component(str)
+      @encoding_cache[str] ||= begin
+        # Use URI.encode_www_form_component but replace + with %20 for path segments
+        URI.encode_www_form_component(str).gsub('+', '%20')
+      end
     end
 
     # Optimized query params with caching
@@ -352,7 +354,7 @@ module RubyRoutes
       return EMPTY_HASH unless query_start
 
       query_string = path[(query_start + 1)..-1]
-      return EMPTY_HASH if query_string.empty?
+      return EMPTY_HASH if query_string.empty? || query_string.match?(/^\?+$/)
 
       # Cache query param parsing
       if (cached = @query_cache.get(query_string))
@@ -403,7 +405,7 @@ module RubyRoutes
         when Proc
           # DEPRECATED: Proc constraints are deprecated due to security risks
           warn_proc_constraint_deprecation(param)
-          
+
           # For backward compatibility, still execute but with strict timeout
           begin
             Timeout.timeout(0.05) do  # Reduced timeout for security
@@ -442,23 +444,23 @@ module RubyRoutes
 
     def warn_proc_constraint_deprecation(param)
       return if @proc_warnings_shown&.include?(param)
-      
+
       @proc_warnings_shown ||= Set.new
       @proc_warnings_shown << param
-      
+
       warn <<~WARNING
         [DEPRECATION] Proc constraints are deprecated due to security risks.
-        
+
         Parameter: #{param}
         Route: #{@path}
-        
+
         Secure alternatives:
         - Use regex: constraints: { #{param}: /\\A\\d+\\z/ }
         - Use built-in types: constraints: { #{param}: :int }
         - Use hash constraints: constraints: { #{param}: { min_length: 3, format: /\\A[a-z]+\\z/ } }
-        
+
         Available built-in types: :int, :uuid, :email, :slug, :alpha, :alphanumeric
-        
+
         This warning will become an error in a future version.
       WARNING
     end
@@ -468,23 +470,23 @@ module RubyRoutes
       if constraint[:min_length] && value.length < constraint[:min_length]
         raise RubyRoutes::ConstraintViolation, "Value too short (minimum #{constraint[:min_length]} characters)"
       end
-      
+
       if constraint[:max_length] && value.length > constraint[:max_length]
         raise RubyRoutes::ConstraintViolation, "Value too long (maximum #{constraint[:max_length]} characters)"
       end
-      
+
       if constraint[:format] && !value.match?(constraint[:format])
         raise RubyRoutes::ConstraintViolation, "Value does not match required format"
       end
-      
+
       if constraint[:in] && !constraint[:in].include?(value)
         raise RubyRoutes::ConstraintViolation, "Value not in allowed list"
       end
-      
+
       if constraint[:not_in] && constraint[:not_in].include?(value)
         raise RubyRoutes::ConstraintViolation, "Value in forbidden list"
       end
-      
+
       if constraint[:range] && !constraint[:range].cover?(value.to_i)
         raise RubyRoutes::ConstraintViolation, "Value not in allowed range"
       end

data/lib/ruby_routes/route_set.rb

@@ -73,7 +73,7 @@ module RubyRoutes
         controller: route.controller,
         action: route.action
       }.freeze
-      
+
       insert_cache_entry(cache_key, result)
       result
     end
@@ -143,9 +143,8 @@ module RubyRoutes
 
     # Optimized cache key building - avoid string interpolation
     def build_cache_key(method, path)
-      # Use string interpolation which is faster than buffer + dup + freeze
       # String interpolation creates a new string directly without intermediate allocations
-      "#{method}:#{path}".freeze
+      "#{method}:#{path}"
     end
 
     # Get thread-local params hash, reusing when possible

data/lib/ruby_routes/string_extensions.rb

@@ -14,8 +14,10 @@ class String
     case self
     when /y$/
       self.sub(/y$/, 'ies')
-    when /sh$/, /ch$/, /x$/, /z$/
+    when /sh$/, /ch$/, /x$/
       self + 'es'
+    when /z$/
+      self + 'zes'
     when /s$/
       # Words ending in 's' are already plural
       self

data/lib/ruby_routes/url_helpers.rb

@@ -4,6 +4,7 @@ module RubyRoutes
   module UrlHelpers
     def self.included(base)
       base.extend(ClassMethods)
+      base.include(base.url_helpers)
     end
 
     module ClassMethods
@@ -49,11 +50,11 @@ module RubyRoutes
       # HTML forms only support GET and POST
       # For other methods, use POST with _method hidden field
       form_method = (method == 'get') ? 'get' : 'post'
-      
+
       safe_path = CGI.escapeHTML(path.to_s)
       safe_form_method = CGI.escapeHTML(form_method)
       html = "<form action=\"#{safe_path}\" method=\"#{safe_form_method}\">"
-      
+
       # Add _method hidden field for non-GET/POST methods
       if method != 'get' && method != 'post'
         safe_method = CGI.escapeHTML(method)

data/lib/ruby_routes/version.rb

@@ -1,3 +1,3 @@
 module RubyRoutes
-  VERSION = "2.0.0"
+  VERSION = "2.1.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_routes
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Yosef Benny Widyokarsono
@@ -37,6 +37,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '13.0'
+- !ruby/object:Gem::Dependency
+  name: rack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement