cryx-g5k 0.2.10 → 0.2.11

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :minor: 2
-:patch: 10
+:patch: 11
 :major: 0

data/lib/g5k/rack/jsonp.rb

@@ -25,7 +25,11 @@ module Rack
       status, headers, response = @app.call(env)
       if callback
         response = pad(callback, response)
-        headers['Content-Length'] = response.length.to_s
+        headers['Content-Length'] = response.first.length.to_s
+      elsif headers['Content-Type'] =~ /application\/json/
+        # add a \n after the response if this is a json (not JSONP) response
+        response = carriage_return(response)
+        headers['Content-Length'] = response.first.length.to_s
       end
       [status, headers, response]
     end
@@ -39,8 +43,12 @@ module Rack
     # 
     def pad(callback, response, body = "")
       response.each{ |s| body << s }
-      "#{callback}(#{body})"
+      ["#{callback}(#{body})"]
+    end
+    
+    def carriage_return(response, body = "")
+      response.each{ |s| body << s }
+      ["#{body}\n"]
     end
-  
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: cryx-g5k
 version: !ruby/object:Gem::Version 
-  version: 0.2.10
+  version: 0.2.11
 platform: ruby
 authors: 
 - Cyril Rohr
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-27 00:00:00 -07:00
+date: 2009-04-02 00:00:00 -07:00
 default_executable: 
 dependencies: []