rack-jsonp 1.2.1 → 1.3.0

data/README.rdoc

@@ -1,11 +1,16 @@
 = rack-jsonp
 
-A Rack middleware for providing JSON-P support. Most of it is taken from the original Rack::JSONP middleware present in rack-contrib.
+A Rack middleware for providing JSON-P support. Most of it is taken from the
+original Rack::JSONP middleware present in rack-contrib.
 
-Since I don't want to include the complete rack-contrib gem when all I need is the JSONP middleware, I created this gem.
+Since I don't want to include the complete rack-contrib gem when all I need is
+the JSONP middleware, I created this gem.
 
 == Contributions
-* Patches by Sebastián Gamboa (sagmor), Garrett Bjerkhoel (dewski) and Jason Morrison (jasonm).
+
+* Patches by Sebastián Gamboa (sagmor), Garrett Bjerkhoel (dewski), Jason
+  Morrison (jasonm), Brian Dunn (briandunn), Jon Allured (jonallured), Oleg
+  Ivanov (morhekil).
 
 == Copyright
 

data/lib/rack/jsonp.rb

@@ -13,19 +13,24 @@ module Rack
       @callback_param = options[:callback_param] || 'callback'
     end
 
-    # Proxies the request to the application, stripping out the JSON-P callback
-    # method and padding the response with the appropriate callback format.
+    # Proxies the request to the application, stripping out the JSON-P
+    # callback method and padding the response with the appropriate callback
+    # format.
     #
     # Changes nothing if no <tt>callback</tt> param is specified.
     #
     def call(env)
-      # remove the callback and _ parameters BEFORE calling the backend,
-      # so that caching middleware does not store a copy for each value of the callback parameter
+      # remove the callback and _ parameters BEFORE calling the backend, so
+      # that caching middleware does not store a copy for each value of the
+      # callback parameter
       request = Rack::Request.new(env)
       callback = request.params.delete(@callback_param)
-      env['QUERY_STRING'] = env['QUERY_STRING'].split("&").delete_if{|param| param =~ /^(_|#{@callback_param})=/}.join("&")
+      env['QUERY_STRING'] = env['QUERY_STRING'].split("&").delete_if{|param|
+        param =~ /^(_|#{@callback_param})=/
+      }.join("&")
 
       status, headers, response = @app.call(env)
+
       if callback && headers['Content-Type'] =~ /json/i
         response = pad(callback, response)
         headers['Content-Length'] = response.first.bytesize.to_s
@@ -35,25 +40,35 @@ module Rack
         response = carriage_return(response)
         headers['Content-Length'] = response.first.bytesize.to_s
       end
+
       [status, headers, response]
     end
 
     # Pads the response with the appropriate callback format according to the
     # JSON-P spec/requirements.
     #
-    # The Rack response spec indicates that it should be enumerable. The method
-    # of combining all of the data into a single string makes sense since JSON
-    # is returned as a full string.
+    # The Rack response spec indicates that it should be enumerable. The
+    # method of combining all of the data into a single string makes sense
+    # since JSON is returned as a full string.
     #
     def pad(callback, response, body = "")
       response.each{ |s| body << s.to_s }
+      close(response)
       ["#{callback}(#{body})"]
     end
 
     def carriage_return(response, body = "")
       response.each{ |s| body << s.to_s }
+      close(response)
       ["#{body}\n"]
     end
+
+    # Close original response if it was Rack::BodyProxy (or anything else
+    # responding to close, as we're going to lose it anyway), or it will cause
+    # thread failures with newer Rack.
+    def close(io)
+      io.close if io.respond_to?(:close)
+    end
   end
 
 end

data/spec/rack_jsonp_spec.rb

@@ -4,6 +4,57 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe Rack::JSONP do
 
+  describe "closing application's response" do
+    let(:test_body) { ['test_body'] }
+    let(:params) { "foo=bar" }
+    let(:content_type) { "text/html" }
+    let(:app_params) {{}}
+    after do
+      request = Rack::MockRequest.env_for("/", :params => params)
+      app = lambda { |env| [200, {'Content-Type' => content_type}, test_body] }
+      Rack::JSONP.new(app, app_params).call(request).last
+    end
+
+    describe "when app response is closeable" do
+      let(:test_body) { ['test_body'].stub(:close => true) }
+
+      describe "and it is json" do
+        let(:content_type) { "application/json" }
+
+        describe "and callback was given" do
+          let(:params) { "foo=bar&callback=foo" }
+
+          it "closes the original body" do
+            test_body.should_receive(:close)
+          end
+        end
+
+        describe "and carriage return was requested" do
+          let(:app_params) {{ :carriage_return => true }}
+
+          it "closes the original body" do
+            test_body.should_receive(:close)
+          end
+        end
+      end
+
+      describe "and it is not json" do
+        let(:content_type) { "text/html"}
+        let(:params) { "foo=bar&callback=foo" }
+        it "does not close original body" do
+          test_body.should_not_receive(:close)
+        end
+      end
+    end
+
+    describe "when app response is not closeable" do
+        let(:params) { "foo=bar&callback=foo" }
+        it "does not close original body" do
+          test_body.should_not_receive(:close)
+        end
+    end
+  end
+
   describe "when a callback parameter is provided" do
     it "should wrap the response body in the Javascript callback [default callback param]" do
       test_body = '{"bar":"foo"}'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rack-jsonp
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: 
   segments: 
   - 1
-  - 2
-  - 1
-  version: 1.2.1
+  - 3
+  - 0
+  version: 1.3.0
 platform: ruby
 authors: 
 - Cyril Rohr
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-29 00:00:00 +02:00
+date: 2011-10-19 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency