Use #remove_possible_method instead here

smartinez87 · May 4, 2011 · 9be7911 · 9be7911
1 parent 1c2dc92
commit 9be7911
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/actionpack/lib/action_dispatch/routing/route_set.rb b/actionpack/lib/action_dispatch/routing/route_set.rb
@@ -3,6 +3,7 @@
 require 'active_support/core_ext/object/blank'
 require 'active_support/core_ext/object/to_query'
 require 'active_support/core_ext/hash/slice'
+require 'active_support/core_ext/module/remove_method'
 
 module ActionDispatch
   module Routing
@@ -160,7 +161,7 @@ def define_hash_access(route, name, kind, options)
 
             # We use module_eval to avoid leaks
             @module.module_eval <<-END_EVAL, __FILE__, __LINE__ + 1
-              remove_method :#{selector} if method_defined?(:#{selector})
+              remove_possible_method :#{selector}
               def #{selector}(*args)
                 options = args.extract_options!
 
@@ -194,7 +195,7 @@ def define_url_helper(route, name, kind, options)
             hash_access_method = hash_access_name(name, kind)
 
             @module.module_eval <<-END_EVAL, __FILE__, __LINE__ + 1
-              remove_method :#{selector} if method_defined?(:#{selector})
+              remove_possible_method :#{selector}
               def #{selector}(*args)
                 url_for(#{hash_access_method}(*args))
               end