roda 3.107.0 → 3.109.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 84bb84bd98ebe0d00d48315d9036ae1c22d93c92715922a6dba297f225c9fec7
-  data.tar.gz: 7cf2abbe3656ec22aef206a4e895c2520a8f80dc0ed11ec058a8a5f4cf3194b5
+  metadata.gz: f8fe0436b7983ecbf3bbbf1cf8d7d8867f87184550ef097d6fad894a17211c5e
+  data.tar.gz: a19800b130b13b745d3ff6a77c22ac88e4c44b70a778c243e07212c0fcebd019
 SHA512:
-  metadata.gz: 874ed7d5065e77c593bccd1939d3742acf3e65a0b6ea6eb95e02cd6ce9ca55c9819cfafe6ecfc61ce548075832b91c68800e7f5ae35774efb60949f0a86cb1ae
-  data.tar.gz: 40a37368dfc79527849fec46d615c26680cad15dd590b8b6a3dba0fa2809c2b90bacefa70f65b78566f88c62485f97afd715494a214fcc87050125ac7743d519
+  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/_base64.rb

@@ -9,12 +9,12 @@ class Roda
           def decode64(str)
             str.unpack1("m0")
           end
-        # :nocov:
+        # simplecov:disable
         else
           def decode64(str)
             str.unpack("m0")[0]
           end
-        # :nocov:
+        # simplecov:enable
         end
 
         def urlsafe_encode64(bin)

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/_optimized_matching.rb

@@ -44,6 +44,7 @@ class Roda
                 rp = @remaining_path
                 if rp.getbyte(0) == 47
                   if last = rp.index('/', 1)
+                    return false if last == 1
                     @remaining_path = rp[last, rp.length]
                     always{yield rp[1, last-1]}
                   elsif (len = rp.length) > 1

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/all_verbs.rb

@@ -6,7 +6,7 @@ class Roda
     # The all_verbs plugin adds methods for http verbs other than
     # get and post.  The following verbs are added, assuming
     # rack handles them: delete, head, options, link, patch, put,
-    # trace, unlink.
+    # query, trace, unlink.
     #
     # These methods operate just like Roda's default get and post
     # methods, so using them without any arguments just checks for
@@ -33,7 +33,7 @@ class Roda
     # isn't documentation for the individual methods created.
     module AllVerbs
       module RequestMethods
-        %w'delete head options link patch put trace unlink'.each do |verb|
+        %w'delete head options link patch put query trace unlink'.each do |verb|
           if ::Rack::Request.method_defined?("#{verb}?")
             class_eval(<<-END, __FILE__, __LINE__+1)
               def #{verb}(*args, &block)

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
@@ -659,9 +656,9 @@ class Roda
           begin
             require 'uglifier'
           rescue => e
-            # :nocov:
+            # simplecov:disable
             raise CompressorNotFound, "#{e.class}: #{e.message}", e.backtrace
-            # :nocov:
+            # simplecov:enable
           end
 
           Uglifier.compile(content)
@@ -689,11 +686,11 @@ class Roda
           digest = begin
             require 'openssl'
             ::OpenSSL::Digest
-          # :nocov:
+          # simplecov:disable
           rescue LoadError
             require 'digest/sha2'
             ::Digest
-          # :nocov:
+          # simplecov:enable
           end
           digest.const_get(algo.to_s.upcase).hexdigest(content)
         end
@@ -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/bearer_token.rb

@@ -8,9 +8,9 @@ class Roda
     # in the authorization header will be recognized as long as they start
     # with the case insensitive string "bearer ".
     module BearerToken
-      # :nocov:
+      # simplecov:disable
       METHOD = RUBY_VERSION >= "2.4" ? :match? : :match
-      # :nocov:
+      # simplecov:enable
 
       module RequestMethods
         # Return the bearer token for the request if there is one in the

data/lib/roda/plugins/break.rb

@@ -22,12 +22,20 @@ class Roda
     #   end
     #
     # This provides the same basic feature as the pass plugin, but
-    # uses Ruby's standard control flow primative instead of a
+    # uses Ruby's standard control flow primitive instead of a
     # separate method.
     module Break
       module RequestMethods
         private
 
+        # Handle passing inside the match block.
+        def always
+          rp = @remaining_path
+          super
+        ensure
+          @remaining_path = rp
+        end
+
         # Handle break inside match blocks, restoring remaining path.
         def if_match(_)
           rp = @remaining_path

data/lib/roda/plugins/caching.rb

@@ -75,28 +75,27 @@ class Roda
         # Set the last modified time of the resource using the Last-Modified header.
         # The +time+ argument should be a Time instance.
         #
-        # If the current request includes an If-Modified-Since header that is
-        # equal or later than the time specified, immediately returns a response
-        # with a 304 status.
-        #
         # If the current request includes an If-Unmodified-Since header that is
         # before than the time specified, immediately returns a response
         # with a 412 status.
+        #
+        # If the current request does not include an If-None-Match header and
+        # includes an If-Modified-Since header that is equal or later than the
+        # time specified, immediately returns a response with a 304 status.
         def last_modified(time)
           return unless time
           res = response
           e = env
           res[RodaResponseHeaders::LAST_MODIFIED] = time.httpdate
-          return if e['HTTP_IF_NONE_MATCH']
           status = res.status
 
-          if (!status || status == 200) && (ims = time_from_header(e['HTTP_IF_MODIFIED_SINCE'])) && ims >= time.to_i
-            res.status = 304
+          if (!status || (status >= 200 && status < 300) || status == 412) && (ius = time_from_header(e['HTTP_IF_UNMODIFIED_SINCE'])) && ius < time.to_i
+            res.status = 412
             halt
           end
 
-          if (!status || (status >= 200 && status < 300) || status == 412) && (ius = time_from_header(e['HTTP_IF_UNMODIFIED_SINCE'])) && ius < time.to_i
-            res.status = 412
+          if !e['HTTP_IF_NONE_MATCH'] && (!status || status == 200) && (ims = time_from_header(e['HTTP_IF_MODIFIED_SINCE'])) && ims >= time.to_i
+            res.status = 304
             halt
           end
         end
@@ -113,8 +112,9 @@ class Roda
         # matching etag, immediately returns a response with a 304 or 412 status,
         # depending on the request method.
         #
-        # When the current request includes an If-Match header with a
-        # etag that doesn't match, immediately returns a response with a 412 status.
+        # When the current request includes an If-Match header with an etag that
+        # doesn't match, or where the :weak option was used, immediately returns a
+        # response with a 412 status.
         def etag(value, opts=OPTS)
           # Before touching this code, please double check RFC 2616 14.24 and 14.26.
           weak = opts[:weak]
@@ -132,7 +132,7 @@ class Roda
             end
 
             if ifm = e['HTTP_IF_MATCH']
-              unless etag_matches?(ifm, etag, new_resource)
+              if weak || !etag_matches?(ifm, etag, new_resource)
                 res.status = 412
                 halt
               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'
@@ -36,11 +36,15 @@ class Roda
           Process.clock_gettime(Process::CLOCK_MONOTONIC)
         end
       else
-        # :nocov:
+        # simplecov:disable
         def self.start_timer # :nodoc:
           Time.now
         end
-        # :nocov:
+        # simplecov:enable
+      end
+
+      module ClassMethods
+        RodaPlugins.opt_attr_reader(self, :common_logger_meth)
       end
 
       module InstanceMethods
@@ -61,13 +65,13 @@ class Roda
           line = "#{env['HTTP_X_FORWARDED_FOR'] || env["REMOTE_ADDR"] || "-"} - #{env["REMOTE_USER"] || "-"} [#{Time.now.strftime("%d/%b/%Y:%H:%M:%S %z")}] \"#{env["REQUEST_METHOD"]} #{env["SCRIPT_NAME"]}#{env["PATH_INFO"]}#{"?#{env["QUERY_STRING"]}" if ((qs = env["QUERY_STRING"]) && !qs.empty?)} #{@_request.http_version}\" #{status} #{((length = headers[RodaResponseHeaders::CONTENT_LENGTH]) && (length unless length == '0')) || '-'} #{elapsed_time} "
           if MUTATE_LINE
             line.gsub!(/[^[:print:]]/){|c| sprintf("\\x%x", c.ord)}
-          # :nocov:
+          # simplecov:disable
           else
             line = line.gsub(/[^[:print:]]/){|c| sprintf("\\x%x", c.ord)}
-          # :nocov:
+          # 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