rack-jsonp-tools 0.3.2 → 0.3.3

data/VERSION

@@ -1 +1 @@
-0.3.2
+0.3.3

data/lib/rack/jsonp/callback.rb

@@ -16,13 +16,11 @@ module Rack
           # Call original app
           status, headers, @body = @app.call(env)
 
-          # Callback
-          @pre, @post = "#{callback}(", ")" 
-
           # Fix content length if present
           content_length = headers["Content-Length"].to_i
 
-          if content_length > 0
+          if (200...300).include?(status) && content_length > 0
+            @pre, @post = "#{callback}(", ")" 
             headers["Content-Length"] = (@pre.size + content_length + @post.size).to_s
             headers["Content-Type"]   = "application/javascript" # Set proper content type as per RFC4329
             [200, headers, self] # Override status

data/lib/rack/jsonp/status_wrapper.rb

@@ -11,13 +11,11 @@ module Rack
           # Call original app
           status, headers, @body = @app.call(env)
 
-          # Wrap
-          @pre, @post = '{"body": ', ', "status": ' + status.to_s + '}'
-
           # Fix content length if present
           content_length = headers["Content-Length"].to_i
 
-          if content_length > 0
+          if (200...300).include?(status) && content_length > 0
+            @pre, @post = '{"body": ', ', "status": ' + status.to_s + '}'
             headers["Content-Length"] = (@pre.size + content_length + @post.size).to_s
             [status, headers, self] # Override status
           else

data/rack-jsonp-tools.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rack-jsonp-tools}
-  s.version = "0.3.2"
+  s.version = "0.3.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jacek Becela"]
-  s.date = %q{2010-06-25}
+  s.date = %q{2010-06-28}
   s.description = %q{A collection of rack middlewares helping you add JSONP to your app}
   s.email = %q{jacek.becela@gmail.com}
   s.files = [

data/test/callback_test.rb

@@ -3,7 +3,7 @@ require "rack/jsonp/callback"
  
 class CallbackTest < Test::Unit::TestCase
   def setup
-    @status  = 401
+    @status  = 201
     @headers = { "Content-Type" => "application/json", "Content-Length" => "2" }
     @body    = "{}"
   end
@@ -36,4 +36,19 @@ class CallbackTest < Test::Unit::TestCase
     }
     assert_equal expected_body, body
   end
+  
+  test "doesn't touch response if outside of status range 200...300" do
+    env = Rack::MockRequest.env_for("/?_callback=callback")
+    app = Rack::JSONP::Callback.new(lambda { |env| [301, @headers, [@body]] })
+
+    status, headers, iterable = app.call(env)
+    body = ""; iterable.each { |l| body << l }
+
+    assert_equal 301, status
+    assert_equal @headers, { 
+      "Content-Type"   => "application/json", 
+      "Content-Length" => @body.size.to_s 
+    }
+    assert_equal @body, body
+  end
 end

data/test/status_wrapper_test.rb

@@ -3,7 +3,7 @@ require "rack/jsonp/status_wrapper"
  
 class StatusWrapperTest < Test::Unit::TestCase
   def setup
-    @status  = 401
+    @status  = 201
     @body    = "{ number: 666 }"
     @headers = { "Content-Type" => "application/json", "Content-Length" => @body.size }
   end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 2
-  version: 0.3.2
+  - 3
+  version: 0.3.3
 platform: ruby
 authors: 
 - Jacek Becela
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-25 00:00:00 +02:00
+date: 2010-06-28 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency