Merge branch 'master' into docrails

3 files changed, 23 insertions, 22 deletions

diff --git a/activemodel/lib/active_model/attribute_methods.rb b/activemodel/lib/active_model/attribute_methods.rb
index c1334069fa..f04829ef09 100644
--- a/activemodel/lib/active_model/attribute_methods.rb
+++ b/activemodel/lib/active_model/attribute_methods.rb
@@ -89,13 +89,20 @@ module ActiveModel
       #   # => 'address_id'
       def define_attr_method(name, value=nil, &block)
         sing = singleton_class
-        sing.send :alias_method, "original_#{name}", name
+        sing.class_eval <<-eorb, __FILE__, __LINE__ + 1
+          if method_defined?(:original_#{name})
+            undef :original_#{name}
+          end
+          alias_method :original_#{name}, :#{name}
+        eorb
         if block_given?
           sing.send :define_method, name, &block
         else
           # use eval instead of a block to work around a memory leak in dev
           # mode in fcgi
-          sing.class_eval "def #{name}; #{value.to_s.inspect}; end"
+          sing.class_eval <<-eorb, __FILE__, __LINE__ + 1
+            def #{name}; #{value.to_s.inspect}; end
+          eorb
         end
       end
 
@@ -256,8 +263,13 @@ module ActiveModel
               if respond_to?(generate_method)
                 send(generate_method, attr_name)
               else
+                method_name = matcher.method_name(attr_name)
+
                 generated_attribute_methods.module_eval <<-STR, __FILE__, __LINE__+1
-                  def #{matcher.method_name(attr_name)}(*args)
+                  if method_defined?(:#{method_name})
+                    undef :#{method_name}
+                  end
+                  def #{method_name}(*args)
                     send(:#{matcher.method_missing_target}, '#{attr_name}', *args)
                   end
                 STR
diff --git a/activemodel/lib/active_model/dirty.rb b/activemodel/lib/active_model/dirty.rb
index 5f02929a9d..d3a6bad6bb 100644
--- a/activemodel/lib/active_model/dirty.rb
+++ b/activemodel/lib/active_model/dirty.rb
@@ -91,7 +91,7 @@ module ActiveModel
     #   person.name = 'bob'
     #   person.changed? # => true
     def changed?
-      !changed_attributes.empty?
+      !@changed_attributes.empty?
     end
 
     # List of attributes with unsaved changes.
@@ -99,7 +99,7 @@ module ActiveModel
     #   person.name = 'bob'
     #   person.changed # => ['name']
     def changed
-      changed_attributes.keys
+      @changed_attributes.keys
     end
 
     # Map of changed attrs => [original value, new value].
@@ -116,33 +116,23 @@ module ActiveModel
     #   person.save
     #   person.previous_changes # => {'name' => ['bob, 'robert']}
     def previous_changes
-      previously_changed_attributes
+      @previously_changed
     end
 
     private
-      # Map of change <tt>attr => original value</tt>.
-      def changed_attributes
-        @changed_attributes ||= {}
-      end
-
-      # Map of fields that were changed when the model was saved
-      def previously_changed_attributes
-        @previously_changed || {}
-      end
-
       # Handle <tt>*_changed?</tt> for +method_missing+.
       def attribute_changed?(attr)
-        changed_attributes.include?(attr)
+        @changed_attributes.include?(attr)
       end
 
       # Handle <tt>*_change</tt> for +method_missing+.
       def attribute_change(attr)
-        [changed_attributes[attr], __send__(attr)] if attribute_changed?(attr)
+        [@changed_attributes[attr], __send__(attr)] if attribute_changed?(attr)
       end
 
       # Handle <tt>*_was</tt> for +method_missing+.
       def attribute_was(attr)
-        attribute_changed?(attr) ? changed_attributes[attr] : __send__(attr)
+        attribute_changed?(attr) ? @changed_attributes[attr] : __send__(attr)
       end
 
       # Handle <tt>*_will_change!</tt> for +method_missing+.
@@ -153,12 +143,12 @@ module ActiveModel
         rescue TypeError, NoMethodError
         end
 
-        changed_attributes[attr] = value
+        @changed_attributes[attr] = value
       end
 
       # Handle <tt>reset_*!</tt> for +method_missing+.
       def reset_attribute!(attr)
-        __send__("#{attr}=", changed_attributes[attr]) if attribute_changed?(attr)
+        __send__("#{attr}=", @changed_attributes[attr]) if attribute_changed?(attr)
       end
   end
 end
diff --git a/activemodel/lib/active_model/validations.rb b/activemodel/lib/active_model/validations.rb
index ba8648f8c9..6013cdb23b 100644
--- a/activemodel/lib/active_model/validations.rb
+++ b/activemodel/lib/active_model/validations.rb
@@ -112,7 +112,6 @@ module ActiveModel
       #     end
       #   end
       #
-      # This usage applies to +validate_on_create+ and +validate_on_update as well+.
       def validate(*args, &block)
         options = args.last
         if options.is_a?(Hash) && options.key?(:on)