ruby_routes 2.4.0 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 57b9470b49019746492c10fd0e202c6c544c78459f36e0d2c1f8d400103def93
-  data.tar.gz: 8e59a14f7854cadb955d381fcf7947b7769d0041de5067f3e3dc5827d13cbb26
+  metadata.gz: 07fa3c9d3d13ac8b73c6f4775871cd5ad6c3cd7c5d0e571797b83fb0dea72189
+  data.tar.gz: 2684722163772fe4489d4e8c32eaff036002c5b58e05be68e25e9a0c59cd680b
 SHA512:
-  metadata.gz: c746c95407c222fdd209e464c3f1b89971987d8b41a557b7f173e1acb55fa5d6626b030bab26aed81c7ff766bd9da8c4ba4c2895ce167558a61c089923e14f12
-  data.tar.gz: 6b512f5e810f19fa4031b33f29d3efa72feabb841e8ac3558af67ce6ec43556cacc85577993015cde7f3f400c10e9a36cbc8e007831808a798fa80204fd57046
+  metadata.gz: dfc84b5cfa67c1da89ab8067ad01c8706c81717611969c287a4a536055fe1ee1b4ac80b791248c05dddb090548f1e29006889d2d7f5e91b9058349b9f9a8b317
+  data.tar.gz: b2ab1c86ca6838a4164621987c813b7320e3f042d1666576e00c3acf48576204c837fd13582ed42f2cf896334b9e1683c8ceab8868c03b7f9a482dcb808a5052

data/lib/ruby_routes/constant.rb

@@ -107,6 +107,8 @@ module RubyRoutes
     # @return [Integer]
     QUERY_CACHE_SIZE = 128
 
+    METHOD_CACHE_MAX_SIZE = 1000
+
     # HTTP method constants.
     HTTP_GET     = 'GET'
     HTTP_POST    = 'POST'
@@ -146,7 +148,7 @@ module RubyRoutes
     # Default result for no traversal match.
     #
     # @return [Array]
-    NO_TRAVERSAL_RESULT = [nil, false, {}].freeze
+    NO_TRAVERSAL_RESULT = [nil, false, EMPTY_HASH].freeze
 
     # Built-in validators for constraints.
     #
@@ -171,7 +173,7 @@ module RubyRoutes
       segment_string = raw.to_s
       dispatch_key   = segment_string.empty? ? :default : segment_string.getbyte(0)
       factory        = DESCRIPTOR_FACTORIES[dispatch_key] || DESCRIPTOR_FACTORIES[:default]
-      factory.call(segment_string)
+      factory.call(segment_string).freeze
     end
   end
 end

data/lib/ruby_routes/node.rb

@@ -3,6 +3,7 @@
 require_relative 'segment'
 require_relative 'utility/path_utility'
 require_relative 'utility/method_utility'
+require_relative 'constant'
 
 module RubyRoutes
   # Node

data/lib/ruby_routes/radix_tree/finder.rb

@@ -96,7 +96,10 @@ module RubyRoutes
       # @return [Array] [next_node, stop_traversal, segment_captured]
       def traverse_for_segment(node, segment, index, segments, params, captured_params)
         next_node, stop, segment_captured = node.traverse_for(segment, index, segments, params)
-        captured_params.merge!(segment_captured) if segment_captured
+        if segment_captured
+          params.merge!(segment_captured)  # Merge into running params hash at each step
+          captured_params.merge!(segment_captured)  # Keep for best candidate consistency
+        end
         [next_node, stop]
       end
 
@@ -162,9 +165,7 @@ module RubyRoutes
       # @param params [Hash] parameters hash
       # @param captured_params [Hash] captured parameters from traversal
       # @return [Array] [handler, params] or [nil, params]
-      def fallback_candidate(state, method, params, captured_params)
-        finalize_match(state[:best_node], method, state[:best_params], state[:best_captured])
-      end
+
 
       # Common method to finalize a match attempt.
       # Assumes the node is already validated as an endpoint.
@@ -175,20 +176,18 @@ module RubyRoutes
       # @param captured_params [Hash] captured parameters from traversal
       # @return [Array] [handler, params] or [nil, params]
       def finalize_match(node, method, params, captured_params)
+        # Apply captured params once at the beginning
+        apply_captured_params(params, captured_params)
+
         if node && endpoint_with_method?(node, method)
           handler = node.handlers[method]
-          # Apply captured params before constraint validation
-          apply_captured_params(params, captured_params)
           if check_constraints(handler, params)
             return [handler, params]
           end
         end
         # For non-matching paths, return nil
-        apply_captured_params(params, captured_params)
         [nil, params]
       end
-
-      # Handles matching for the root path.
       #
       # @param method [String] HTTP method
       # @param params_out [Hash] parameters hash

data/lib/ruby_routes/radix_tree/inserter.rb

@@ -46,6 +46,7 @@ module RubyRoutes
       # @return [Node] the dynamic child node
       def handle_dynamic(current_node, token)
         param_name = token[1..]
+        raise ArgumentError, "Dynamic parameter name cannot be empty" if param_name.nil? || param_name.empty?
         current_node.dynamic_child ||= build_param_node(param_name)
         current_node.dynamic_child
       end

data/lib/ruby_routes/route/constraint_validator.rb

@@ -66,6 +66,8 @@ module RubyRoutes
           validate_alpha_constraint(value)
         when 'alphanumeric'
           validate_alphanumeric_constraint(value)
+        else
+          invalid!
         end
       end
 

data/lib/ruby_routes/route/param_support.rb

@@ -2,6 +2,7 @@
 
 require_relative 'path_generation'
 require_relative 'warning_helpers'
+require_relative 'constraint_validator'
 
 module RubyRoutes
   class Route

data/lib/ruby_routes/route/warning_helpers.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'set'
+require 'thread'
 
 module RubyRoutes
   class Route
@@ -19,13 +20,14 @@ module RubyRoutes
       # @param param [String, Symbol] The parameter name for which the warning
       #   is being emitted.
       # @return [void]
+
       def warn_proc_constraint_deprecation(param)
         key = param.to_sym
-        return if @proc_warnings_shown&.include?(key)
-
-        @proc_warnings_shown ||= Set.new
-        @proc_warnings_shown << key
-        warn_proc_warning(key)
+        @warnings_mutex ||= Mutex.new
+        @warnings_mutex.synchronize do
+          @proc_warnings_shown ||= Set.new
+          warn_proc_warning(key) if @proc_warnings_shown.add?(key)
+        end
       end
 
       # Warn about `Proc` constraint deprecation.

data/lib/ruby_routes/route.rb

@@ -83,7 +83,7 @@ module RubyRoutes
       setup_controller_and_action(options)
 
       @name = options[:as]
-      @constraints = options[:constraints] || {}
+      @constraints = (options[:constraints] || {}).freeze
       @defaults = (options[:defaults] || {}).transform_keys(&:to_s).freeze
       @param_key_slots = [[nil, nil], [nil, nil]]
       @required_validated_once = false
@@ -145,8 +145,9 @@ module RubyRoutes
     # @param options [Hash] The options for the route.
     # @return [String, nil] The inferred controller name.
     def extract_controller(options)
+      return options[:controller] if options[:controller]
       to = options[:to]
-      return options[:controller] unless to
+      return nil unless to
 
       to.to_s.split('#', 2).first
     end

data/lib/ruby_routes/route_set/cache_helpers.rb

@@ -64,12 +64,15 @@ module RubyRoutes
       # @param entry [Hash] The cache entry.
       # @return [void]
       def insert_cache_entry(cache_key, entry)
-        if @recognition_cache.size >= @recognition_cache_max
-          @recognition_cache.keys.first(@recognition_cache_max / 4).each do |evict_key|
-            @recognition_cache.delete(evict_key)
+        @cache_mutex ||= Mutex.new
+        @cache_mutex.synchronize do
+          if @recognition_cache.size >= @recognition_cache_max
+            @recognition_cache.keys.first(@recognition_cache_max / 4).each do |evict_key|
+              @recognition_cache.delete(evict_key)
+            end
           end
