roda 3.108.0 → 3.109.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 88f17808e272159aaa6d5f1239eeb3453935aa188c0933b753e5a66046212e03
-  data.tar.gz: 952920ff3e1dafeefea80acefcbd3fb5e03f0033c2ca909757c697e2acd7c955
+  metadata.gz: f8fe0436b7983ecbf3bbbf1cf8d7d8867f87184550ef097d6fad894a17211c5e
+  data.tar.gz: a19800b130b13b745d3ff6a77c22ac88e4c44b70a778c243e07212c0fcebd019
 SHA512:
-  metadata.gz: fdd21d3152a257f21d1cfb33562334b71de82e1f017899dae0d5e9974f9b1028824c017f82d54405d5f88bed4d53607f6c238bb21c1907492da38b3b755e1a73
-  data.tar.gz: 61ed1ac97df5919e486a82abb62ad47b45603ec3c46d230ce6aa6f7ac697cd52b45af167a597ad691ec6de5267886e6b420efc0d3117a3604ba45f613703e80d
+  metadata.gz: e0778c049972903e98c14287074ed0833eb63b201834c61ed8731cafb9be5da523963e931eb8ed668a975f61682d866c6ffcd1e61a4aaa19d62ec663f2318fc1
+  data.tar.gz: 17e2cd71b7593a18b398fd2965a2673280e11f76db7f02f9de1eaa604e4632857fbe8c1875cfd9fc3ec9d6af2152ad4a63d757065a1ae53cb46766de5690238a

data/lib/roda/opts.rb

@@ -0,0 +1,22 @@
+# frozen-string-literal: true
+
+class Roda
+  class RodaOpts < Hash
+    # The Roda class to set instance variables on when calling #[]=
+    attr_writer :roda_class
+
+    # If duplicating the hash, detach the Roda class.
+    def initialize_copy(_)
+      super
+      @roda_class = nil
+    end
+
+    # Set an <tt>@opt_*</tt> instance variable in the Roda class if it is tied
+    # to a Roda class.
+    def []=(k, v)
+      super
+      @roda_class.instance_variable_set(:"@opt_#{k}", v) if @roda_class && Symbol === k
+      v
+    end
+  end
+end

data/lib/roda/plugins/Integer_matcher_max.rb

@@ -23,7 +23,7 @@ class Roda
     module IntegerMatcherMax
       def self.configure(app, max=nil)
         if max
-          app.class_eval do
+          app.class_exec do
             meth = :_max_value_convert_class_Integer
             define_method(meth){max}
             alias_method meth, meth

data/lib/roda/plugins/_add_script_name.rb

@@ -0,0 +1,14 @@
+# frozen-string-literal: true
+
+#
+class Roda
+  module RodaPlugins
+    module AddScriptName_
+      module ClassMethods
+        RodaPlugins.opt_attr_reader(self, :add_script_name, name: :add_script_name?)
+      end
+    end
+
+    register_plugin(:_add_script_name, AddScriptName_)
+  end
+end

data/lib/roda/plugins/_json.rb

@@ -0,0 +1,22 @@
+# frozen-string-literal: true
+
+require 'json'
+
+#
+class Roda
+  module RodaPlugins
+    module JSON_
+      module ClassMethods
+        def json_parser
+          @opt_json_parser || ::JSON.method(:parse)
+        end
+
+        def json_serializer
+          @opt_json_serializer || :to_json.to_proc
+        end
+      end
+    end
+
+    register_plugin(:_json, JSON_)
+  end
+end

data/lib/roda/plugins/_symbol_class_matchers.rb

@@ -26,11 +26,11 @@ class Roda
             regexp = matcher
             consume_regexp = self::RodaRequest.send(:consume_pattern, regexp)
           when Symbol
-            unless opts[:symbol_matchers]
+            unless respond_to?(:symbol_matchers)
               raise RodaError, "cannot provide Symbol matcher to class_matcher unless using symbol_matchers plugin: #{matcher.inspect}"
             end
 
-            regexp, consume_regexp, convert_meth, consume_meth = opts[:symbol_matchers][matcher]
+            regexp, consume_regexp, convert_meth, consume_meth = symbol_matchers[matcher]
 
             unless regexp
               raise RodaError, "unregistered symbol matcher given to #{type}_matcher: #{matcher.inspect}"
@@ -38,11 +38,11 @@ class Roda
 
             block = _merge_matcher_blocks(type, obj, block, convert_meth)
           when Class
