tricycle-rack-contrib 0.9.0 → 0.9.3

data/Rakefile

@@ -44,10 +44,10 @@ task :rdoc => ["RDOX"]
 
 # load gemspec like github's gem builder to surface any SAFE issues.
 require 'rubygems/specification'
-$spec = eval(File.read('tricycle-rack-contrib.gemspec'))
+$spec = eval(File.read('rack-contrib.gemspec'))
 
 def package(ext='')
-  "pkg/tricycle-rack-contrib-#{$spec.version}" + ext
+  "pkg/rack-contrib-#{$spec.version}" + ext
 end
 
 desc 'Build packages'
@@ -60,8 +60,8 @@ end
 
 directory 'pkg/'
 
-file package('.gem') => %w[pkg/ tricycle-rack-contrib.gemspec] + $spec.files do |f|
-  sh "gem build tricycle-rack-contrib.gemspec"
+file package('.gem') => %w[pkg/ rack-contrib.gemspec] + $spec.files do |f|
+  sh "gem build rack-contrib.gemspec"
   mv File.basename(f.name), f.name
 end
 
@@ -72,14 +72,14 @@ end
 desc 'Publish gem and tarball to rubyforge'
 task 'publish:gem' => [package('.gem'), package('.tar.gz')] do |t|
   sh <<-end
-    rubyforge add_release rack tricycle-rack-contrib #{$spec.version} #{package('.gem')} &&
-    rubyforge add_file    rack tricycle-rack-contrib #{$spec.version} #{package('.tar.gz')}
+    rubyforge add_release rack rack-contrib #{$spec.version} #{package('.gem')} &&
+    rubyforge add_file    rack rack-contrib #{$spec.version} #{package('.tar.gz')}
   end
 end
 
 # GEMSPEC ===================================================================
 
-file 'tricycle-rack-contrib.gemspec' => FileList['{lib,test}/**','Rakefile', 'README.rdoc'] do |f|
+file 'rack-contrib.gemspec' => FileList['{lib,test}/**','Rakefile', 'README.rdoc'] do |f|
   # read spec file and split out manifest section
   spec = File.read(f.name)
   parts = spec.split("  # = MANIFEST =\n")

data/lib/rack/contrib.rb

@@ -22,7 +22,6 @@ module Rack
   autoload :PostBodyContentTypeParser,  "rack/contrib/post_body_content_type_parser"
   autoload :ProcTitle,                  "rack/contrib/proctitle"
   autoload :Profiler,                   "rack/contrib/profiler"
-  autoload :Runtime,                    "rack/contrib/runtime"
   autoload :Sendfile,                   "rack/contrib/sendfile"
   autoload :Signals,                    "rack/contrib/signals"
   autoload :TimeZone,                   "rack/contrib/time_zone"

data/lib/rack/contrib/jsonp.rb

@@ -22,7 +22,7 @@ module Rack
         response = pad(request.params.delete('callback'), response)
         headers['Content-Length'] = response.length.to_s
       end
-      [status, headers, response]
+      [status, headers, [response]]
     end
 
     # Pads the response with the appropriate callback format according to the

data/lib/rack/contrib/response_cache.rb

@@ -8,45 +8,23 @@ require 'rack'
 # be served directly by a front end webserver.
 class Rack::ResponseCache
   # The default proc used if a block is not provided to .new
-  # Doesn't cache unless path does not contain '..', Content-Type is
-  # whitelisted, and path agrees with Content-Type
-  # Inserts appropriate extension if no extension in path
-  # Uses /index.html if path ends in /
+  # Returns nil (ie. don't cache) if Cache-Control includes "private" directive
+  # It unescapes the PATH_INFO of the environment, and makes sure that it doesn't
+  # include '..'.  If the Content-Type of the response is text/(html|css|xml),
+  # return a path with the appropriate extension (.html, .css, or .xml).
+  # If the path ends with a / and the Content-Type is text/html, change the basename
+  # of the path to index.html.
   DEFAULT_PATH_PROC = proc do |env, res|
+    if res[1].include? "Cache-Control"
+      return if res[1]["Cache-Control"].split(',').collect{|d|d.strip}.include? "private"
+    end
     path = Rack::Utils.unescape(env['PATH_INFO'])
