PUT and DELETE working

lib/sinatra.rb

@@ -34,6 +34,7 @@
 require File.dirname(__FILE__) + '/sinatra/loader'
 
 Sinatra::Loader.load_files Dir.glob(SINATRA_ROOT + '/lib/sinatra/core_ext/*.rb')
+Sinatra::Loader.load_files Dir.glob(SINATRA_ROOT + '/lib/sinatra/rack_ext/*.rb')
 Sinatra::Loader.load_files Dir.glob(SINATRA_ROOT + '/lib/sinatra/*.rb')
 Sinatra::Loader.load_files Dir.glob(SINATRA_ROOT + '/vendor/*/init.rb')
 

lib/sinatra/rack_ext/request.rb

@@ -0,0 +1,15 @@
+module Rack
+
+  class Request
+
+    def request_method
+      if @env['REQUEST_METHOD'] == 'POST' && %w(PUT DELETE).include?(params['_method'])
+        params['_method'].upcase
+      else
+        @env['REQUEST_METHOD']
+      end
+    end
+
+  end
+
+end

test/sinatra/dispatcher_test.rb

@@ -76,5 +76,16 @@
     get_it '/test/blake'
     body.should.equal 'blake'
   end
-
-end
+
+  it "should respond to DELETE and PUT" do
+    Sinatra::Event.new(:delete, '/') do
+      request.request_method
+    end
+
+    # Browser only know GET and POST.  DELETE and PUT are signaled by passing in a _method paramater
+    post_it '/', :_method => 'DELETE'
+    status.should.equal 200
+    text.should.equal 'DELETE'
+  end
+
+end

test/sinatra/request_test.rb

@@ -0,0 +1,21 @@
+require File.dirname(__FILE__) + '/../helper'
+
+describe "Rack::Request" do
+  it "should return PUT and DELETE based on _method param" do
+    env = {'REQUEST_METHOD' => 'POST', 'rack.input' => StringIO.new('_method=DELETE')}
+    Rack::Request.new(env).request_method.should.equal 'DELETE'
+
+    env = {'REQUEST_METHOD' => 'POST', 'rack.input' => StringIO.new('_method=PUT')}
+    Rack::Request.new(env).request_method.should.equal 'PUT'
+  end
+
+  it "should not allow faking" do
+    env = {'REQUEST_METHOD' => 'POST', 'rack.input' => StringIO.new('_method=GET')}
+    Rack::Request.new(env).request_method.should.equal 'POST'
+
+    env = {'REQUEST_METHOD' => 'GET', 'rack.input' => StringIO.new('_method=POST')}
+    Rack::Request.new(env).request_method.should.equal 'GET'
+  end
+end
+
+