-            unless opts[:class_matchers]
+            unless respond_to?(:class_matchers)
               raise RodaError, "cannot provide Class matcher to symbol_matcher unless using class_matchers plugin: #{matcher.inspect}"
             end
 
-            regexp, consume_regexp, convert_meth, consume_meth = opts[:class_matchers][matcher]
+            regexp, consume_regexp, convert_meth, consume_meth = class_matchers[matcher]
             unless regexp
               raise RodaError, "unregistered class matcher given to #{type}_matcher: #{matcher.inspect}"
             end
@@ -60,9 +60,9 @@ class Roda
           end
 
           consume_meth ||= options[:segment] ? :_consume_single_segment : :consume
-          array = opts[:"#{type}_matchers"][obj] = [regexp, consume_regexp, convert_meth, consume_meth].freeze
+          array = (obj.is_a?(Symbol) ? symbol_matchers : class_matchers)[obj] = [regexp, consume_regexp, convert_meth, consume_meth].freeze
 
-          self::RodaRequest.class_eval do
+          self::RodaRequest.class_exec do
             class_exec(meth, array, &request_class_block)
             private meth
           end

data/lib/roda/plugins/additional_render_engines.rb

@@ -34,6 +34,10 @@ class Roda
         app.opts[:additional_render_engines] = render_engines.dup.freeze
       end
 
+      module ClassMethods
+        RodaPlugins.opt_attr_reader(self, :additional_render_engines)
+      end
+
       module InstanceMethods
         private
 
@@ -45,7 +49,7 @@ class Roda
           orig_path = super
 
           unless File.file?(orig_path)
-            self.opts[:additional_render_engines].each do |engine|
+            self.class.additional_render_engines.each do |engine|
               path = super(opts.merge(:engine=>engine))
               return path if File.file?(path)
             end

data/lib/roda/plugins/additional_view_directories.rb

@@ -39,6 +39,10 @@ class Roda
         app.plugin :render, :allowed_paths=>(app.opts[:render][:allowed_paths] + view_dirs).uniq.freeze
       end
 
+      module ClassMethods
+        RodaPlugins.opt_attr_reader(self, :additional_view_directories)
+      end
+
       module InstanceMethods
         private
 
@@ -50,7 +54,7 @@ class Roda
           orig_path = super
 
           unless File.file?(orig_path)
-            self.opts[:additional_view_directories].each do |view_dir|
+            self.class.additional_view_directories.each do |view_dir|
               path = super(opts.merge(:views=>view_dir))
               return path if File.file?(path)
             end

data/lib/roda/plugins/assets.rb

@@ -371,6 +371,8 @@ class Roda
       # Load the render, caching, and h plugins, since the assets plugin
       # depends on them.
       def self.load_dependencies(app, opts = OPTS)
+        app.plugin :_json
+        app.plugin :_add_script_name
         app.plugin :render
         app.plugin :caching
         app.plugin :h
@@ -401,7 +403,7 @@ class Roda
           app.opts[:assets] = opts.dup
           app.opts[:assets][:orig_opts] = opts
         end
-        opts = app.opts[:assets]
+        opts = app.assets_opts
         opts[:path] = app.expand_path(opts[:path]||"assets").freeze
         opts[:public] = app.expand_path(opts[:public]||"public").freeze
 
@@ -420,7 +422,6 @@ class Roda
         end
 
         if opts[:precompiled] && !opts[:compiled] && ::File.exist?(opts[:precompiled])
-          require 'json'
           opts[:compiled] = app.send(:_precompiled_asset_metadata, opts[:precompiled])
         end
 
@@ -498,10 +499,7 @@ class Roda
       end
 
       module ClassMethods
-        # Return the assets options for this class.
-        def assets_opts
-          opts[:assets]
-        end
+        RodaPlugins.opt_attr_reader(self, :assets, name: :assets_opts)
 
         # Compile options for the given asset type.  If no asset_type
         # is given, compile both the :css and :js asset types.  You
@@ -522,10 +520,9 @@ class Roda
           end
 
           if precompile_file = assets_opts[:precompiled]
-            require 'json'
             ::FileUtils.mkdir_p(File.dirname(precompile_file))
             tmp_file = "#{precompile_file}.tmp"
-            ::File.open(tmp_file, 'wb'){|f| f.write((opts[:json_serializer] || :to_json.to_proc).call(assets_opts[:compiled]))}
+            ::File.open(tmp_file, 'wb'){|f| f.write(json_serializer.call(assets_opts[:compiled]))}
             ::File.rename(tmp_file, precompile_file)
           end
 
