rack-jsonp 1.1.0 → 1.2.0

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2009-2010 Cyril Rohr
+Copyright (c) 2009-2011 Cyril Rohr
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.rdoc

@@ -5,8 +5,8 @@ A Rack middleware for providing JSON-P support. Most of it is taken from the ori
 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) and Garrett Bjerkhoel (dewski).
+* Patches by Sebastián Gamboa (sagmor), Garrett Bjerkhoel (dewski) and Jason Morrison (jasonm).
 
 == Copyright
 
-Copyright (c) 2009-2010 Cyril Rohr. See LICENSE for details.
+Copyright (c) 2009-2011 Cyril Rohr. See LICENSE for details.

data/Rakefile

@@ -3,30 +3,12 @@ Bundler.setup
 
 require 'rake'
 
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "rack-jsonp"
-    gem.summary = %Q{A Rack middleware for providing JSON-P support.}
-    gem.description = %Q{A Rack middleware for providing JSON-P support.}
-    gem.email = "cyril.rohr@gmail.com"
-    gem.homepage = "http://github.com/crohr/rack-jsonp"
-    gem.authors = ["Cyril Rohr"]
-    
-    gem.add_dependency('rack')
-    gem.add_development_dependency('rake')
-    gem.add_development_dependency('jeweler')
-    gem.add_development_dependency('rspec', '< 2.0.0')
-    
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
-  end
-
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
-end
+lib = File.expand_path('../lib/', __FILE__)
+$:.unshift lib unless $:.include?(lib)
+require 'rack/jsonp'
 
 require 'spec/rake/spectask'
-Spec::Rake::SpecTask.new(:spec) do |spec|	
+Spec::Rake::SpecTask.new(:spec) do |spec|
   spec.libs << 'lib' << 'spec'
   spec.spec_files = FileList['spec/**/*_spec.rb']
 end
@@ -41,12 +23,7 @@ task :default => :spec
 
 require 'rake/rdoctask'
 Rake::RDocTask.new do |rdoc|
-  if File.exist?('VERSION')
-    version = File.read('VERSION')
-  else
-    version = ""
-  end
-
+  version = Rack::JSONP::VERSION
   rdoc.rdoc_dir = 'rdoc'
   rdoc.title = "rack-jsonp #{version}"
   rdoc.rdoc_files.include('README*')

data/lib/rack/jsonp.rb

@@ -1,28 +1,32 @@
+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)
@@ -35,23 +39,23 @@ module Rack
       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
+
+end

data/spec/rack_jsonp_spec.rb

@@ -21,6 +21,30 @@ describe Rack::JSONP do
       body = Rack::JSONP.new(app, :callback_param => 'whatever').call(request).last
       body.should == ["#{callback}(#{test_body})"]
     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]]
+      end
+      request = Rack::MockRequest.env_for("/", :params => "a=b&_=timestamp")
+      Rack::JSONP.new(app).call(request)
+      app_querystring.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]]
+      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"
+    end
  
     it "should modify the content length to the correct value" do
       test_body = '{"bar":"foo"}'

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rack-jsonp
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 31
+  prerelease: 
   segments: 
   - 1
-  - 1
+  - 2
   - 0
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors: 
 - Cyril Rohr
@@ -14,65 +15,56 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-07 00:00:00 +02:00
+date: 2011-06-06 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rack
+  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
   type: :runtime
-  prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: rake
+  prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
+        hash: 27
         segments: 
         - 0
-        version: "0"
+        - 8
+        version: "0.8"
   type: :development
-  prerelease: false
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: jeweler
+  name: rspec
+  prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
+        hash: 9
         segments: 
-        - 0
-        version: "0"
+        - 1
+        - 3
+        version: "1.3"
   type: :development
-  prerelease: false
   version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rspec
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - <
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 0
-        - 0
-        version: 2.0.0
-  type: :development
-  prerelease: false
-  version_requirements: *id004
 description: A Rack middleware for providing JSON-P support.
-email: cyril.rohr@gmail.com
+email: 
+- cyril.rohr@gmail.com
 executables: []
 
 extensions: []
@@ -81,17 +73,12 @@ extra_rdoc_files:
 - LICENSE
 - README.rdoc
 files: 
-- .document
-- .gitignore
-- Gemfile
-- LICENSE
-- README.rdoc
-- Rakefile
-- VERSION
 - lib/rack/jsonp.rb
-- rack-jsonp.gemspec
 - spec/rack_jsonp_spec.rb
 - spec/spec_helper.rb
+- Rakefile
+- LICENSE
+- README.rdoc
 has_rdoc: true
 homepage: http://github.com/crohr/rack-jsonp
 licenses: []
@@ -106,25 +93,28 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -3568420703856981526
+      hash: 31
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 8
+      version: "1.8"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 9
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      version: "1.3"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: A Rack middleware for providing JSON-P support.
 test_files: 
-- spec/rack_jsonp_spec.rb
 - spec/spec_helper.rb
+- spec/rack_jsonp_spec.rb

data/.document

@@ -1,5 +0,0 @@
-README.rdoc
-lib/**/*.rb
-bin/*
-features/**/*.feature
-LICENSE

data/.gitignore

@@ -1,8 +0,0 @@
-*.sw?
-.DS_Store
-coverage
-rdoc
-pkg
-.bundle/
-Gemfile.lock
-

data/Gemfile

@@ -1,2 +0,0 @@
-source :rubygems
-gemspec

data/VERSION

@@ -1 +0,0 @@
-1.1.0

data/rack-jsonp.gemspec

@@ -1,64 +0,0 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = %q{rack-jsonp}
-  s.version = "1.1.0"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Cyril Rohr"]
-  s.date = %q{2010-09-07}
-  s.description = %q{A Rack middleware for providing JSON-P support.}
-  s.email = %q{cyril.rohr@gmail.com}
-  s.extra_rdoc_files = [
-    "LICENSE",
-     "README.rdoc"
-  ]
-  s.files = [
-    ".document",
-     ".gitignore",
-     "Gemfile",
-     "LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION",
-     "lib/rack/jsonp.rb",
-     "rack-jsonp.gemspec",
-     "spec/rack_jsonp_spec.rb",
-     "spec/spec_helper.rb"
-  ]
-  s.homepage = %q{http://github.com/crohr/rack-jsonp}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{A Rack middleware for providing JSON-P support.}
-  s.test_files = [
-    "spec/rack_jsonp_spec.rb",
-     "spec/spec_helper.rb"
-  ]
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rack>, [">= 0"])
-      s.add_development_dependency(%q<rake>, [">= 0"])
-      s.add_development_dependency(%q<jeweler>, [">= 0"])
-      s.add_development_dependency(%q<rspec>, ["< 2.0.0"])
-    else
-      s.add_dependency(%q<rack>, [">= 0"])
-      s.add_dependency(%q<rake>, [">= 0"])
-      s.add_dependency(%q<jeweler>, [">= 0"])
-      s.add_dependency(%q<rspec>, ["< 2.0.0"])
-    end
-  else
-    s.add_dependency(%q<rack>, [">= 0"])
-    s.add_dependency(%q<rake>, [">= 0"])
-    s.add_dependency(%q<jeweler>, [">= 0"])
-    s.add_dependency(%q<rspec>, ["< 2.0.0"])
-  end
-end
-