re-invent missing Rack::Utils.bytesize (2.0 will work) + prefix ::Rack constant!

Author: kares

src/main/ruby/jruby/rack/error_app.rb

@@ -89,7 +89,7 @@ def serve(code, path, env)
         body = env['REQUEST_METHOD'] == 'HEAD' ? [] : FileBody.new(path, size = File.size?(path))
         response = [ code, headers, body ]
 
-        size ||= ::Rack::Utils.bytesize(File.read(path)) if defined?(::Rack::Utils.bytesize)
+        size ||= Utils.bytesize(File.read(path))
 
         response[1]['Content-Length'] = size.to_s if size
         response
@@ -155,13 +155,21 @@ def expand_path(path, root = self.root)
 
       begin
         require 'rack/utils'
+        Utils = ::Rack::Utils
+
+        if ''.respond_to?(:bytesize) # Ruby >= 1.9
+          def Utils.bytesize(string); string.bytesize end
+        else
+          def Utils.bytesize(string); string.size end
+        end unless defined? Utils.bytesize
+
         require 'rack/mime'
       rescue LoadError; end
 
-      if defined? Rack::Utils.best_q_match
+      if defined? Utils.best_q_match
 
         def accepts_html?(env)
-          Rack::Utils.best_q_match(env['HTTP_ACCEPT'], %w[text/html])
+          Utils.best_q_match(env['HTTP_ACCEPT'], %w[text/html])
         rescue
           http_accept?(env, 'text/html')
         end

src/main/ruby/jruby/rack/error_app/show_status.rb

@@ -15,19 +15,19 @@ def initialize(app)
 
     def call(env)
       status, headers, body = @app.call(env)
-      headers = ::Rack::Utils::HeaderHash.new(headers)
+      headers = Utils::HeaderHash.new(headers)
       empty = headers['Content-Length'].to_i <= 0
 
       detail = env['rack.showstatus.detail']
       # client or server error, or explicit message
       if (status.to_i >= 400 && empty) || detail
         # required erb template variables (captured with binding) :
         request = req = ::Rack::Request.new(env); request && req # avoid un-used warning
-        message = ::Rack::Utils::HTTP_STATUS_CODES[status.to_i] || status.to_s
+        message = Utils::HTTP_STATUS_CODES[status.to_i] || status.to_s
         detail = detail.nil? ? message : detail # false for no detail
 
         body = @template.result(binding)
-        size = ::Rack::Utils.bytesize(body)
+        size = Utils.bytesize(body)
         [status, headers.merge('Content-Type' => "text/html", 'Content-Length' => size.to_s), [body]]
       else
         [status, headers, body]
@@ -38,9 +38,9 @@ def call(env)
     def h(obj)
       case obj
       when String
-        ::Rack::Utils.escape_html(obj)
+        Utils.escape_html(obj)
       else
-        ::Rack::Utils.escape_html(obj.inspect)
+        Utils.escape_html(obj.inspect)
       end
     end