+          @recognition_cache[cache_key] = entry
         end
-        @recognition_cache[cache_key] = entry
       end
     end
   end

data/lib/ruby_routes/route_set/collection_helpers.rb

@@ -18,10 +18,10 @@ module RubyRoutes
       # @param route [Route] The route to add.
       # @return [Route] The added route.
       def add_to_collection(route)
-        @named_routes[route.name] = route if route.named?
-        @radix_tree.add(route.path, route.methods, route)
         return route if @routes.include?(route) # Prevent duplicate insertion
 
+        @named_routes[route.name] = route if route.named?
+        @radix_tree.add(route.path, route.methods, route)
         @routes << route
         route
       end
@@ -74,13 +74,16 @@ module RubyRoutes
       #
       # @return [void]
       def clear!
-        @routes.clear
-        @named_routes.clear
-        @recognition_cache.clear
-        @cache_hits = 0
-        @cache_misses = 0
-        @radix_tree = RadixTree.new
-        RubyRoutes::Utility::KeyBuilderUtility.clear!
+        @cache_mutex ||= Mutex.new
+        @cache_mutex.synchronize do
+          @routes.clear
+          @named_routes.clear
+          @recognition_cache.clear
+          @cache_hits = 0
+          @cache_misses = 0
+          @radix_tree = RadixTree.new
+          RubyRoutes::Utility::KeyBuilderUtility.clear!
+        end
       end
 
       # Get the number of routes.

data/lib/ruby_routes/route_set.rb

@@ -90,18 +90,6 @@ module RubyRoutes
       route.generate_path(params)
     end
 
-    # Replay recorded calls on the router instance.
-    #
-    # This method replays all the recorded route definitions and other
-    # configuration calls on the given router instance.
-    #
-    # @param router [Router] The router instance to replay calls on.
-    # @return [void]
-    def replay_recorded_calls(router)
-      # Placeholder for actual implementation
-      # Iterate over recorded calls and apply them to the router
-    end
-
     private
 
     # Set up the radix tree for structural path matching.

data/lib/ruby_routes/router/build_helpers.rb

@@ -17,6 +17,12 @@ module RubyRoutes
       def build
         router = Router.new
         validate_calls(@recorded_calls)
+        RubyRoutes::Constant::RECORDED_METHODS.each do |method_name|
+          define_method(method_name) do |*arguments, &definition_block|
+            @recorded_calls << [__method__, arguments, definition_block]
+            nil
+          end
+        end
         router.finalize!
         router
       end

data/lib/ruby_routes/router/builder.rb

@@ -42,7 +42,10 @@ module RubyRoutes
       # @return [Array<Array(Symbol, Array, Proc|NilClass)>]
       #   A snapshot of the recorded calls to avoid external mutation.
       def recorded_calls
-        @recorded_calls.dup.freeze
+        # Deep-copy each recorded call’s args array and freeze the result to prevent mutation
+        @recorded_calls
+          .map { |(method_name, args, block)| [method_name, args.dup.freeze, block] }
+          .freeze
       end
 
       # Initialize the Builder.
@@ -72,26 +75,6 @@ module RubyRoutes
           nil
         end
       end
-
-      private
-
-      # Validate the recorded calls.
-      #
-      # This method ensures that all recorded calls use valid router methods
-      # as defined in `RubyRoutes::Constant::RECORDED_METHODS`.
-      #
-      # @param recorded_calls [Array<Array(Symbol, Array, Proc|NilClass)>]
-      #   The recorded calls to validate.
-      # @raise [ArgumentError] If any recorded call uses an invalid method.
-      # @return [void]
-      def validate_calls(recorded_calls)
-        allowed_router_methods = RubyRoutes::Constant::RECORDED_METHODS
-        recorded_calls.each do |(router_method, _arguments, _definition_block)|
-          unless router_method.is_a?(Symbol) && allowed_router_methods.include?(router_method)
-            raise ArgumentError, "Invalid router method: #{router_method.inspect}"
-          end
-        end
-      end
     end
   end
 end

data/lib/ruby_routes/router/http_helpers.rb

@@ -83,7 +83,12 @@ module RubyRoutes
         via = options[:via]
         raise ArgumentError, 'match requires :via (e.g., via: [:get, :post])' if via.nil? || Array(via).empty?
 
-        add_route(path, options)
+        normalized_via = Array(via)
+        opts = options.dup
+        # Keep :via in opts only if BuildHelpers expects it; otherwise delete.
+        # If BuildHelpers infers from the second arg, delete it:
+        opts.delete(:via)
+        add_route(path, build_route_options(opts, normalized_via))
         self
       end
 

data/lib/ruby_routes/router/resource_helpers.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require_relative 'build_helpers'
+require_relative '../utility/inflector_utility'
 
 module RubyRoutes
   class Router
@@ -13,8 +14,6 @@ module RubyRoutes
     module ResourceHelpers
       include RubyRoutes::Router::BuildHelpers
 
-      private
-
       # Define RESTful routes for a resource.
       #
       # @param resource_name [Symbol, String] The name of the resource.
@@ -35,6 +34,8 @@ module RubyRoutes
         end
       end
 
+      private
+
       # Prepare options by removing the `:to` key if present.
       #
       # @param options [Hash] The options hash.

data/lib/ruby_routes/router.rb

@@ -3,6 +3,7 @@
 require_relative 'utility/inflector_utility'
 require_relative 'utility/route_utility'
 require_relative 'router/http_helpers'
+require_relative 'router/resource_helpers'
 require_relative 'constant'
 require_relative 'route_set'
 module RubyRoutes
@@ -87,11 +88,16 @@ module RubyRoutes
       return self if @frozen
 
       @frozen = true
+      if @route_set.respond_to?(:finalize!)
+        @route_set.finalize!
+      else
+        @route_set.freeze
+      end
+      @route_utils.freeze if @route_utils.respond_to?(:freeze)
       @scope_stack.freeze
       @concerns.freeze
       self
     end
-
     # Check if the router is frozen.
     #
     # @return [Boolean] `true` if the router is frozen, `false` otherwise.
@@ -99,12 +105,17 @@ module RubyRoutes
       !!@frozen
     end
 
-    # Define a root route.
+    # Define the root route.
     #
     # @param options [Hash] The options for the root route.
     # @return [Router] self.
     def root(options = {})
-      add_route('/', build_route_options(options, :get))
+      ensure_unfrozen!
+      if options[:to]
+        add_route('/', via: [:get], **options)
+      else
+        add_route('/', controller: 'root', action: :index, via: [:get], **options)
+      end
       self
     end
 
@@ -117,6 +128,7 @@ module RubyRoutes
     # @param nested_block [Proc] The block for nested routes.
     # @return [Router] self.
     def resources(resource_name, options = {}, &nested_block)
+      ensure_unfrozen!
       define_resource_routes(resource_name, options, &nested_block)
       self
     end
@@ -127,6 +139,7 @@ module RubyRoutes
     # @param options [Hash] The options for the resource.
     # @return [Router] self.
     def resource(resource_name, options = {})
+      ensure_unfrozen!
       singular   = RubyRoutes::Utility::InflectorUtility.singularize(resource_name.to_s)
       controller = options[:controller] || singular
       define_singular_routes(singular, controller, options)
@@ -141,6 +154,7 @@ module RubyRoutes
     # @param block [Proc] The block for nested routes.
     # @return [Router] self.
     def namespace(namespace_name, options = {}, &block)
+      ensure_unfrozen!
       push_scope({ path: "/#{namespace_name}", module: namespace_name }.merge(options)) do
         instance_eval(&block) if block
       end
@@ -152,6 +166,7 @@ module RubyRoutes
     # @param block [Proc] The block for nested routes.
     # @return [Router] self.
     def scope(options_or_path = {}, &block)
+      ensure_unfrozen!
       scope_entry = options_or_path.is_a?(String) ? { path: options_or_path } : options_or_path
       push_scope(scope_entry) { instance_eval(&block) if block }
     end
@@ -162,6 +177,7 @@ module RubyRoutes
     # @param block [Proc] The block for nested routes.
     # @return [Router] self.
     def constraints(constraints_hash = {}, &block)
+      ensure_unfrozen!
       push_scope(constraints: constraints_hash) { instance_eval(&block) if block }
     end
 
@@ -171,6 +187,7 @@ module RubyRoutes
     # @param block [Proc] The block for nested routes.
     # @return [Router] self.
     def defaults(defaults_hash = {}, &block)
+      ensure_unfrozen!
       push_scope(defaults: defaults_hash) { instance_eval(&block) if block }
     end
 
@@ -192,6 +209,7 @@ module RubyRoutes
     # @param block [Proc] The block for additional routes.
     # @return [void]
     def concerns(*concern_names, &block)
+      ensure_unfrozen!
       concern_names.each do |name|
         concern_block = @concerns[name]
         raise "Concern '#{name}' not found" unless concern_block

data/lib/ruby_routes/utility/method_utility.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require_relative '../constant'
+require_relative '../route/small_lru'
 
 module RubyRoutes
   module Utility
@@ -38,15 +39,10 @@ module RubyRoutes
       }.freeze
 
       # Cache for non‑predefined or previously seen method tokens.
-      # Keys: original `String` or `Symbol`
-      # Values: frozen uppercase `String`
+      # Now uses SmallLru for LRU eviction instead of simple clearing.
       #
-      # Note: This is intentionally mutable for caching purposes.
-      #
-      # @return [Hash{(String,Symbol) => String}]
-      # rubocop:disable Style/MutableConstant
-      METHOD_CACHE = {} # Intentionally mutable for caching
-      # rubocop:enable Style/MutableConstant
+      # @return [SmallLru]
+      METHOD_CACHE = RubyRoutes::Route::SmallLru.new(RubyRoutes::Constant::METHOD_CACHE_MAX_SIZE)
 
       # Normalize an HTTP method‑like input to a canonical uppercase `String`.
       #
@@ -80,8 +76,9 @@ module RubyRoutes
       def normalize_string_method(method_input)
         return method_input if already_upper_ascii?(method_input)
 
-        key = method_input.dup
-        METHOD_CACHE[key] ||= ascii_upcase(key).freeze
+        # Use SmallLru for LRU eviction, freeze key to prevent mutation
+        key = method_input.dup.freeze
+        METHOD_CACHE.get(key) || METHOD_CACHE.set(key, ascii_upcase(method_input.dup).freeze)
       end
 
       # Normalize a `Symbol` HTTP method.
@@ -89,7 +86,10 @@ module RubyRoutes
       # @param method_input [Symbol] The HTTP method input.
       # @return [String] The normalized HTTP method.
       def normalize_symbol_method(method_input)
-        SYMBOL_MAP[method_input] || (METHOD_CACHE[method_input] ||= ascii_upcase(method_input.to_s).freeze)
+        SYMBOL_MAP[method_input] || begin
+          key = method_input.to_s.freeze
+          METHOD_CACHE.get(key) || METHOD_CACHE.set(key, ascii_upcase(method_input.to_s).freeze)
+        end
       end
 
       # Normalize an arbitrary HTTP method input.
@@ -100,8 +100,9 @@ module RubyRoutes
         coerced = method_input.to_s
         return coerced if already_upper_ascii?(coerced)
 
-        key = coerced.dup
-        METHOD_CACHE[key] ||= ascii_upcase(key).freeze
+        # Use SmallLru for LRU eviction, freeze key to prevent mutation
+        key = coerced.dup.freeze
+        METHOD_CACHE.get(key) || METHOD_CACHE.set(key, ascii_upcase(coerced.dup).freeze)
       end
 
       # Determine if a `String` consists solely of uppercase ASCII (`A–Z`) or non‑letters.

data/lib/ruby_routes/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RubyRoutes
-  VERSION = '2.4.0'
+  VERSION = '2.5.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_routes
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.5.0
 platform: ruby
 authors:
 - Yosef Benny Widyokarsono