jsonp.rb in rack-jsonp-1.2.0

- old
+ new

@@ -1,30 +1,34 @@
+require 'rack'
+
 module Rack
   # A Rack middleware for providing JSON-P support.
-  # 
+  #
   # Adapted from Flinn Mueller (http://actsasflinn.com/).
   #
   class JSONP
-  
+
+    VERSION = "1.2.0"
+
     def initialize(app, options = {})
       @app = app
       @carriage_return = options[:carriage_return] || false
       @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.
-    # 
+    #
     # Changes nothing if no <tt>callback</tt> param is specified.
-    # 
+    #
     def call(env)
-      # remove the callback and _ parameters BEFORE calling the backend, 
+      # 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.length.to_s
         headers['Content-Type'] = 'application/javascript'
@@ -33,25 +37,25 @@
         response = carriage_return(response)
         headers['Content-Length'] = response.first.length.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.
-    # 
+    #
     def pad(callback, response, body = "")
       response.each{ |s| body << s.to_s }
       ["#{callback}(#{body})"]
     end
-    
+
     def carriage_return(response, body = "")
       response.each{ |s| body << s.to_s }
       ["#{body}\n"]
     end
   end
-  
-end
\ No newline at end of file
+
+end