rack 1.4.0 → 1.4.5

data/test/spec_static.rb

@@ -1,22 +1,27 @@
 require 'rack/static'
+require 'rack/lint'
 require 'rack/mock'
 
 class DummyApp
   def call(env)
-    [200, {}, ["Hello World"]]
+    [200, {"Content-Type" => "text/plain"}, ["Hello World"]]
   end
 end
 
 describe Rack::Static do
+  def static(app, *args)
+    Rack::Lint.new Rack::Static.new(app, *args)
+  end
+
   root = File.expand_path(File.dirname(__FILE__))
 
   OPTIONS = {:urls => ["/cgi"], :root => root}
-  STATIC_OPTIONS = {:urls => [""], :root => root, :index => 'static/index.html'}
+  STATIC_OPTIONS = {:urls => [""], :root => "#{root}/static", :index => 'index.html'}
   HASH_OPTIONS = {:urls => {"/cgi/sekret" => 'cgi/test'}, :root => root}
 
-  @request = Rack::MockRequest.new(Rack::Static.new(DummyApp.new, OPTIONS))
-  @static_request = Rack::MockRequest.new(Rack::Static.new(DummyApp.new, STATIC_OPTIONS))
-  @hash_request = Rack::MockRequest.new(Rack::Static.new(DummyApp.new, HASH_OPTIONS))
+  @request = Rack::MockRequest.new(static(DummyApp.new, OPTIONS))
+  @static_request = Rack::MockRequest.new(static(DummyApp.new, STATIC_OPTIONS))
+  @hash_request = Rack::MockRequest.new(static(DummyApp.new, HASH_OPTIONS))
 
   it "serves files" do
     res = @request.get("/cgi/test")
@@ -35,10 +40,22 @@ describe Rack::Static do
     res.body.should == "Hello World"
   end
 
-  it "calls index file when requesting root" do
+  it "calls index file when requesting root in the given folder" do
     res = @static_request.get("/")
     res.should.be.ok
     res.body.should =~ /index!/
+
+    res = @static_request.get("/other/")
+    res.should.be.not_found
+
+    res = @static_request.get("/another/")
+    res.should.be.ok
+    res.body.should =~ /another index!/
+  end
+
+  it "doesn't call index file if :index option was omitted" do
+    res = @request.get("/")
+    res.body.should == "Hello World"
   end
 
   it "serves hidden files" do
@@ -53,12 +70,76 @@ describe Rack::Static do
     res.body.should == "Hello World"
   end
 
-  it "supports serving fixed cache-control" do
+  it "supports serving fixed cache-control (legacy option)" do
     opts = OPTIONS.merge(:cache_control => 'public')
-    request = Rack::MockRequest.new(Rack::Static.new(DummyApp.new, opts))
+    request = Rack::MockRequest.new(static(DummyApp.new, opts))
     res = request.get("/cgi/test")
     res.should.be.ok
     res.headers['Cache-Control'].should == 'public'
   end
 
+  HEADER_OPTIONS = {:urls => ["/cgi"], :root => root, :header_rules => [
+    [:all, {'Cache-Control' => 'public, max-age=100'}],
+    [:fonts, {'Cache-Control' => 'public, max-age=200'}],
+    [%w(png jpg), {'Cache-Control' => 'public, max-age=300'}],
+    ['/cgi/assets/folder/', {'Cache-Control' => 'public, max-age=400'}],
+    ['cgi/assets/javascripts', {'Cache-Control' => 'public, max-age=500'}],
+    [/\.(css|erb)\z/, {'Cache-Control' => 'public, max-age=600'}]
+  ]}
+  @header_request = Rack::MockRequest.new(static(DummyApp.new, HEADER_OPTIONS))
+
+  it "supports header rule :all" do
+    # Headers for all files via :all shortcut
+    res = @header_request.get('/cgi/assets/index.html')
+    res.should.be.ok
+    res.headers['Cache-Control'].should == 'public, max-age=100'
+  end
+
+  it "supports header rule :fonts" do
+    # Headers for web fonts via :fonts shortcut
+    res = @header_request.get('/cgi/assets/fonts/font.eot')
+    res.should.be.ok
+    res.headers['Cache-Control'].should == 'public, max-age=200'
+  end
+
+  it "supports file extension header rules provided as an Array" do
+    # Headers for file extensions via array
+    res = @header_request.get('/cgi/assets/images/image.png')
+    res.should.be.ok
+    res.headers['Cache-Control'].should == 'public, max-age=300'
+  end
+
+  it "supports folder rules provided as a String" do
+    # Headers for files in folder via string
+    res = @header_request.get('/cgi/assets/folder/test.js')
+    res.should.be.ok
+    res.headers['Cache-Control'].should == 'public, max-age=400'
+  end
+
+  it "supports folder header rules provided as a String not starting with a slash" do
+    res = @header_request.get('/cgi/assets/javascripts/app.js')
+    res.should.be.ok
+    res.headers['Cache-Control'].should == 'public, max-age=500'
+  end
+
+  it "supports flexible header rules provided as Regexp" do
+    # Flexible Headers via Regexp
+    res = @header_request.get('/cgi/assets/stylesheets/app.css')
+    res.should.be.ok
+    res.headers['Cache-Control'].should == 'public, max-age=600'
+  end
+
+  it "prioritizes header rules over fixed cache-control setting (legacy option)" do
+    opts = OPTIONS.merge(
+      :cache_control => 'public, max-age=24',
+      :header_rules => [
+        [:all, {'Cache-Control' => 'public, max-age=42'}]
+      ])
+
+    request = Rack::MockRequest.new(static(DummyApp.new, opts))
+    res = request.get("/cgi/test")
+    res.should.be.ok
+    res.headers['Cache-Control'].should == 'public, max-age=42'
+  end
+
 end

data/test/spec_urlmap.rb

@@ -10,11 +10,11 @@ describe Rack::URLMap do
         'Content-Type' => 'text/plain'
       }, [""]]
     }
-    map = Rack::URLMap.new({
+    map = Rack::Lint.new(Rack::URLMap.new({
       'http://foo.org/bar' => app,
       '/foo' => app,
       '/foo/bar' => app
-    })
+    }))
 
     res = Rack::MockRequest.new(map).get("/")
     res.should.be.not_found
@@ -66,7 +66,7 @@ describe Rack::URLMap do
 
 
   it "dispatches hosts correctly" do
-    map = Rack::URLMap.new("http://foo.org/" => lambda { |env|
+    map = Rack::Lint.new(Rack::URLMap.new("http://foo.org/" => lambda { |env|
                              [200,
                               { "Content-Type" => "text/plain",
                                 "X-Position" => "foo.org",
@@ -90,7 +90,7 @@ describe Rack::URLMap do
                                 "X-Position" => "default.org",
                                 "X-Host" => env["HTTP_HOST"] || env["SERVER_NAME"],
                               }, [""]]}
-                           )
+                           ))
 
     res = Rack::MockRequest.new(map).get("/")
     res.should.be.ok
@@ -124,7 +124,7 @@ describe Rack::URLMap do
   end
 
   should "be nestable" do
-    map = Rack::URLMap.new("/foo" =>
+    map = Rack::Lint.new(Rack::URLMap.new("/foo" =>
       Rack::URLMap.new("/bar" =>
         Rack::URLMap.new("/quux" =>  lambda { |env|
                            [200,
@@ -133,7 +133,7 @@ describe Rack::URLMap do
                               "X-PathInfo" => env["PATH_INFO"],
                               "X-ScriptName" => env["SCRIPT_NAME"],
                             }, [""]]}
-                         )))
+                         ))))
 
     res = Rack::MockRequest.new(map).get("/foo/bar")
     res.should.be.not_found
@@ -146,7 +146,7 @@ describe Rack::URLMap do
   end
 
   should "route root apps correctly" do
-    map = Rack::URLMap.new("/" => lambda { |env|
+    map = Rack::Lint.new(Rack::URLMap.new("/" => lambda { |env|
                              [200,
                               { "Content-Type" => "text/plain",
                                 "X-Position" => "root",
@@ -160,7 +160,7 @@ describe Rack::URLMap do
                                 "X-PathInfo" => env["PATH_INFO"],
                                 "X-ScriptName" => env["SCRIPT_NAME"]
                               }, [""]]}
-                           )
+                           ))
 
     res = Rack::MockRequest.new(map).get("/foo/bar")
     res.should.be.ok
@@ -188,7 +188,7 @@ describe Rack::URLMap do
   end
 
   should "not squeeze slashes" do
-    map = Rack::URLMap.new("/" => lambda { |env|
+    map = Rack::Lint.new(Rack::URLMap.new("/" => lambda { |env|
                              [200,
                               { "Content-Type" => "text/plain",
                                 "X-Position" => "root",
@@ -202,7 +202,7 @@ describe Rack::URLMap do
                                 "X-PathInfo" => env["PATH_INFO"],
                                 "X-ScriptName" => env["SCRIPT_NAME"]
                               }, [""]]}
-                           )
+                           ))
 
     res = Rack::MockRequest.new(map).get("/http://example.org/bar")
     res.should.be.ok

data/test/spec_utils.rb

@@ -1,8 +1,18 @@
 # -*- encoding: utf-8 -*-
 require 'rack/utils'
 require 'rack/mock'
+require 'timeout'
 
 describe Rack::Utils do
+
+  # A helper method which checks
+  # if certain query parameters 
+  # are equal.
+  def equal_query_to(query)
+    parts = query.split('&')
+    lambda{|other| (parts & other.split('&')) == parts }
+  end
+
   def kcodeu
     one8 = RUBY_VERSION.to_f < 1.9
     default_kcode, $KCODE = $KCODE, 'U' if one8
@@ -103,6 +113,14 @@ describe Rack::Utils do
     Rack::Utils.parse_query("my+weird+field=q1%212%22%27w%245%267%2Fz8%29%3F").
       should.equal "my weird field" => "q1!2\"'w$5&7/z8)?"
     Rack::Utils.parse_query("foo%3Dbaz=bar").should.equal "foo=baz" => "bar"
+    Rack::Utils.parse_query("=").should.equal "" => ""
+    Rack::Utils.parse_query("=value").should.equal "" => "value"
+    Rack::Utils.parse_query("key=").should.equal "key" => ""
+    Rack::Utils.parse_query("&key&").should.equal "key" => nil
+    Rack::Utils.parse_query(";key;", ";,").should.equal "key" => nil
+    Rack::Utils.parse_query(",key,", ";,").should.equal "key" => nil
+    Rack::Utils.parse_query(";foo=bar,;", ";,").should.equal "foo" => "bar"
+    Rack::Utils.parse_query(",foo=bar;,", ";,").should.equal "foo" => "bar"
   end
 
   should "parse nested query strings correctly" do
@@ -179,7 +197,7 @@ describe Rack::Utils do
 
     lambda { Rack::Utils.parse_nested_query("x[y]=1&x[]=1") }.
       should.raise(TypeError).
-      message.should.equal "expected Array (got Hash) for param `x'"
+      message.should.match(/expected Array \(got [^)]*\) for param `x'/)
 
     lambda { Rack::Utils.parse_nested_query("x[y]=1&x[y][][w]=2") }.
       should.raise(TypeError).
@@ -187,13 +205,13 @@ describe Rack::Utils do
   end
 
   should "build query strings correctly" do
-    Rack::Utils.build_query("foo" => "bar").should.equal "foo=bar"
+    Rack::Utils.build_query("foo" => "bar").should.be equal_query_to("foo=bar")
     Rack::Utils.build_query("foo" => ["bar", "quux"]).
-      should.equal "foo=bar&foo=quux"
+      should.be equal_query_to("foo=bar&foo=quux")
     Rack::Utils.build_query("foo" => "1", "bar" => "2").
-      should.equal "foo=1&bar=2"
+      should.be equal_query_to("foo=1&bar=2")
     Rack::Utils.build_query("my weird field" => "q1!2\"'w$5&7/z8)?").
-      should.equal "my+weird+field=q1%212%22%27w%245%267%2Fz8%29%3F"
+      should.be equal_query_to("my+weird+field=q1%212%22%27w%245%267%2Fz8%29%3F")
   end
 
   should "build nested query strings correctly" do
@@ -202,9 +220,9 @@ describe Rack::Utils do
     Rack::Utils.build_nested_query("foo" => "bar").should.equal "foo=bar"
 
     Rack::Utils.build_nested_query("foo" => "1", "bar" => "2").
-      should.equal "foo=1&bar=2"
+      should.be equal_query_to("foo=1&bar=2")
     Rack::Utils.build_nested_query("my weird field" => "q1!2\"'w$5&7/z8)?").
-      should.equal "my+weird+field=q1%212%22%27w%245%267%2Fz8%29%3F"
+      should.be equal_query_to("my+weird+field=q1%212%22%27w%245%267%2Fz8%29%3F")
 
     Rack::Utils.build_nested_query("foo" => [nil]).
       should.equal "foo[]"
@@ -313,6 +331,11 @@ describe Rack::Utils do
     Rack::Utils.bytesize("FOO\xE2\x82\xAC").should.equal 6
   end
 
+  should "should perform constant time string comparison" do
+    Rack::Utils.secure_compare('a', 'a').should.equal true
+    Rack::Utils.secure_compare('a', 'b').should.equal false
+  end
+
   should "return status code for integer" do
     Rack::Utils.status_code(200).should.equal 200
   end
@@ -347,6 +370,10 @@ describe Rack::Utils, "byte_range" do
     Rack::Utils.byte_ranges({"HTTP_RANGE" => "bytes=499-499"},500).should.equal [(499..499)]
   end
 
+  should "parse several byte ranges" do
+    Rack::Utils.byte_ranges({"HTTP_RANGE" => "bytes=500-600,601-999"},1000).should.equal [(500..600),(601..999)]
+  end
+
   should "truncate byte ranges" do
     Rack::Utils.byte_ranges({"HTTP_RANGE" => "bytes=123-999"},500).should.equal [(123..499)]
     Rack::Utils.byte_ranges({"HTTP_RANGE" => "bytes=600-999"},500).should.equal []

data/test/static/another/index.html

@@ -0,0 +1 @@
+another index!

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rack
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 13
   prerelease: 
   segments: 
   - 1
   - 4
-  - 0
-  version: 1.4.0
+  - 5
+  version: 1.4.5
 platform: ruby
 authors: 
 - Christian Neukirchen
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-28 00:00:00 Z
+date: 2013-02-08 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: bacon
@@ -81,7 +81,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 1923831981
+        hash: 3904189667
         segments: 
         - 1
         - 2
@@ -112,7 +112,7 @@ description: |
   servers, web frameworks, and software in between (the so-called
   middleware) into a single method call.
   
-  Also see http://rack.rubyforge.org.
+  Also see http://rack.github.com/.
 
 email: chneukirchen@gmail.com
 executables: 
@@ -124,7 +124,10 @@ extra_rdoc_files:
 - KNOWN-ISSUES
 files: 
 - bin/rackup
+- contrib/rack.png
+- contrib/rack.svg
 - contrib/rack_logo.svg
+- contrib/rdoc.css
 - example/lobster.ru
 - example/protectedlobster.rb
 - example/protectedlobster.ru
@@ -137,6 +140,7 @@ files:
 - lib/rack/auth/digest/request.rb
 - lib/rack/backports/uri/common_18.rb
 - lib/rack/backports/uri/common_192.rb
+- lib/rack/backports/uri/common_193.rb
 - lib/rack/body_proxy.rb
 - lib/rack/builder.rb
 - lib/rack/cascade.rb
@@ -194,7 +198,14 @@ files:
 - test/builder/anything.rb
 - test/builder/comment.ru
 - test/builder/end.ru
+- test/builder/line.ru
 - test/builder/options.ru
+- test/cgi/assets/folder/test.js
+- test/cgi/assets/fonts/font.eot
+- test/cgi/assets/images/image.png
+- test/cgi/assets/index.html
+- test/cgi/assets/javascripts/app.js
+- test/cgi/assets/stylesheets/app.css
 - test/cgi/lighttpd.conf
 - test/cgi/rackup_stub.rb
 - test/cgi/sample_rackup.ru
@@ -213,6 +224,9 @@ files:
 - test/multipart/filename_with_escaped_quotes
 - test/multipart/filename_with_escaped_quotes_and_modification_param
 - test/multipart/filename_with_percent_escaped_quotes
+- test/multipart/filename_with_unescaped_percentages
+- test/multipart/filename_with_unescaped_percentages2
+- test/multipart/filename_with_unescaped_percentages3
 - test/multipart/filename_with_unescaped_quotes
 - test/multipart/ie
 - test/multipart/mixed_files
@@ -223,6 +237,7 @@ files:
 - test/multipart/webkit
 - test/rackup/config.ru
 - test/registering_handler/rack/handler/registering_myself.rb
+- test/spec_auth.rb
 - test/spec_auth_basic.rb
 - test/spec_auth_digest.rb
 - test/spec_body_proxy.rb
@@ -269,6 +284,7 @@ files:
 - test/spec_urlmap.rb
 - test/spec_utils.rb
 - test/spec_webrick.rb
+- test/static/another/index.html
 - test/static/index.html
 - test/testrequest.rb
 - test/unregistered_handler/rack/handler/unregistered.rb
@@ -279,7 +295,7 @@ files:
 - Rakefile
 - README.rdoc
 - SPEC
-homepage: http://rack.rubyforge.org
+homepage: http://rack.github.com/
 licenses: []
 
 post_install_message: 
@@ -308,11 +324,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: rack
-rubygems_version: 1.8.12
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: a modular Ruby webserver interface
 test_files: 
+- test/spec_auth.rb
 - test/spec_auth_basic.rb
 - test/spec_auth_digest.rb
 - test/spec_body_proxy.rb
@@ -359,3 +376,4 @@ test_files:
 - test/spec_urlmap.rb
 - test/spec_utils.rb
 - test/spec_webrick.rb
+has_rdoc: