roda 3.107.0 → 3.109.0

data/lib/roda/plugins/typecast_params.rb

@@ -1122,7 +1122,7 @@ class Roda
       # before processing them.
       def self.configure(app, opts=OPTS, &block)
         app.const_set(:TypecastParams, Class.new(RodaPlugins::TypecastParams::Params)) unless app.const_defined?(:TypecastParams)
-        app::TypecastParams.class_eval(&block) if block
+        app::TypecastParams.class_eval(&block) if block # RODA4: use class_exec
         if opts[:strip] == :all
           app::TypecastParams.send(:include, StringStripper)
         end
@@ -1133,7 +1133,7 @@ class Roda
           app::TypecastParams.send(:include, SkipBytesizeChecking)
         end
         if opts[:date_parse_input_handler]
-          app::TypecastParams.class_eval do
+          app::TypecastParams.class_exec do
             include DateParseInputHandler
             define_method(:handle_date_parse_input, &opts[:date_parse_input_handler])
             private :handle_date_parse_input

data/lib/roda/plugins/typecast_params_sized_integers.rb

@@ -90,7 +90,7 @@ class Roda
         end
 
         if default = opts[:default_size]
-          app::TypecastParams.class_eval do
+          app::TypecastParams.class_exec do
             meths = ['', 'convert_', '_convert_array_', '_max_input_bytesize_for_', '_invalid_value_message_for_']
             %w[int uint pos_int pos_uint Integer Integeru].each do |type|
               meths.each do |prefix|

data/lib/roda/plugins/url_escape.rb

@@ -16,20 +16,8 @@ class Roda
     #   end
     module UrlEscape
       module InstanceMethods
-        if RUBY_VERSION >= '2'
-          define_method(:url_escape, Rack::Utils.instance_method(:escape))
-          define_method(:url_unescape, Rack::Utils.instance_method(:unescape))
-        # :nocov:
-        else
-          def url_escape(v)
-            Rack::Utils.escape(v)
-          end
-
-          def url_unescape(v)
-            Rack::Utils.unescape(v)
-          end
-        end
-        # :nocov:
+        define_method(:url_escape, Rack::Utils.instance_method(:escape))
+        define_method(:url_unescape, Rack::Utils.instance_method(:unescape))
       end
     end
 

data/lib/roda/plugins/view_options.rb

@@ -158,13 +158,11 @@ class Roda
         # template isn't a layout template, merge the options
         # and locals into the returned hash.
         def parse_template_opts(template, opts)
-          t_opts = super
-
-          if !t_opts[:_is_layout] && (v_opts = @_view_options)
-            t_opts.merge!(v_opts)
+          if (v_opts = @_view_options) && (!template.is_a?(Hash) || !template[:_is_layout])
+            opts = v_opts.merge(opts)
           end
 
-          t_opts
+          super
         end
 
         # If layout options or locals have been set,

data/lib/roda/plugins.rb

@@ -32,6 +32,16 @@ class Roda
       plugin
     end
 
+    # Define an attr_reader method for name that uses the instance variable
+    # <tt>@opt_*</tt>. Designed to be used with instance variables set via RodaOpts#[]=.
+    def self.opt_attr_reader(mod, key, name: key)
+      opt_name = :"opt_#{key}"
+      mod.send(:attr_reader, opt_name)
+      mod.send(:alias_method, name, opt_name)
+      mod.send(:remove_method, opt_name)
+      nil
+    end
+
     # Register the given plugin with Roda, so that it can be loaded using #plugin
     # with a symbol.  Should be used by plugin files. Example:
     #
@@ -43,11 +53,11 @@ class Roda
     # Deprecate the constant with the given name in the given module,
     # if the ruby version supports it.
     def self.deprecate_constant(mod, name)
-      # :nocov:
+      # simplecov:disable
       if RUBY_VERSION >= '2.3'
         mod.deprecate_constant(name)
       end
-      # :nocov:
+      # simplecov:enable
     end
 
     if RUBY_VERSION >= '3.3'
@@ -57,12 +67,12 @@ class Roda
         mod.set_temporary_name(yield)
         mod
       end
-    # :nocov:
+    # simplecov:disable
     else
       def self.set_temp_name(mod)
         mod
       end
     end
-    # :nocov:
+    # simplecov:enable
   end
 end

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 = 109
 
   # The patch version of Roda, updated only for bug fixes from the last
   # feature release.

data/lib/roda.rb

@@ -5,6 +5,7 @@ require_relative "roda/request"
 require_relative "roda/response"
 require_relative "roda/plugins"
 require_relative "roda/cache"
+require_relative "roda/opts"
 require_relative "roda/version"
 
 # The main class for Roda.  Roda is built completely out of plugins, with the
@@ -18,7 +19,8 @@ class Roda
   @inherit_middleware = true
   @middleware = []
   @plugins = []
-  @opts = {}
+  @opts = RodaOpts.new
+  @opts.roda_class = self
   @raw_route_block = nil
   @route_block = nil
   @rack_app_route_block = nil
@@ -30,6 +32,8 @@ class Roda
     module Base
       # Class methods for the Roda class.
       module ClassMethods
+        RodaPlugins.opt_attr_reader(self, :root, name: :app_root)
+
         # The rack application that this class uses.
         def app
           @app || build_rack_app
@@ -140,11 +144,11 @@ class Roda
                   # Fallback to instance_exec in this case.
                   b = block
                   block = if RUBY_VERSION >= '2.7'
-                    eval('lambda{|*a, **kw| instance_exec(*a, **kw, &b)}', nil, __FILE__, __LINE__) # Keyword arguments fallback
+                    lambda{|*a, **kw| instance_exec(*a, **kw, &b)} # Keyword arguments fallback
                   else
-                    # :nocov:
+                    # simplecov:disable
                     lambda{|*a| instance_exec(*a, &b)} # Keyword arguments fallback
-                    # :nocov:
+                    # simplecov:enable
                   end
                 else
                   arity_meth = meth
@@ -189,7 +193,7 @@ class Roda
         end
 
         # Expand the given path, using the root argument as the base directory.
-        def expand_path(path, root=opts[:root])
+        def expand_path(path, root=app_root)
           ::File.expand_path(path, root)
         end
 
@@ -207,9 +211,9 @@ class Roda
             # If the _roda_run_main_route instance method has not been overridden,
             # make it an alias to _roda_main_route for performance
             if instance_method(:_roda_run_main_route).owner == InstanceMethods
-              class_eval("alias _roda_run_main_route _roda_main_route")
+              alias_method :_roda_run_main_route, :_roda_main_route
             end
-            self::RodaResponse.class_eval do
+            self::RodaResponse.class_exec do
               if instance_method(:set_default_headers).owner == ResponseMethods &&
                  instance_method(:default_headers).owner == ResponseMethods
 
@@ -226,7 +230,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
@@ -253,21 +257,28 @@ class Roda
         def inherited(subclass)
           raise RodaError, "Cannot subclass a frozen Roda class" if frozen?
 
-          # Mark current class as having been subclassed, as some optimizations
-          # depend on the class not being subclassed
-          opts[:subclassed] = true
-
           super
           subclass.instance_variable_set(:@inherit_middleware, @inherit_middleware)
           subclass.instance_variable_set(:@middleware, @inherit_middleware ? @middleware.dup : [])
           subclass.instance_variable_set(:@plugins, @plugins.dup)
-          subclass.instance_variable_set(:@opts, opts.dup)
-          subclass.opts.delete(:subclassed)
-          subclass.opts.to_a.each do |k,v|
-            if (v.is_a?(Array) || v.is_a?(Hash)) && !v.frozen?
-              subclass.opts[k] = v.dup
+
+          opts = RodaOpts.new
+          opts.roda_class = subclass
+          @opts.each do |k,v|
+            opts[k] = if k == :subclassed
+              false
+            elsif (v.is_a?(Array) || v.is_a?(Hash)) && !v.frozen?
+              v.dup
+            else
+              v
             end
           end
+          subclass.instance_variable_set(:@opts, opts)
+
+          # Mark current class as having been subclassed, as some optimizations
+          # depend on the class not being subclassed
+          @opts[:subclassed] = true
+
           if block = @raw_route_block
             subclass.route(&block)
           end
@@ -312,9 +323,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 +361,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.109.0
 platform: ruby
 authors:
 - Jeremy Evans
@@ -159,11 +159,14 @@ files:
 - MIT-LICENSE
 - lib/roda.rb
 - lib/roda/cache.rb
+- lib/roda/opts.rb
 - lib/roda/plugins.rb
 - lib/roda/plugins/Integer_matcher_max.rb
+- lib/roda/plugins/_add_script_name.rb
 - lib/roda/plugins/_after_hook.rb
 - lib/roda/plugins/_base64.rb
 - lib/roda/plugins/_before_hook.rb
+- lib/roda/plugins/_json.rb
 - lib/roda/plugins/_optimized_matching.rb
 - lib/roda/plugins/_symbol_class_matchers.rb
 - lib/roda/plugins/_symbol_regexp_matchers.rb
@@ -259,6 +262,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
@@ -333,14 +337,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.2
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.16
+rubygems_version: 4.0.20
 specification_version: 4
 summary: Routing tree web toolkit
 test_files: []