@@ -558,7 +555,7 @@ class Roda
 
         # The precompiled asset metadata stored in the given file
         def _precompiled_asset_metadata(file)
-          (opts[:json_parser] || ::JSON.method(:parse)).call(::File.read(file))
+          json_parser.call(::File.read(file))
         end
 
         # Compile each array of files for the given type into a single
@@ -711,7 +708,7 @@ class Roda
           end
           stype = ltype.to_s
 
-          url_prefix = request.script_name if self.class.opts[:add_script_name]
+          url_prefix = request.script_name if self.class.add_script_name?
           relative_paths = o[:relative_paths]
 
           paths = if o[:compiled]

data/lib/roda/plugins/autoload_hash_branches.rb

@@ -38,13 +38,15 @@ class Roda
       end
 
       module ClassMethods
+        RodaPlugins.opt_attr_reader(self, :autoload_hash_branch_files)
+
         # Autoload the given file when there is request for the hash branch.
         # The given file should configure the hash branch specified.
         def autoload_hash_branch(namespace='', segment, file)
           segment = "/#{segment}"
           file = File.expand_path(file)
-          opts[:autoload_hash_branch_files] << file
-          routes = opts[:hash_branches][namespace] ||= {}
+          autoload_hash_branch_files << file
+          routes = hash_branches[namespace] ||= {}
           meth = routes[segment] = define_roda_method(routes[segment] || "hash_branch_#{namespace}_#{segment}", 1) do |r|
             loc = method(routes[segment]).source_location
             require file
@@ -68,7 +70,11 @@ class Roda
 
         # Eagerly load all hash branches when freezing the application.
         def freeze
-          opts.delete(:autoload_hash_branch_files).each{|file| require file} unless opts.frozen?
+          unless opts.frozen?
+            autoload_hash_branch_files.each{|file| require file}
+            opts[:autoload_hash_branch_files] = nil
+            opts.delete(:autoload_hash_branch_files)
+          end
           super
         end
       end

data/lib/roda/plugins/autoload_named_routes.rb

@@ -35,12 +35,14 @@ class Roda
       end
 
       module ClassMethods
+        RodaPlugins.opt_attr_reader(self, :autoload_named_route_files)
+
         # Autoload the given file when there is request for the named route.
         # The given file should configure the named route specified.
         def autoload_named_route(namespace=nil, name, file)
           file = File.expand_path(file)
-          opts[:autoload_named_route_files] << file
-          routes = opts[:namespaced_routes][namespace] ||= {}
+          autoload_named_route_files << file
+          routes = namespaced_routes[namespace] ||= {}
           meth = routes[name] = define_roda_method(routes[name] || "named_routes_#{namespace}_#{name}", 1) do |r|
             loc = method(routes[name]).source_location
             require file
@@ -54,7 +56,11 @@ class Roda
 
         # Eagerly load all autoloaded named routes when freezing the application.
         def freeze
-          opts.delete(:autoload_named_route_files).each{|file| require file} unless opts.frozen?
+          unless opts.frozen?
+            autoload_named_route_files.each{|file| require file}
+            opts[:autoload_named_route_files] = nil
+            opts.delete(:autoload_named_route_files)
+          end
           super
         end
       end

data/lib/roda/plugins/capture_erb.rb

@@ -51,6 +51,10 @@ class Roda
         app.opts[:capture_erb_returns] = opts[:returns] if opts.has_key?(:returns)
       end
 
+      module ClassMethods
+        RodaPlugins.opt_attr_reader(self, :capture_erb_returns)
+      end
+
       module InstanceMethods
         # Temporarily replace the ERB output buffer
         # with an empty string, and then yield to the block.
@@ -71,7 +75,7 @@ class Roda
           if buf_was.respond_to?(:capture) && !buf_was.instance_of?(String)
             buf_was.capture(&block)
           else
-            returns = opts.fetch(:returns) { self.opts[:capture_erb_returns] }
+            returns = opts.fetch(:returns) { self.class.capture_erb_returns }
 
             begin
               instance_variable_set(outvar, String.new)

data/lib/roda/plugins/chunked.rb

@@ -162,7 +162,7 @@ class Roda
         app.opts[:chunk_by_default] = opts[:chunk_by_default]
         app.opts[:force_chunked_encoding] = opts[:force_chunked_encoding]
         if opts[:headers]
-          app.opts[:chunk_headers] = (app.opts[:chunk_headers] || {}).merge(opts[:headers]).freeze
+          app.opts[:chunk_headers] = (app.chunk_headers || {}).merge(opts[:headers]).freeze
         end
       end
 
@@ -207,6 +207,12 @@ class Roda
         end
       end
 
+      module ClassMethods
+        RodaPlugins.opt_attr_reader(self, :chunk_by_default, name: :chunk_by_default?)
+        RodaPlugins.opt_attr_reader(self, :force_chunked_encoding, name: :force_chunked_encoding?)
+        RodaPlugins.opt_attr_reader(self, :chunk_headers)
+      end
+
       module InstanceMethods
         # Disable chunking for the current request.  Mostly useful when
         # chunking is turned on by default.
@@ -217,7 +223,7 @@ class Roda
         # If chunking by default, call chunked if it hasn't yet been
         # called and chunking is not specifically disabled.
         def view(*a)
-          if opts[:chunk_by_default] && @_chunked != false && !defined?(yield)
+          if self.class.chunk_by_default? && @_chunked != false && !defined?(yield)
             chunked(*a)
           else
             super
@@ -228,7 +234,7 @@ class Roda
         # an overview.  If a block is given, it is passed to #delay.
         def chunked(template, opts=OPTS, &block)
           if @_chunked.nil?
-            @_chunked = !self.opts[:force_chunked_encoding] || @_request.http_version == "HTTP/1.1" 
+            @_chunked = !self.class.force_chunked_encoding? || @_request.http_version == "HTTP/1.1" 
           end
 
           if block
@@ -255,10 +261,10 @@ class Roda
 
           res = response
           headers = res.headers
-          if chunk_headers = self.opts[:chunk_headers]
+          if chunk_headers = self.class.chunk_headers
             headers.merge!(chunk_headers)
           end
-          if self.opts[:force_chunked_encoding]
+          if self.class.force_chunked_encoding?
             res[RodaResponseHeaders::TRANSFER_ENCODING] = 'chunked'
             body = Body.new(self)
           else

data/lib/roda/plugins/class_level_routing.rb

@@ -60,17 +60,19 @@ class Roda
       end
 
       module ClassMethods
+        RodaPlugins.opt_attr_reader(self, :class_level_routes)
+
         # Define routing methods that will store class level routes.
         [:root, :on, :is, :get, :post, :delete, :head, :options, :link, :patch, :put, :trace, :unlink].each do |request_meth|
           define_method(request_meth) do |*args, &block|
             meth = define_roda_method("class_level_routing_#{request_meth}", :any, &block)
-            opts[:class_level_routes] << [request_meth, args, meth].freeze
+            class_level_routes << [request_meth, args, meth].freeze
           end
         end
 
         # Freeze the class level routes so that there can be no thread safety issues at runtime.
         def freeze
-          opts[:class_level_routes].freeze
+          class_level_routes.freeze
           super
         end
       end
