rack-jsonr 0.1.4 → 0.2.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MzFjZjg3ZjY1MjkxODRmZjdlMDhmMzRjMDg5OGIzZTM0ZWI4ODI1YQ==
+    MzBlYjQzNDI1OWI4Njk0NDE4NWQ2NzUwNTAxZTBhZTE5MWNhMGJiZg==
   data.tar.gz: !binary |-
-    ZDkzZGNmOWJlMWExMmUwNzRmMWUyZjMxYjRhMDc1NjIyNzg3NTc4Nw==
+    Y2YxMTA2OTc2NjM0MjBkMzhhOGQ0MTQyNGY2YjliYTM3YmE4MjE4NA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZDBjZWFhZGQxMmI1OTk2ODVkOWQ4Y2MwMmJhZWYxODRmNTQxZWI0MWQzM2My
-    YTM4Njc0ZDFhZjQwNDk3OGJlNDE4NDViZDZmNzA1MDQ0YTgyMmQ5MDkwMjU5
-    ODU4Yjk3YzgwMTE1NWMwZWRlMjY4ZjM3NjlkMDQ4ZTNkYzU1N2Q=
+    MjljNjk5MmE2YjlhODhjOTI1ZDJiZTVkMzYzYWZmNWM4MzE0NjFiYjA4Zjhk
+    MWJlOTgzNDI1MzkyZmZiMzMyNmY0YWJlMzhhYjZhNDlhMWM0YmUxM2M2OWY4
+    YzI2OTA5Zjc5MTZlY2Y3YTdiYzYzZGRiNWM4MTc2M2EzOTgzNTY=
   data.tar.gz: !binary |-
-    OTAyMGQxYmNhY2I0MTM5MDlmNWQzNTIwZjRlMDU2NDEyNzAxYmRjNmNkMjRh
-    ZDMyZmQ4MTUzYTY5MWYyN2E1MGRiMGVlNWFiODczN2U0ZWQ1NzE3Y2JlOWJh
-    MDQ5MGQ2YjRiMDk3YTNlNTk5MTE3NjM0YzAyODEwZTM5ZGYzYjg=
+    ZTBkMGM1M2ExN2JlMmZmZDRmNWU0MTRiYjNjYTU0YzQ2MjI3YjQ4MTY5Mzcz
+    YjgzNTM1ZTk4MzFhN2I2ZGM0NDBhNGMzZWQ2MWVjOGNhZWNiYjU2Y2MzNjQw
+    MThiYTVmYjk3ZDcwOGYxZmVkYmYxOGNiM2YwNmRmYWE0MDhmYzg=

data/lib/rack/jsonr/jsonr.rb

@@ -1,15 +1,16 @@
 require 'rack'
 
 module Rack
-  # A Rack middleware for providing JSONP in a usable way - accepts GET/POST/PUT/DELETE verbs and http status and
-  # headers are readable from the body.
-  #
-  # Based on Rack-JSONP by Flinn Mueller (http://actsasflinn.com/)
-  #
   class JSONR
+    # Based on Rack-JSONP by Flinn Mueller (http://actsasflinn.com/)
     include Rack::Utils
 
-    def initialize(app)
+    HTTP_METHODS = %w(GET HEAD PUT POST DELETE OPTIONS PATCH)
+    METHOD_OVERRIDE_PARAM_KEY = '_method'.freeze
+    HTTP_METHOD_OVERRIDE_HEADER = 'HTTP_X_HTTP_METHOD_OVERRIDE'.freeze
+
+    def initialize(app, options={})
+      @options = options
       @app = app
     end
 
@@ -26,11 +27,15 @@ module Rack
       request = Rack::Request.new(env)
       params = request.params
 
-      if is_jsonp_request?(request)
-        env['REQUEST_METHOD'] = params['request_method'].upcase if params['request_method'] and ['POST','PUT','DELETE'].include?(params['request_method'].upcase)
+      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
 
-      if is_jsonp_request?(request) #and is_json_response?(headers)
+      if is_jsonp_request?(request)
         response = format_jsonp(request.params.delete('callback'), status, headers, response)
         status = 200
 

data/lib/rack/jsonr/version.rb

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

metadata

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