Changed ActiveRecord to use new callbacks and speed up observers by only notifying events that are actually being consumed.

Signed-off-by: Joshua Peek <josh@joshpeek.com>

2 files changed, 2 insertions, 2 deletions

diff --git a/activemodel/lib/active_model/validations/presence.rb b/activemodel/lib/active_model/validations/presence.rb
index 72d6b1c6f0..3ff677c137 100644
--- a/activemodel/lib/active_model/validations/presence.rb
+++ b/activemodel/lib/active_model/validations/presence.rb
@@ -32,7 +32,7 @@ module ActiveModel
 
         # can't use validates_each here, because it cannot cope with nonexistent attributes,
         # while errors.add_on_empty can
-        send(validation_method(configuration[:on]), configuration) do |record|
+        validate configuration do |record|
           record.errors.add_on_blank(attr_names, configuration[:message])
         end
       end
diff --git a/activemodel/lib/active_model/validations/with.rb b/activemodel/lib/active_model/validations/with.rb
index 851cdfebf0..edc2133ddc 100644
--- a/activemodel/lib/active_model/validations/with.rb
+++ b/activemodel/lib/active_model/validations/with.rb
@@ -51,7 +51,7 @@ module ActiveModel
       def validates_with(*args)
         configuration = args.extract_options!
 
-        send(validation_method(configuration[:on]), configuration) do |record|
+        validate configuration do |record|
           args.each do |klass|
             klass.new(record, configuration.except(:on, :if, :unless)).validate
           end