@@ -93,7 +95,7 @@ class Roda
             @_response.status = nil
             result.replace(_roda_handle_route do
               r = @_request
-              opts[:class_level_routes].each do |request_meth, args, meth|
+              self.class.class_level_routes.each do |request_meth, args, meth|
                 r.instance_variable_set(:@remaining_path, @_original_remaining_path)
                 r.public_send(request_meth, *args) do |*a|
                   send(meth, *a)

data/lib/roda/plugins/class_matchers.rb

@@ -93,6 +93,8 @@ class Roda
       end
 
       module ClassMethods
+        RodaPlugins.opt_attr_reader(self, :class_matchers)
+
         # Set the matcher and block to use for the given class.
         # The matcher can be a regexp, registered class matcher, or registered symbol
         # matcher (if using the symbol_matchers plugin).
@@ -119,7 +121,7 @@ class Roda
 
         # Freeze the class_matchers hash when freezing the app.
         def freeze
-          opts[:class_matchers].freeze
+          class_matchers.freeze
           super
         end
       end

data/lib/roda/plugins/common_logger.rb

@@ -26,8 +26,8 @@ class Roda
       private_constant :MUTATE_LINE
 
       def self.configure(app, logger=nil, opts=OPTS)
-        app.opts[:common_logger] = logger || app.opts[:common_logger] || $stderr
-        app.opts[:common_logger_meth] = app.opts[:common_logger].method(opts.fetch(:method){logger.respond_to?(:write) ? :write : :<<})
+        common_logger = app.opts[:common_logger] = logger || app.opts[:common_logger] || $stderr # RODA4: drop setting of option, no longer used
+        app.opts[:common_logger_meth] = common_logger.method(opts.fetch(:method){logger.respond_to?(:write) ? :write : :<<})
       end
 
       if RUBY_VERSION >= '2.1'
@@ -43,6 +43,10 @@ class Roda
         # simplecov:enable
       end
 
+      module ClassMethods
+        RodaPlugins.opt_attr_reader(self, :common_logger_meth)
+      end
+
       module InstanceMethods
         private
 
@@ -67,7 +71,7 @@ class Roda
           # simplecov:enable
           end
           line[-1] = "\n"
-          opts[:common_logger_meth].call(line)
+          self.class.common_logger_meth.call(line)
         end
 
         # Create timer instance used for timing

data/lib/roda/plugins/conditional_sessions.rb

@@ -23,7 +23,7 @@ class Roda
       # a request method for whether sessions are allowed.
       def self.load_dependencies(app, opts=OPTS, &block)
         app.plugin :sessions, opts
-        app::RodaRequest.class_eval do
+        app::RodaRequest.class_exec do
           define_method(:use_sessions?, &block)
           alias use_sessions? use_sessions?
         end

data/lib/roda/plugins/content_for.rb

@@ -69,13 +69,17 @@ class Roda
         app.opts[:append_content_for] = opts.fetch(:append, true)
       end
 
+      module ClassMethods
+        RodaPlugins.opt_attr_reader(self, :append_content_for, name: :append_content_for?)
+      end
+
       module InstanceMethods
         # If called with a block, store content enclosed by block
         # under the given key.  If called without a block, retrieve
         # stored content with the given key, or return nil if there
         # is no content stored with that key.
         def content_for(key, value=nil, &block)
-          append = opts[:append_content_for]
+          append = self.class.append_content_for?
 
           if block || value
             if block

data/lib/roda/plugins/content_security_policy.rb

@@ -289,6 +289,10 @@ class Roda
         policy.freeze
       end
 
+      module ClassMethods
+        RodaPlugins.opt_attr_reader(self, :content_security_policy)
+      end
+
       module InstanceMethods
         # If a block is given, yield the current content security policy.  Returns the
         # current content security policy.
@@ -308,7 +312,7 @@ class Roda
 
         # The current content security policy to be used for this response.
         def content_security_policy
-          @content_security_policy ||= roda_class.opts[:content_security_policy].dup
+          @content_security_policy ||= roda_class.content_security_policy.dup
         end
 
         # Do not set a content security policy header for this response.
@@ -322,7 +326,7 @@ class Roda
         def set_default_headers
           super
           unless @skip_content_security_policy
-            (@content_security_policy || roda_class.opts[:content_security_policy]).set_header(headers)
+            (@content_security_policy || roda_class.content_security_policy).set_header(headers)
           end
         end
       end

data/lib/roda/plugins/cookie_flags.rb

@@ -61,7 +61,7 @@ class Roda
       end
 
       def self.configure(app, opts=OPTS)
-        previous = app.opts[:cookie_flags] || DEFAULTS
+        previous = app.cookie_flags || DEFAULTS
         opts = app.opts[:cookie_flags] = previous.merge(opts)
 
         case opts[:same_site]
@@ -74,11 +74,15 @@ class Roda
         opts.freeze
       end
 
+      module ClassMethods
+        RodaPlugins.opt_attr_reader(self, :cookie_flags)
+      end
+
       module InstanceMethods
         private
 
         def _handle_cookie_flags_array(cookies)
-          opts = self.class.opts[:cookie_flags]
+          opts = self.class.cookie_flags
           needs_secure = opts[:secure]
           needs_httponly = opts[:httponly]
           if needs_same_site = opts[:same_site]

data/lib/roda/plugins/cookies.rb

@@ -20,7 +20,11 @@ class Roda
     module Cookies
       # Allow setting default cookie options when loading the cookies plugin.
       def self.configure(app, opts={})
-        app.opts[:cookies_opts] = (app.opts[:cookies_opts]||{}).merge(opts).freeze
+        app.opts[:cookies_opts] = (app.cookies_opts||{}).merge(opts).freeze
+      end
+
+      module ClassMethods
+        RodaPlugins.opt_attr_reader(self, :cookies_opts)
       end
 
       module ResponseMethods
@@ -32,7 +36,7 @@ class Roda
         #   response.delete_cookie('foo')
         #   response.delete_cookie('foo', domain: 'example.org')
         def delete_cookie(key, value = {})
-          ::Rack::Utils.delete_cookie_header!(@headers, key, roda_class.opts[:cookies_opts].merge(value))
+          ::Rack::Utils.delete_cookie_header!(@headers, key, roda_class.cookies_opts.merge(value))
         end
 
         # Set the cookie with the given key in the headers.
@@ -41,7 +45,7 @@ class Roda
         #   response.set_cookie('foo', value: 'bar', domain: 'example.org')
         def set_cookie(key, value)
           value = { :value=>value } unless value.respond_to?(:keys)
-          ::Rack::Utils.set_cookie_header!(@headers, key, roda_class.opts[:cookies_opts].merge(value))
+          ::Rack::Utils.set_cookie_header!(@headers, key, roda_class.cookies_opts.merge(value))
         end
       end
     end

data/lib/roda/plugins/custom_block_results.rb

@@ -44,16 +44,18 @@ class Roda
       end
 
       module ClassMethods
+        RodaPlugins.opt_attr_reader(self, :custom_block_results)
+
         # Freeze the configured custom block results when freezing the app.
         def freeze
-          opts[:custom_block_results].freeze
+          custom_block_results.freeze
           super
         end
 
         # Specify a block that will be called when an instance of klass
         # is returned as a block result.  The block defines a method.
         def handle_block_result(klass, &block)
-          opts[:custom_block_results][klass] = define_roda_method(opts[:custom_block_results][klass] || "custom_block_result_#{klass}", 1, &block)
+          custom_block_results[klass] = define_roda_method(custom_block_results[klass] || "custom_block_result_#{klass}", 1, &block)
         end
       end
 
@@ -63,7 +65,7 @@ class Roda
         # Try each configured custom block result, and call the related method
         # to get the block result.
         def unsupported_block_result(result)
-          roda_class.opts[:custom_block_results].each do |klass, meth|
+          roda_class.custom_block_results.each do |klass, meth|
             if klass === result
               result = scope.send(meth, result)
 

data/lib/roda/plugins/custom_matchers.rb

@@ -58,8 +58,10 @@ class Roda
       end
 
       module ClassMethods
+        RodaPlugins.opt_attr_reader(self, :custom_matchers)
+
         def custom_matcher(match_class, &block)
-          custom_matchers = Hash[opts[:custom_matchers]]
+          custom_matchers = Hash[self.custom_matchers]
           meth = custom_matchers[match_class] = custom_matchers[match_class] || :"_custom_matcher_#{match_class}"
           opts[:custom_matchers] = custom_matchers.freeze
           self::RodaRequest.send(:define_method, meth, &block)
@@ -72,7 +74,7 @@ class Roda
 
         # Try custom matchers before calling super
         def unsupported_matcher(matcher)
-          roda_class.opts[:custom_matchers].each do |match_class, meth|
+          roda_class.custom_matchers.each do |match_class, meth|
             if match_class === matcher
               return send(meth, matcher)
             end

data/lib/roda/plugins/default_headers.rb

@@ -27,15 +27,12 @@ class Roda
       end 
 
       module ClassMethods
-        # The default response headers to use for the current class.
-        def default_headers
-          opts[:default_headers]
-        end
+        RodaPlugins.opt_attr_reader(self, :default_headers)
 
         # Optimize the response class set_default_headers method if it hasn't been
         # overridden and all default headers are strings.
         def freeze
-          if (headers = opts[:default_headers]).all?{|k, v| k.is_a?(String) && v.is_a?(String)} &&
+          if (headers = default_headers).all?{|k, v| k.is_a?(String) && v.is_a?(String)} &&
              (self::RodaResponse.instance_method(:set_default_headers).owner == Base::ResponseMethods)
             self::RodaResponse.class_eval(<<-END, __FILE__, __LINE__+1)
               private

data/lib/roda/plugins/default_status.rb

@@ -18,6 +18,7 @@ class Roda
       def self.configure(app, &block)
         raise RodaError, "default_status plugin requires a block" unless block
         if check_arity = app.opts.fetch(:check_arity, true)
+          # RODA4: Remove support for :check_arity, default to false behavior
           unless block.arity == 0
             if check_arity == :warn
               RodaPlugins.warn "Arity mismatch in block passed to plugin :default_status. Expected Arity 0, but arguments required for #{block.inspect}"