From 5da01a92c741b3a9a020a4dec9ddf120c0484e20 Mon Sep 17 00:00:00 2001
From: Joshua Peek <josh@joshpeek.com>
Date: Sun, 29 Nov 2009 17:01:14 -0600
Subject: Make use of extract_options!

---
 actionpack/lib/action_dispatch/routing/mapper.rb | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'actionpack/lib')

diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb
index 9b00bd3dc0..9ec85daba8 100644
--- a/actionpack/lib/action_dispatch/routing/mapper.rb
+++ b/actionpack/lib/action_dispatch/routing/mapper.rb
@@ -68,7 +68,7 @@ module ActionDispatch
         end
 
         def resource(*resources, &block)
-          options = resources.last.is_a?(Hash) ? resources.pop : {}
+          options = resources.extract_options!
 
           if resources.length > 1
             raise ArgumentError if block_given?
@@ -105,7 +105,7 @@ module ActionDispatch
         end
 
         def resources(*resources, &block)
-          options = resources.last.is_a?(Hash) ? resources.pop : {}
+          options = resources.extract_options!
 
           if resources.length > 1
             raise ArgumentError if block_given?
@@ -173,7 +173,7 @@ module ActionDispatch
         end
 
         def match(*args)
-          options = args.last.is_a?(Hash) ? args.pop : {}
+          options = args.extract_options!
           args.push(options)
 
           case options.delete(:on)
@@ -203,7 +203,7 @@ module ActionDispatch
 
       module Scoping
         def scope(*args)
-          options = args.last.is_a?(Hash) ? args.pop : {}
+          options = args.extract_options!
 
           constraints = options.delete(:constraints) || {}
           unless constraints.is_a?(Hash)
@@ -300,7 +300,7 @@ module ActionDispatch
       end
 
       def match(*args)
-        options = args.last.is_a?(Hash) ? args.pop : {}
+        options = args.extract_options!
 
         if args.length > 1
           args.each { |path| match(path, options) }
@@ -384,7 +384,7 @@ module ActionDispatch
 
       private
         def map_method(method, *args, &block)
-          options = args.last.is_a?(Hash) ? args.pop : {}
+          options = args.extract_options!
           options[:via] = method
           args.push(options)
           match(*args, &block)
-- 
cgit v1.2.3