rack-jsonr 0.2.0 → 0.2.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MzBlYjQzNDI1OWI4Njk0NDE4NWQ2NzUwNTAxZTBhZTE5MWNhMGJiZg==
+    NDJiYzFiMzQ2NTQ3OWUxZjYzOTEzN2ZjNTY2YjI2MWI4YzFiNmJjOA==
   data.tar.gz: !binary |-
-    Y2YxMTA2OTc2NjM0MjBkMzhhOGQ0MTQyNGY2YjliYTM3YmE4MjE4NA==
+    NjU0MGMzYmI5MjUxNmNmOWIyNjE4NTg2Mzk3ZjExOGVmZWFkOTdmNA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MjljNjk5MmE2YjlhODhjOTI1ZDJiZTVkMzYzYWZmNWM4MzE0NjFiYjA4Zjhk
-    MWJlOTgzNDI1MzkyZmZiMzMyNmY0YWJlMzhhYjZhNDlhMWM0YmUxM2M2OWY4
-    YzI2OTA5Zjc5MTZlY2Y3YTdiYzYzZGRiNWM4MTc2M2EzOTgzNTY=
+    NmMzOWM0MDFkMmY5NzA5NGY3ZjlmYmI4N2ExZGQ0Y2Y2YTU1NzJmZDI0ZDhk
+    N2IzZTBlYzU4ZDU5NTQyYzE0NTVjNjY3ZjNiMzE0YzgxMWYwZGUwMWNkYTIz
+    MzVhMDM3MWE0ZmFlYTJjOTBiY2YxNjYyNDBhYzk3MTc5ODkwNzg=
   data.tar.gz: !binary |-
-    ZTBkMGM1M2ExN2JlMmZmZDRmNWU0MTRiYjNjYTU0YzQ2MjI3YjQ4MTY5Mzcz
-    YjgzNTM1ZTk4MzFhN2I2ZGM0NDBhNGMzZWQ2MWVjOGNhZWNiYjU2Y2MzNjQw
-    MThiYTVmYjk3ZDcwOGYxZmVkYmYxOGNiM2YwNmRmYWE0MDhmYzg=
+    NTY3YmYwYzdjMTg2ZjllYzk5ZjM1NTQ0ZGU2NzA3ZTQxMjc0MDMxY2YwOGNh
+    OWY3YmRlNmQ3YjFlMmUwZTQ1NDMwYjk0NTg0MTAyMDBkMTE1NGM2OTg3NWE4
+    OTdhM2RjZWYzYTViYWE0NWE5MjVkNWNjNjQxOWFjMDViZmQ2NWQ=

data/lib/rack/jsonr/jsonr.rb

@@ -5,7 +5,7 @@ module Rack
     # Based on Rack-JSONP by Flinn Mueller (http://actsasflinn.com/)
     include Rack::Utils
 
-    HTTP_METHODS = %w(GET HEAD PUT POST DELETE OPTIONS PATCH)
+    HTTP_METHODS_TO_OVERRIDE = %w(HEAD PUT POST DELETE OPTIONS PATCH)
     METHOD_OVERRIDE_PARAM_KEY = '_method'.freeze
     HTTP_METHOD_OVERRIDE_HEADER = 'HTTP_X_HTTP_METHOD_OVERRIDE'.freeze
 
@@ -27,13 +27,7 @@ module Rack
       request = Rack::Request.new(env)
       params = request.params
 
-      if is_jsonp_request?(request) or @options[:method_override] == :all
-        method_override = (params[METHOD_OVERRIDE_PARAM_KEY] || env[HTTP_METHOD_OVERRIDE_HEADER]).to_s.upcase
-        if HTTP_METHODS.include?(method_override)
-          env['rack.jsonr_method_override.original_method'] = env['REQUEST_METHOD']
-          env['REQUEST_METHOD'] = method_override
-        end
-      end
+      self.class.intercept_method_override(env, request, params, @options[:method_override])
 
       if is_jsonp_request?(request)
         response = format_jsonp(request.params.delete('callback'), status, headers, response)
@@ -51,6 +45,20 @@ module Rack
       [status, headers, response]
     end
 
+    def self.intercept_method_override(env, request, params, override_scope)
+      if is_jsonp_request?(request) or override_scope == :all
+        method_override = (params[METHOD_OVERRIDE_PARAM_KEY] || env[HTTP_METHOD_OVERRIDE_HEADER]).to_s.upcase
+        if HTTP_METHODS_TO_OVERRIDE.include?(method_override)
+          env['rack.jsonr_method_override.original_method'] = env['REQUEST_METHOD']
+          env['REQUEST_METHOD'] = method_override
+        end
+      end
+    end
+
+    def self.is_jsonp_request?(request)
+      (request.params.include?('callback') and request.get?)
+    end
+
     private
 
     def is_json_response?(headers)
@@ -61,10 +69,6 @@ module Rack
       @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
     #
     def format_jsonp(callback, status, headers, response, x_headers={}, body='')

data/lib/rack/jsonr/version.rb

@@ -1,3 +1,3 @@
 class Rack::JSONR
-  VERSION = '0.2.0'
+  VERSION = '0.2.1'
 end

metadata

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