Make JSONP a noop when the status is 1xx, 204 or 304.

aslakhellesoy · Jun 22, 2010 · 952cb23 · 952cb23 · lawrencepit · Jun 23, 2010
1 parent 3a65d6e
commit 952cb23
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/lib/rack/contrib/jsonp.rb b/lib/rack/contrib/jsonp.rb
@@ -20,6 +20,10 @@ def initialize(app)
     def call(env)
       status, headers, response = @app.call(env)
 
+      if STATUS_WITH_NO_ENTITY_BODY.include?(status)
+        return status, headers, response
+      end
+
       headers = HeaderHash.new(headers)
       request = Rack::Request.new(env)
 

diff --git a/test/spec_rack_jsonp.rb b/test/spec_rack_jsonp.rb
@@ -70,4 +70,13 @@
     body.should.equal [test_body]
   end
 
+  specify "should not change anything if the request doesn't have a body" do
+    app1 = lambda { |env| [100, {}, []] }
+    app2 = lambda { |env| [204, {}, []] }
+    app3 = lambda { |env| [304, {}, []] }
+    request = Rack::MockRequest.env_for("/", :params => "callback=foo", 'HTTP_ACCEPT' => 'application/json')
+    Rack::JSONP.new(app1).call(request).should.equal app1.call({})
+    Rack::JSONP.new(app2).call(request).should.equal app2.call({})
+    Rack::JSONP.new(app3).call(request).should.equal app3.call({})
+  end
 end