roda 2.27.0 → 2.28.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e2d73336ee24aee0fa3afe57096ef4d2f47c14f5
-  data.tar.gz: 9c0dbc60da0f5d73a24ad48a807f413c0f84e300
+  metadata.gz: ca75e717d558d6b3c163517c6e8e3678a33b68e0
+  data.tar.gz: a08ab3922fc609e9413f6151444bc9a92186777e
 SHA512:
-  metadata.gz: d0e19332b1d9c17b18d4d9e3514a90389e65373508874b41521c3fb4fcfa4f0dc97da1fdfbb09273c9b84ac08addf4c286d85c4467538a1481e459a5307c6ae2
-  data.tar.gz: 4d7de5e3b2331e0e9a6c1983a2b79ba2a5f6d5e105b6d7fd8f5acf5d52128f34762cabf68627e5f2866415667fbfcd41b23f7fc315a0ea14ab52cb88b19217ba
+  metadata.gz: 29684100b4d5dd39d11e034a9158442b9e7379c11fe8c0169033fab127394855e79016aa0101f7abdb79cc544dbfcedc98c0fa3fd6fad7559678ab43f69b9dbe
+  data.tar.gz: 77d6d7bb57535d375a46103b4ba5f803231172ecf6b98cdc3ebba85600be1e02dfe06dc907758ffbdbe6123911f436e15fbf87fe3c2a4f2d4a0742a36af94471

data/CHANGELOG

@@ -1,3 +1,11 @@
+= 2.28.0 (2017-07-14)
+
+* Deprecate unneeded internal constants (jeremyevans)
+
+* Optimize for ruby 2.3+ using frozen string literals instead of constants (jeremyevans)
+
+* Move 303 default redirect status from sinatra_helpers to status_303 plugin, so it can be loaded separately (plujon) (#122)
+
 = 2.27.0 (2017-06-14)
 
 * Add class_matchers plugin for matching other classes (in addition to String/Integer), with user specified regexps and type conversion (jeremyevans)

data/doc/release_notes/2.28.0.txt

@@ -0,0 +1,17 @@
+= New Features
+
+* A status_303 plugin has been added, which changes the default
+  redirect status from 302 to 303 if the HTTP version is 1.1 and
+  the request is not a GET request.
+
+= Other Improvements
+
+* Roda is now optimized for ruby 2.3+ using frozen string literals
+  instead of constant references.  This improves performance on ruby
+  2.3+, and decreases performance on ruby <2.3.
+
+= Backwards Compatibility
+
+* Many now unused internal constants are now deprecated, and
+  attempting to access them will result in deprecation warnings
+  on ruby 2.3+.

data/lib/roda.rb

@@ -89,6 +89,14 @@ class Roda
       @plugins[name] = mod
     end
 
+    # Deprecate the constant with the given name in the given module,
+    # if the ruby version supports it.
+    def self.deprecate_constant(mod, name)
+      if RUBY_VERSION >= '2.3'
+        mod.deprecate_constant(name)
+      end
+    end
+
     # The base plugin for Roda, implementing all default functionality.
     # Methods are put into a plugin so future plugins can easily override
     # them and call super to get the default behavior.
@@ -340,19 +348,29 @@ class Roda
       # for the request.
       module RequestMethods
         PATH_INFO = "PATH_INFO".freeze
+        RodaPlugins.deprecate_constant(self, :PATH_INFO)
         SCRIPT_NAME = "SCRIPT_NAME".freeze
+        RodaPlugins.deprecate_constant(self, :SCRIPT_NAME)
         REQUEST_METHOD = "REQUEST_METHOD".freeze
+        RodaPlugins.deprecate_constant(self, :REQUEST_METHOD)
         EMPTY_STRING = "".freeze
+        RodaPlugins.deprecate_constant(self, :EMPTY_STRING)
         SLASH = "/".freeze
+        RodaPlugins.deprecate_constant(self, :SLASH)
         COLON = ":".freeze
+        RodaPlugins.deprecate_constant(self, :COLON)
         SEGMENT = "([^\\/]+)".freeze
+        RodaPlugins.deprecate_constant(self, :SEGMENT)
         TERM_INSPECT = "TERM".freeze
+        RodaPlugins.deprecate_constant(self, :TERM_INSPECT)
         GET_REQUEST_METHOD = 'GET'.freeze
+        RodaPlugins.deprecate_constant(self, :GET_REQUEST_METHOD)
         SESSION_KEY = 'rack.session'.freeze
+        RodaPlugins.deprecate_constant(self, :SESSION_KEY)
 
         TERM = Object.new
         def TERM.inspect
-          TERM_INSPECT
+          "TERM"
         end
         TERM.freeze
 
@@ -408,7 +426,7 @@ class Roda
         #   r.inspect
         #   # => '#<Roda::RodaRequest GET /foo/bar>'
         def inspect
-          "#<#{self.class.inspect} #{@env[REQUEST_METHOD]} #{path}>"
+          "#<#{self.class.inspect} #{@env["REQUEST_METHOD"]} #{path}>"
         end
 
         # Does a terminal match on the current path, matching only if the arguments
@@ -469,7 +487,7 @@ class Roda
         # Similar to the default Rack::Request get? method, but can be
         # overridden without changing rack's behavior.
         def is_get?
-          @env[REQUEST_METHOD] == GET_REQUEST_METHOD
+          @env["REQUEST_METHOD"] == 'GET'
         end
 
         # Does a match on the path, matching only if the arguments
@@ -510,7 +528,7 @@ class Roda
         # The already matched part of the path, including the original SCRIPT_NAME.
         def matched_path
           e = @env
-          e[SCRIPT_NAME] + e[PATH_INFO].chomp(@remaining_path)
+          e["SCRIPT_NAME"] + e["PATH_INFO"].chomp(@remaining_path)
         end
 
         # This an an optimized version of Rack::Request#path.
@@ -521,7 +539,7 @@ class Roda
         #   # => '/foo/bar'
         def path
           e = @env
-          "#{e[SCRIPT_NAME]}#{e[PATH_INFO]}"
+          "#{e["SCRIPT_NAME"]}#{e["PATH_INFO"]}"
         end
 
         # The current path to match requests against.
@@ -631,7 +649,7 @@ class Roda
         # Use <tt>r.get true</tt> to handle +GET+ requests where the current
         # path is empty.
         def root(&block)
-          if remaining_path == SLASH && is_get?
+          if remaining_path == "/" && is_get?
             always(&block)
           end
         end
@@ -650,8 +668,8 @@ class Roda
         def run(app)
           e = @env
           path = real_remaining_path
-          sn = SCRIPT_NAME
-          pi = PATH_INFO
+          sn = "SCRIPT_NAME"
+          pi = "PATH_INFO"
           script_name = e[sn]
           path_info = e[pi]
           begin
@@ -667,7 +685,7 @@ class Roda
         # The session for the current request.  Raises a RodaError if
         # a session handler has not been loaded.
         def session
-          @env[SESSION_KEY] || raise(RodaError, "You're missing a session handler. You can get started by adding use Rack::Session::Cookie")
+          @env['rack.session'] || raise(RodaError, "You're missing a session handler. You can get started by adding use Rack::Session::Cookie")
         end
 
         private
@@ -721,21 +739,21 @@ class Roda
         # string so that regexp metacharacters are not matched, and recognizes
         # colon tokens for placeholders.
         def _match_string(str)
-          if str.index(COLON) && placeholder_string_matcher?
+          if str.index(":") && placeholder_string_matcher?
             consume(self.class.cached_matcher(str){Regexp.escape(str).gsub(/:(\w+)/){|m| _match_symbol_regexp($1)}})
           else
             rp = @remaining_path
             if rp.start_with?("/#{str}")
               last = str.length + 1
               case rp[last]
-              when SLASH
+              when "/"
                 @remaining_path = rp[last, rp.length]
               when nil
-                @remaining_path = EMPTY_STRING
+                @remaining_path = ""
               when Integer
                 # :nocov:
                 # Ruby 1.8 support
-                if rp[last].chr == SLASH
+                if rp[last].chr == "/"
                   @remaining_path = rp[last, rp.length]
                 end
                 # :nocov:
@@ -747,7 +765,7 @@ class Roda
         # Match the given symbol if any segment matches.
         def _match_symbol(sym=nil)
           rp = @remaining_path
-          if rp[0, 1] == SLASH
+          if rp[0, 1] == "/"
             if last = rp.index('/', 1)
               if last > 1
                 @captures << rp[1, last-1]
@@ -755,7 +773,7 @@ class Roda
               end
             elsif rp.length > 1
               @captures << rp[1,rp.length]
-              @remaining_path = EMPTY_STRING
+              @remaining_path = ""
             end
           end
         end
@@ -766,12 +784,12 @@ class Roda
         # The regular expression to use for matching symbols.  By default, any non-empty
         # segment matches.
         def _match_symbol_regexp(s)
-          SEGMENT
+          "([^\\/]+)"
         end
 
         # The base remaining path to use.
         def _remaining_path(env)
-          env[PATH_INFO]
+          env["PATH_INFO"]
         end
 
         # Backbone of the verb method support, using a terminal match if
@@ -841,7 +859,7 @@ class Roda
 
         # Whether the current path is considered empty.
         def empty_path?
-          remaining_path == EMPTY_STRING
+          remaining_path == ""
         end
 
         # If all of the arguments match, yields to the match block and
@@ -900,7 +918,7 @@ class Roda
           if type.is_a?(Array)
             type.any?{|t| match_method(t)}
           else
-            type.to_s.upcase == @env[REQUEST_METHOD]
+            type.to_s.upcase == @env["REQUEST_METHOD"]
           end
         end
 
@@ -934,10 +952,14 @@ class Roda
 
       # Instance methods for RodaResponse
       module ResponseMethods
+        DEFAULT_HEADERS = {"Content-Type" => "text/html".freeze}.freeze
+
         CONTENT_LENGTH = "Content-Length".freeze
+        RodaPlugins.deprecate_constant(self, :CONTENT_LENGTH)
         CONTENT_TYPE = "Content-Type".freeze
-        DEFAULT_HEADERS = {"Content-Type" => "text/html".freeze}.freeze
+        RodaPlugins.deprecate_constant(self, :CONTENT_TYPE)
         LOCATION = "Location".freeze
+        RodaPlugins.deprecate_constant(self, :LOCATION)
 
         # The body for the current response.
         attr_reader :body
@@ -1007,9 +1029,9 @@ class Roda
           h = @headers
 
           if empty && (s == 304 || s == 204 || s == 205 || (s >= 100 && s <= 199))
-            h.delete(CONTENT_TYPE)
+            h.delete("Content-Type")
           else
-            h[CONTENT_LENGTH] ||= @length.to_s
+            h["Content-Length"] ||= @length.to_s
           end
 
           [s, h, b]
@@ -1042,7 +1064,7 @@ class Roda
         #   response.redirect('foo', 301)
         #   response.redirect('bar')
         def redirect(path, status = 302)
-          @headers[LOCATION] = path
+          @headers["Location"] = path
           @status  = status
           nil
         end

data/lib/roda/plugins/assets.rb

@@ -306,20 +306,34 @@ class Roda
         :compiled_css_dir => nil,
         :compiled_js_dir  => nil,
       }.freeze
