Fixed that Module#alias_method_chain should work with both foo? foo! and foo at the same time (closes #4954) [anna@wota.jp]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4429 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

1 files changed, 10 insertions, 4 deletions

diff --git a/activesupport/lib/active_support/core_ext/module/aliasing.rb b/activesupport/lib/active_support/core_ext/module/aliasing.rb
index 1f904377df..5c5875504f 100644
--- a/activesupport/lib/active_support/core_ext/module/aliasing.rb
+++ b/activesupport/lib/active_support/core_ext/module/aliasing.rb
@@ -9,11 +9,17 @@ class Module
   #   alias_method_chain :foo, :feature
   #
   # And both aliases are set up for you.
+  #
+  # A punctuation is moved to the end on predicates or bang methods.
+  #
+  #   alias_method_chain :foo?, :feature
+  # 
+  # generates "foo_without_feature?" method for old one,
+  # and expects "foo_with_feature?" method for new one.
   def alias_method_chain(target, feature)
-    # Strip out punctuation on predicates or bang methods since
-    # e.g. target?_without_feature is not a valid method name.
+    punctuation    = target.to_s.scan(/[?!]/).first
     aliased_target = target.to_s.sub(/[?!]/, '')
-    alias_method "#{aliased_target}_without_#{feature}", target
-    alias_method target, "#{aliased_target}_with_#{feature}"
+    alias_method "#{aliased_target}_without_#{feature}#{punctuation}", target
+    alias_method target, "#{aliased_target}_with_#{feature}#{punctuation}"
   end
 end