rack-contrib 1.1.0 → 1.2.0

data/AUTHORS

@@ -24,3 +24,4 @@ TJ Holowaychuk <tj@vision-media.ca>
 anupom syam <anupom.syam@gmail.com>
 ichverstehe <ichverstehe@gmail.com>
 kubicek <jiri@kubicek.cz>
+Jordi Polo <mumismo@gmail.com>

data/COPYING

@@ -1,3 +1,4 @@
+The MIT License (MIT)
 Copyright (c) 2008 The Committers
 
 Permission is hereby granted, free of charge, to any person obtaining a copy

data/README.rdoc

@@ -48,6 +48,7 @@ interface:
 * Rack::ResponseHeaders - Manipulates response headers object at runtime
 * Rack::SimpleEndpoint - Creates simple endpoints with routing rules, similar to Sinatra actions
 * Rack::TryStatic - Tries to match request to a static file
+* Rack::Printout - Prints the environment and the response per request
 
 === Use
 
@@ -73,9 +74,25 @@ components included. The following example shows what a simple rackup
 
   run theapp
 
+=== Testing
+
+To contribute to the project, begin by cloning the repo and installing the necessary gems:
+
+    gem install json rack ruby-prof test-spec test-unit
+
+To run the entire test suite, run 
+    rake test
+
+To run a specific component's tests run
+    specrb -Ilib:test -w test/spec_rack_thecomponent.rb
+
+This works on ruby 1.8.7 but has problems under ruby 1.9.x. 
+
+TODO: instructions for 1.9.x and include bundler
+
 === Links
 
 rack-contrib on GitHub:: <http://github.com/rack/rack-contrib>
 Rack:: <http://rack.rubyforge.org/>
-Rack On GitHub:: <http://github.org/rack/rack>
+Rack On GitHub:: <http://github.com/rack/rack>
 rack-devel mailing list:: <http://groups.google.com/group/rack-devel>

data/lib/rack/contrib.rb

@@ -3,7 +3,7 @@ require 'rack'
 module Rack
   module Contrib
     def self.release
-      "1.0.1"
+      "1.2.0"
     end
   end
 
@@ -14,6 +14,7 @@ module Rack
   autoload :CSSHTTPRequest,             "rack/contrib/csshttprequest"
   autoload :Deflect,                    "rack/contrib/deflect"
   autoload :ExpectationCascade,         "rack/contrib/expectation_cascade"
+  autoload :HostMeta,                   "rack/contrib/host_meta"
   autoload :GarbageCollector,           "rack/contrib/garbagecollector"
   autoload :JSONP,                      "rack/contrib/jsonp"
   autoload :LighttpdScriptNameFix,      "rack/contrib/lighttpd_script_name_fix"
@@ -36,4 +37,6 @@ module Rack
   autoload :ResponseCache,              "rack/contrib/response_cache"
   autoload :RelativeRedirect,           "rack/contrib/relative_redirect"
   autoload :StaticCache,                "rack/contrib/static_cache"
+  autoload :TryStatic,                  "rack/contrib/try_static"
+  autoload :Printout,                   "rack/contrib/printout"
 end

data/lib/rack/contrib/accept_format.rb

@@ -37,7 +37,7 @@ module Rack
       if ::File.extname(req.path_info).empty?
         accept = env['HTTP_ACCEPT'].to_s.scan(/[^;,\s]*\/[^;,\s]*/)[0].to_s
         extension =  Rack::Mime::MIME_TYPES.invert[accept] || @ext
-        req.path_info = req.path_info+"#{extension}"
+        req.path_info = req.path_info.chomp('/') << "#{extension}"
       end
 
       @app.call(env)

data/lib/rack/contrib/common_cookies.rb

@@ -19,10 +19,8 @@ module Rack
     private
 
     def domain
-      @domain ||= begin
-        @host =~ DOMAIN_REGEXP
-        ".#{$1}.#{$2}"
-      end
+      @host =~ DOMAIN_REGEXP
+      ".#{$1}.#{$2}"
     end
 
     def share_cookie(headers)

data/lib/rack/contrib/jsonp.rb

@@ -7,6 +7,21 @@ module Rack
   class JSONP
     include Rack::Utils
 
