Merge branch 'patch' of https://github.com/rkh/rack into rkh-patch

cldwalker · Mar 18, 2011 · 1a5a44a · 1a5a44a
2 parents 397dc1e + 828e2ab
commit 1a5a44a
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/lib/rack/methodoverride.rb b/lib/rack/methodoverride.rb
@@ -1,6 +1,6 @@
 module Rack
   class MethodOverride
-    HTTP_METHODS = %w(GET HEAD PUT POST DELETE OPTIONS)
+    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

diff --git a/lib/rack/request.rb b/lib/rack/request.rb
@@ -117,6 +117,7 @@ def delete?;  request_method == "DELETE"  end
     def get?;     request_method == "GET"     end
     def head?;    request_method == "HEAD"    end
     def options?; request_method == "OPTIONS" end
+    def patch?;   request_method == "PATCH"   end
     def post?;    request_method == "POST"    end
     def put?;     request_method == "PUT"     end
     def trace?;   request_method == "TRACE"   end

diff --git a/test/spec_methodoverride.rb b/test/spec_methodoverride.rb
@@ -22,12 +22,12 @@
   should "modify REQUEST_METHOD for POST requests when X-HTTP-Method-Override is set" do
     env = Rack::MockRequest.env_for("/",
             :method => "POST",
-            "HTTP_X_HTTP_METHOD_OVERRIDE" => "PUT"
+            "HTTP_X_HTTP_METHOD_OVERRIDE" => "PATCH"
           )
     app = Rack::MethodOverride.new(lambda{|envx| Rack::Request.new(envx) })
     req = app.call(env)
 
-    req.env["REQUEST_METHOD"].should.equal "PUT"
+    req.env["REQUEST_METHOD"].should.equal "PATCH"
   end
 
   should "not modify REQUEST_METHOD if the method is unknown" do

diff --git a/test/spec_request.rb b/test/spec_request.rb
@@ -16,6 +16,7 @@
     req.should.not.be.put
     req.should.not.be.delete
     req.should.not.be.head
+    req.should.not.be.patch
 
     req.script_name.should.equal ""
     req.path_info.should.equal "/"