rack-rack-contrib 0.9.1 → 0.9.2

data/README.rdoc

@@ -40,7 +40,9 @@ interface:
   absolute URLs.
 * Rack::Backstage - Returns content of specified file if it exists, which makes
   it convenient for putting up maintenance pages.
-* Rack::Format - Adds a format extension at the end of the URI when there is none, corresponding to the mime-type given in the Accept HTTP header.
+* Rack::AcceptFormat - Adds a format extension at the end of the URI when there is none, corresponding to the mime-type given in the Accept HTTP header.
+* Rack::HostMeta - Configures /host-meta using a block
+* Rack::Cookies - Adds simple cookie jar hash to env
 
 === Use
 

data/lib/rack/contrib.rb

@@ -7,7 +7,9 @@ module Rack
     end
   end
 
+  autoload :AcceptFormat,               "rack/contrib/accept_format"
   autoload :BounceFavicon,              "rack/contrib/bounce_favicon"
+  autoload :Cookies,                    "rack/contrib/cookies"
   autoload :CSSHTTPRequest,             "rack/contrib/csshttprequest"
   autoload :Deflect,                    "rack/contrib/deflect"
   autoload :ETag,                       "rack/contrib/etag"

data/lib/rack/contrib/accept_format.rb

@@ -24,20 +24,22 @@ module Rack
   # MIT-License - Cyril Rohr
   #
   class AcceptFormat
-    # Constants
-    DEFAULT_EXTENSION = ".html"
 
-    def initialize(app)
+    def initialize(app, default_extention = '.html')
+      @ext = default_extention.to_s.strip
+      @ext = ".#{@ext}" unless @ext[0] == ?.
       @app = app
     end
 
     def call(env)
       req = Rack::Request.new(env)
-      unless req.path_info =~ /(.*)\.(.+)/
-        accept = env['HTTP_ACCEPT'].scan(/[^;,\s]*\/[^;,\s]*/)[0] rescue ""
-        extension =  Rack::Mime::MIME_TYPES.invert[accept] || DEFAULT_EXTENSION
+
+      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}"
       end
+
       @app.call(env)
     end
   end

data/lib/rack/contrib/csshttprequest.rb

@@ -26,7 +26,7 @@ module Rack
     end
 
     def encode(response, assembled_body="")
-      response.each { |s| assembled_body << s } # call down the stack
+      response.each { |s| assembled_body << s.to_s } # call down the stack
       return ::CSSHTTPRequest.encode(assembled_body)
     end
 

data/lib/rack/contrib/jsonp.rb

@@ -33,7 +33,7 @@ module Rack
     # is returned as a full string.
     #
     def pad(callback, response, body = "")
-      response.each{ |s| body << s }
+      response.each{ |s| body << s.to_s }
       "#{callback}(#{body})"
     end
 

data/lib/rack/contrib/route_exceptions.rb

@@ -4,45 +4,46 @@ module Rack
       [Exception, '/error/internal']
     ]
 
-    ROUTE_EXCEPTIONS_PATH_INFO = 'rack.route_exceptions.path_info'.freeze
-    ROUTE_EXCEPTIONS_EXCEPTION = 'rack.route_exceptions.exception'.freeze
-    ROUTE_EXCEPTIONS_RESPONSE = 'rack.route_exceptions.response'.freeze
+    PATH_INFO = 'rack.route_exceptions.path_info'.freeze
+    EXCEPTION = 'rack.route_exceptions.exception'.freeze
+    RETURNED  = 'rack.route_exceptions.returned'.freeze
+
+    class << self
+      def route(exception, to)
+        ROUTES.delete_if{|k,v| k == exception }
+        ROUTES << [exception, to]
+      end
+
+      alias []= route
+    end
 
     def initialize(app)
       @app = app
     end
 
     def call(env, try_again = true)
-      status, header, body = response = @app.call(env)
-
-      response
+      returned = @app.call(env)
     rescue Exception => exception
       raise(exception) unless try_again
 
       ROUTES.each do |klass, to|
         next unless klass === exception
-        return route(to, env, response, exception)
+        return route(to, env, returned, exception)
       end
 
       raise(exception)
     end
 
-    def route(to, env, response, exception)
-      hash = {
-        ROUTE_EXCEPTIONS_PATH_INFO => env['PATH_INFO'],
-        ROUTE_EXCEPTIONS_EXCEPTION => exception,
-        ROUTE_EXCEPTIONS_RESPONSE => response
-      }
-      env.merge!(hash)
+    def route(to, env, returned, exception)
+      env.merge!(
+        PATH_INFO => env['PATH_INFO'],
+        EXCEPTION => exception,
+        RETURNED => returned
+      )
 
       env['PATH_INFO'] = to
 
       call(env, try_again = false)
     end
-
-    def self.route(exception, to)
-      ROUTES.delete_if{|k,v| k == exception }
-      ROUTES << [exception, to]
-    end
   end
 end

data/rack-contrib.gemspec

@@ -3,7 +3,7 @@ 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 = '0.9.1'
+  s.version = '0.9.2'
   s.date = '2009-03-07'
 
   s.description = "Contributed Rack Middleware and Utilities"
@@ -74,7 +74,7 @@ Gem::Specification.new do |s|
   s.test_files = s.files.select {|path| path =~ /^test\/spec_.*\.rb/}
 
   s.extra_rdoc_files = %w[README.rdoc COPYING]
-  s.add_dependency 'rack', '~> 0.9.1'
+  s.add_dependency 'rack', '>= 0.9.1'
   s.add_dependency 'test-spec', '~> 0.9.0'
   s.add_development_dependency 'tmail', '>= 1.2'
   s.add_development_dependency 'json', '>= 1.1'

data/test/spec_rack_accept_format.rb

@@ -4,16 +4,41 @@ require 'rack/contrib/accept_format'
 require 'rack/mime'
 
 context "Rack::AcceptFormat" do
+  app = lambda { |env| [200, {'Content-Type' => 'text/plain'}, env['PATH_INFO']] }
+
   specify "should do nothing when a format extension is already provided" do
-    app = lambda { |env| [200, {'Content-Type' => 'text/plain'}, env['PATH_INFO']] }
     request = Rack::MockRequest.env_for("/resource.json")
     body = Rack::AcceptFormat.new(app).call(request).last
     body.should == "/resource.json"
   end
 
+  context "default extention" do
+    specify "should allow custom default" do
+      request = Rack::MockRequest.env_for("/resource")
+      body = Rack::AcceptFormat.new(app, '.xml').call(request).last
+      body.should == "/resource.xml"
+    end
+
+    specify "should default to html" do
+      request = Rack::MockRequest.env_for("/resource")
+      body = Rack::AcceptFormat.new(app).call(request).last
+      body.should == "/resource.html"
+    end
+
+    specify "should notmalize custom extention" do
+      request = Rack::MockRequest.env_for("/resource")
+
+      body = Rack::AcceptFormat.new(app,'xml').call(request).last #no dot prefix
+      body.should == "/resource.xml"
+
+      body = Rack::AcceptFormat.new(app, :xml).call(request).last
+      body.should == "/resource.xml"
+    end
+  end
+
   context "there is no format extension" do
     Rack::Mime::MIME_TYPES.clear
-    app = lambda { |env| [200, {'Content-Type' => 'text/plain'}, env['PATH_INFO']] }
+
     def mime(ext, type)
       ext = ".#{ext}" unless ext.to_s[0] == ?.
       Rack::Mime::MIME_TYPES[ext.to_s] = type
@@ -22,13 +47,13 @@ context "Rack::AcceptFormat" do
     specify "should add the default extension if no Accept header" do
       request = Rack::MockRequest.env_for("/resource")
       body = Rack::AcceptFormat.new(app).call(request).last
-      body.should == "/resource#{Rack::AcceptFormat::DEFAULT_EXTENSION}"
+      body.should == "/resource.html"
     end
 
     specify "should add the default extension if the Accept header is not registered in the Mime::Types" do
       request = Rack::MockRequest.env_for("/resource", 'HTTP_ACCEPT' => 'application/json;q=1.0, text/html;q=0.8, */*;q=0.1')
       body = Rack::AcceptFormat.new(app).call(request).last
-      body.should == "/resource#{Rack::AcceptFormat::DEFAULT_EXTENSION}"
+      body.should == "/resource.html"
     end
 
     specify "should add the correct extension if the Accept header is registered in the Mime::Types" do
@@ -38,4 +63,10 @@ context "Rack::AcceptFormat" do
       body.should == "/resource.json"
     end
   end
+
+  specify "shouldn't confuse extention when there are dots in path" do
+    request = Rack::MockRequest.env_for("/parent.resource/resource")
+    body = Rack::AcceptFormat.new(app, '.html').call(request).last
+    body.should == "/parent.resource/resource.html"
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rack-rack-contrib
 version: !ruby/object:Gem::Version 
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors: 
 - rack-devel
@@ -18,7 +18,7 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
         version: 0.9.1
     version: