rack-jsonr 0.2.6 → 0.2.7

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NjZlYTIxNWI0MzUwZjhhZjhhODBhOWJjZGY3Y2Y4NzUxNjM0ZWIzYQ==
+    ZTEzNzM0ZDBmMDhkYmQ2ZDIzODIxNzZhMWUyYjIzODZkMGFlMGI1Yg==
   data.tar.gz: !binary |-
-    MTdjZGE5NDEyYjE5Y2I4NDZmMzE4ZGRlN2YwNTNkM2IwZmVlYmExNg==
+    M2VhZTNiNDYzYzcyMzkyOTY2NzE1Yzg3ZjcwZGU2ZDFmMWY2NTdiMw==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    YjRiNmZjZGEzZjJkYjFjNDQyNTc3NGM4MGJkNzcwZmQxZDI2NGM4MzJlMTZi
-    ODBiMTg4M2IxZDQ0NjY4OTJmZTFkMGRlODBiMjNkNmZjZGViNTU5ODQxNzZl
-    Mjg5YWVlODMyNmZhZjQ5Y2U0ZTUzMGYwYzE1ZGZmMTliYWUxYTY=
+    ZmFiN2IwMmVlYTExNjNlMDAzOTUzODdmMTY1NTNjMDdkOTM1NWU2NTVhMmQ0
+    YWI2Mjk0MDNkMjkzN2Y5MzE1NWQzMDRlMGFhMGE4NThmODEzOWRkZTMxOGY1
+    N2ZlN2M3Njc1MWUyNDA5MGExYjM5NTMyMmQ1OTAxZTkxMzM5NjU=
   data.tar.gz: !binary |-
-    NjM5YTJlMDk1MTFiYWNkMTAxNGVkMmQ2ZjFhOTlkMzc0ODVjNGZiOGQ4MDEw
-    ZDlkODJmZTc0MzY1OGI0MTQ5MTM3NGJmNDZmYWIyM2VhNTdiNzJiMWIxNDY5
-    NGVmNzU2NGVjYjlhNDMxMDFlNmFkYmNmNDQxZTczOGJmNDQ0NjE=
+    MDFhNTE1MjA1ZjZjNWY0OTQ2NzllNmE5ODgyNzk0ZWI1YTI4ODE2YWQyMmIy
+    ZTNmYWE1MTQ0Y2UwOGYyZDUyNDYxNDAyM2ZhYjEwOTM3YTJlYThlOTI4MGY3
+    OTc1ODk5YWVjMzg1NzkwNmVlMWM3ZWZhNTk2NzJkMGE4NTBhYmY=

data/lib/rack/jsonr/jsonr.rb

@@ -72,10 +72,15 @@ module Rack
     # Formats the JSONP padding to include body, headers and http status
     #
     def format_jsonp(callback, status, headers, response, x_headers={}, body='')
+      content_is_text = headers['Content-Type'].to_s.include?('text/html') ? true : false
       headers['Content-Type'] = 'application/javascript;charset=utf-8'
       headers.each {|k,v| x_headers[k] = v if (k =~ /^X-.+/i) }
       response.each {|v| body << v.to_s }
-      body = 'null' if body.nil? or body == ''
+      if body.nil? or body == ''
+        body = 'null'
+      elsif content_is_text
+        body = body.to_json
+      end
       ["#{callback}(#{body}, #{status}, #{x_headers.to_json})"]
     end
 

data/lib/rack/jsonr/version.rb

@@ -1,3 +1,3 @@
 class Rack::JSONR
-  VERSION = '0.2.6'
+  VERSION = '0.2.7'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-jsonr
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
 platform: ruby
 authors:
 - Caleb Clark