-    
-    content_types = {
-      "application/pdf" => %w[pdf],
-      "application/xhtml+xml" => %w[xhtml],
-      "text/css" => %w[css],
-      "text/csv" => %w[csv],
-      "text/html" => %w[html htm],
-      "text/javascript" => %w[js], "application/javascript" => %w[js],
-      "text/plain" => %w[txt],
-      "text/xml" => %w[xml],
-    }
-    content_type = res[1]['Content-Type'].to_s
-    
-    if !path.include?('..') and extensions = content_types[content_type]
-      # path doesn't include '..' and Content-Type is whitelisted
-      case
-      when path.match(/\/$/) && content_type == "text/html"
-        # path ends in / and Content-Type is text/html
-        path << "index.html"
-      when File.extname(path) == ""
-        # no extension
-        path << ".#{extensions.first}"
-      when !extensions.include?(File.extname(path)[1..-1])
-        # extension agrees with Content-Type
-        path = nil
-      else
-        # do nothing, path is alright
-      end
-    else
-      path = nil
+    if !path.include?('..') and match = /text\/((?:x|ht)ml|css)/o.match(res[1]['Content-Type'])
+      type = match[1]
+      path = "#{path}.#{type}" unless /\.#{type}\z/.match(path)
+      path = File.join(File.dirname(path), 'index.html') if type == 'html' and File.basename(path) == '.html'
+      path
     end
-    
-    path
   end
 
   # Initialize a new ReponseCache object with the given arguments.  Arguments:
@@ -87,7 +65,7 @@ class Rack::ResponseCache
   
   private 
   def cacheable?
-    get and !query_string and success and !no_cache and !private_cache
+    get and !query_string and success and !no_cache
   end
   
   def get
@@ -102,10 +80,6 @@ class Rack::ResponseCache
     @res[0] == 200
   end
   
-  def private_cache
-    cache_control_directives.include? 'private'
-  end
-  
   def no_cache
     cache_control_directives.include? 'no-cache'
   end

data/{tricycle-rack-contrib.gemspec → rack-contrib.gemspec}

@@ -2,15 +2,15 @@ Gem::Specification.new do |s|
   s.specification_version = 2 if s.respond_to? :specification_version=
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
 
-  s.name = 'tricycle-rack-contrib'
-  s.version = '0.9.0'
-  s.date = '2010-01-06'
+  s.name = 'rack-contrib'
+  s.version = '0.9.3'
+  s.date = '2009-08-06'
 
-  s.description = "Contributed Rack Middleware and Utilities, including Tricycle's modifications"
-  s.summary     = "Contributed Rack Middleware and Utilities, including Tricycle's modifications"
+  s.description = "Contributed Rack Middleware and Utilities"
+  s.summary     = "Contributed Rack Middleware and Utilities"
 
-  s.authors = ["tricycle", "rack-devel"]
-  s.email = "gems@tricycledevelopments.com"
+  s.authors = ["rack-devel"]
+  s.email = "rack-devel@googlegroups.com"
 
   # = MANIFEST =
   s.files = %w[
@@ -23,7 +23,6 @@ Gem::Specification.new do |s|
     lib/rack/contrib/bounce_favicon.rb
     lib/rack/contrib/callbacks.rb
     lib/rack/contrib/config.rb
-    lib/rack/contrib/cookies.rb
     lib/rack/contrib/csshttprequest.rb
     lib/rack/contrib/deflect.rb
     lib/rack/contrib/etag.rb
@@ -44,7 +43,7 @@ Gem::Specification.new do |s|
     lib/rack/contrib/sendfile.rb
     lib/rack/contrib/signals.rb
     lib/rack/contrib/time_zone.rb
-    tricycle-rack-contrib.gemspec
+    rack-contrib.gemspec
     test/404.html
     test/Maintenance.html
     test/mail_settings.rb
@@ -76,13 +75,13 @@ Gem::Specification.new do |s|
 
   s.extra_rdoc_files = %w[README.rdoc COPYING]
   s.add_dependency 'rack', '>= 0.9.1'
-  s.add_development_dependency 'test-spec', '~> 0.9.0'
+  s.add_dependency 'test-spec', '~> 0.9.0'
   s.add_development_dependency 'tmail', '>= 1.2'
   s.add_development_dependency 'json', '>= 1.1'
 
   s.has_rdoc = true
-  s.homepage = "http://github.com/tricycle/rack-contrib/"
-  s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "tricycle-rack-contrib", "--main", "README"]
+  s.homepage = "http://github.com/rack/rack-contrib/"
+  s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "rack-contrib", "--main", "README"]
   s.require_paths = %w[lib]
   s.rubygems_version = '1.1.1'
 end

data/test/spec_rack_jsonp.rb

@@ -11,7 +11,7 @@ context "Rack::JSONP" do
       app = lambda { |env| [200, {'Content-Type' => 'text/plain'}, [test_body]] }
       request = Rack::MockRequest.env_for("/", :input => "foo=bar&callback=#{callback}")
       body = Rack::JSONP.new(app).call(request).last
-      body.should.equal "#{callback}(#{test_body})"
+      body.join.should.equal "#{callback}(#{test_body})"
     end
 
     specify "should modify the content length to the correct value" do
@@ -25,7 +25,7 @@ context "Rack::JSONP" do
   end
 
   specify "should not change anything if no callback param is provided" do
-    app = lambda { |env| [200, {'Content-Type' => 'text/plain'}, ['{"bar":"foo"}']] }
+    app = lambda { |env| [200, {'Content-Type' => 'text/plain'}, '{"bar":"foo"}'] }
     request = Rack::MockRequest.env_for("/", :input => "foo=bar")
     body = Rack::JSONP.new(app).call(request).last
     body.join.should.equal '{"bar":"foo"}'

data/test/spec_rack_response_cache.rb

@@ -1,7 +1,6 @@
 require 'test/spec'
 require 'rack/mock'
-#require 'rack/contrib/response_cache'
-require File.join(File.dirname(__FILE__), '../lib/rack/contrib/response_cache')
+require 'rack/contrib/response_cache'
 require 'fileutils'
 
 context Rack::ResponseCache do
@@ -36,7 +35,7 @@ context Rack::ResponseCache do
     @cache.should.equal('/path/to/blah.html'=>@def_value, '/path/3.html'=>@def_value)
   end
 
-  specify "should not cache results if request method is not GET" do
+  specify "should not CACHE RESults if request method is not GET" do
     request(:meth=>:post)
     @cache.should.equal({})
     request(:meth=>:put)
@@ -124,44 +123,27 @@ context Rack::ResponseCache do
     @cache.should.equal('/path with spaces.html'=>@def_value, '/path<href>.html'=>@def_value)
   end
 
-  specify "should cache html mime_type without extension at .html" do
+  specify "should cache html, css, and xml responses by default" do
     request(:path=>'/a')
     @cache.should.equal('/a.html'=>@def_value)
+    request(:path=>'/b', :headers=>{'CT'=>'text/xml'})
+    @cache.should.equal('/a.html'=>@def_value, '/b.xml'=>@def_value)
+    request(:path=>'/c', :headers=>{'CT'=>'text/css'})
+    @cache.should.equal('/a.html'=>@def_value, '/b.xml'=>@def_value, '/c.css'=>@def_value)
   end
 
-  {
-    :css => %w[text/css],
-    :csv => %w[text/csv],
-    :html => %w[text/html],
-    :js => %w[text/javascript application/javascript],
-    :pdf => %w[application/pdf],
-    :txt => %w[text/plain],
-    :xhtml => %w[application/xhtml+xml],
-    :xml => %w[text/xml],
-  }.each do |extension, mime_types|
-    mime_types.each do |mime_type|
-      specify "should cache #{mime_type} responses with the extension ('#{extension}') unchanged" do
-        request(:path=>"/a.#{extension}", :headers=>{'CT'=>mime_type})
-        @cache.should.equal("/a.#{extension}"=>@def_value)
-      end
-
-      specify "should cache #{mime_type} responses with the relevant extension ('#{extension}') added if not already present" do
-        request(:path=>'/a', :headers=>{'CT'=>mime_type})
-        @cache.should.equal("/a.#{extension}"=>@def_value)
-      end
-    end
-  end
-  
-  specify "should cache 'text/html' responses with the extension ('htm') unchanged" do
-    request(:path=>"/a.htm", :headers=>{'CT'=>"text/html"})
-    @cache.should.equal("/a.htm"=>@def_value)
+  specify "should cache responses by default with the extension added if not already present" do
+    request(:path=>'/a.html')
+    @cache.should.equal('/a.html'=>@def_value)
+    request(:path=>'/b.xml', :headers=>{'CT'=>'text/xml'})
+    @cache.should.equal('/a.html'=>@def_value, '/b.xml'=>@def_value)
+    request(:path=>'/c.css', :headers=>{'CT'=>'text/css'})
+    @cache.should.equal('/a.html'=>@def_value, '/b.xml'=>@def_value, '/c.css'=>@def_value)
   end
