Merge branch 'master' into active_model

Conflicts:
	activemodel/lib/active_model/core.rb
	activemodel/test/cases/state_machine/event_test.rb
	activemodel/test/cases/state_machine/state_transition_test.rb
	activerecord/lib/active_record/validations.rb
	activerecord/test/cases/validations/i18n_validation_test.rb
	activeresource/lib/active_resource.rb
	activeresource/test/abstract_unit.rb

1 files changed, 105 insertions, 7 deletions

diff --git a/activesupport/test/new_callbacks_test.rb b/activesupport/test/new_callbacks_test.rb
index 5cde078b65..7bec47224d 100644
--- a/activesupport/test/new_callbacks_test.rb
+++ b/activesupport/test/new_callbacks_test.rb
@@ -19,11 +19,11 @@ module NewCallbacksTest
 
     class << self
       def callback_symbol(callback_method)
-        returning(:"#{callback_method}_method") do |method_name|
-          define_method(method_name) do
-            history << [callback_method, :symbol]
-          end
+        method_name = :"#{callback_method}_method"
+        define_method(method_name) do
+          history << [callback_method, :symbol]
         end
+        method_name
       end
 
       def callback_string(callback_method)
@@ -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
@@ -345,7 +365,7 @@ module NewCallbacksTest
     save_callback :after, :third
 
   
-    attr_reader :history
+    attr_reader :history, :saved
     def initialize
       @history = []
     end
@@ -370,8 +390,72 @@ module NewCallbacksTest
     end
   
     def save
-      _run_save_callbacks
+      _run_save_callbacks do
+        @saved = true
+      end
+    end
+  end
+
+  class CallbackObject
+    def before_save(caller)
+      caller.record << "before"
+    end
+    
+    def around_save(caller)
+      caller.record << "around before"
+      yield
+      caller.record << "around after"
+    end
+  end
+
+  class UsingObjectBefore
+    include ActiveSupport::NewCallbacks
+    
+    define_callbacks :save
+    save_callback :before, CallbackObject.new
+    
+    attr_accessor :record
+    def initialize
+      @record = []
+    end
+    
+    def save
+      _run_save_callbacks do
+        @record << "yielded"
+      end
+    end 
+  end
+
+  class UsingObjectAround
+    include ActiveSupport::NewCallbacks
+    
+    define_callbacks :save
+    save_callback :around, CallbackObject.new
+    
+    attr_accessor :record
+    def initialize
+      @record = []
+    end
+    
+    def save
+      _run_save_callbacks do
+        @record << "yielded"
+      end
+    end 
+  end
+  
+  class UsingObjectTest < Test::Unit::TestCase
+    def test_before_object
+      u = UsingObjectBefore.new
+      u.save
+      assert_equal ["before", "yielded"], u.record
     end
+    
+    def test_around_object
+      u = UsingObjectAround.new
+      u.save
+      assert_equal ["around before", "yielded", "around after"], u.record
+    end    
   end
 
   class CallbackTerminatorTest < Test::Unit::TestCase
@@ -380,5 +464,19 @@ module NewCallbacksTest
       terminator.save
       assert_equal ["first", "second", "third", "second", "first"], terminator.history
     end
+    
+    def test_block_never_called_if_terminated
+      obj = CallbackTerminator.new
+      obj.save
+      assert !obj.saved
+    end    
   end
-end
\ No newline at end of file
+  
+  class HyphenatedKeyTest < Test::Unit::TestCase
+    def test_save
+      obj = HyphenatedCallbacks.new
+      obj.save
+      assert_equal obj.stuff, "OMG"
+    end    
+  end  
+end