Merge commit 'rails/master'

Conflicts:
	activerecord/lib/active_record/associations.rb

3 files changed, 3 insertions, 19 deletions

diff --git a/activemodel/lib/active_model/attribute_methods.rb b/activemodel/lib/active_model/attribute_methods.rb
index 1091ad3095..aa35a2726e 100644
--- a/activemodel/lib/active_model/attribute_methods.rb
+++ b/activemodel/lib/active_model/attribute_methods.rb
@@ -181,7 +181,7 @@ module ActiveModel
       end
 
       def attribute_methods_generated?
-        @attribute_methods_generated ? true : false
+        @attribute_methods_generated ||= nil
       end
 
       protected
diff --git a/activemodel/lib/active_model/observing.rb b/activemodel/lib/active_model/observing.rb
index 3b230c43b9..d9d1ab8967 100644
--- a/activemodel/lib/active_model/observing.rb
+++ b/activemodel/lib/active_model/observing.rb
@@ -40,23 +40,6 @@ module ActiveModel
         observers.each { |o| instantiate_observer(o) }
       end
 
-      # Wraps methods with before and after notifications.
-      #
-      #   wrap_with_notifications :create, :save, :update, :destroy
-      def wrap_with_notifications(*methods)
-        methods.each do |method|
-          class_eval(<<-EOS, __FILE__, __LINE__ + 1)
-            def #{method}_with_notifications(*args, &block)
-              notify_observers(:before_#{method})
-              result = #{method}_without_notifications(*args, &block)
-              notify_observers(:after_#{method})
-              result
-            end
-          EOS
-          alias_method_chain(method, :notifications)
-        end
-      end
-
       protected
         def instantiate_observer(observer) #:nodoc:
           # string/symbol
diff --git a/activemodel/lib/active_model/validations_repair_helper.rb b/activemodel/lib/active_model/validations_repair_helper.rb
index 432e411308..0809e7c0d1 100644
--- a/activemodel/lib/active_model/validations_repair_helper.rb
+++ b/activemodel/lib/active_model/validations_repair_helper.rb
@@ -7,7 +7,8 @@ module ActiveModel
         model_classes.inject({}) do |repair, klass|
           repair[klass] ||= {}
           [:validate, :validate_on_create, :validate_on_update].each do |callback|
-            the_callback = klass.instance_variable_get("@#{callback.to_s}_callbacks")
+            ivar = "@#{callback.to_s}_callbacks"
+            the_callback = klass.instance_variable_get(ivar) if klass.instance_variable_defined?(ivar)
             repair[klass][callback] = (the_callback.nil? ? nil : the_callback.dup)
           end
           repair