rack-contrib 2.2.0 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ca58db2b7968ad4691e8bec79eea2088dabc3da5d309358f7df76d668324d824
-  data.tar.gz: 51816bb6b59a598fea16eb100cc783b3c0ff58eb37aa3585bb8d65141f2aae4f
+  metadata.gz: cf14e9cb70d9701bc1f3fe5ce036a0667f4ba6c9411e0e6ded73ef958228ec45
+  data.tar.gz: d0c2abe31908dd0d49dec3635cca17c720c94d098a04e9485adf917c469e0ee5
 SHA512:
-  metadata.gz: 7442b5ad170ae2946f017d8ccd007d02455b7939fe42239378505b61983cd9a1f090549e87b07e08323a7cf99d04f026e8df0f326e34be166508187cca3735e7
-  data.tar.gz: 99985100672c65c9ee559a37281f5dddea4fcdc8481ddffd75c2f6e697197a1070339c5b70733d736f8ba33078d5f699f00097cd6ec96266c8f07edb008b727b
+  metadata.gz: f352f5eac5008e79d645460cd9b17dcc7231fe55edb63a0540c6c0991c06ba5f989cd70c23453e854a8189bcd02ad1be96366bb4d24efdaccefc5fe823a9eed5
+  data.tar.gz: 379d6d0190a63d1df9c615e2fdd53bfebcac0cf506407e1e8a11c734ffc955f066a2aa56e79db21458b62efbb6603e1749f1bdddaed1c35fb84a69cd494dba8f

data/README.md

@@ -8,7 +8,6 @@ interface:
 * `Rack::BounceFavicon` - Returns a 404 for requests to `/favicon.ico`
 * `Rack::CSSHTTPRequest` - Adds CSSHTTPRequest support by encoding responses as CSS for cross-site AJAX-style data loading
 * `Rack::Callbacks` - Implements DSL for pure before/after filter like Middlewares.
-* `Rack::Config` - Shared configuration for cooperative middleware.
 * `Rack::Cookies` - Adds simple cookie jar hash to env
 * `Rack::Deflect` - Helps protect against DoS attacks.
 * `Rack::Evil` - Lets the rack application return a response to the client from any place.

data/lib/rack/contrib.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rack'
 
 module Rack
@@ -33,7 +35,6 @@ module Rack
   autoload :ProcTitle,                  "rack/contrib/proctitle"
   autoload :Profiler,                   "rack/contrib/profiler"
   autoload :ResponseHeaders,            "rack/contrib/response_headers"
-  autoload :Runtime,                    "rack/contrib/runtime"
   autoload :Signals,                    "rack/contrib/signals"
   autoload :SimpleEndpoint,             "rack/contrib/simple_endpoint"
   autoload :TimeZone,                   "rack/contrib/time_zone"

data/lib/rack/contrib/access.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "ipaddr"
 
 module Rack
@@ -48,9 +50,9 @@ module Rack
     end
 
     def call(env)
-      @original_request = Request.new(env)
+      request = Request.new(env)
       ipmasks = ipmasks_for_path(env)
-      return forbidden! unless ip_authorized?(ipmasks)
+      return forbidden! unless ip_authorized?(request, ipmasks)
       status, headers, body = @app.call(env)
       [status, headers, body]
     end
@@ -73,11 +75,11 @@ module Rack
       [403, { 'Content-Type' => 'text/html', 'Content-Length' => '0' }, []]
     end
 
-    def ip_authorized?(ipmasks)
+    def ip_authorized?(request, ipmasks)
       return true if ipmasks.nil?
 
       ipmasks.any? do |ip_mask|
-        ip_mask.include?(IPAddr.new(@original_request.ip))
+        ip_mask.include?(IPAddr.new(request.ip))
       end
     end
 

data/lib/rack/contrib/backstage.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Rack
   class Backstage
     File = ::File
@@ -10,7 +12,7 @@ module Rack
     def call(env)
       if File.exists?(@file)
         content = File.read(@file)
-        length = "".respond_to?(:bytesize) ? content.bytesize.to_s : content.size.to_s
+        length = content.bytesize.to_s
         [503, {'Content-Type' => 'text/html', 'Content-Length' => length}, [content]]
       else
         @app.call(env)

data/lib/rack/contrib/bounce_favicon.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Rack
   # Bounce those annoying favicon.ico requests
   class BounceFavicon

data/lib/rack/contrib/callbacks.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Rack
   class Callbacks
     def initialize(&block)

data/lib/rack/contrib/common_cookies.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Rack
   # Rack middleware to use common cookies across domain and subdomains.
   class CommonCookies
@@ -10,21 +12,24 @@ module Rack
     end
 
     def call(env)
-      @app.call(env).tap do |(status, headers, response)|
-        @host = env['HTTP_HOST'].sub PORT, ''
-        share_cookie headers
-      end
+      status, headers, body = @app.call(env)
+      headers = Utils::HeaderHash.new(headers)
+
+      host = env['HTTP_HOST'].sub PORT, ''
+      share_cookie(headers, host)
+
+      [status, headers, body]
     end
 
     private
 
-    def domain
-      @host =~ DOMAIN_REGEXP
+    def domain(host)
+      host =~ DOMAIN_REGEXP
       ".#{$1}.#{$2}"
     end
 
-    def share_cookie(headers)
-      headers['Set-Cookie'] &&= common_cookie(headers) if @host !~ LOCALHOST_OR_IP_REGEXP
+    def share_cookie(headers, host)
+      headers['Set-Cookie'] &&= common_cookie(headers, host) if host !~ LOCALHOST_OR_IP_REGEXP
     end
 
     def cookie(headers)
@@ -32,8 +37,8 @@ module Rack
       cookies.is_a?(Array) ? cookies.join("\n") : cookies
     end
 
-    def common_cookie(headers)
-      cookie(headers).gsub(/; domain=[^;]*/, '').gsub(/$/, "; domain=#{domain}")
+    def common_cookie(headers, host)
+      cookie(headers).gsub(/; domain=[^;]*/, '').gsub(/$/, "; domain=#{domain(host)}")
     end
   end
-end
+end

data/lib/rack/contrib/config.rb

@@ -1,16 +1,4 @@
-module Rack
+# frozen_string_literal: true
 
-  # Rack::Config modifies the environment using the block given during
-  # initialization.
-  class Config
-    def initialize(app, &block)
-      @app = app
-      @block = block
-    end
-
-    def call(env)
-      @block.call(env)
-      @app.call(env)
-    end
-  end
-end
+require 'rack'
+require 'rack/config'

data/lib/rack/contrib/cookies.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Rack
   class Cookies
     class CookieJar < Hash

data/lib/rack/contrib/csshttprequest.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'csshttprequest'
 
 module Rack
@@ -13,9 +15,12 @@ module Rack
     # the CSSHTTPRequest encoder
     def call(env)
       status, headers, response = @app.call(env)
+      headers = Utils::HeaderHash.new(headers)
+
       if chr_request?(env)
-        response = encode(response)
-        modify_headers!(headers, response)
+        encoded_response = encode(response)
+        modify_headers!(headers, encoded_response)
+        response = [encoded_response]
       end
       [status, headers, response]
     end
@@ -25,9 +30,8 @@ module Rack
         !(/\.chr$/.match(env['PATH_INFO'])).nil? || Rack::Request.new(env).params['_format'] == 'chr'
     end
 
-    def encode(response, assembled_body="")
-      response.each { |s| assembled_body << s.to_s } # call down the stack
-      return ::CSSHTTPRequest.encode(assembled_body)
+    def encode(body)
+      ::CSSHTTPRequest.encode(body.to_enum.to_a.join)
     end
 
     def modify_headers!(headers, encoded_response)

data/lib/rack/contrib/deflect.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'thread'
 
 # TODO: optional stats
@@ -67,10 +69,10 @@ module Rack
     end
 
     def deflect? env
-      @remote_addr = env['REMOTE_ADDR']
-      return false if options[:whitelist].include? @remote_addr
-      return true  if options[:blacklist].include? @remote_addr
-      sync { watch }
+      remote_addr = env['REMOTE_ADDR']
+      return false if options[:whitelist].include? remote_addr
+      return true  if options[:blacklist].include? remote_addr
+      sync { watch(remote_addr) }
     end
 
     def log message
@@ -82,55 +84,55 @@ module Rack
       @mutex.synchronize(&block)
     end
 
-    def map
-      @remote_addr_map[@remote_addr] ||= {
+    def map(remote_addr)
+      @remote_addr_map[remote_addr] ||= {
         :expires => Time.now + options[:interval],
         :requests => 0
       }
     end
 
-    def watch
-      increment_requests
-      clear! if watch_expired? and not blocked?
-      clear! if blocked? and block_expired?
-      block! if watching? and exceeded_request_threshold?
-      blocked?
+    def watch(remote_addr)
+      increment_requests(remote_addr)
+      clear!(remote_addr) if watch_expired?(remote_addr) and not blocked?(remote_addr)
+      clear!(remote_addr) if blocked?(remote_addr) and block_expired?(remote_addr)
+      block!(remote_addr) if watching?(remote_addr) and exceeded_request_threshold?(remote_addr)
+      blocked?(remote_addr)
     end
 
-    def block!
-      return if blocked?
-      log "blocked #{@remote_addr}"
-      map[:block_expires] = Time.now + options[:block_duration]
+    def block!(remote_addr)
+      return if blocked?(remote_addr)
+      log "blocked #{remote_addr}"
+      map(remote_addr)[:block_expires] = Time.now + options[:block_duration]
     end
 
-    def blocked?
-      map.has_key? :block_expires
+    def blocked?(remote_addr)
+      map(remote_addr).has_key? :block_expires
     end
 
-    def block_expired?
-      map[:block_expires] < Time.now rescue false
+    def block_expired?(remote_addr)
+      map(remote_addr)[:block_expires] < Time.now rescue false
     end
 
-    def watching?
-      @remote_addr_map.has_key? @remote_addr
+    def watching?(remote_addr)
+      @remote_addr_map.has_key? remote_addr
     end
 
-    def clear!
-      return unless watching?
-      log "released #{@remote_addr}" if blocked?
-      @remote_addr_map.delete @remote_addr
+    def clear!(remote_addr)
+      return unless watching?(remote_addr)
+      log "released #{remote_addr}" if blocked?(remote_addr)
+      @remote_addr_map.delete remote_addr
     end
 
-    def increment_requests
-      map[:requests] += 1
+    def increment_requests(remote_addr)
+      map(remote_addr)[:requests] += 1
     end
 
-    def exceeded_request_threshold?
-      map[:requests] > options[:request_threshold]
+    def exceeded_request_threshold?(remote_addr)
+      map(remote_addr)[:requests] > options[:request_threshold]
     end
 
-    def watch_expired?
-      map[:expires] <= Time.now
+    def watch_expired?(remote_addr)
+      map(remote_addr)[:expires] <= Time.now
     end
 
   end

data/lib/rack/contrib/enforce_valid_encoding.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Rack
   # Ensure that the path and query string presented to the application
   # contains only valid characters.  If the validation fails, then a

data/lib/rack/contrib/evil.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Rack
   class Evil
     # Lets you return a response to the client immediately from anywhere ( M V or C ) in the code.

data/lib/rack/contrib/expectation_cascade.rb

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 module Rack
   class ExpectationCascade
-    Expect = "Expect".freeze
+    Expect = "HTTP_EXPECT".freeze
     ContinueExpectation = "100-continue".freeze
 
     ExpectationFailed = [417, {"Content-Type" => "text/html"}, []].freeze

data/lib/rack/contrib/garbagecollector.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Rack
   # Forces garbage collection after each request.
   class GarbageCollector

data/lib/rack/contrib/host_meta.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Rack
 
   # Rack middleware implementing the IETF draft: "Host Metadata for the Web"

data/lib/rack/contrib/json_body_parser.rb

@@ -55,16 +55,18 @@ module Rack
     end
 
     def call(env)
-      if @verbs.include?(env[Rack::REQUEST_METHOD]) &&
-         @matcher.call(@media, env['CONTENT_TYPE'])
+      begin
+        if @verbs.include?(env[Rack::REQUEST_METHOD]) &&
+           @matcher.call(@media, env['CONTENT_TYPE'])
 
-        update_form_hash_with_json_body(env)
+          update_form_hash_with_json_body(env)
+        end
+      rescue JSON::ParserError
+        body = { error: 'Failed to parse body as JSON' }.to_json
+        header = { 'Content-Type' => 'application/json' }
+        return Rack::Response.new(body, 400, header).finish
       end
       @app.call(env)
-    rescue JSON::ParserError
-      body = { error: 'Failed to parse body as JSON' }.to_json
-      header = { 'Content-Type' => 'application/json' }
-      Rack::Response.new(body, 400, header).finish
     end
 
     private

data/lib/rack/contrib/jsonp.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Rack
 
   # A Rack middleware for providing JSON-P support.
@@ -53,7 +55,7 @@ module Rack
 
         # Set new Content-Length, if it was set before we mutated the response body
         if headers['Content-Length']
-          length = response.to_ary.inject(0) { |len, part| len + part.bytesize }
+          length = response.map(&:bytesize).reduce(0, :+)
           headers['Content-Length'] = length.to_s
         end
       end
@@ -87,8 +89,8 @@ module Rack
     # method of combining all of the data into a single string makes sense
     # since JSON is returned as a full string.
     #
-    def pad(callback, response, body = "")
-      response.each do |s|
+    def pad(callback, response)
+      body = response.to_enum.map do |s|
         # U+2028 and U+2029 are allowed inside strings in JSON (as all literal
         # Unicode characters) but JavaScript defines them as newline
         # seperators. Because no literal newlines are allowed in a string, this
@@ -96,8 +98,8 @@ module Rack
         # replacing them with the escaped version. This should be safe because
         # according to the JSON spec, these characters are *only* valid inside
         # a string and should therefore not be present any other places.
-        body << s.to_s.gsub(U2028, '\u2028').gsub(U2029, '\u2029')
-      end
+        s.gsub(U2028, '\u2028').gsub(U2029, '\u2029')
+      end.join
 
       # https://github.com/rack/rack-contrib/issues/46
       response.close if response.respond_to?(:close)

data/lib/rack/contrib/lazy_conditional_get.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Rack
 
   ##
@@ -43,6 +45,10 @@ module Rack
   # know for sure that it does not modify the cached content, you can set the
   # `Rack-Lazy-Conditional-Get` on response to `skip`. This will not update the
   # global modification date.
+  #
+  # NOTE: This will not work properly in a multi-threaded environment with
+  # default cache object. A provided cache object should ensure thread-safety
+  # of the `get`/`set`/`[]`/`[]=` methods.
 
   class LazyConditionalGet
 
@@ -70,7 +76,10 @@ module Rack
       if reading? env and fresh? env
         return [304, {'Last-Modified' => env['HTTP_IF_MODIFIED_SINCE']}, []]
       end
+
       status, headers, body = @app.call env
+      headers = Utils::HeaderHash.new(headers)
+
       update_cache unless (reading?(env) or skipping?(headers))
       headers['Last-Modified'] = cached_value if stampable? headers
       [status, headers, body]

data/lib/rack/contrib/lighttpd_script_name_fix.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Rack
   # Lighttpd sets the wrong SCRIPT_NAME and PATH_INFO if you mount your
   # FastCGI app at "/". This middleware fixes this issue.

data/lib/rack/contrib/locale.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'i18n'
 
 module Rack
@@ -14,6 +16,7 @@ module Rack
 
       env['rack.locale'] = I18n.locale = locale.to_s
       status, headers, body = @app.call(env)
+      headers = Utils::HeaderHash.new(headers)
 
       unless headers['Content-Language']
         headers['Content-Language'] = locale.to_s

data/lib/rack/contrib/mailexceptions.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'net/smtp'
 require 'mail'
 require 'erb'
@@ -104,7 +106,7 @@ module Rack
 
     def extract_body(env)
       if io = env['rack.input']
-        io.rewind if io.respond_to?(:rewind)
+        io.rewind
         io.read
       end
     end

data/lib/rack/contrib/nested_params.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rack/utils'
 
 module Rack
@@ -24,7 +26,7 @@ module Rack
         post_body = env[POST_BODY]
         env[FORM_INPUT] = post_body
         env[FORM_HASH] = Rack::Utils.parse_nested_query(post_body.read)
-        post_body.rewind if post_body.respond_to?(:rewind)
+        post_body.rewind
       end
       @app.call(env)
     end

data/lib/rack/contrib/not_found.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Rack
   # Rack::NotFound is a default endpoint. Optionally initialize with the
   # path to a custom 404 page, to override the standard response body.

data/lib/rack/contrib/post_body_content_type_parser.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 begin
   require 'json'
 rescue LoadError => e

data/lib/rack/contrib/printout.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Rack
   #prints the environment and request for simple debugging
   class Printout

data/lib/rack/contrib/proctitle.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Rack
   # Middleware to update the process title ($0) with information about the
   # current request. Based loosely on:

data/lib/rack/contrib/profiler.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'ruby-prof'
 
 module Rack

data/lib/rack/contrib/relative_redirect.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rack'
 
 # Rack::RelativeRedirect is a simple middleware that converts relative paths in
@@ -30,15 +32,18 @@ class Rack::RelativeRedirect
   # and use that to make the Location header an absolute url.  If the Location
   # does not start with a slash, make location relative to the path requested.
   def call(env)
-    res = @app.call(env)
-    if [301,302,303, 307,308].include?(res[0]) and loc = res[1]['Location'] and !%r{\Ahttps?://}o.match(loc)
-      absolute = @absolute_proc.call(env, res)
-      res[1]['Location'] = if %r{\A/}.match(loc)
+    status, headers, body = @app.call(env)
+    headers = Rack::Utils::HeaderHash.new(headers)
+
+    if [301,302,303, 307,308].include?(status) and loc = headers['Location'] and !%r{\Ahttps?://}o.match(loc)
+      absolute = @absolute_proc.call(env, [status, headers, body])
+      headers['Location'] = if %r{\A/}.match(loc)
         "#{absolute}#{loc}"
       else
         "#{absolute}#{File.dirname(Rack::Utils.unescape(env['PATH_INFO']))}/#{loc}"
       end
     end
-    res
+
+    [status, headers, body]
   end
 end

data/lib/rack/contrib/response_cache.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'fileutils'
 require 'rack'
 
@@ -19,12 +21,8 @@ class Rack::ResponseCache
   DEFAULT_PATH_PROC = proc do |env, res|
     path = Rack::Utils.unescape(env['PATH_INFO'])
     headers = res[1]
-    # Content-Type is almost always at headers['Content-Type'], but to fully
-    # comply with HTTP RFC 7230, we fall back to a case-insensitive lookup
-    content_type = headers.fetch('Content-Type') do |titlecase_key|
-      _, val = headers.find { |key, _| key.casecmp(titlecase_key) == 0 }
-      val
-    end
+    content_type = headers['Content-Type']
+
     if !path.include?('..') and match = /text\/((?:x|ht)ml|css)/o.match(content_type)
       type = match[1]
       path = "#{path}.#{type}" unless /\.#{type}\z/.match(path)
@@ -54,16 +52,19 @@ class Rack::ResponseCache
   # If the cache is a string, create any necessary middle directories, and cache the file in the appropriate
   # subdirectory of cache.  Otherwise, cache the body of the response as the value with the path as the key.
   def call(env)
-    res = @app.call(env)
-    if env['REQUEST_METHOD'] == 'GET' and env['QUERY_STRING'] == '' and res[0] == 200 and path = @path_proc.call(env, res)
+    status, headers, body = @app.call(env)
+    headers = Rack::Utils::HeaderHash.new(headers)
+
+    if env['REQUEST_METHOD'] == 'GET' and env['QUERY_STRING'] == '' and status == 200 and path = @path_proc.call(env, [status, headers, body])
       if @cache.is_a?(String)
         path = File.join(@cache, path) if @cache
         FileUtils.mkdir_p(File.dirname(path))
-        File.open(path, 'wb'){|f| res[2].each{|c| f.write(c)}}
+        File.open(path, 'wb'){|f| body.each{|c| f.write(c)}}
       else
-        @cache[path] = res[2]
+        @cache[path] = body
       end
     end
-    res
+
+    [status, headers, body]
   end
 end

data/lib/rack/contrib/response_headers.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Rack
   # Allows you to tap into the response headers. Yields a Rack::Utils::HeaderHash
   # of current response headers to the block. Example:

data/lib/rack/contrib/route_exceptions.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Rack
   class RouteExceptions
     ROUTES = [

data/lib/rack/contrib/runtime.rb

@@ -1,31 +1,4 @@
+# frozen_string_literal: true
 
-module Rack
-  # Sets an "X-Runtime" response header, indicating the response
-  # time of the request, in seconds
-  #
-  # You can put it right before the application to see the processing
-  # time, or before all the other middlewares to include time for them,
-  # too.
-  class Runtime
-    def initialize(app, name = nil)
-      @app = app
-      @header_name = "X-Runtime"
-      @header_name << "-#{name}" if name
-    end
-
-    def call(env)
-      start_time = Time.now
-      status, headers, body = @app.call(env)
-      request_time = Time.now - start_time
-
-      if !headers.has_key?(@header_name)
-        headers[@header_name] = "%0.6f" % request_time
-      end
-
-      [status, headers, body]
-    end
-  end
-end
-
-
-
+require 'rack'
+require 'rack/runtime'

data/lib/rack/contrib/signals.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Rack
   # Installs signal handlers that are safely processed after a request
   #
@@ -24,6 +26,10 @@ module Rack
         @body.each(&block)
         @callback.call
       end
+
+      def close
+        @body.close if @body.respond_to?(:close)
+      end
     end
 
     def initialize(app, &block)

data/lib/rack/contrib/simple_endpoint.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Rack
   # Create simple endpoints with routing rules, similar to Sinatra actions.
   #
@@ -78,4 +80,4 @@ module Rack
         @verbs.empty? || @verbs.include?(method)
       end
   end
-end
+end

data/lib/rack/contrib/static_cache.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'time'
 
 module Rack
@@ -57,10 +59,12 @@ module Rack
       @no_cache = {}
       @urls.collect! do |url|
         if url  =~ /\*$/
-          url.sub!(/\*$/, '')
-          @no_cache[url] = 1
+          url_prefix = url.sub(/\*$/, '')
+          @no_cache[url_prefix] = 1
+          url_prefix
+        else
+          url
         end
-        url
       end
       root = options[:root] || Dir.pwd
       @file_server = Rack::File.new(root)
@@ -81,7 +85,10 @@ module Rack
         if @versioning_enabled
           path.sub!(@version_regex, '\1')
         end
+
         status, headers, body = @file_server.call(env)
+        headers = Utils::HeaderHash.new(headers)
+
         if @no_cache[url].nil?
           headers['Cache-Control'] ="max-age=#{@duration_in_seconds}, public"
           headers['Expires'] = duration_in_words

data/lib/rack/contrib/time_zone.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Rack
   class TimeZone
     Javascript = <<-EOJ

data/lib/rack/contrib/try_static.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Rack
 
   # The Rack::TryStatic middleware delegates requests to Rack::Static middleware

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rack-contrib
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.3.0
 platform: ruby
 authors:
 - rack-devel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-29 00:00:00.000000000 Z
+date: 2020-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack