Makes new callbacks support keys with special characters

2 files changed, 29 insertions, 0 deletions

diff --git a/activesupport/lib/active_support/new_callbacks.rb b/activesupport/lib/active_support/new_callbacks.rb
index 7a48dbac04..8a91e1c674 100644
--- a/activesupport/lib/active_support/new_callbacks.rb
+++ b/activesupport/lib/active_support/new_callbacks.rb
@@ -356,6 +356,7 @@ module ActiveSupport
         str = <<-RUBY_EVAL
           def _run_#{symbol}_callbacks(key = nil)
             if key
+              key = key.hash.to_s.gsub(/-/, '_')
               name = "_run__\#{self.class.name.split("::").last}__#{symbol}__\#{key}__callbacks"
               
               if respond_to?(name)
diff --git a/activesupport/test/new_callbacks_test.rb b/activesupport/test/new_callbacks_test.rb
index abe7790ebf..8c887e1bf1 100644
--- a/activesupport/test/new_callbacks_test.rb
+++ b/activesupport/test/new_callbacks_test.rb
@@ -255,6 +255,26 @@ module NewCallbacksTest
     end
   end
 
+  class HyphenatedCallbacks
+    include ActiveSupport::NewCallbacks
+    define_callbacks :save
+    attr_reader :stuff
+    
+    save_callback :before, :omg, :per_key => {:if => :yes}
+    
+    def yes() true end
+      
+    def omg
+      @stuff = "OMG"
+    end
+    
+    def save
+      _run_save_callbacks("hyphen-ated") do
+        @stuff
+      end
+    end
+  end
+
   class AroundCallbacksTest < Test::Unit::TestCase
     def test_save_around
       around = AroundPerson.new
@@ -381,4 +401,12 @@ module NewCallbacksTest
       assert_equal ["first", "second", "third", "second", "first"], terminator.history
     end
   end
+  
+  class HyphenatedKeyTest < Test::Unit::TestCase
+    def test_save
+      obj = HyphenatedCallbacks.new
+      obj.save
+      assert_equal obj.stuff, "OMG"
+    end
+  end  
 end