rack-jsonp 1.0.0 → 1.1.0

data/.gitignore

@@ -3,3 +3,6 @@
 coverage
 rdoc
 pkg
+.bundle/
+Gemfile.lock
+

data/Gemfile

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

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2009 Cyril Rohr
+Copyright (c) 2009-2010 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

@@ -1,9 +1,12 @@
 = 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.
+
 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).
 
 == Copyright
 
-Copyright (c) 2009 Cyril Rohr. See LICENSE for details.
+Copyright (c) 2009-2010 Cyril Rohr. See LICENSE for details.

data/Rakefile

@@ -1,4 +1,6 @@
-require 'rubygems'
+require "bundler"
+Bundler.setup
+
 require 'rake'
 
 begin
@@ -10,6 +12,12 @@ begin
     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
 
@@ -18,7 +26,7 @@ rescue LoadError
 end
 
 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
@@ -29,9 +37,6 @@ Spec::Rake::SpecTask.new(:rcov) do |spec|
   spec.rcov = true
 end
 
-
-
-
 task :default => :spec
 
 require 'rake/rdoctask'

data/VERSION

@@ -1 +1 @@
-1.0.0
+1.1.0

data/lib/rack/jsonp.rb

@@ -24,9 +24,10 @@ module Rack
       env['QUERY_STRING'] = env['QUERY_STRING'].split("&").delete_if{|param| param =~ /^(_|#{@callback_param})/}.join("&")
       
       status, headers, response = @app.call(env)
-      if callback
+      if callback && headers['Content-Type'] =~ /json/i
         response = pad(callback, response)
         headers['Content-Length'] = response.first.length.to_s
+        headers['Content-Type'] = 'application/javascript'
       elsif @carriage_return && headers['Content-Type'] =~ /json/i
         # add a \n after the response if this is a json (not JSONP) response
         response = carriage_return(response)

data/rack-jsonp.gemspec

@@ -1,15 +1,15 @@
 # Generated by jeweler
-# DO NOT EDIT THIS FILE
-# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
+# 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.0.0"
+  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{2009-10-21}
+  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 = [
@@ -19,6 +19,7 @@ Gem::Specification.new do |s|
   s.files = [
     ".document",
      ".gitignore",
+     "Gemfile",
      "LICENSE",
      "README.rdoc",
      "Rakefile",
@@ -31,7 +32,7 @@ Gem::Specification.new do |s|
   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.5}
+  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",
@@ -42,9 +43,22 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    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
+

data/spec/rack_jsonp_spec.rb

@@ -7,8 +7,8 @@ describe Rack::JSONP do
     it "should wrap the response body in the Javascript callback [default callback param]" do
       test_body = '{"bar":"foo"}'
       callback = 'foo'
-      app = lambda { |env| [200, {'Content-Type' => 'text/plain'}, [test_body]] }
-      request = Rack::MockRequest.env_for("/", :input => "foo=bar&callback=#{callback}")
+      app = lambda { |env| [200, {'Content-Type' => 'application/json'}, [test_body]] }
+      request = Rack::MockRequest.env_for("/", :params => "foo=bar&callback=#{callback}")
       body = Rack::JSONP.new(app).call(request).last
       body.should == ["#{callback}(#{test_body})"]
     end
@@ -16,8 +16,8 @@ describe Rack::JSONP do
     it "should wrap the response body in the Javascript callback [custom callback param]" do
       test_body = '{"bar":"foo"}'
       callback = 'foo'
-      app = lambda { |env| [200, {'Content-Type' => 'text/plain'}, [test_body]] }
-      request = Rack::MockRequest.env_for("/", :input => "foo=bar&whatever=#{callback}")
+      app = lambda { |env| [200, {'Content-Type' => 'application/json'}, [test_body]] }
+      request = Rack::MockRequest.env_for("/", :params => "foo=bar&whatever=#{callback}")
       body = Rack::JSONP.new(app, :callback_param => 'whatever').call(request).last
       body.should == ["#{callback}(#{test_body})"]
     end
@@ -25,25 +25,43 @@ describe Rack::JSONP do
     it "should modify the content length to the correct value" do
       test_body = '{"bar":"foo"}'
       callback = 'foo'
-      app = lambda { |env| [200, {'Content-Type' => 'text/plain'}, [test_body]] }
-      request = Rack::MockRequest.env_for("/", :input => "foo=bar&callback=#{callback}")
+      app = lambda { |env| [200, {'Content-Type' => 'application/json'}, [test_body]] }
+      request = Rack::MockRequest.env_for("/", :params => "foo=bar&callback=#{callback}")
       headers = Rack::JSONP.new(app).call(request)[1]
       headers['Content-Length'].should == ((test_body.length + callback.length + 2).to_s) # 2 parentheses
     end
+    
+    it "should change the response Content-Type to application/javascript" do
+      test_body = '{"bar":"foo"}'
+      callback = 'foo'
+      app = lambda { |env| [200, {'Content-Type' => 'application/json'}, [test_body]] }
+      request = Rack::MockRequest.env_for("/", :params => "foo=bar&callback=#{callback}")
+      headers = Rack::JSONP.new(app).call(request)[1]
+      headers['Content-Type'].should == "application/javascript"
+    end
+    
+    it "should not wrap content unless response is json" do
+      test_body = '<html><body>Hello, World!</body></html>'
+      callback = 'foo'
+      app = lambda { |env| [200, {'Content-Type' => 'text/html'}, [test_body]] }
+      request = Rack::MockRequest.env_for("/", :params => "foo=bar&callback=#{callback}")
+      body = Rack::JSONP.new(app).call(request).last
+      body.should == [test_body]
+    end
   end
  
   describe "when json content is returned" do
     it "should do nothing if no carriage return has been requested" do
       test_body = '{"bar":"foo"}'
       app = lambda { |env| [200, {'Content-Type' => 'application/vnd.com.example.Object+json'}, [test_body]] }
-      request = Rack::MockRequest.env_for("/", :input => "foo=bar")
+      request = Rack::MockRequest.env_for("/", :params => "foo=bar")
       body = Rack::JSONP.new(app).call(request).last
       body.should == ['{"bar":"foo"}']
     end
     it "should add a carriage return if requested" do
       test_body = '{"bar":"foo"}'
       app = lambda { |env| [200, {'Content-Type' => 'application/vnd.com.example.Object+json'}, [test_body]] }
-      request = Rack::MockRequest.env_for("/", :input => "foo=bar")
+      request = Rack::MockRequest.env_for("/", :params => "foo=bar")
       body = Rack::JSONP.new(app, :carriage_return => true).call(request).last
       body.should == ["{\"bar\":\"foo\"}\n"]
     end
@@ -51,15 +69,15 @@ describe Rack::JSONP do
       test_body = '{"bar":"foo"}'
       callback = 'foo'
       app = lambda { |env| [200, {'Content-Type' => 'application/vnd.com.example.Object+json'}, [test_body]] }
-      request = Rack::MockRequest.env_for("/", :input => "foo=bar&callback=#{callback}")
+      request = Rack::MockRequest.env_for("/", :params => "foo=bar&callback=#{callback}")
       body = Rack::JSONP.new(app, :carriage_return => true).call(request).last
       body.should == ["#{callback}(#{test_body})"]
     end
   end
   
   it "should not change anything if no callback param is provided" do
-    app = lambda { |env| [200, {'Content-Type' => 'text/plain'}, ['{"bar":"foo"}']] }
-    request = Rack::MockRequest.env_for("/", :input => "foo=bar")
+    app = lambda { |env| [200, {'Content-Type' => 'application/json'}, ['{"bar":"foo"}']] }
+    request = Rack::MockRequest.env_for("/", :params => "foo=bar")
     body = Rack::JSONP.new(app).call(request).last
     body.join.should == '{"bar":"foo"}'
   end

data/spec/spec_helper.rb

@@ -1,11 +1,5 @@
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+require 'rack'
 require 'rack/jsonp'
 require 'spec'
-require 'spec/autorun'
-require 'rack'
-
-
-Spec::Runner.configure do |config|
-  
-end

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: rack-jsonp
 version: !ruby/object:Gem::Version 
-  version: 1.0.0
+  prerelease: false
+  segments: 
+  - 1
+  - 1
+  - 0
+  version: 1.1.0
 platform: ruby
 authors: 
 - Cyril Rohr
@@ -9,10 +14,63 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-21 00:00:00 +02:00
+date: 2010-09-07 00:00:00 +02:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: rack
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  prerelease: false
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rake
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  prerelease: false
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: jeweler
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  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
 executables: []
@@ -25,6 +83,7 @@ extra_rdoc_files:
 files: 
 - .document
 - .gitignore
+- Gemfile
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -43,21 +102,26 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: -3568420703856981526
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: A Rack middleware for providing JSON-P support.