-  
-  [:css, :xml, :xhtml, :js, :txt, :pdf, :csv].each do |extension|
-    specify "should not cache if extension and content-type don't agree" do
-      request(:path=>"/d.#{extension}", :headers=>{'CT'=>'text/html'})
-      @cache.should.equal({})
-    end    
+
+  specify "should not delete existing extensions" do
+    request(:path=>'/d.css', :headers=>{'CT'=>'text/html'})
+    @cache.should.equal('/d.css.html'=>@def_value)
   end
 
   specify "should cache html responses with empty basename to index.html by default" do

metadata

@@ -1,16 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: tricycle-rack-contrib
 version: !ruby/object:Gem::Version 
-  version: 0.9.0
+  version: 0.9.3
 platform: ruby
 authors: 
-- tricycle
 - rack-devel
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-01-06 00:00:00 +11:00
+date: 2009-08-06 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,7 +24,7 @@ dependencies:
     version: 
 - !ruby/object:Gem::Dependency 
   name: test-spec
-  type: :development
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -53,8 +52,8 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "1.1"
     version: 
-description: Contributed Rack Middleware and Utilities, including Tricycle's modifications
-email: gems@tricycledevelopments.com
+description: Contributed Rack Middleware and Utilities
+email: rack-devel@googlegroups.com
 executables: []
 
 extensions: []
@@ -72,7 +71,6 @@ files:
 - lib/rack/contrib/bounce_favicon.rb
 - lib/rack/contrib/callbacks.rb
 - lib/rack/contrib/config.rb
-- lib/rack/contrib/cookies.rb
 - lib/rack/contrib/csshttprequest.rb
 - lib/rack/contrib/deflect.rb
 - lib/rack/contrib/etag.rb
@@ -93,7 +91,7 @@ files:
 - lib/rack/contrib/sendfile.rb
 - lib/rack/contrib/signals.rb
 - lib/rack/contrib/time_zone.rb
-- tricycle-rack-contrib.gemspec
+- rack-contrib.gemspec
 - test/404.html
 - test/Maintenance.html
 - test/mail_settings.rb
@@ -119,15 +117,14 @@ files:
 - test/spec_rack_response_cache.rb
 - test/spec_rack_sendfile.rb
 has_rdoc: true
-homepage: http://github.com/tricycle/rack-contrib/
-licenses: []
-
+homepage: http://github.com/rack/rack-contrib/
+licenses: 
 post_install_message: 
 rdoc_options: 
 - --line-numbers
 - --inline-source
 - --title
-- tricycle-rack-contrib
+- rack-contrib
 - --main
 - README
 require_paths: 
@@ -150,7 +147,7 @@ rubyforge_project:
 rubygems_version: 1.3.5
 signing_key: 
 specification_version: 2
-summary: Contributed Rack Middleware and Utilities, including Tricycle's modifications
+summary: Contributed Rack Middleware and Utilities
 test_files: 
 - test/spec_rack_accept_format.rb
 - test/spec_rack_backstage.rb

data/lib/rack/contrib/cookies.rb

@@ -1,50 +0,0 @@
-module Rack
-  class Cookies
-    class CookieJar < Hash
-      def initialize(cookies)
-        @set_cookies = {}
-        @delete_cookies = {}
-        super()
-        update(cookies)
-      end
-
-      def [](name)
-        super(name.to_s)
-      end
-
-      def []=(key, options)
-        unless options.is_a?(Hash)
-          options = { :value => options }
-        end
-
-        options[:path] ||= '/'
-        @set_cookies[key] = options
-        super(key.to_s, options[:value])
-      end
-
-      def delete(key, options = {})
-        options[:path] ||= '/'
-        @delete_cookies[key] = options
-        super(key.to_s)
-      end
-
-      def finish!(resp)
-        @set_cookies.each { |k, v| resp.set_cookie(k, v) }
-        @delete_cookies.each { |k, v| resp.delete_cookie(k, v) }
-      end
-    end
-
-    def initialize(app)
-      @app = app
-    end
-
-    def call(env)
-      req = Request.new(env)
-      env['rack.cookies'] = cookies = CookieJar.new(req.cookies)
-      status, headers, body = @app.call(env)
-      resp = Response.new(body, status, headers)
-      cookies.finish!(resp)
-      resp.to_a
-    end
-  end
-end