rack-jsonp-tools 0.2.0 → 0.3.0

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.3.0

data/lib/rack/jsonp/callback.rb

@@ -27,7 +27,7 @@ module Rack
           # Set proper content type as per RFC4329
           headers["Content-Type"] = "application/javascript"
 
-          [status, headers, self]
+          [200, headers, self] # Override status
         else
           @app.call(env)
         end

data/lib/rack/jsonp/status_wrapper.rb

@@ -1,9 +1,36 @@
 module Rack
   module JSONP
   
-    class Callback
-      # Coming soon!
+    class StatusWrapper
+      def initialize(app, callback_param = "_callback")
+        @app, @callback_param = app, callback_param
+      end
+      
+      def call(env)
+        if env["jsonp.callback"]
+          # Call original app
+          status, headers, @body = @app.call(env)
+
+          # Wrap
+          @pre, @post = '{"body": ', ', "status": ' + status.to_s + '}'
+
+          # Fix content length if present
+          if content_length = headers["Content-Length"]
+            headers["Content-Length"] = (@pre.size + content_length.to_i + @post.size).to_s
+          end
+
+          [status, headers, self]
+        else
+          @app.call(env)
+        end
+      end
+      
+      def each(&block)
+        block.call(@pre)
+        @body.each(&block)
+        block.call(@post)
+      end
     end
     
   end
-end
+end

data/rack-jsonp-tools.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rack-jsonp-tools}
-  s.version = "0.2.0"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jacek Becela"]
-  s.date = %q{2010-06-21}
+  s.date = %q{2010-06-25}
   s.description = %q{A collection of rack middlewares helping you add JSONP to your app}
   s.email = %q{jacek.becela@gmail.com}
   s.files = [
@@ -23,6 +23,7 @@ Gem::Specification.new do |s|
      "rack-jsonp-tools.gemspec",
      "test/callback_test.rb",
      "test/method_override_test.rb",
+     "test/status_wrapper_test.rb",
      "test/test_helper.rb"
   ]
   s.homepage = %q{http://github.com/ncr/rack-jsonp-tools}
@@ -33,6 +34,7 @@ Gem::Specification.new do |s|
   s.test_files = [
     "test/callback_test.rb",
      "test/method_override_test.rb",
+     "test/status_wrapper_test.rb",
      "test/test_helper.rb"
   ]
 

data/test/callback_test.rb

@@ -3,7 +3,7 @@ require "rack/jsonp/callback"
  
 class CallbackTest < Test::Unit::TestCase
   def setup
-    @status  = 200
+    @status  = 401
     @headers = { "Content-Type" => "application/json", "Content-Length" => "2" }
     @body    = "{}"
   end
@@ -29,7 +29,7 @@ class CallbackTest < Test::Unit::TestCase
 
     expected_body = "callback(#{@body})"
 
-    assert_equal @status, status
+    assert_equal 200, status
     assert_equal @headers, { 
       "Content-Type"   => "application/javascript", 
       "Content-Length" => expected_body.size.to_s 

data/test/status_wrapper_test.rb

@@ -0,0 +1,45 @@
+require "test_helper"
+require "rack/jsonp/status_wrapper"
+ 
+class StatusWrapperTest < Test::Unit::TestCase
+  def setup
+    @status  = 401
+    @body    = "{ number: 666 }"
+    @headers = { "Content-Type" => "application/json", "Content-Length" => @body.size }
+  end
+  
+  def app
+    app = Rack::Builder.new # instance_eval fail
+    app.use Rack::JSONP::Callback
+    app.use Rack::JSONP::StatusWrapper
+    app.run lambda { |env| [@status, @headers, [@body]] }
+    app
+  end
+  
+  test "doesn't change anything when callback is missing" do
+    env = Rack::MockRequest.env_for("/")
+
+    status, headers, iterable = app.call(env)
+    body = ""; iterable.each { |l| body << l }
+
+    assert_equal @status, status
+    assert_equal @headers, headers
+    assert_equal @body, body
+  end
+  
+  test "wraps response with status and updates headers" do
+    env = Rack::MockRequest.env_for("/?_callback=callback")
+
+    status, headers, iterable = app.call(env)
+    body = ""; iterable.each { |l| body << l }
+
+    expected_body = 'callback({"body": ' + @body + ', "status": ' + @status.to_s + '})'
+
+    assert_equal 200, status
+    assert_equal @headers, { 
+      "Content-Type"   => "application/javascript", 
+      "Content-Length" => expected_body.size.to_s 
+    }
+    assert_equal expected_body, body
+  end
+end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 2
+  - 3
   - 0
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Jacek Becela
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-21 00:00:00 +02:00
+date: 2010-06-25 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -73,6 +73,7 @@ files:
 - rack-jsonp-tools.gemspec
 - test/callback_test.rb
 - test/method_override_test.rb
+- test/status_wrapper_test.rb
 - test/test_helper.rb
 has_rdoc: true
 homepage: http://github.com/ncr/rack-jsonp-tools
@@ -107,4 +108,5 @@ summary: Add JSONP support to your app in less than 3 minutes! Method Override i
 test_files: 
 - test/callback_test.rb
 - test/method_override_test.rb
+- test/status_wrapper_test.rb
 - test/test_helper.rb