+      EMPTY_ATTRS = {}.freeze
+
       JS_END = "\"></script>".freeze
+      RodaPlugins.deprecate_constant(self, :JS_END)
       CSS_END = "\" />".freeze
+      RodaPlugins.deprecate_constant(self, :CSS_END)
       SPACE = ' '.freeze
+      RodaPlugins.deprecate_constant(self, :SPACE)
       DOT = '.'.freeze
+      RodaPlugins.deprecate_constant(self, :DOT)
       SLASH = '/'.freeze
+      RodaPlugins.deprecate_constant(self, :SLASH)
       NEWLINE = "\n".freeze
+      RodaPlugins.deprecate_constant(self, :NEWLINE)
       EMPTY_STRING = ''.freeze
+      RodaPlugins.deprecate_constant(self, :EMPTY_STRING)
       JS_SUFFIX = '.js'.freeze
+      RodaPlugins.deprecate_constant(self, :JS_SUFFIX)
       CSS_SUFFIX = '.css'.freeze
+      RodaPlugins.deprecate_constant(self, :CSS_SUFFIX)
       HTTP_ACCEPT_ENCODING = 'HTTP_ACCEPT_ENCODING'.freeze
+      RodaPlugins.deprecate_constant(self, :HTTP_ACCEPT_ENCODING)
       CONTENT_ENCODING = 'Content-Encoding'.freeze
+      RodaPlugins.deprecate_constant(self, :CONTENT_ENCODING)
       GZIP = 'gzip'.freeze
+      RodaPlugins.deprecate_constant(self, :GZIP)
       DOTGZ = '.gz'.freeze
-      EMPTY_ATTRS = {}.freeze
+      RodaPlugins.deprecate_constant(self, :DOTGZ)
 
       # Internal exception raised when a compressor cannot be found
       CompressorNotFound = Class.new(RodaError)
@@ -419,8 +433,8 @@ class Roda
         opts[:css_prefix]          = sj.call(:prefix, :css_route)
         opts[:compiled_js_prefix]  = j.call(:prefix, :compiled_js_route, :compiled_name)
         opts[:compiled_css_prefix] = j.call(:prefix, :compiled_css_route, :compiled_name)
-        opts[:js_suffix]           = opts[:add_suffix] ? JS_SUFFIX : EMPTY_STRING
-        opts[:css_suffix]          = opts[:add_suffix] ? CSS_SUFFIX : EMPTY_STRING
+        opts[:js_suffix]           = (opts[:add_suffix] ? '.js' : '').freeze
+        opts[:css_suffix]          = (opts[:add_suffix] ? '.css' : '').freeze
 
         opts.freeze
       end
@@ -626,7 +640,7 @@ class Roda
             asset_dir = o[ltype]
             if dirs && !dirs.empty?
               dirs.each{|f| asset_dir = asset_dir[f]}
-              prefix = "#{dirs.join(SLASH)}/" if o[:group_subdirs]
+              prefix = "#{dirs.join('/')}/" if o[:group_subdirs]
             end
             Array(asset_dir).map{|f| "#{url_prefix}/#{o[:"#{stype}_prefix"]}#{prefix}#{f}#{o[:"#{stype}_suffix"]}"}
           end
@@ -648,20 +662,20 @@ class Roda
           o = self.class.assets_opts
           if o[:compiled] && (algo = o[:sri]) && (hash = _compiled_assets_hash(type))
             attrs = Hash[attrs]
-            attrs[:integrity] = "#{algo}-#{h([[hash].pack('H*')].pack('m').tr("\n", EMPTY_STRING))}"
+            attrs[:integrity] = "#{algo}-#{h([[hash].pack('H*')].pack('m').tr("\n", ''))}"
           end
 
-          attrs = attrs.map{|k,v| "#{k}=\"#{h(v)}\""}.join(SPACE)
+          attrs = attrs.map{|k,v| "#{k}=\"#{h(v)}\""}.join(' ')
 
           if ltype == :js
             tag_start = "<script type=\"text/javascript\" #{attrs} src=\""
-            tag_end = JS_END
+            tag_end = "\"></script>"
           else
             tag_start = "<link rel=\"stylesheet\" #{attrs} href=\""
-            tag_end = CSS_END
+            tag_end = "\" />"
           end
 
-          assets_paths(type).map{|p| "#{tag_start}#{h(p)}#{tag_end}"}.join(NEWLINE)
+          assets_paths(type).map{|p| "#{tag_start}#{h(p)}#{tag_end}"}.join("\n")
         end
 
         # Render the asset with the given filename.  When assets are compiled,
@@ -676,9 +690,9 @@ class Roda
           if o[:compiled]
             file = "#{o[:"compiled_#{type}_path"]}#{file}"
 
-            if o[:gzip] && env[HTTP_ACCEPT_ENCODING] =~ /\bgzip\b/
-              @_response[CONTENT_ENCODING] = GZIP
-              file += DOTGZ
+            if o[:gzip] && env['HTTP_ACCEPT_ENCODING'] =~ /\bgzip\b/
+              @_response['Content-Encoding'] = 'gzip'
+              file += '.gz'
             end
 
             check_asset_request(file, type, ::File.stat(file).mtime)
@@ -713,7 +727,7 @@ class Roda
           stype = type.to_s
 
           if dirs && !dirs.empty?
-            key = dirs.join(DOT)
+            key = dirs.join('.')
             ckey = "#{stype}.#{key}"
             if hash = ukey = compiled[ckey]
               ukey = "#{key}.#{ukey}"

data/lib/roda/plugins/assets_preloading.rb

@@ -49,8 +49,11 @@ class Roda
         :css => 'style'.freeze,
         :js => 'script'.freeze,
       }.freeze
+
       COMMA = ",".freeze
+      RodaPlugins.deprecate_constant(self, :COMMA)
       NEWLINE= "\n".freeze
+      RodaPlugins.deprecate_constant(self, :NEWLINE)
 
       # Depend on the assets plugin, as we'll be calling some functions in it.
       def self.load_dependencies(app)
@@ -61,13 +64,13 @@ class Roda
         # Return a string of <link> tags for the given asset
         # types/groups.
         def preload_assets_link_tags(*args)
-          _preload_assets_array(args).map{|path, as| "<link href=\"#{h(path)}\" rel=\"preload\" as=\"#{as}\">"}.join(NEWLINE)
+          _preload_assets_array(args).map{|path, as| "<link href=\"#{h(path)}\" rel=\"preload\" as=\"#{as}\">"}.join("\n")
         end
 
         # Return a string suitable for a Link header for the
         # given asset types/groups.
         def preload_assets_link_header(*args)
-          _preload_assets_array(args).map{|path, as| "<#{path}>;rel=preload;as=#{as}"}.join(COMMA)
+          _preload_assets_array(args).map{|path, as| "<#{path}>;rel=preload;as=#{as}"}.join(",")
         end
 
         private

data/lib/roda/plugins/backtracking_array.rb

@@ -27,7 +27,9 @@ class Roda
     module BacktrackingArray
       module RequestMethods
         PATH_INFO = "PATH_INFO".freeze
+        RodaPlugins.deprecate_constant(self, :PATH_INFO)
         SCRIPT_NAME = "SCRIPT_NAME".freeze
+        RodaPlugins.deprecate_constant(self, :SCRIPT_NAME)
 
         private
 

data/lib/roda/plugins/caching.rb

@@ -73,12 +73,19 @@ class Roda
 
       module RequestMethods
         LAST_MODIFIED = 'Last-Modified'.freeze
+        RodaPlugins.deprecate_constant(self, :LAST_MODIFIED)
         HTTP_IF_NONE_MATCH = 'HTTP_IF_NONE_MATCH'.freeze
+        RodaPlugins.deprecate_constant(self, :HTTP_IF_NONE_MATCH)
         HTTP_IF_MATCH = 'HTTP_IF_MATCH'.freeze
+        RodaPlugins.deprecate_constant(self, :HTTP_IF_MATCH)
         HTTP_IF_MODIFIED_SINCE = 'HTTP_IF_MODIFIED_SINCE'.freeze
+        RodaPlugins.deprecate_constant(self, :HTTP_IF_MODIFIED_SINCE)
         HTTP_IF_UNMODIFIED_SINCE = 'HTTP_IF_UNMODIFIED_SINCE'.freeze
+        RodaPlugins.deprecate_constant(self, :HTTP_IF_UNMODIFIED_SINCE)
         ETAG = 'ETag'.freeze
+        RodaPlugins.deprecate_constant(self, :ETAG)
         STAR = '*'.freeze
+        RodaPlugins.deprecate_constant(self, :STAR)
 
         # Set the last modified time of the resource using the Last-Modified header.
         # The +time+ argument should be a Time instance.
@@ -94,16 +101,16 @@ class Roda
           return unless time
           res = response
           e = env
-          res[LAST_MODIFIED] = time.httpdate
-          return if e[HTTP_IF_NONE_MATCH]
+          res['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
+          if (!status || status == 200) && (ims = time_from_header(e['HTTP_IF_MODIFIED_SINCE'])) && ims >= time.to_i
             res.status = 304
             halt
           end
 
-          if (!status || (status >= 200 && status < 300) || status == 412) && (ius = time_from_header(e[HTTP_IF_UNMODIFIED_SINCE])) && ius < time.to_i
+          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
@@ -130,16 +137,16 @@ class Roda
 
           res = response
           e = env
-          res[ETAG] = etag = "#{'W/' if weak}\"#{value}\""
+          res['ETag'] = etag = "#{'W/' if weak}\"#{value}\""
           status = res.status
 
           if (!status || (status >= 200 && status < 300) || status == 304)
-            if etag_matches?(e[HTTP_IF_NONE_MATCH], etag, new_resource)
+            if etag_matches?(e['HTTP_IF_NONE_MATCH'], etag, new_resource)
               res.status = (request_method =~ /\AGET|HEAD|OPTIONS|TRACE\z/i ? 304 : 412)
               halt
             end
 
-            if ifm = e[HTTP_IF_MATCH]
+            if ifm = e['HTTP_IF_MATCH']
               unless etag_matches?(ifm, etag, new_resource)
                 res.status = 412
                 halt
@@ -153,7 +160,7 @@ class Roda
         # Helper method checking if a ETag value list includes the current ETag.
         def etag_matches?(list, etag, new_resource)
           return unless list
-          return !new_resource if list == STAR
+          return !new_resource if list == '*'
           list.to_s.split(/\s*,\s*/).include?(etag)
         end
 

data/lib/roda/plugins/chunked.rb

@@ -145,11 +145,16 @@ class Roda
     # method is not called until template rendering, the flash may not be
     # rotated.
     module Chunked
+      OPTS = {}.freeze
+
       HTTP_VERSION = 'HTTP_VERSION'.freeze
+      RodaPlugins.deprecate_constant(self, :HTTP_VERSION)
       HTTP11 = "HTTP/1.1".freeze
+      RodaPlugins.deprecate_constant(self, :HTTP11)
       TRANSFER_ENCODING = 'Transfer-Encoding'.freeze
+      RodaPlugins.deprecate_constant(self, :TRANSFER_ENCODING)
       CHUNKED = 'chunked'.freeze
-      OPTS = {}.freeze
+      RodaPlugins.deprecate_constant(self, :CHUNKED)
 
       # Depend on the render plugin
       def self.load_dependencies(app, opts=OPTS)
@@ -215,7 +220,7 @@ class Roda
         # an overview.  If a block is given, it is passed to #delay.
         def chunked(template, opts=OPTS, &block)
           unless defined?(@_chunked)
-            @_chunked = env[HTTP_VERSION] == HTTP11
+            @_chunked = env['HTTP_VERSION'] == "HTTP/1.1"
           end
 
           if block
@@ -245,7 +250,7 @@ class Roda
           if chunk_headers = self.opts[:chunk_headers]
             headers.merge!(chunk_headers)
           end
-          headers[TRANSFER_ENCODING] = CHUNKED
+          headers['Transfer-Encoding'] = 'chunked'
 
           throw :halt, res.finish_with_body(Body.new(self))
         end

data/lib/roda/plugins/drop_body.rb

@@ -12,8 +12,11 @@ class Roda
       module ResponseMethods
         DROP_BODY_STATUSES = [100, 101, 102, 204, 205, 304].freeze
         EMPTY_BODY = [].freeze
+
         CONTENT_LENGTH = "Content-Length".freeze
+        RodaPlugins.deprecate_constant(self, :CONTENT_LENGTH)
         CONTENT_TYPE = "Content-Type".freeze
+        RodaPlugins.deprecate_constant(self, :CONTENT_TYPE)
 
         # If the response status indicates a body should not be
         # returned, use an empty body and remove the Content-Length
@@ -23,8 +26,8 @@ class Roda
           if DROP_BODY_STATUSES.include?(r[0])
             r[2] = EMPTY_BODY
             h = r[1]
-            h.delete(CONTENT_LENGTH)
-            h.delete(CONTENT_TYPE)
+            h.delete("Content-Length")
+            h.delete("Content-Type")
           end
           r
         end

data/lib/roda/plugins/empty_root.rb

@@ -32,6 +32,7 @@ class Roda
     # it is empty.
     module EmptyRoot
       EMPTY_STRING = ''.freeze
+      RodaPlugins.deprecate_constant(self, :EMPTY_STRING)
 
       module RequestMethods
         # Match when the remaining path is the empty string,
@@ -39,7 +40,7 @@ class Roda
         # the remaining path is +/+.
         def root(&block)
           super
-          if remaining_path == EMPTY_STRING && is_get?
+          if remaining_path == '' && is_get?
             always(&block)
           end
         end

data/lib/roda/plugins/error_email.rb

@@ -94,7 +94,7 @@ END
 
           message
         end
-      }
+      }#.freeze # RODA3
 
       # Set default opts for plugin.  See ErrorEmail module RDoc for options.
       def self.configure(app, opts=OPTS)

data/lib/roda/plugins/flash.rb

@@ -38,6 +38,7 @@ class Roda
     module Flash
       # The internal session key used to store the flash.
       KEY = :_flash
+      RodaPlugins.deprecate_constant(self, :KEY)
 
       # Simple flash hash, where assiging to the hash updates the flash
       # used in the following request.
@@ -94,7 +95,7 @@ class Roda
         # Access the flash hash for the current request, loading
         # it from the session if it is not already loaded.
         def flash
-          @_flash ||= FlashHash.new(session[KEY])
+          @_flash ||= FlashHash.new(session[:_flash])
         end
 
         # If the routing doesn't raise an error, rotate the flash
@@ -103,7 +104,7 @@ class Roda
           res = super
 
           if f = @_flash
-            session[KEY] = f.next
+            session[:_flash] = f.next
           end
 
           res

data/lib/roda/plugins/h.rb

@@ -18,7 +18,7 @@ class Roda
         require 'cgi/escape'
         unless CGI.respond_to?(:escapeHTML) # work around for JRuby 9.1
           CGI = Object.new
-          CGI.extend(::CGI::Util)
+          CGI.extend(defined?(::CGI::Escape) ? ::CGI::Escape : ::CGI::Util)
         end
 
         module InstanceMethods

