rack-jsonp 1.3.0 → 1.3.1

data/README.rdoc

@@ -10,7 +10,7 @@ the JSONP middleware, I created this gem.
 
 * Patches by Sebastián Gamboa (sagmor), Garrett Bjerkhoel (dewski), Jason
   Morrison (jasonm), Brian Dunn (briandunn), Jon Allured (jonallured), Oleg
-  Ivanov (morhekil).
+  Ivanov (morhekil), Jonas Grimfelt (grimen).
 
 == Copyright
 

data/lib/rack/jsonp.rb

@@ -11,6 +11,7 @@ module Rack
       @app = app
       @carriage_return = options[:carriage_return] || false
       @callback_param = options[:callback_param] || 'callback'
+      @timestamp_param = options[:timestamp_param] || '_'
     end
 
     # Proxies the request to the application, stripping out the JSON-P
@@ -25,9 +26,12 @@ module Rack
       # callback parameter
       request = Rack::Request.new(env)
       callback = request.params.delete(@callback_param)
+      timestamp = request.params.delete(@timestamp_param)
       env['QUERY_STRING'] = env['QUERY_STRING'].split("&").delete_if{|param|
-        param =~ /^(_|#{@callback_param})=/
+        param =~ /^(#{@timestamp_param}|#{@callback_param})=/
       }.join("&")
+      env['rack.jsonp.callback'] = callback
+      env['rack.jsonp.timestamp'] = timestamp
 
       status, headers, response = @app.call(env)
 

data/spec/rack_jsonp_spec.rb

@@ -75,27 +75,31 @@ describe Rack::JSONP do
     end
 
     it "removes the underscore parameter" do
-      test_body = '{"bar":"foo"}'
-      app_querystring = nil
       app = lambda do |env|
-        app_querystring = env['QUERY_STRING']
-        [200, {'Content-Type' => 'application/json'}, [test_body]]
+        [200, {'Content-Type' => 'application/json'}, [env['QUERY_STRING']]]
       end
       request = Rack::MockRequest.env_for("/", :params => "a=b&_=timestamp")
-      Rack::JSONP.new(app).call(request)
-      app_querystring.should == "a=b"
+      status, headers, body = Rack::JSONP.new(app).call(request)
+      body.should == ["a=b"]
     end
 
     it "does not remove parameters that start with an underscore" do
-      test_body = '{"bar":"foo"}'
-      app_querystring = nil
       app = lambda do |env|
-        app_querystring = env['QUERY_STRING']
-        [200, {'Content-Type' => 'application/json'}, [test_body]]
+        [200, {'Content-Type' => 'application/json'}, [env['QUERY_STRING']]]
       end
       request = Rack::MockRequest.env_for("/", :params => "a=b&_=timestamp&_c=saveme")
-      Rack::JSONP.new(app).call(request)
-      app_querystring.should == "a=b&_c=saveme"
+      status, headers, body = Rack::JSONP.new(app).call(request)
+      body.should == ["a=b&_c=saveme"]
+    end
+
+    it "should store the callback and timestamp params in the environment" do
+      app = lambda do |env|
+        result = [env['rack.jsonp.timestamp'], env['rack.jsonp.callback']].join(";")
+        [200, {'Content-Type' => 'application/json'}, [result]]
+      end
+      request = Rack::MockRequest.env_for("/", :params => "a=b&tparam=timestamp&cparam=callback")
+      status, headers, body = Rack::JSONP.new(app, :timestamp_param => "tparam", :callback_param => "cparam").call(request)
+      body.should == ["callback(timestamp;callback)"]
     end
 
     describe "content length" do

metadata

@@ -1,120 +1,105 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: rack-jsonp
-version: !ruby/object:Gem::Version 
-  hash: 27
+version: !ruby/object:Gem::Version
+  version: 1.3.1
   prerelease: 
-  segments: 
-  - 1
-  - 3
-  - 0
-  version: 1.3.0
 platform: ruby
-authors: 
+authors:
 - Cyril Rohr
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-10-19 00:00:00 +02:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-07-07 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rack
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 0
-        - 8
-        version: "0.8"
+      - !ruby/object:Gem::Version
+        version: '0.8'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 1
-        - 3
-        version: "1.3"
+      - !ruby/object:Gem::Version
+        version: '0.8'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
   type: :development
-  version_requirements: *id003
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
 description: A Rack middleware for providing JSON-P support.
-email: 
+email:
 - cyril.rohr@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE
 - README.rdoc
-files: 
+files:
 - lib/rack/jsonp.rb
 - spec/rack_jsonp_spec.rb
 - spec/spec_helper.rb
 - Rakefile
 - LICENSE
 - README.rdoc
-has_rdoc: true
 homepage: http://github.com/crohr/rack-jsonp
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --charset=UTF-8
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 31
-      segments: 
-      - 1
-      - 8
-      version: "1.8"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '1.8'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 9
-      segments: 
-      - 1
-      - 3
-      version: "1.3"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '1.3'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
 summary: A Rack middleware for providing JSON-P support.
-test_files: 
+test_files:
 - spec/spec_helper.rb
 - spec/rack_jsonp_spec.rb
+has_rdoc: