roda 3.107.0 → 3.108.0

data/lib/roda/request.rb

@@ -437,8 +437,15 @@ class Roda
 
         # Match the given hash if all hash matchers match.
         def _match_hash(hash)
+          rp = @remaining_path
+          captures_len = @captures.length
+
           # Allow calling private methods, as match methods are generally private
-          hash.all?{|k,v| send("match_#{k}", v)}
+          return true if hash.all?{|k,v| send("match_#{k}", v)}
+
+          @remaining_path = rp
+          @captures.slice!(captures_len, 10000000)
+          false
         end
 
         # Match integer segment of up to 100 decimal characters, and yield resulting value as an
@@ -510,6 +517,7 @@ class Roda
           rp = @remaining_path
           if rp.getbyte(0) == 47
             if last = rp.index('/', 1)
+              return false if last == 1
               @captures << rp[1, last-1]
               @remaining_path = rp[last, rp.length]
             elsif (len = rp.length) > 1
@@ -568,12 +576,12 @@ class Roda
 
             if meth
               return unless captures = scope.send(meth, *captures)
-            # :nocov:
+            # simplecov:disable
             # RODA4: Remove elsif block
             elsif defined?(yield)
               RodaPlugins.warn("Passing a block to RodaRequest#consume will be ignored in Roda 4. Update the code to pass a scope method symbol as the second argument.")
               return unless captures = yield(*captures)
-            # :nocov:
+            # simplecov:enable
             end
 
             @remaining_path = matchdata.post_match
@@ -594,13 +602,13 @@ class Roda
             if regexp.match?(rp)
               if last = rp.index('/', 1)
                 val = rp[1, last-1]
-                @remaining_path = rp[last, rp.length]
+                new_rp = rp[last, rp.length]
               else
                 val = rp[1, rp.length]
-                @remaining_path = ""
+                new_rp = ""
               end
 
-              if meth
+              ret = if meth
                 if captures = scope.send(meth, val)
                   if captures.is_a?(Array)
                     @captures.concat(captures)
@@ -611,12 +619,16 @@ class Roda
               else
                 @captures << val
               end
+
+              @remaining_path = new_rp if ret
+
+              ret
             end
           end
-        # :nocov:
+        # simplecov:disable
         else
           alias _consume_single_segment consume
-        # :nocov:
+        # simplecov:enable
         end
 
         # The default path to use for redirects when a path is not given.
@@ -627,9 +639,13 @@ class Roda
         #
         # If the current request is a GET request, raise an error, as otherwise
         # it is easy to create an infinite redirect.
+        #
+        # If the path starts +//+, then this redirects to the root path
+        # (+/+) instead of using a protocol-relative redirect.
         def default_redirect_path
           raise RodaError, "must provide path argument to redirect for get requests" if is_get?
-          path
+          path = self.path
+          path.start_with?('//') ? '/' : path
         end
 
         # The default status to use for redirects if a status is not provided,

data/lib/roda/version.rb

@@ -4,7 +4,7 @@ class Roda
   RodaMajorVersion = 3
 
   # The minor version of Roda, updated for new feature releases of Roda.
-  RodaMinorVersion = 107
+  RodaMinorVersion = 108
 
   # The patch version of Roda, updated only for bug fixes from the last
   # feature release.

data/lib/roda.rb

@@ -142,9 +142,9 @@ class Roda
                   block = if RUBY_VERSION >= '2.7'
                     eval('lambda{|*a, **kw| instance_exec(*a, **kw, &b)}', nil, __FILE__, __LINE__) # Keyword arguments fallback
                   else
-                    # :nocov:
+                    # simplecov:disable
                     lambda{|*a| instance_exec(*a, &b)} # Keyword arguments fallback
-                    # :nocov:
+                    # simplecov:enable
                   end
                 else
                   arity_meth = meth
@@ -226,7 +226,7 @@ class Roda
               plugin :direct_call
             end
 
-            if RUBY_VERSION > "2.4" && ([:on, :is, :_verb, :_match_class_String, :_match_class_Integer, :_match_string, :_match_regexp, :empty_path?, :if_match, :match, :_match_class]).all?{|m| self::RodaRequest.instance_method(m).owner == RequestMethods}
+            if RUBY_VERSION > "2.4" && ([:on, :is, :_verb, :_match_class_String, :_match_class_Integer, :_match_string, :_match_regexp, :empty_path?, :if_match, :match, :_match_class, :always]).all?{|m| self::RodaRequest.instance_method(m).owner == RequestMethods}
               plugin :_optimized_matching
             end
           end
@@ -312,9 +312,9 @@ class Roda
           plugin.configure(self, *args, &block) if plugin.respond_to?(:configure)
           @app = nil
         end
-        # :nocov:
+        # simplecov:disable
         ruby2_keywords(:plugin) if respond_to?(:ruby2_keywords, true)
-        # :nocov:
+        # simplecov:enable
 
         # Setup routing tree for the current Roda application, and build the
         # underlying rack application using the stored middleware. Requires
@@ -350,9 +350,9 @@ class Roda
           @middleware << [args, block].freeze
           @app = nil
         end
-        # :nocov:
+        # simplecov:disable
         ruby2_keywords(:use) if respond_to?(:ruby2_keywords, true)
-        # :nocov:
+        # simplecov:enable
 
         private
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: roda
 version: !ruby/object:Gem::Version
-  version: 3.107.0
+  version: 3.108.0
 platform: ruby
 authors:
 - Jeremy Evans
@@ -259,6 +259,7 @@ files:
 - lib/roda/plugins/padrino_render.rb
 - lib/roda/plugins/param_matchers.rb
 - lib/roda/plugins/params_capturing.rb
+- lib/roda/plugins/params_capturing_restore.rb
 - lib/roda/plugins/part.rb
 - lib/roda/plugins/partials.rb
 - lib/roda/plugins/pass.rb