data/lib/roda/plugins/heartbeat.rb

@@ -15,9 +15,11 @@ class Roda
     #   plugin :heartbeat, :path=>'/status'
     module Heartbeat
       OPTS = {}.freeze
-      PATH_INFO = 'PATH_INFO'.freeze
       HEARTBEAT_RESPONSE = [200, {'Content-Type'=>'text/plain'}.freeze, ['OK'.freeze].freeze].freeze
 
+      PATH_INFO = 'PATH_INFO'.freeze
+      RodaPlugins.deprecate_constant(self, :PATH_INFO)
+
       # Set the heartbeat path to the given path.
       def self.configure(app, opts=OPTS)
         app.opts[:heartbeat_path] = (opts[:path] || app.opts[:heartbeat_path] || "/heartbeat").dup.freeze
@@ -26,7 +28,7 @@ class Roda
       module InstanceMethods
         # If the request is for a heartbeat path, return the heartbeat response.
         def call
-          if env[PATH_INFO] == opts[:heartbeat_path]
+          if env['PATH_INFO'] == opts[:heartbeat_path]
             response = HEARTBEAT_RESPONSE.dup
             response[1] = Hash[response[1]]
             response

data/lib/roda/plugins/json.rb

@@ -54,8 +54,10 @@ class Roda
     #   plugin :json, :content_type=>'application/xml'
     module Json
       OPTS = {}.freeze
-      DEFAULT_SERIALIZER = lambda{|o| o.to_json}
+      DEFAULT_SERIALIZER = :to_json.to_proc
+
       DEFAULT_CONTENT_TYPE = 'application/json'.freeze
+      RodaPlugins.deprecate_constant(self, :DEFAULT_CONTENT_TYPE)
 
       # Set the classes to automatically convert to JSON, and the serializer to use.
       def self.configure(app, opts=OPTS)
@@ -69,7 +71,7 @@ class Roda
 
         app.opts[:json_result_include_request] = opts[:include_request] || app.opts[:json_result_include_request]
 
-        app.opts[:json_result_content_type] = opts[:content_type] || DEFAULT_CONTENT_TYPE
+        app.opts[:json_result_content_type] = opts[:content_type] || 'application/json'.freeze
       end
 
       module ClassMethods

data/lib/roda/plugins/json_parser.rb

@@ -12,12 +12,17 @@ class Roda
     # header for the request includes "json".
     module JsonParser
       OPTS = {}.freeze
+      DEFAULT_ERROR_HANDLER = proc{|r| r.halt [400, {}, []]}
+      DEFAULT_PARSER = JSON.method(:parse)
+
       JSON_PARAMS_KEY = "roda.json_params".freeze
+      RodaPlugins.deprecate_constant(self, :JSON_PARAMS_KEY)
       INPUT_KEY = "rack.input".freeze
+      RodaPlugins.deprecate_constant(self, :INPUT_KEY)
       FORM_HASH_KEY = "rack.request.form_hash".freeze
+      RodaPlugins.deprecate_constant(self, :FORM_HASH_KEY)
       FORM_INPUT_KEY = "rack.request.form_input".freeze
-      DEFAULT_ERROR_HANDLER = proc{|r| r.halt [400, {}, []]}
-      DEFAULT_PARSER = JSON.method(:parse)
+      RodaPlugins.deprecate_constant(self, :FORM_INPUT_KEY)
 
       # Handle options for the json_parser plugin:
       # :error_handler :: A proc to call if an exception is raised when
@@ -41,18 +46,18 @@ class Roda
         # parse the request body as JSON.  Ignore an empty request body.
         def POST
           env = @env
-          if post_params = (env[JSON_PARAMS_KEY] || env[FORM_HASH_KEY])
+          if post_params = (env["roda.json_params"] || env["rack.request.form_hash"])
             post_params
-          elsif (input = env[INPUT_KEY]) && content_type =~ /json/
+          elsif (input = env["rack.input"]) && content_type =~ /json/
             str = input.read
             input.rewind
             return super if str.empty?
             begin
-              json_params = env[JSON_PARAMS_KEY] = parse_json(str)
+              json_params = env["roda.json_params"] = parse_json(str)
             rescue
               roda_class.opts[:json_parser_error_handler].call(self)
             end
-            env[FORM_INPUT_KEY] = input
+            env["rack.request.form_input"] = input
             json_params
           else
             super

data/lib/roda/plugins/mailer.rb

@@ -110,17 +110,28 @@ class Roda
     # Roda application if you want your helper methods to automatically be
     # available in your email views.
     module Mailer
+      OPTS = {}.freeze
+
       REQUEST_METHOD = "REQUEST_METHOD".freeze
+      RodaPlugins.deprecate_constant(self, :REQUEST_METHOD)
       PATH_INFO = "PATH_INFO".freeze
+      RodaPlugins.deprecate_constant(self, :PATH_INFO)
       SCRIPT_NAME = 'SCRIPT_NAME'.freeze
+      RodaPlugins.deprecate_constant(self, :SCRIPT_NAME)
       EMPTY_STRING = ''.freeze
+      RodaPlugins.deprecate_constant(self, :EMPTY_STRING)
       RACK_INPUT = 'rack.input'.freeze
+      RodaPlugins.deprecate_constant(self, :RACK_INPUT)
       RODA_MAIL = 'roda.mail'.freeze
+      RodaPlugins.deprecate_constant(self, :RODA_MAIL)
       RODA_MAIL_ARGS = 'roda.mail_args'.freeze
+      RodaPlugins.deprecate_constant(self, :RODA_MAIL_ARGS)
       MAIL = "MAIL".freeze
+      RodaPlugins.deprecate_constant(self, :MAIL)
       CONTENT_TYPE = 'Content-Type'.freeze
+      RodaPlugins.deprecate_constant(self, :CONTENT_TYPE)
       TEXT_PLAIN = "text/plain".freeze
-      OPTS = {}.freeze
+      RodaPlugins.deprecate_constant(self, :TEXT_PLAIN)
 
       # Error raised when the using the mail class method, but the routing
       # tree doesn't return the mail object. 
@@ -139,7 +150,7 @@ class Roda
         def mail(path, *args)
           mail = ::Mail.new
           catch(:no_mail) do
-            unless mail.equal?(new(PATH_INFO=>path, SCRIPT_NAME=>EMPTY_STRING, REQUEST_METHOD=>MAIL, RACK_INPUT=>StringIO.new, RODA_MAIL=>mail, RODA_MAIL_ARGS=>args).call(&route_block))
+            unless mail.equal?(new("PATH_INFO"=>path, 'SCRIPT_NAME'=>'', "REQUEST_METHOD"=>"MAIL", 'rack.input'=>StringIO.new, 'roda.mail'=>mail, 'roda.mail_args'=>args).call(&route_block))
               raise Error, "route did not return mail instance for #{path.inspect}, #{args.inspect}"
             end
             mail
@@ -161,9 +172,9 @@ class Roda
         # the request.  This yields any of the captures to the block, as well as
         # any arguments passed to the +mail+ or +sendmail+ Roda class methods.
         def mail(*args)
-          if @env[REQUEST_METHOD] == MAIL
+          if @env["REQUEST_METHOD"] == "MAIL"
             if_match(args) do |*vs|
-              yield(*(vs + @env[RODA_MAIL_ARGS]))
+              yield(*(vs + @env['roda.mail_args']))
             end
           end
         end
@@ -179,7 +190,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('Content-Type')
             m.headers(@headers)
             m.body(@body.join) unless @body.empty?
             mail_attachments.each do |a, block|
@@ -191,7 +202,7 @@ class Roda
               if mail.multipart?
                 if mail.content_type =~ /multipart\/mixed/ &&
                    mail.parts.length >= 2 &&
-                   (part = mail.parts.find{|p| !p.attachment && p.content_type == TEXT_PLAIN})
+                   (part = mail.parts.find{|p| !p.attachment && p.content_type == "text/plain"})
                   part.content_type = content_type
                 end
               else
@@ -217,7 +228,7 @@ class Roda
         # Add delegates for common email methods.
         [:from, :to, :cc, :bcc, :subject].each do |meth|
           define_method(meth) do |*args|
-            env[RODA_MAIL].send(meth, *args)
+            env['roda.mail'].send(meth, *args)
             nil
           end
         end
@@ -231,10 +242,10 @@ class Roda
         # as the default content_type for the email.
         def initialize(env)
           super
-          if mail = env[RODA_MAIL]
+          if mail = env['roda.mail']
             res = @_response
             res.mail = mail
-            res.headers.delete(CONTENT_TYPE)
+            res.headers.delete('Content-Type')
           end
         end
 
@@ -256,7 +267,7 @@ class Roda
         # Set the text_part or html_part (depending on the method) in the related email,
         # using the given body and optional headers.
         def _mail_part(meth, body, headers=nil)
-          env[RODA_MAIL].send(meth) do
+          env['roda.mail'].send(meth) do
             body(body)
             headers(headers) if headers
           end

data/lib/roda/plugins/match_affix.rb

@@ -27,7 +27,9 @@ class Roda
     # at the end of the path only.
     module MatchAffix
       PREFIX = "/".freeze
+      RodaPlugins.deprecate_constant(self, :PREFIX)
       SUFFIX = "(?=\/|\z)".freeze
+      RodaPlugins.deprecate_constant(self, :SUFFIX)
 
       # Set the default prefix and suffix to use in match patterns, if a non-nil value
       # is given.
@@ -42,7 +44,7 @@ class Roda
         # Use the match prefix and suffix provided when loading the plugin, or fallback
         # to Roda's default prefix/suffix if one was not provided.
         def consume_pattern(pattern)
-          /\A#{roda_class.opts[:match_prefix] || PREFIX}(?:#{pattern})#{roda_class.opts[:match_suffix] || SUFFIX}/
+          /\A#{roda_class.opts[:match_prefix] || "/"}(?:#{pattern})#{roda_class.opts[:match_suffix] || "(?=\/|\z)"}/
         end
       end
 

data/lib/roda/plugins/optimized_string_matchers.rb

@@ -25,6 +25,7 @@ class Roda
     # match blocks.
     module OptimizedStringMatchers
       EMPTY_STRING = ''.freeze
+      RodaPlugins.deprecate_constant(self, :EMPTY_STRING)
 
       module RequestMethods
         # Optimized version of +on+ that only supports a single string.
@@ -36,7 +37,7 @@ class Roda
         def is_exactly(s)
           rp = @remaining_path
           if _match_string(s)
-            if @remaining_path == EMPTY_STRING
+            if @remaining_path == ''
               always{yield}
             else
               @remaining_path = rp

data/lib/roda/plugins/partials.rb

@@ -21,7 +21,9 @@ class Roda
     # Note that this plugin automatically loads the :render plugin.
     module Partials
       OPTS = {}.freeze
+
       SLASH = '/'.freeze
+      RodaPlugins.deprecate_constant(self, :SLASH)
 
       # Depend on the render plugin, since this overrides
       # some of its methods.
@@ -36,9 +38,9 @@ class Roda
         def partial(template, opts=OPTS)
           opts = parse_template_opts(template, opts)
           if opts[:template]
-            template = opts[:template].split(SLASH)
+            template = opts[:template].split('/')
             template[-1] = "_#{template[-1]}"
-            opts[:template] = template.join(SLASH)
+            opts[:template] = template.join('/')
           end
           render_template(opts)
         end

data/lib/roda/plugins/path_rewriter.rb

@@ -45,9 +45,11 @@ class Roda
     # it can be rewritten again by a later rewrite.  Note that PATH_INFO rewrites are
     # processed before remaining_path rewrites.
     module PathRewriter
-      PATH_INFO = 'PATH_INFO'.freeze
       OPTS={}.freeze
 
+      PATH_INFO = 'PATH_INFO'.freeze
+      RodaPlugins.deprecate_constant(self, :PATH_INFO)
+
       def self.configure(app)
         app.instance_exec do
           app.opts[:remaining_path_rewrites] ||= []
@@ -86,7 +88,7 @@ class Roda
       module RequestMethods
         # Rewrite remaining_path and/or PATH_INFO based on the path rewrites.
         def initialize(scope, env)
-          path_info = env[PATH_INFO]
+          path_info = env['PATH_INFO']
 
           rewrite_path(scope.class.opts[:path_info_rewrites], path_info)
           super

data/lib/roda/plugins/public.rb

@@ -21,10 +21,12 @@ class Roda
     #   plugin :public
     #   plugin :public, :root=>'static'
     module Public
-      NULL_BYTE = "\0".freeze
       SPLIT = Regexp.union(*[File::SEPARATOR, File::ALT_SEPARATOR].compact)
       PARSER = RUBY_VERSION >= '1.9' ? URI::DEFAULT_PARSER : URI
 
+      NULL_BYTE = "\0".freeze
+      RodaPlugins.deprecate_constant(self, :NULL_BYTE)
+
       # Use options given to setup a Rack::File instance for serving files. Options:
       # :default_mime :: The default mime type to use if the mime type is not recognized.
       # :gzip :: Whether to serve already gzipped files with a .gz extension for clients
@@ -42,7 +44,7 @@ class Roda
         def public
           if is_get?
             path = PARSER.unescape(real_remaining_path)
-            return if path.include?(NULL_BYTE)
+            return if path.include?("\0")
 
             roda_opts = roda_class.opts
             server = roda_opts[:public_server]

data/lib/roda/plugins/run_append_slash.rb

@@ -22,6 +22,7 @@ class Roda
     #   # GET /a/ => App gets "/" as PATH_INFO
     module RunAppendSlash
       OPTS = {}.freeze
+
       # Set plugin specific options.  Options:
       # :use_redirects :: Whether to issue 302 redirects when appending the
       #                   trailing slash.

data/lib/roda/plugins/shared_vars.rb

@@ -48,6 +48,7 @@ class Roda
     #   end
     module SharedVars
       KEY = 'roda.shared'.freeze
+      RodaPlugins.deprecate_constant(self, :KEY)
 
       module InstanceMethods
         # Returns the current shared vars for the request.  These are
@@ -61,15 +62,15 @@ class Roda
         # only make the changes to the shared vars for the duration of the
         # block, restoring the previous shared vars before the block returns.
         def shared(vars=nil)
-          h = env[KEY] ||= {}
+          h = env['roda.shared'] ||= {}
 
           if block_given?
             if vars
               begin
-                env[KEY] = Hash[h].merge!(vars)
+                env['roda.shared'] = Hash[h].merge!(vars)
                 yield
               ensure
-                env[KEY] = h
+                env['roda.shared'] = h
               end
             else
               raise RodaError, "must pass a vars hash when calling shared with a block"

data/lib/roda/plugins/sinatra_helpers.rb

@@ -211,20 +211,39 @@ class Roda
     # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
     # OTHER DEALINGS IN THE SOFTWARE.
     module SinatraHelpers
+      OPTS = {}.freeze
+
       CONTENT_TYPE = "Content-Type".freeze
+      RodaPlugins.deprecate_constant(self, :CONTENT_TYPE)
       CONTENT_DISPOSITION = "Content-Disposition".freeze
+      RodaPlugins.deprecate_constant(self, :CONTENT_DISPOSITION)
       CONTENT_LENGTH = "Content-Length".freeze
+      RodaPlugins.deprecate_constant(self, :CONTENT_LENGTH)
       OCTET_STREAM = 'application/octet-stream'.freeze
+      RodaPlugins.deprecate_constant(self, :OCTET_STREAM)
       ATTACHMENT = 'attachment'.freeze
+      RodaPlugins.deprecate_constant(self, :ATTACHMENT)
       HTTP_VERSION = 'HTTP_VERSION'.freeze
+      RodaPlugins.deprecate_constant(self, :HTTP_VERSION)
       HTTP11 = "HTTP/1.1".freeze
+      RodaPlugins.deprecate_constant(self, :HTTP11)
       HTTP_X_FORWARDED_HOST = "HTTP_X_FORWARDED_HOST".freeze
+      RodaPlugins.deprecate_constant(self, :HTTP_X_FORWARDED_HOST)
       EMPTY_STRING = ''.freeze
+      RodaPlugins.deprecate_constant(self, :EMPTY_STRING)
       SLASH = '/'.freeze
+      RodaPlugins.deprecate_constant(self, :SLASH)
       SEMICOLON = ';'.freeze
+      RodaPlugins.deprecate_constant(self, :SEMICOLON)
       COMMA = ', '.freeze
+      RodaPlugins.deprecate_constant(self, :COMMA)
       CHARSET = 'charset'.freeze
-      OPTS = {}.freeze
+      RodaPlugins.deprecate_constant(self, :CHARSET)
+
+      # Depend on the status_303 plugin.
+      def self.load_dependencies(app, _opts = nil)
+        app.plugin :status_303
+      end
 
       # Add delegate methods to the route block scope
       # calling request or response methods, unless the
@@ -323,14 +342,14 @@ class Roda
         def send_file(path, opts = OPTS)
           res = response
           headers = res.headers
-          if opts[:type] || !headers[CONTENT_TYPE]
-            res.content_type(opts[:type] || ::File.extname(path), :default => OCTET_STREAM)
+          if opts[:type] || !headers["Content-Type"]
+            res.content_type(opts[:type] || ::File.extname(path), :default => 'application/octet-stream')
           end
 
           disposition = opts[:disposition]
           filename    = opts[:filename]
           if disposition || filename
-            disposition ||= ATTACHMENT
+            disposition ||= 'attachment'
             filename = path if filename.nil?
             res.attachment(filename, disposition)
           end
@@ -350,7 +369,7 @@ class Roda
           end
 
           res.status = opts[:status] || s
-          headers.delete(CONTENT_LENGTH)
+          headers.delete("Content-Length")
           headers.replace(h.merge!(headers))
           res.body = b
 
@@ -365,14 +384,14 @@ class Roda
           addr = addr.to_s if addr
           return addr if addr =~ /\A[A-z][A-z0-9\+\.\-]*:/
           uri = if absolute
-            h = if @env.has_key?(HTTP_X_FORWARDED_HOST) || port != (ssl? ? 443 : 80)
+            h = if @env.has_key?("HTTP_X_FORWARDED_HOST") || port != (ssl? ? 443 : 80)
               host_with_port
             else
               host
             end
             ["http#{'s' if ssl?}://#{h}"]
           else
-            [EMPTY_STRING]
+            ['']
           end
           uri << script_name.to_s if add_script_name
           uri << (addr || path_info)
@@ -380,17 +399,6 @@ class Roda
         end
         alias url uri
         alias to uri
-
-        private
-
-        # Use a 303 response for non-GET responses if client uses HTTP 1.1.
-        def default_redirect_status
-          if @env[HTTP_VERSION] == HTTP11 && !is_get?
-            303
-          else
-            super
-          end
-        end
       end
 
       module ResponseMethods
@@ -416,7 +424,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["Content-Length"]
           super
         end
 
@@ -433,35 +441,35 @@ 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 = (return @headers[CONTENT_TYPE]; nil), opts = OPTS)
+        def content_type(type = (return @headers["Content-Type"]; nil), opts = OPTS)
           unless (mime_type = mime_type(type) || opts[:default])
             raise RodaError, "Unknown media type: #{type}"
           end
 
           unless opts.empty?
             opts.each do |key, val|
-              next if key == :default || (key == :charset && mime_type.include?(CHARSET))
+              next if key == :default || (key == :charset && mime_type.include?('charset'))
               val = val.inspect if val =~ /[";,]/
-              mime_type += "#{mime_type.include?(SEMICOLON) ? COMMA : SEMICOLON}#{key}=#{val}"
+              mime_type += "#{mime_type.include?(';') ? ', ' : ';'}#{key}=#{val}"
             end
           end
 
-          @headers[CONTENT_TYPE] = mime_type
+          @headers["Content-Type"] = mime_type
         end
 
         # Set the Content-Disposition to "attachment" with the specified filename,
         # instructing the user agents to prompt to save.
-        def attachment(filename = nil, disposition=ATTACHMENT)
+        def attachment(filename = nil, disposition='attachment')
           if filename
             params = "; filename=#{File.basename(filename).inspect}"
-            unless @headers[CONTENT_TYPE]
+            unless @headers["Content-Type"]
               ext = File.extname(filename)
               unless ext.empty?
                 content_type(ext)
               end
             end
           end
-          @headers[CONTENT_DISPOSITION] = "#{disposition}#{params}"
+          @headers["Content-Disposition"] = "#{disposition}#{params}"
         end
 
         # Whether or not the status is set to 1xx. Returns nil if status not yet set.
@@ -500,7 +508,7 @@ class Roda
         # If only a type is given, lookup the type in Rack's MIME registry and
         # return it.
         def mime_type(type=(return; nil), value = nil)
-          return type.to_s if type.to_s.include?(SLASH)
+          return type.to_s if type.to_s.include?('/')
           type = ".#{type}" unless type.to_s[0] == ?.
           if value
             Rack::Mime::MIME_TYPES[type] = value

data/lib/roda/plugins/slash_path_empty.rb

@@ -12,13 +12,14 @@ class Roda
     # where a trailing "/" in the path should be ignored.
     module SlashPathEmpty
       SLASH = "/".freeze
+      RodaPlugins.deprecate_constant(self, :SLASH)
 
       module RequestMethods
         private
 
         # Consider the path empty if it is "/".
         def empty_path?
-          super || remaining_path == SLASH
+          super || remaining_path == '/'
         end
       end
     end

data/lib/roda/plugins/status_303.rb

@@ -0,0 +1,32 @@
+# frozen-string-literal: true
+
+#
+class Roda
+  module RodaPlugins
+    # The status_303 plugin sets the default redirect status to be 303
+    # rather than 302 when the request is not a GET and the
+    # redirection occurs on an HTTP 1.1 connection as per RFC 7231.
+    # The author knows of no cases where this actually matters in
+    # practice.
+    #
+    # Example:
+    #
+    #   plugin :status_303
+    module Status303
+      module RequestMethods
+
+        private
+
+        def default_redirect_status
+          if env['HTTP_VERSION'] == 'HTTP/1.1' && !is_get?
+            303
+          else
+            super
+          end
+        end
+      end
+    end
+
+    register_plugin(:status_303, Status303)
+  end
+end

data/lib/roda/plugins/type_routing.rb

@@ -82,7 +82,9 @@ class Roda
     #                Default is +true+.
     module TypeRouting
       ACCEPT_HEADER = 'HTTP_ACCEPT'.freeze
+      RodaPlugins.deprecate_constant(self, :ACCEPT_HEADER)
       CONTENT_TYPE_HEADER = 'Content-Type'.freeze
+      RodaPlugins.deprecate_constant(self, :CONTENT_TYPE_HEADER)
 
       CONFIGURATION = {
         :mimes => {
@@ -146,7 +148,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_HEADER] ||= @scope.opts[:type_routing][:types][type]
+          response['Content-Type'] ||= @scope.opts[:type_routing][:types][type]
           always(&block)
         end
 
@@ -191,7 +193,7 @@ class Roda
         def accept_response_type
           mimes = @scope.opts[:type_routing][:mimes]
 
-          @env[ACCEPT_HEADER].to_s.split(/\s*,\s*/).map do |part|
+          @env['HTTP_ACCEPT'].to_s.split(/\s*,\s*/).map do |part|
             mime, _= part.split(/\s*;\s*/, 2)
             if sym = mimes[mime]
               return sym

data/lib/roda/version.rb

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

data/spec/plugin/status_303_spec.rb

@@ -0,0 +1,28 @@
+require File.expand_path("spec_helper", File.dirname(File.dirname(__FILE__)))
+
+describe "status_303 plugin" do
+  it 'uses a 302 for get requests' do
+    app(:status_303) do
+      request.redirect '/foo'
+      fail 'redirect should halt'
+    end
+    status.must_equal 302
+    body.must_equal ''
+    header('Location').must_equal '/foo'
+  end
+
+  it 'uses the code given when specified' do
+    app(:status_303) do
+      request.redirect '/foo', 301
+    end
+    status.must_equal 301
+  end
+
+  it 'uses 303 for post requests if request is HTTP 1.1, 302 for 1.0' do
+    app(:status_303) do
+      request.redirect '/foo'
+    end
+    status('HTTP_VERSION' => 'HTTP/1.1', 'REQUEST_METHOD'=>'POST').must_equal 303
+    status('HTTP_VERSION' => 'HTTP/1.0', 'REQUEST_METHOD'=>'POST').must_equal 302
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: roda
 version: !ruby/object:Gem::Version
-  version: 2.27.0
+  version: 2.28.0
 platform: ruby
 authors:
 - Jeremy Evans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-14 00:00:00.000000000 Z
+date: 2017-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -207,6 +207,7 @@ extra_rdoc_files:
 - doc/release_notes/2.25.0.txt
 - doc/release_notes/2.26.0.txt
 - doc/release_notes/2.27.0.txt
+- doc/release_notes/2.28.0.txt
 files:
 - CHANGELOG
 - MIT-LICENSE
@@ -238,6 +239,7 @@ files:
 - doc/release_notes/2.25.0.txt
 - doc/release_notes/2.26.0.txt
 - doc/release_notes/2.27.0.txt
+- doc/release_notes/2.28.0.txt
 - doc/release_notes/2.3.0.txt
 - doc/release_notes/2.4.0.txt
 - doc/release_notes/2.5.0.txt
@@ -316,6 +318,7 @@ files:
 - lib/roda/plugins/static.rb
 - lib/roda/plugins/static_path_info.rb
 - lib/roda/plugins/static_routing.rb
+- lib/roda/plugins/status_303.rb
 - lib/roda/plugins/status_handler.rb
 - lib/roda/plugins/streaming.rb
 - lib/roda/plugins/strip_path_prefix.rb
@@ -407,6 +410,7 @@ files:
 - spec/plugin/slash_path_empty_spec.rb
 - spec/plugin/static_routing_spec.rb
 - spec/plugin/static_spec.rb
+- spec/plugin/status_303_spec.rb
 - spec/plugin/status_handler_spec.rb
 - spec/plugin/streaming_spec.rb
 - spec/plugin/strip_path_prefix_spec.rb