Rolled back broken aliasing

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

1 files changed, 4 insertions, 10 deletions

diff --git a/activesupport/lib/active_support/core_ext/module/aliasing.rb b/activesupport/lib/active_support/core_ext/module/aliasing.rb
index 5c5875504f..1f904377df 100644
--- a/activesupport/lib/active_support/core_ext/module/aliasing.rb
+++ b/activesupport/lib/active_support/core_ext/module/aliasing.rb
@@ -9,17 +9,11 @@ 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)
-    punctuation    = target.to_s.scan(/[?!]/).first
+    # Strip out punctuation on predicates or bang methods since
+    # e.g. target?_without_feature is not a valid method name.
     aliased_target = target.to_s.sub(/[?!]/, '')
-    alias_method "#{aliased_target}_without_#{feature}#{punctuation}", target
-    alias_method target, "#{aliased_target}_with_#{feature}#{punctuation}"
+    alias_method "#{aliased_target}_without_#{feature}", target
+    alias_method target, "#{aliased_target}_with_#{feature}"
   end
 end