roda 3.68.0 → 3.70.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: faad040bd1e251d705afbfe6ced40794aa2f135658168c85603a6c8a83a497be
-  data.tar.gz: 6e1d78ffdf0442835a754e54fc6216d8f668f3d0cb8e9c5635c1a582b17d5746
+  metadata.gz: 0d8ea04ca767f8be110f6ba14d1fd877a389a2e733e2925020f2ac589f6a9571
+  data.tar.gz: c9a2d26f41724c05ea1de5e8fb0058093e5fad34fb0c6479dd74badcfea67016
 SHA512:
-  metadata.gz: a663960b5f5c5391a44102b1b255fbb5546f241c2386b6fdbe8a5050f434407332f239eb0c862ab877de239ec1b4ea39c4f9202c488672a846c5f8eabaef6379
-  data.tar.gz: 508fa08ad66e1b11b5abc552345067fc2517aeb10ea060c6298a337b44db453c5daf35a0bbafe399dd9167286fd9ea35c07d75c340f640a6198beb52367352d5
+  metadata.gz: 288a793976f389dfa2fe8fd55fb649590748cbe7ebb9da48f351117bb93da33ceee5848077f53c73430fd943b6be5b69a6d189e8b7424fe9ec60892dbaacff56
+  data.tar.gz: 3cad6d6823a2fbcd5534521b6e5fbcc7b85c04d1a80e9ca758cac6ab9b4b967a5f019b653de7d4de3c1d32069832f362fd2564ec219252b0f2dd8ccf1c0785c1

data/CHANGELOG

@@ -1,3 +1,13 @@
+= 3.70.0 (2023-07-12)
+
+* Add plain_hash_response_headers plugin, using a plain hash for response headers on Rack 3 for much better performance (jeremyevans)
+
+* Use lower case response header keys by default on Rack 3, instead of relying on Rack::Headers conversion (jeremyevans)
+
+= 3.69.0 (2023-06-13)
+
+* Allow symbol_matcher in symbol_matchers plugin to take a block to allow type conversion (jeremyevans)
+
 = 3.68.0 (2023-05-11)
 
 * Make Roda.run in multi_run plugin accept blocks to allow autoloading the apps to dispatch to (jeremyevans)

data/doc/release_notes/3.69.0.txt

@@ -0,0 +1,33 @@
+= New Feature
+
+* The symbol_matcher method in the symbol_matchers plugin now
+  supports a block to allow for type conversion of matched
+  segments:
+
+    symbol_matcher(:date, /(\d\d\d\d)-(\d\d)-(\d\d)/) do |y, m, d|
+      [Date.new(y.to_i, m.to_i, d.to_i)]
+    end
+  
+    route do |r|
+      r.on :date do |date|
+        # date is an instance of Date
+      end
+    end
+
+  As shown above, the block should return an array of objects to yield
+  to the match block.
+ 
+  If you have a segment match the passed regexp, but decide during block
+  processing that you do not want to treat it as a match, you can have the
+  block return nil or false.  This is useful if you want to make sure you
+  are using valid data:
+  
+    symbol_matcher(:date, /(\d\d\d\d)-(\d\d)-(\d\d)/) do |y, m, d|
+      y = y.to_i
+      m = m.to_i
+      d = d.to_i
+      [Date.new(y, m, d)] if Date.valid_date?(y, m, d)
+    end
+  
+  When providing a block when using the symbol_matchers method, that
+  symbol may not work with the params_capturing plugin.

data/doc/release_notes/3.70.0.txt

@@ -0,0 +1,19 @@
+= New Features
+
+* A plain_hash_response_headers plugin has been added.  On Rack 3,
+  this changes Roda to use a plain hash for response headers (as it
+  does on Rack 2), instead of using Rack::Headers (the default on
+  Rack 3).  For a minimal app, using this plugin can almost double
+  the performance on Rack 3.  Before using this plugin, you should
+  make sure that all response headers set explictly in your
+  application are already lower-case.
+
+= Improvements
+
+* Roda now natively uses lower-case for all response headers set
+  implicitly when using Rack 3.  Previously, Roda used mixed-case
+  response headers and had Rack::Headers handle the conversion to
+  lower-case (Rack 3 requires lower-case response headers). Note
+  that Rack::Headers is still used for response headers by default
+  on Rack 3, as applications may not have converted to using
+  lower-case response headers.

data/lib/roda/plugins/assets.rb

@@ -430,8 +430,8 @@ class Roda
           opts[:css_headers] = headers.merge(opts[:css_headers])
           opts[:js_headers]  = headers.merge(opts[:js_headers])
         end
-        opts[:css_headers]['Content-Type'] ||= "text/css; charset=UTF-8".freeze
-        opts[:js_headers]['Content-Type']  ||= "application/javascript; charset=UTF-8".freeze
+        opts[:css_headers][RodaResponseHeaders::CONTENT_TYPE] ||= "text/css; charset=UTF-8".freeze
+        opts[:js_headers][RodaResponseHeaders::CONTENT_TYPE]  ||= "application/javascript; charset=UTF-8".freeze
 
         [:css_headers, :js_headers, :css_opts, :js_opts, :dependencies, :expanded_dependencies].each do |s|
           opts[s].freeze
@@ -754,7 +754,7 @@ class Roda
             file = "#{o[:"compiled_#{type}_path"]}#{file}"
 
             if o[:gzip] && env['HTTP_ACCEPT_ENCODING'] =~ /\bgzip\b/
-              @_response['Content-Encoding'] = 'gzip'
+              @_response[RodaResponseHeaders::CONTENT_ENCODING] = 'gzip'
               file += '.gz'
             end
 

data/lib/roda/plugins/caching.rb

@@ -86,7 +86,7 @@ class Roda
           return unless time
           res = response
           e = env
-          res['Last-Modified'] = time.httpdate
+          res[RodaResponseHeaders::LAST_MODIFIED] = time.httpdate
           return if e['HTTP_IF_NONE_MATCH']
           status = res.status
 
@@ -122,7 +122,7 @@ class Roda
 
           res = response
           e = env
-          res['ETag'] = etag = "#{'W/' if weak}\"#{value}\""
+          res[RodaResponseHeaders::ETAG] = etag = "#{'W/' if weak}\"#{value}\""
           status = res.status
 
           if (!status || (status >= 200 && status < 300) || status == 304)
@@ -176,7 +176,7 @@ class Roda
             values << (v == true ? k : "#{k}=#{v}")
           end
 
-          self['Cache-Control'] = values.join(', ') unless values.empty?
+          @headers[RodaResponseHeaders::CACHE_CONTROL] = values.join(', ') unless values.empty?
         end
 
         # Set Cache-Control header with the max_age given.  max_age should
@@ -185,7 +185,7 @@ class Roda
         # HTTP 1.0 clients (Cache-Control is an HTTP 1.1 header).
         def expires(max_age, opts=OPTS)
           cache_control(Hash[opts].merge!(:max_age=>max_age))
-          self['Expires'] = (Time.now + max_age).httpdate
+          @headers[RodaResponseHeaders::EXPIRES] = (Time.now + max_age).httpdate
         end
 
         # Remove Content-Type and Content-Length for 304 responses.
@@ -193,8 +193,8 @@ class Roda
           a = super
           if a[0] == 304
             h = a[1]
-            h.delete('Content-Type')
-            h.delete('Content-Length')
+            h.delete(RodaResponseHeaders::CONTENT_TYPE)
+            h.delete(RodaResponseHeaders::CONTENT_LENGTH)
           end
           a
         end

data/lib/roda/plugins/chunked.rb

@@ -257,7 +257,7 @@ class Roda
             headers.merge!(chunk_headers)
           end
           if self.opts[:force_chunked_encoding]
-            headers['Transfer-Encoding'] = 'chunked'
+            res[RodaResponseHeaders::TRANSFER_ENCODING] = 'chunked'
             body = Body.new(self)
           else
             body = StreamBody.new(self)

data/lib/roda/plugins/class_matchers.rb

@@ -33,7 +33,7 @@ class Roda
     # block return nil or false.  This is useful if you want to make sure you
     # are using valid data:
     #
-    #   class_matcher(Date, /(\dd\d)-(\d\d)-(\d\d)/) do |y, m, d|
+    #   class_matcher(Date, /(\d\d\d\d)-(\d\d)-(\d\d)/) do |y, m, d|
     #     y = y.to_i
     #     m = m.to_i
     #     d = d.to_i

data/lib/roda/plugins/common_logger.rb

@@ -46,7 +46,7 @@ class Roda
 
         # Log request/response information in common log format to logger.
         def _roda_after_90__common_logger(result)
-          return unless result && result[0] && result[1]
+          return unless result && (status = result[0]) && (headers = result[1])
 
           elapsed_time = if timer = @_request_timer
             '%0.4f' % (CommonLogger.start_timer - timer)
@@ -56,7 +56,7 @@ class Roda
 
           env = @_request.env
 
-          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}\" #{result[0]} #{((length = result[1]['Content-Length']) && (length unless length == '0')) || '-'} #{elapsed_time}\n"
+          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}\n"
           if MUTATE_LINE
             line.gsub!(/[^[:print:]\n]/){|c| sprintf("\\x%x", c.ord)}
           # :nocov:

data/lib/roda/plugins/content_security_policy.rb

@@ -200,7 +200,7 @@ class Roda
 
         # The header name to use, depends on whether report only mode has been enabled.
         def header_key
-          @report_only ? 'Content-Security-Policy-Report-Only' : 'Content-Security-Policy'
+          @report_only ? RodaResponseHeaders::CONTENT_SECURITY_POLICY_REPORT_ONLY : RodaResponseHeaders::CONTENT_SECURITY_POLICY
         end
 
         # The header value to use.
@@ -309,7 +309,7 @@ class Roda
         # Set the appropriate content security policy header.
         def set_default_headers
           super
-          (@content_security_policy || roda_class.opts[:content_security_policy]).set_header(@headers)
+          (@content_security_policy || roda_class.opts[:content_security_policy]).set_header(headers)
         end
       end
     end

data/lib/roda/plugins/drop_body.rb

@@ -27,8 +27,8 @@ class Roda
           when DROP_BODY_RANGE, 204, 304
             r[2] = EMPTY_ARRAY
             h = r[1]
-            h.delete("Content-Length")
-            h.delete("Content-Type")
+            h.delete(RodaResponseHeaders::CONTENT_LENGTH)
+            h.delete(RodaResponseHeaders::CONTENT_TYPE)
           when 205
             r[2] = EMPTY_ARRAY
             empty_205_headers(r[1])

data/lib/roda/plugins/exception_page.rb

@@ -198,7 +198,7 @@ END
         def exception_page(exception, opts=OPTS)
           message = exception_page_exception_message(exception)
           if opts[:json]
-            @_response['Content-Type'] = "application/json"
+            @_response[RodaResponseHeaders::CONTENT_TYPE] = "application/json"
             {
               "exception"=>{
                 "class"=>exception.class.to_s,
@@ -207,7 +207,7 @@ END
               }
             }
           elsif env['HTTP_ACCEPT'] =~ /text\/html/
-            @_response['Content-Type'] = "text/html"
+            @_response[RodaResponseHeaders::CONTENT_TYPE] = "text/html"
 
             context = opts[:context] || 7
             css_file = opts[:css_file]
@@ -394,7 +394,7 @@ END1
 </html>
 END
           else
-            @_response['Content-Type'] = "text/plain"
+            @_response[RodaResponseHeaders::CONTENT_TYPE] = "text/plain"
             "#{exception.class}: #{message}\n#{exception.backtrace.map{|l| "\t#{l}"}.join("\n")}"
           end
         end
@@ -429,11 +429,11 @@ END
         # Serve exception page assets
         def exception_page_assets
           get 'exception_page.css' do
-            response['Content-Type'] = "text/css"
+            response[RodaResponseHeaders::CONTENT_TYPE] = "text/css"
             scope.exception_page_css
           end
           get 'exception_page.js' do
-            response['Content-Type'] = "application/javascript"
+            response[RodaResponseHeaders::CONTENT_TYPE] = "application/javascript"
             scope.exception_page_js
           end
         end

data/lib/roda/plugins/header_matchers.rb

@@ -45,7 +45,7 @@ class Roda
         # Match if the given mimetype is one of the accepted mimetypes.
         def match_accept(mimetype)
           if @env["HTTP_ACCEPT"].to_s.split(',').any?{|s| s.strip == mimetype}
-            response["Content-Type"] = mimetype
+            response[RodaResponseHeaders::CONTENT_TYPE] = mimetype
           end
         end
 

data/lib/roda/plugins/heartbeat.rb

@@ -27,7 +27,7 @@ class Roda
           if env['PATH_INFO'] == opts[:heartbeat_path]
             response = @_response
             response.status = 200
-            response['Content-Type'] = 'text/plain'
+            response[RodaResponseHeaders::CONTENT_TYPE] = 'text/plain'
             response.write 'OK'
             throw :halt, response.finish
           end

data/lib/roda/plugins/json.rb

@@ -86,7 +86,7 @@ class Roda
         # Handle a result for one of the registered JSON result classes
         # by converting the result to JSON.
         def handle_json_block_result(result)
-          @_response['Content-Type'] ||= opts[:json_result_content_type]
+          @_response[RodaResponseHeaders::CONTENT_TYPE] ||= opts[:json_result_content_type]
           @_request.send(:convert_to_json, result)
         end
       end

data/lib/roda/plugins/mailer.rb

@@ -186,7 +186,7 @@ class Roda
         # that the routing tree did not handle the request.
         def finish
           if m = mail
-            header_content_type = @headers.delete('Content-Type')
+            header_content_type = @headers.delete(RodaResponseHeaders::CONTENT_TYPE)
             m.headers(@headers)
             m.body(@body.join) unless @body.empty?
             mail_attachments.each do |a, block|
@@ -241,7 +241,7 @@ class Roda
           if mail = env['roda.mail']
             res = @_response
             res.mail = mail
-            res.headers.delete('Content-Type')
+            res.headers.delete(RodaResponseHeaders::CONTENT_TYPE)
           end
         end
 

data/lib/roda/plugins/not_allowed.rb

@@ -138,7 +138,7 @@ class Roda
         def method_not_allowed(verbs)
           res = response
           res.status = 405
-          res['Allow'] = verbs
+          res[RodaResponseHeaders::ALLOW] = verbs
           nil
         end
       end

data/lib/roda/plugins/plain_hash_response_headers.rb

@@ -0,0 +1,32 @@
+# frozen-string-literal: true
+
+#
+class Roda
+  module RodaPlugins
+    # The response_headers_plain_hash plugin will change Roda to
+    # use a plain hash for response headers.  This is Roda's
+    # default behavior on Rack 2, but on Rack 3+, Roda defaults
+    # to using Rack::Headers for response headers for backwards
+    # compatibility (Rack::Headers automatically lower cases header
+    # keys).
+    #
+    # On Rack 3+, you should use this plugin for better performance
+    # if you are sure all headers in your application and middleware
+    # are already lower case (lower case response header keys are
+    # required by the Rack 3 spec).
+    module PlainHashResponseHeaders
+      if defined?(Rack::Headers) && Rack::Headers.is_a?(Class)
+        module ResponseMethods
+          private
+
+          # Use plain hash for headers
+          def _initialize_headers
+            {}
+          end
+        end
+      end
+    end
+
+    register_plugin(:plain_hash_response_headers, PlainHashResponseHeaders)
+  end
+end

data/lib/roda/plugins/public.rb

@@ -123,8 +123,8 @@ class Roda
               headers.replace(h)
 
               unless s == 304
-                headers['Content-Type'] = ::Rack::Mime.mime_type(::File.extname(path), 'text/plain')
-                headers['Content-Encoding'] = encoding
+                headers[RodaResponseHeaders::CONTENT_TYPE] = ::Rack::Mime.mime_type(::File.extname(path), 'text/plain')
+                headers[RodaResponseHeaders::CONTENT_ENCODING] = encoding
               end
 
               halt [s, headers, b]

data/lib/roda/plugins/route_csrf.rb

@@ -193,7 +193,10 @@ class Roda
               raise InvalidToken, msg
             when :empty_403
               @_response.status = 403
-              @_response.headers.replace('Content-Type'=>'text/html', 'Content-Length'=>'0')
+              headers = @_response.headers
+              headers.clear
+              headers[RodaResponseHeaders::CONTENT_TYPE] = 'text/html'
+              headers[RodaResponseHeaders::CONTENT_LENGTH] ='0'
               throw :halt, @_response.finish_with_body([])
             when :clear_session
               session.clear

data/lib/roda/plugins/sinatra_helpers.rb

@@ -327,7 +327,7 @@ class Roda
         def send_file(path, opts = OPTS)
           res = response
           headers = res.headers
-          if opts[:type] || !headers["Content-Type"]
+          if opts[:type] || !headers[RodaResponseHeaders::CONTENT_TYPE]
             res.content_type(opts[:type] || ::File.extname(path), :default => 'application/octet-stream')
           end
 
@@ -352,7 +352,7 @@ class Roda
           end
 
           res.status = opts[:status] || s
-          headers.delete("Content-Length")
+          headers.delete(RodaResponseHeaders::CONTENT_LENGTH)
           headers.replace(h.merge!(headers))
           res.body = b
 
@@ -407,7 +407,7 @@ class Roda
 
         # If the body is a DelayedBody, set the appropriate length for it.
         def finish
-          @length = @body.length if @body.is_a?(DelayedBody) && !@headers["Content-Length"]
+          @length = @body.length if @body.is_a?(DelayedBody) && !@headers[RodaResponseHeaders::CONTENT_LENGTH]
           super
         end
 
@@ -424,7 +424,7 @@ class Roda
 
         # Set the Content-Type of the response body given a media type or file
         # extension.  See plugin documentation for options.
-        def content_type(type = nil || (return @headers["Content-Type"]), opts = OPTS)
+        def content_type(type = nil || (return @headers[RodaResponseHeaders::CONTENT_TYPE]), opts = OPTS)
           unless (mime_type = mime_type(type) || opts[:default])
             raise RodaError, "Unknown media type: #{type}"
           end
@@ -437,7 +437,7 @@ class Roda
             end
           end
 
-          @headers["Content-Type"] = mime_type
+          @headers[RodaResponseHeaders::CONTENT_TYPE] = mime_type
         end
 
         # Set the Content-Disposition to "attachment" with the specified filename,
@@ -463,14 +463,14 @@ class Roda
               encoded_params = "; filename*=#{encoding.to_s}''#{encoded_filename}"
             end
 
-            unless @headers["Content-Type"]
+            unless @headers[RodaResponseHeaders::CONTENT_TYPE]
               ext = File.extname(filename)
               unless ext.empty?
                 content_type(ext)
               end
             end
           end
-          @headers["Content-Disposition"] = "#{disposition}#{params}#{encoded_params}"
+          @headers[RodaResponseHeaders::CONTENT_DISPOSITION] = "#{disposition}#{params}#{encoded_params}"
         end
 
         # Whether or not the status is set to 1xx. Returns nil if status not yet set.

data/lib/roda/plugins/symbol_matchers.rb

@@ -37,6 +37,35 @@ class Roda
     #
     # If using this plugin with the params_capturing plugin, this plugin should
     # be loaded first.
+    #
+    # You can provide a block when calling +symbol_matcher+, and it will be called
+    # for all matches to allow for type conversion.  The block must return an
+    # array:
+    #
+    #   symbol_matcher(:date, /(\d\d\d\d)-(\d\d)-(\d\d)/) do |y, m, d|
+    #     [Date.new(y.to_i, m.to_i, d.to_i)]
+    #   end
+    #
+    #   route do |r|
+    #     r.on :date do |date|
+    #       # date is an instance of Date
+    #     end
+    #   end
+    #
+    # If you have a segment match the passed regexp, but decide during block
+    # processing that you do not want to treat it as a match, you can have the
+    # block return nil or false.  This is useful if you want to make sure you
+    # are using valid data:
+    #
+    #   symbol_matcher(:date, /(\d\d\d\d)-(\d\d)-(\d\d)/) do |y, m, d|
+    #     y = y.to_i
+    #     m = m.to_i
+    #     d = d.to_i
+    #     [Date.new(y, m, d)] if Date.valid_date?(y, m, d)
+    #   end
+    #
+    # However, if providing a block to the symbol_matchers plugin, the symbol may 
+    # not work with the params_capturing plugin.
     module SymbolMatchers
       def self.load_dependencies(app)
         app.plugin :_symbol_regexp_matchers
@@ -50,9 +79,10 @@ class Roda
 
       module ClassMethods
         # Set the regexp to use for the given symbol, instead of the default.
-        def symbol_matcher(s, re)
+        def symbol_matcher(s, re, &block)
           meth = :"match_symbol_#{s}"
-          self::RodaRequest.send(:define_method, meth){re}
+          array = [re, block].freeze
+          self::RodaRequest.send(:define_method, meth){array}
           self::RodaRequest.send(:private, meth)
         end
       end
@@ -67,8 +97,8 @@ class Roda
           meth = :"match_symbol_#{s}"
           if respond_to?(meth, true)
             # Allow calling private match methods
-            re = send(meth)
-            consume(self.class.cached_matcher(re){re})
+            re, block = send(meth)
+            consume(self.class.cached_matcher(re){re}, &block)
           else
             super
           end
@@ -80,7 +110,8 @@ class Roda
           meth = :"match_symbol_#{s}"
           if respond_to?(meth, true)
             # Allow calling private match methods
-            send(meth)
+            re, = send(meth)
+            re
           else
             super
           end

data/lib/roda/plugins/type_routing.rb

@@ -152,7 +152,7 @@ class Roda
         # the request afterwards, returning the result of the block.
         def on_type(type, &block)
           return unless type == requested_type
-          response['Content-Type'] ||= @scope.opts[:type_routing][:types][type]
+          response[RodaResponseHeaders::CONTENT_TYPE] ||= @scope.opts[:type_routing][:types][type]
           always(&block)
         end
 
@@ -200,7 +200,7 @@ class Roda
           @env['HTTP_ACCEPT'].to_s.split(/\s*,\s*/).map do |part|
             mime, _= part.split(/\s*;\s*/, 2)
             if sym = mimes[mime]
-              response['Vary'] = (vary = response['Vary']) ? "#{vary}, Accept" : 'Accept'
+              response[RodaResponseHeaders::VARY] = (vary = response[RodaResponseHeaders::VARY]) ? "#{vary}, Accept" : 'Accept'
               return sym
             end
           end

data/lib/roda/response.rb

@@ -6,6 +6,25 @@ rescue LoadError
 end
 
 class Roda
+  # Contains constants for response headers.  This approach is used so that all
+  # headers used internally by Roda can be lower case on Rack 3, so that it is
+  # possible to use a plain hash of response headers instead of using Rack::Headers.
+  module RodaResponseHeaders
+    headers = %w'Allow Cache-Control Content-Disposition Content-Encoding Content-Length
+       Content-Security-Policy Content-Security-Policy-Report-Only Content-Type
+       ETag Expires Last-Modified Link Location Set-Cookie Transfer-Encoding Vary'.freeze.each(&:freeze)
+
+    if defined?(Rack::Headers) && Rack::Headers.is_a?(Class)
+      headers.each do |mixed_case|
+        const_set(mixed_case.gsub('-', '_').upcase!.to_sym, mixed_case.downcase.freeze)
+      end
+    else
+      headers.each do |mixed_case|
+        const_set(mixed_case.gsub('-', '_').upcase!.to_sym, mixed_case.freeze)
+      end
+    end
+  end
+
   # Base class used for Roda responses.  The instance methods for this
   # class are added by Roda::RodaPlugins::Base::ResponseMethods, the class
   # methods are added by Roda::RodaPlugins::Base::ResponseClassMethods.
@@ -30,7 +49,7 @@ class Roda
 
       # Instance methods for RodaResponse
       module ResponseMethods
-        DEFAULT_HEADERS = {"Content-Type" => "text/html".freeze}.freeze
+        DEFAULT_HEADERS = {RodaResponseHeaders::CONTENT_TYPE => "text/html".freeze}.freeze
 
         # The body for the current response.
         attr_reader :body
@@ -42,20 +61,11 @@ class Roda
         # code for non-empty responses and a 404 code for empty responses.
         attr_accessor :status
 
-        if defined?(Rack::Headers) && Rack::Headers.is_a?(Class)
-          # Set the default headers when creating a response.
-          def initialize
-            @headers = Rack::Headers.new
-            @body    = []
-            @length  = 0
-          end
-        else
-          # Set the default headers when creating a response.
-          def initialize
-            @headers = {}
-            @body    = []
-            @length  = 0
-          end
+        # Set the default headers when creating a response.
+        def initialize
+          @headers = _initialize_headers
+          @body    = []
+          @length  = 0
         end
 
         # Return the response header with the given key. Example:
@@ -108,15 +118,15 @@ class Roda
           if b.empty?
             s = @status || 404
             if (s == 304 || s == 204 || (s >= 100 && s <= 199))
-              h.delete("Content-Type")
+              h.delete(RodaResponseHeaders::CONTENT_TYPE)
             elsif s == 205
               empty_205_headers(h)
             else
-              h["Content-Length"] ||= '0'
+              h[RodaResponseHeaders::CONTENT_LENGTH] ||= '0'
             end
           else
             s = @status || default_status
-            h["Content-Length"] ||= @length.to_s
+            h[RodaResponseHeaders::CONTENT_LENGTH] ||= @length.to_s
           end
 
           [s, h, b]
@@ -149,7 +159,7 @@ class Roda
         #   response.redirect('foo', 301)
         #   response.redirect('bar')
         def redirect(path, status = 302)
-          @headers["Location"] = path
+          @headers[RodaResponseHeaders::LOCATION] = path
           @status  = status
           nil
         end
@@ -171,18 +181,30 @@ class Roda
 
         private
 
+        if defined?(Rack::Headers) && Rack::Headers.is_a?(Class)
+          # Use Rack::Headers for headers by default on Rack 3
+          def _initialize_headers
+            Rack::Headers.new
+          end
+        else
+          # Use plain hash for headers by default on Rack 1-2
+          def _initialize_headers
+            {}
+          end
+        end
+
         if Rack.release < '2.0.2'
           # Don't use a content length for empty 205 responses on
           # rack 1, as it violates Rack::Lint in that version.
           def empty_205_headers(headers)
-            headers.delete("Content-Type")
-            headers.delete("Content-Length")
+            headers.delete(RodaResponseHeaders::CONTENT_TYPE)
+            headers.delete(RodaResponseHeaders::CONTENT_LENGTH)
           end
         else
           # Set the content length for empty 205 responses to 0
           def empty_205_headers(headers)
-            headers.delete("Content-Type")
-            headers["Content-Length"] = '0'
+            headers.delete(RodaResponseHeaders::CONTENT_TYPE)
+            headers[RodaResponseHeaders::CONTENT_LENGTH] = '0'
           end
         end
 

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

data/lib/roda.rb

@@ -204,7 +204,7 @@ class Roda
 
                 alias set_default_headers set_default_headers
                 def set_default_headers
-                  @headers['Content-Type'] ||= 'text/html'
+                  @headers[RodaResponseHeaders::CONTENT_TYPE] ||= 'text/html'
                 end
               end
             end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: roda
 version: !ruby/object:Gem::Version
-  version: 3.68.0
+  version: 3.70.0
 platform: ruby
 authors:
 - Jeremy Evans
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-11 00:00:00.000000000 Z
+date: 2023-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -241,7 +241,9 @@ extra_rdoc_files:
 - doc/release_notes/3.66.0.txt
 - doc/release_notes/3.67.0.txt
 - doc/release_notes/3.68.0.txt
+- doc/release_notes/3.69.0.txt
 - doc/release_notes/3.7.0.txt
+- doc/release_notes/3.70.0.txt
 - doc/release_notes/3.8.0.txt
 - doc/release_notes/3.9.0.txt
 files:
@@ -316,7 +318,9 @@ files:
 - doc/release_notes/3.66.0.txt
 - doc/release_notes/3.67.0.txt
 - doc/release_notes/3.68.0.txt
+- doc/release_notes/3.69.0.txt
 - doc/release_notes/3.7.0.txt
+- doc/release_notes/3.70.0.txt
 - doc/release_notes/3.8.0.txt
 - doc/release_notes/3.9.0.txt
 - lib/roda.rb
@@ -410,6 +414,7 @@ files:
 - lib/roda/plugins/path_matchers.rb
 - lib/roda/plugins/path_rewriter.rb
 - lib/roda/plugins/placeholder_string_matchers.rb
+- lib/roda/plugins/plain_hash_response_headers.rb
 - lib/roda/plugins/precompile_templates.rb
 - lib/roda/plugins/public.rb
 - lib/roda/plugins/r.rb