rack-jsonr 0.1.3 → 0.1.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YmVhODZiYzRmZDAxYTE3YTYxNDU5NTYyMjMwZDI1OTVmZTEwNmU5Zg==
+    MzFjZjg3ZjY1MjkxODRmZjdlMDhmMzRjMDg5OGIzZTM0ZWI4ODI1YQ==
   data.tar.gz: !binary |-
-    OTAwNmRlNTMyY2E2OGU5NDcwMGRhYjVjY2UzYzNlMDhiZWU0ZDEzNA==
+    ZDkzZGNmOWJlMWExMmUwNzRmMWUyZjMxYjRhMDc1NjIyNzg3NTc4Nw==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    Mzc1ZDIzNjkyYmQ5YmFmNGY1ZTc5NmNmZjJkZTc4YzFiNmZjZjk2ZjllMzYz
-    OWI0MWRjNWZjYzlkMTQ4M2JmNDlhODY0MWFiODA0M2FiNDk2MjU4MjkwMzBj
-    N2E3MzljYzIzNTJmMmQwODZjZDM3NmJiZTdkYjAwNjgyZWQ3NTU=
+    ZDBjZWFhZGQxMmI1OTk2ODVkOWQ4Y2MwMmJhZWYxODRmNTQxZWI0MWQzM2My
+    YTM4Njc0ZDFhZjQwNDk3OGJlNDE4NDViZDZmNzA1MDQ0YTgyMmQ5MDkwMjU5
+    ODU4Yjk3YzgwMTE1NWMwZWRlMjY4ZjM3NjlkMDQ4ZTNkYzU1N2Q=
   data.tar.gz: !binary |-
-    ZGYxYWIzZDE5MTBmYWVjYzE2MjVmMTY3MGM5ZjFhMWViN2FmOGE0MzQzYWIy
-    YjA5N2M4ZDQ5NjRhZWJkNWU5NTRlMTVhZmI3YmMyMjUzOGViOTYxNmE1M2Rk
-    OWY2YzY5NGVjZmJjZGJlMDI4NjRlOGUyOWNhYzBlYzg1ODg1ZTI=
+    OTAyMGQxYmNhY2I0MTM5MDlmNWQzNTIwZjRlMDU2NDEyNzAxYmRjNmNkMjRh
+    ZDMyZmQ4MTUzYTY5MWYyN2E1MGRiMGVlNWFiODczN2U0ZWQ1NzE3Y2JlOWJh
+    MDQ5MGQ2YjRiMDk3YTNlNTk5MTE3NjM0YzAyODEwZTM5ZGYzYjg=

data/lib/rack/jsonr/jsonr.rb

@@ -27,13 +27,10 @@ module Rack
       params = request.params
 
       if is_jsonp_request?(request)
-        env['IS_REQUESTING_JSONP'] = true
         env['REQUEST_METHOD'] = params['request_method'].upcase if params['request_method'] and ['POST','PUT','DELETE'].include?(params['request_method'].upcase)
-      else
-        env['IS_REQUESTING_JSONP'] = false
       end
 
-      if is_jsonp_request?(request) and is_json_response?(headers)
+      if is_jsonp_request?(request) #and is_json_response?(headers)
         response = format_jsonp(request.params.delete('callback'), status, headers, response)
         status = 200
 
@@ -56,7 +53,11 @@ module Rack
     end
 
     def is_jsonp_request?(request)
-      @is_jsonp_request ||= (request.params.include?('callback') and request.get?)
+      @is_jsonp_request ||= self.class.is_jsonp_request?(request)
+    end
+
+    def self.is_jsonp_request?(request)
+      (request.params.include?('callback') and request.get?)
     end
 
     # Formats the JSONP padding to include body, headers and http status

data/lib/rack/jsonr/version.rb

@@ -1,3 +1,3 @@
 class Rack::JSONR
-  VERSION = '0.1.3'
+  VERSION = '0.1.4'
 end

metadata

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