+    VALID_JS_VAR    = /[a-zA-Z_$][\w$]*/
+    VALID_CALLBACK  = /\A#{VALID_JS_VAR}(?:\.?#{VALID_JS_VAR})*\z/
+
+    # These hold the Unicode characters \u2028 and \u2029.
+    #
+    # They are defined in constants for Ruby 1.8 compatibility.
+    #
+    # In 1.8
+    # "\u2028" # => "u2028"
+    # "\u2029" # => "u2029"
+    # In 1.9
+    # "\342\200\250" # => "\u2028"
+    # "\342\200\251" # => "\u2029"
+    U2028, U2029 = ("\u2028" == 'u2028') ? ["\342\200\250", "\342\200\251"] : ["\u2028", "\u2029"]
+
     def initialize(app)
       @app = app
     end
@@ -18,13 +33,17 @@ module Rack
     # Changes nothing if no <tt>callback</tt> param is specified.
     #
     def call(env)
+      request = Rack::Request.new(env)
+
       status, headers, response = @app.call(env)
 
       headers = HeaderHash.new(headers)
-      request = Rack::Request.new(env)
       
       if is_json?(headers) && has_callback?(request)
-        response = pad(request.params.delete('callback'), response)
+        callback = request.params['callback']
+        return bad_request unless valid_callback?(callback)
+
+        response = pad(callback, response)
 
         # No longer json, its javascript!
         headers['Content-Type'] = headers['Content-Type'].gsub('json', 'javascript')
@@ -35,6 +54,7 @@ module Rack
           headers['Content-Length'] = length.to_s
         end
       end
+
       [status, headers, response]
     end
     
@@ -45,7 +65,16 @@ module Rack
     end
     
     def has_callback?(request)
-      request.params.include?('callback')
+      request.params.include?('callback') and not request.params['callback'].empty?
+    end
+
+    # See:
+    # http://stackoverflow.com/questions/1661197/valid-characters-for-javascript-variable-names
+    # 
+    # NOTE: Supports dots (.) since callbacks are often in objects:
+    # 
+    def valid_callback?(callback)
+      callback =~ VALID_CALLBACK
     end
 
     # Pads the response with the appropriate callback format according to the
@@ -56,8 +85,25 @@ module Rack
     # since JSON is returned as a full string.
     #
     def pad(callback, response, body = "")
-      response.each{ |s| body << s.to_s }
-      ["#{callback}(#{body})"]
+      response.each 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
+        # causes a ParseError in the browser. We work around this issue by
+        # 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
+      
+      # https://github.com/rack/rack-contrib/issues/46
+      response.close if response.respond_to?(:close)
+
+      ["/**/#{callback}(#{body})"]
+    end
+
+    def bad_request(body = "Bad Request")
+      [ 400, { 'Content-Type' => 'text/plain', 'Content-Length' => body.size.to_s }, [body] ]
     end
 
   end

data/lib/rack/contrib/locale.rb

@@ -8,24 +8,35 @@ module Rack
 
     def call(env)
       old_locale = I18n.locale
-      locale = nil
-
-      # http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.4
-      if lang = env["HTTP_ACCEPT_LANGUAGE"]
-        lang = lang.split(",").map { |l|
-          l += ';q=1.0' unless l =~ /;q=\d+\.\d+$/
-          l.split(';q=')
-        }.first
-        locale = lang.first.split("-").first
-      else
-        locale = I18n.default_locale
+
+      begin
+        locale = accept_locale(env) || I18n.default_locale
+        locale = env['rack.locale'] = I18n.locale = locale.to_s
+        status, headers, body = @app.call(env)
+        headers['Content-Language'] = locale
+        [status, headers, body]
+      ensure
+        I18n.locale = old_locale
       end
+    end
+
+    private
+
+    # http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.4
+    def accept_locale(env)
+      accept_langs = env["HTTP_ACCEPT_LANGUAGE"]
+      return if accept_langs.nil?
+
+      languages_and_qvalues = accept_langs.split(",").map { |l|
+        l += ';q=1.0' unless l =~ /;q=\d+(?:\.\d+)?$/
+        l.split(';q=')
+      }
+
+      lang = languages_and_qvalues.sort_by { |(locale, qvalue)|
+        qvalue.to_f
+      }.last.first
 
-      locale = env['rack.locale'] = I18n.locale = locale.to_s
-      status, headers, body = @app.call(env)
-      headers['Content-Language'] = locale
-      I18n.locale = old_locale
-      [status, headers, body]
+      lang == '*' ? nil : lang
     end
   end
 end

data/lib/rack/contrib/mailexceptions.rb

@@ -1,5 +1,5 @@
 require 'net/smtp'
-require 'tmail'
+require 'mail'
 require 'erb'
 
 module Rack
@@ -14,10 +14,10 @@ module Rack
       @app = app
       @config = {
         :to      => nil,
-        :from    => ENV['USER'] || 'rack',
+        :from    => ENV['USER'] || 'rack@localhost',
         :subject => '[exception] %s',
         :smtp    => {
-          :server         => 'localhost',
+          :address         => 'localhost',
           :domain         => 'localhost',
           :port           => 25,
           :authentication => :login,
@@ -34,8 +34,6 @@ module Rack
         begin
           @app.call(env)
         rescue => boom
-          # TODO don't allow exceptions from send_notification to
-          # propogate
           send_notification boom, env
           raise
         end
@@ -53,40 +51,24 @@ module Rack
 
   private
     def generate_mail(exception, env)
-      mail = TMail::Mail.new
-      mail.to = Array(config[:to])
-      mail.from = config[:from]
-      mail.subject = config[:subject] % [exception.to_s]
-      mail.date = Time.now
-      mail.set_content_type 'text/plain'
-      mail.charset = 'UTF-8'
-      mail.body = @template.result(binding)
-      mail
+      mail = Mail.new({
+        :from => config[:from], 
+        :to => config[:to],
+         :subject => config[:subject] % [exception.to_s],
+         :body => @template.result(binding)
+      })
     end
 
     def send_notification(exception, env)
       mail = generate_mail(exception, env)
       smtp = config[:smtp]
+      # for backward compability, replace the :server key with :address 
+      address = smtp.delete :server
+      smtp[:address] = address if address
+      mail.delivery_method :smtp, smtp
+      mail.deliver!
       env['mail.sent'] = true
-      return if smtp[:server] == 'example.com'
-
-      server = service.new(smtp[:server], smtp[:port])
-
-      if smtp[:enable_starttls_auto] == :auto
-        server.enable_starttls_auto 
-      elsif smtp[:enable_starttls_auto]
-        server.enable_starttls 
-      end
-
-      server.start smtp[:domain], smtp[:user_name], smtp[:password], smtp[:authentication]
-
-      mail.to.each do |recipient|
-        server.send_message mail.to_s, mail.from, recipient
-      end
-    end
-
-    def service
-      Net::SMTP
+      mail
     end
 
     def extract_body(env)

data/lib/rack/contrib/post_body_content_type_parser.rb

@@ -29,9 +29,9 @@ module Rack
     end
 
     def call(env)
-      case env[CONTENT_TYPE]
-      when APPLICATION_JSON
-        env.update(FORM_HASH => JSON.parse(env[POST_BODY].read), FORM_INPUT => env[POST_BODY])
+      if Rack::Request.new(env).media_type == APPLICATION_JSON && (body = env[POST_BODY].read).length != 0
+        env[POST_BODY].rewind # somebody might try to read this stream
+        env.update(FORM_HASH => JSON.parse(body), FORM_INPUT => env[POST_BODY])
       end
       @app.call(env)
     end

data/lib/rack/contrib/printout.rb

@@ -0,0 +1,25 @@
+module Rack
+  #prints the environment and request for simple debugging
+  class Printout
+    def initialize(app)
+      @app = app
+    end
+
+    def call(env)
+      # See http://rack.rubyforge.org/doc/SPEC.html for details
+      puts "**********\n Environment\n **************"
+      puts env.inspect
+      
+      puts "**********\n Response\n **************"
+      response = @app.call(env)
+      puts response.inspect
+
+      puts "**********\n Response contents\n **************"
+      response[2].each do |chunk|
+        puts chunk
+      end
+      puts "\n \n"
+      return response
+    end
+  end
+end

data/lib/rack/contrib/profiler.rb

@@ -6,30 +6,22 @@ module Rack
   #
   # Pass the :printer option to pick a different result format.
   class Profiler
-    MODES = %w(
-      process_time
-      wall_time
-      cpu_time
-      allocations
-      memory
-      gc_runs
-      gc_time
-    )
+    MODES = %w(process_time wall_time cpu_time
+               allocations memory gc_runs gc_time)
 
-    DEFAULT_PRINTER = RubyProf::CallTreePrinter
-    DEFAULT_CONTENT_TYPE = 'application/octet-stream'
+    DEFAULT_PRINTER = :call_stack
 
-    PRINTER_CONTENT_TYPE = {
-      RubyProf::FlatPrinter => 'text/plain',
-      RubyProf::GraphPrinter => 'text/plain',
-      RubyProf::GraphHtmlPrinter => 'text/html'
-    }
+    CONTENT_TYPES = Hash.new('application/octet-stream').merge(
+      'RubyProf::FlatPrinter'      => 'text/plain',
+      'RubyProf::GraphPrinter'     => 'text/plain',
+      'RubyProf::GraphHtmlPrinter' => 'text/html',
+      'RubyProf::CallStackPrinter' => 'text/html')
 
-    # Accepts a :printer => [:call_tree|:graph_html|:graph|:flat] option
-    # defaulting to :call_tree.
+    # Accepts a :printer => [:call_stack|:call_tree|:graph_html|:graph|:flat]
+    # option defaulting to :call_stack.
     def initialize(app, options = {})
       @app = app
-      @printer = parse_printer(options[:printer])
+      @printer = parse_printer(options[:printer] || DEFAULT_PRINTER)
       @times = (options[:times] || 1).to_i
     end
 
@@ -43,10 +35,10 @@ module Rack
 
     private
       def profiling?(env)
-        unless RubyProf.running?
+        unless ::RubyProf.running?
           request = Rack::Request.new(env.clone)
           if mode = request.params.delete('profile')
-            if RubyProf.const_defined?(mode.upcase)
+            if ::RubyProf.const_defined?(mode.upcase)
               mode
             else
               env['rack.errors'].write "Invalid RubyProf measure_mode: " +
@@ -58,10 +50,10 @@ module Rack
       end
 
       def profile(env, mode)
-        RubyProf.measure_mode = RubyProf.const_get(mode.upcase)
+        ::RubyProf.measure_mode = ::RubyProf.const_get(mode.upcase)
 
         GC.enable_stats if GC.respond_to?(:enable_stats)
-        result = RubyProf.profile do
+        result = ::RubyProf.profile do
           @times.times { @app.call(env) }
         end
         GC.disable_stats if GC.respond_to?(:disable_stats)
@@ -77,8 +69,8 @@ module Rack
       end
 
       def headers(printer, env, mode)
-        headers = { 'Content-Type' => PRINTER_CONTENT_TYPE[printer] || DEFAULT_CONTENT_TYPE }
-        if printer == RubyProf::CallTreePrinter
+        headers = { 'Content-Type' => CONTENT_TYPES[printer.name] }
+        if printer == ::RubyProf::CallTreePrinter
           filename = ::File.basename(env['PATH_INFO'])
           headers['Content-Disposition'] =
             %(attachment; filename="#{filename}.#{mode}.tree")
@@ -87,16 +79,14 @@ module Rack
       end
 
       def parse_printer(printer)
-        if printer.nil?
-          DEFAULT_PRINTER
-        elsif printer.is_a?(Class)
+        if printer.is_a?(Class)
           printer
         else
           name = "#{camel_case(printer)}Printer"
-          if RubyProf.const_defined?(name)
-            RubyProf.const_get(name)
+          if ::RubyProf.const_defined?(name)
+            ::RubyProf.const_get(name)
           else
-            DEFAULT_PRINTER
+            ::RubyProf::FlatPrinter
           end
         end
       end

data/lib/rack/contrib/static_cache.rb

@@ -26,7 +26,7 @@ module Rack
   #
   # Examples:
   #     use Rack::StaticCache, :urls => ["/images", "/css", "/js", "/documents*"], :root => "statics"
-  #     will serve all requests beginning with /images, /csss or /js from the
+  #     will serve all requests beginning with /images, /css or /js from the
   #     directory "statics/images",  "statics/css",  "statics/js".
   #     All the files from these directories will have modified headers to enable client/proxy caching,
   #     except the files from the directory "documents". Append a * (star) at the end of the pattern
@@ -87,7 +87,7 @@ module Rack
     end
 
     def duration_in_seconds
-      60 * 60 * 24 * 365 * @cache_duration
+      (60 * 60 * 24 * 365 * @cache_duration).to_i
     end
   end
 end

data/lib/rack/contrib/try_static.rb

@@ -17,9 +17,9 @@ module Rack
 
     def initialize(app, options)
       @app = app
-      @try = ['', *options.delete(:try)]
+      @try = ['', *options[:try]]
       @static = ::Rack::Static.new(
-        lambda { [404, {}, []] },
+        lambda { |_| [404, {}, []] },
         options)
     end
 

data/rack-contrib.gemspec

@@ -3,8 +3,8 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
 
   s.name = 'rack-contrib'
-  s.version = '1.1.0'
-  s.date = '2010-10-19'
+  s.version = '1.2.0'
+  s.licenses = ['MIT']
 
   s.description = "Contributed Rack Middleware and Utilities"
   s.summary     = "Contributed Rack Middleware and Utilities"
@@ -41,6 +41,7 @@ Gem::Specification.new do |s|
     lib/rack/contrib/not_found.rb
     lib/rack/contrib/post_body_content_type_parser.rb
     lib/rack/contrib/proctitle.rb
+    lib/rack/contrib/printout.rb
     lib/rack/contrib/profiler.rb
     lib/rack/contrib/relative_redirect.rb
     lib/rack/contrib/response_cache.rb

data/test/spec_rack_jsonp.rb

@@ -51,6 +51,113 @@ context "Rack::JSONP" do
       headers = Rack::JSONP.new(app).call(request)[1]
       headers['Content-Type'].should.equal('application/javascript')
     end
+
+    specify "should not allow literal U+2028 or U+2029" do
+      test_body = unless "\u2028" == 'u2028'
+        "{\"bar\":\"\u2028 and \u2029\"}"
+      else
+        "{\"bar\":\"\342\200\250 and \342\200\251\"}"
+      end
+      callback = 'foo'
+      app = lambda { |env| [200, {'Content-Type' => 'application/json'}, [test_body]] }
+      request = Rack::MockRequest.env_for("/", :params => "foo=bar&callback=#{callback}")
+      body = Rack::JSONP.new(app).call(request).last
+      unless "\u2028" == 'u2028'
+        body.join.should.not.match(/\u2028|\u2029/)
+      else
+        body.join.should.not.match(/\342\200\250|\342\200\251/)
+      end
+    end
+    
+    context "but is empty" do
+      specify "should " do
+        test_body = '{"bar":"foo"}'
+        callback = ''
+        app = lambda { |env| [200, {'Content-Type' => 'application/json'}, [test_body]] }
+        request = Rack::MockRequest.env_for("/", :params => "foo=bar&callback=#{callback}")
+        body = Rack::JSONP.new(app).call(request).last
+        body.should.equal ['{"bar":"foo"}']
+      end
+    end
+    
+    context 'but is invalid' do
+      context 'with content-type application/json' do
+        specify 'should return "Bad Request"' do
+          test_body = '{"bar":"foo"}'
+          callback = '*'
+          content_type = 'application/json'
+          app = lambda { |env| [200, {'Content-Type' => content_type}, [test_body]] }
+          request = Rack::MockRequest.env_for("/", :params => "foo=bar&callback=#{callback}")
+          body = Rack::JSONP.new(app).call(request).last
+          body.should.equal ['Bad Request']
+        end
+
+        specify 'should return set the response code to 400' do
+          test_body = '{"bar":"foo"}'
+          callback = '*'
+          content_type = 'application/json'
+          app = lambda { |env| [200, {'Content-Type' => content_type}, [test_body]] }
+          request = Rack::MockRequest.env_for("/", :params => "foo=bar&callback=#{callback}")
+          response_code = Rack::JSONP.new(app).call(request).first
+          response_code.should.equal 400
+        end
+      end
+
+      context 'with content-type text/plain' do
+        specify 'should return "Good Request"' do
+          test_body = 'Good Request'
+          callback = '*'
+          content_type = 'text/plain'
+          app = lambda { |env| [200, {'Content-Type' => content_type}, [test_body]] }
+          request = Rack::MockRequest.env_for("/", :params => "foo=bar&callback=#{callback}")
+          body = Rack::JSONP.new(app).call(request).last
+          body.should.equal ['Good Request']
+        end
+
+        specify 'should not change the response code from 200' do
+          test_body = '{"bar":"foo"}'
+          callback = '*'
+          content_type = 'text/plain'
+          app = lambda { |env| [200, {'Content-Type' => content_type}, [test_body]] }
+          request = Rack::MockRequest.env_for("/", :params => "foo=bar&callback=#{callback}")
+          response_code = Rack::JSONP.new(app).call(request).first
+          response_code.should.equal 200
+        end
+      end
+    end
+
+    context "with XSS vulnerability attempts" do
+      def request(callback, body = '{"bar":"foo"}')
+        app = lambda { |env| [200, {'Content-Type' => 'application/json'}, [body]] }
+        request = Rack::MockRequest.env_for("/", :params => "foo=bar&callback=#{callback}")
+        Rack::JSONP.new(app).call(request)
+      end
+      
+      def assert_bad_request(response)
+        response.should.not.equal nil
+        status, headers, body = response
+        status.should.equal 400
+        body.should.equal ["Bad Request"]
+      end
+      
+      specify "should return bad request for callback with invalid characters" do
+        assert_bad_request(request("foo<bar>baz()$"))
+      end
+      
+      specify "should return bad request for callbacks with <script> tags" do
+        assert_bad_request(request("foo<script>alert(1)</script>"))
+      end
+      
+      specify "should return bad requests for callbacks with multiple statements" do
+        assert_bad_request(request("foo%3balert(1)//")) # would render: "foo;alert(1)//"
+      end
+      
+      specify "should not return a bad request for callbacks with dots in the callback" do
+        status, headers, body = request(callback = "foo.bar.baz", test_body = '{"foo":"bar"}')
+        status.should.equal 200
+        body.should.equal ["#{callback}(#{test_body})"]
+      end
+    end
     
   end
 
@@ -78,4 +185,4 @@ context "Rack::JSONP" do
     body.should.equal [test_body]
   end  
 
-end
+end

data/test/spec_rack_mailexceptions.rb

@@ -2,10 +2,8 @@ require 'test/spec'
 require 'rack/mock'
 
 begin
-  require 'tmail'
-  require 'rack/contrib/mailexceptions'
-
-  require File.dirname(__FILE__) + '/mail_settings.rb'
+  require './lib/rack/contrib/mailexceptions'
+  require './test/mail_settings.rb'
 
   class TestError < RuntimeError
   end
@@ -57,13 +55,13 @@ begin
           mail.smtp @smtp_settings
         end
 
-      tmail = mailer.send(:generate_mail, test_exception, @env)
-      tmail.to.should.equal ['foo@example.org']
-      tmail.from.should.equal ['bar@example.org']
-      tmail.subject.should.equal '[ERROR] Suffering Succotash!'
-      tmail.body.should.not.be.nil
-      tmail.body.should.be =~ /FOO:\s+"BAR"/
-      tmail.body.should.be =~ /^\s*THE BODY\s*$/
+      mail = mailer.send(:generate_mail, test_exception, @env)
+      mail.to.should.equal ['foo@example.org']
+      mail.from.should.equal ['bar@example.org']
+      mail.subject.should.equal '[ERROR] Suffering Succotash!'
+      mail.body.should.not.be.nil
+      mail.body.should.be =~ /FOO:\s+"BAR"/
+      mail.body.should.be =~ /^\s*THE BODY\s*$/
     end
 
     specify 'catches exceptions raised from app, sends mail, and re-raises' do
@@ -167,5 +165,5 @@ begin
     end
   end
 rescue LoadError => boom
-  STDERR.puts "WARN: Skipping Rack::MailExceptions tests (tmail not installed)"
+  STDERR.puts "WARN: Skipping Rack::MailExceptions tests (mail not installed)"
 end

data/test/spec_rack_post_body_content_type_parser.rb

@@ -6,26 +6,34 @@ begin
 
   context "Rack::PostBodyContentTypeParser" do
 
-    specify "should handle requests with POST body Content-Type of application/json" do
-      app = lambda { |env| [200, {'Content-Type' => 'text/plain'}, Rack::Request.new(env).POST] }
-      env = env_for_post_with_headers('/', {'Content_Type'.upcase => 'application/json'}, {:body => "asdf", :status => "12"}.to_json)
-      body = Rack::PostBodyContentTypeParser.new(app).call(env).last
-      body['body'].should.equal "asdf"
-      body['status'].should.equal "12"
+    specify "should parse 'application/json' requests" do
+      params = params_for_request '{"key":"value"}', "application/json"
+      params['key'].should.equal "value"
     end
 
-    specify "should change nothing when the POST body content type isn't application/json" do
-      app = lambda { |env| [200, {'Content-Type' => 'text/plain'}, Rack::Request.new(env).POST] }
-      body = Rack::PostBodyContentTypeParser.new(app).call(Rack::MockRequest.env_for("/", {:method => 'POST', :params => "body=asdf&status=12"})).last
-      body['body'].should.equal "asdf"
-      body['status'].should.equal "12"
+    specify "should parse 'application/json; charset=utf-8' requests" do
+      params = params_for_request '{"key":"value"}', "application/json; charset=utf-8"
+      params['key'].should.equal "value"
+    end
+    
+    specify "should parse 'application/json' requests with empty body" do
+      params = params_for_request "", "application/json"
+      params.should.equal({})
+    end
+
+    specify "shouldn't affect form-urlencoded requests" do
+      params = params_for_request("key=value", "application/x-www-form-urlencoded")
+      params['key'].should.equal "value"
     end
 
   end
 
-  def env_for_post_with_headers(path, headers, body)
-    Rack::MockRequest.env_for(path, {:method => "POST", :input => body}.merge(headers))
+  def params_for_request(body, content_type)
+    env = Rack::MockRequest.env_for "/", {:method => "POST", :input => body, "CONTENT_TYPE" => content_type}
+    app = lambda { |env| [200, {'Content-Type' => 'text/plain'}, Rack::Request.new(env).POST] }
+    Rack::PostBodyContentTypeParser.new(app).call(env).last
   end
+  
 rescue LoadError => e
   # Missing dependency JSON, skipping tests.
   STDERR.puts "WARN: Skipping Rack::PostBodyContentTypeParser tests (json not installed)"

data/test/spec_rack_profiler.rb

@@ -8,14 +8,19 @@ begin
     app = lambda { |env| [200, {'Content-Type' => 'text/plain'}, 'Oh hai der'] }
     request = Rack::MockRequest.env_for("/", :params => "profile=process_time")
 
-    specify 'printer defaults to RubyProf::CallTreePrinter' do
+    specify 'printer defaults to RubyProf::CallStackPrinter' do
       profiler = Rack::Profiler.new(nil)
-      profiler.instance_variable_get('@printer').should.equal RubyProf::CallTreePrinter
+      profiler.instance_variable_get('@printer').should.equal RubyProf::CallStackPrinter
       profiler.instance_variable_get('@times').should.equal 1
     end
 
+    specify 'CallStackPrinter has Content-Type test/html' do
+      headers = Rack::Profiler.new(app, :printer => :call_stack).call(request)[1]
+      headers.should.equal "Content-Type"=>"text/html"
+    end
+
     specify 'CallTreePrinter has correct headers' do
-      headers = Rack::Profiler.new(app).call(request)[1]
+      headers = Rack::Profiler.new(app, :printer => :call_tree).call(request)[1]
       headers.should.equal "Content-Disposition"=>"attachment; filename=\"/.process_time.tree\"", "Content-Type"=>"application/octet-stream"
     end
 

data/test/spec_rack_static_cache.rb

@@ -59,6 +59,14 @@ describe "Rack::StaticCache" do
     res.headers['Expires'].should =~ Regexp.new("#{next_next_year}")
   end
 
+  it "should round max-age if duration is part of a year" do
+    one_week_duration_app_request
+    res = @request.get("/statics/test")
+    res.should.be.ok
+    res.body.should =~ /rubyrack/
+    res.headers['Cache-Control'].should == "max-age=606461, public"
+  end
+
   it "should return 404s if requested with version number but versioning is disabled" do
     configured_app_request
     res = @request.get("/statics/test-0.0.1")
@@ -79,6 +87,11 @@ describe "Rack::StaticCache" do
     request
   end
 
+  def one_week_duration_app_request
+    @options = {:urls => ["/statics"], :root => @root, :duration => 1.fdiv(52)}
+    request
+  end
+
   def configured_app_request
     @options = {:urls => ["/statics", "/documents*"], :root => @root, :versioning => false, :duration => 2}
     request

data/test/spec_rack_try_static.rb

@@ -4,23 +4,25 @@ require 'rack'
 require 'rack/contrib/try_static'
 require 'rack/mock'
 
-def request(options = {})
-  options.merge!({
+def build_options(opts)
+  {
     :urls => %w[/],
     :root => ::File.expand_path(::File.dirname(__FILE__)),
-  })
+  }.merge(opts)
+end
 
+def request(options = {})
   @request =
     Rack::MockRequest.new(
       Rack::TryStatic.new(
-        lambda {[200, {}, ["Hello World"]]},
+        lambda { |_| [200, {}, ["Hello World"]]},
         options))
 end
 
 describe "Rack::TryStatic" do
   context 'when file cannot be found' do
     it 'should call call app' do
-      res = request(:try => ['html']).get('/documents')
+      res = request(build_options(:try => ['html'])).get('/documents')
       res.should.be.ok
       res.body.should == "Hello World"
     end
@@ -28,7 +30,7 @@ describe "Rack::TryStatic" do
 
   context 'when file can be found' do
     it 'should serve first found' do
-      res = request(:try => ['.html', '/index.html', '/index.htm']).get('/documents')
+      res = request(build_options(:try => ['.html', '/index.html', '/index.htm'])).get('/documents')
       res.should.be.ok
       res.body.strip.should == "index.html"
     end
@@ -36,9 +38,19 @@ describe "Rack::TryStatic" do
 
   context 'when path_info maps directly to file' do
     it 'should serve existing' do
-      res = request(:try => ['/index.html']).get('/documents/existing.html')
+      res = request(build_options(:try => ['/index.html'])).get('/documents/existing.html')
       res.should.be.ok
       res.body.strip.should == "existing.html"
     end
   end
+
+  context 'when sharing options' do
+    it 'should not mutate given options' do
+      org_options = build_options  :try => ['/index.html']
+      given_options = org_options.dup
+      request(given_options).get('/documents').should.be.ok
+      request(given_options).get('/documents').should.be.ok
+      given_options.should == org_options
+    end
+  end
 end

metadata

@@ -1,95 +1,88 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: rack-contrib
-version: !ruby/object:Gem::Version 
-  hash: 19
-  prerelease: false
-  segments: 
-  - 1
-  - 1
-  - 0
-  version: 1.1.0
+version: !ruby/object:Gem::Version
+  version: 1.2.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - rack-devel
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-10-19 00:00:00 -07:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2014-10-31 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rack
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 57
-        segments: 
-        - 0
-        - 9
-        - 1
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.9.1
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: test-spec
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.9.1
+- !ruby/object:Gem::Dependency
+  name: test-spec
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 59
-        segments: 
-        - 0
-        - 9
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.9.0
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: tmail
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 1
-        - 2
-        version: "1.2"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.9.0
+- !ruby/object:Gem::Dependency
+  name: tmail
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.2'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: json
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 1
-        - 1
-        version: "1.1"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.2'
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.1'
   type: :development
-  version_requirements: *id004
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.1'
 description: Contributed Rack Middleware and Utilities
 email: rack-devel@googlegroups.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.rdoc
 - COPYING
-files: 
+files:
 - AUTHORS
 - COPYING
 - README.rdoc
@@ -117,6 +110,7 @@ files:
 - lib/rack/contrib/not_found.rb
 - lib/rack/contrib/post_body_content_type_parser.rb
 - lib/rack/contrib/proctitle.rb
+- lib/rack/contrib/printout.rb
 - lib/rack/contrib/profiler.rb
 - lib/rack/contrib/relative_redirect.rb
 - lib/rack/contrib/response_cache.rb
@@ -168,46 +162,38 @@ files:
 - test/spec_rack_static_cache.rb
 - test/spec_rack_try_static.rb
 - test/statics/test
-has_rdoc: true
 homepage: http://github.com/rack/rack-contrib/
-licenses: []
-
+licenses:
+- MIT
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --line-numbers
 - --inline-source
 - --title
 - rack-contrib
 - --main
 - README
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 2
 summary: Contributed Rack Middleware and Utilities
-test_files: 
+test_files:
 - test/spec_rack_accept_format.rb
 - test/spec_rack_access.rb
 - test/spec_rack_backstage.rb