rory 0.3.12 → 0.3.13

data/lib/rory/dispatcher.rb

@@ -56,6 +56,7 @@ module Rory
         route.matches_request?(@request)
       end
       if mapped_route
+        @request.params.delete('_method')
         @request.params.merge! mapped_route.path_params(@request)
       end
       mapped_route

data/lib/rory/route.rb

@@ -54,7 +54,7 @@ module Rory
   private
 
     def method_from_request(request)
-      override_method = request.params.delete('_method')
+      override_method = request.params['_method']
       method = if override_method && ['put', 'patch', 'delete'].include?(override_method.downcase)
         override_method
       else

data/lib/rory/version.rb

@@ -1,3 +1,3 @@
 module Rory
-  VERSION = '0.3.12'
+  VERSION = '0.3.13'
 end

data/spec/fixture_app/config/routes.rb

@@ -1,6 +1,5 @@
 Fixture::Application.set_routes do
   match 'foo/:id/bar', :to => 'foo#bar', :methods => [:get, :post]
-  match '/foo', :to => 'monkeys', :methods => [:delete]
   match 'this/:path/is/:very_awesome', :to => 'awesome#rad'
   scope :module => 'goose' do
     match 'lumpies/:lump', :to => 'lumpies#show', :methods => [:get]
@@ -9,5 +8,6 @@ Fixture::Application.set_routes do
     match 'rabbits/:chew', :to => 'rabbits#chew', :methods => [:get]
   end
   match '/', :to => 'root#vegetable', :methods => [:get]
+  match '/', :to => 'root#no_vegetable', :methods => [:delete]
   match 'for_reals/:parbles', :to => 'for_reals#srsly', :methods => [:get]
 end

data/spec/lib/rory/application_spec.rb

@@ -69,11 +69,11 @@ describe Rory::Application do
     it "generates a collection of routing objects from route configuration" do
       expect(Fixture::Application.routes).to eq [
         Rory::Route.new('foo/:id/bar', :to => 'foo#bar', :methods => [:get, :post]),
-        Rory::Route.new('foo', :to => 'monkeys', :methods => [:delete]),
         Rory::Route.new('this/:path/is/:very_awesome', :to => 'awesome#rad'),
         Rory::Route.new('lumpies/:lump', :to => 'lumpies#show', :methods => [:get], :module => 'goose'),
         Rory::Route.new('rabbits/:chew', :to => 'rabbits#chew', :methods => [:get], :module => 'goose/wombat'),
         Rory::Route.new('', :to => 'root#vegetable', :methods => [:get]),
+        Rory::Route.new('', :to => 'root#no_vegetable', :methods => [:delete]),
         Rory::Route.new('for_reals/:parbles', :to => 'for_reals#srsly', :methods => [:get])
       ]
     end

data/spec/lib/rory/dispatcher_spec.rb

@@ -81,13 +81,19 @@ describe Rory::Dispatcher do
     end
 
     it "uses override method from params if exists" do
-      @request.stub(:path_info => '/foo', :params => { '_method' => 'delete' }, :request_method => 'PUT')
-      expect(@dispatcher.route).to eq Rory::Route.new('/foo', {
-        :to => 'monkeys',
+      @request.stub(:path_info => '/', :params => { '_method' => 'delete' }, :request_method => 'PUT')
+      expect(@dispatcher.route).to eq Rory::Route.new('/', {
+        :to => 'root#no_vegetable',
         :methods => [:delete]
       })
     end
 
+    it "deletes override method from params" do
+      @request.stub(:path_info => '/', :params => { '_method' => 'delete', 'goats' => 'not_sheep' }, :request_method => 'PUT')
+      @dispatcher.route
+      expect(@request.params).to eq('goats' => 'not_sheep')
+    end
+
     it "works with empty path" do
       @request.stub(:path_info => '', :request_method => 'GET')
       expect(@dispatcher.route).to eq Rory::Route.new('/', {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rory
 version: !ruby/object:Gem::Version
-  version: 0.3.12
+  version: 0.3.13
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-07 00:00:00.000000000 Z
+date: 2014-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack