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, 14 insertions, 11 deletions

diff --git a/activerecord/lib/active_record/dirty.rb b/activerecord/lib/active_record/dirty.rb
index 4a2510aa63..178767e0c3 100644
--- a/activerecord/lib/active_record/dirty.rb
+++ b/activerecord/lib/active_record/dirty.rb
@@ -34,20 +34,21 @@ module ActiveRecord
   #   person.name << 'by'
   #   person.name_change    # => ['uncle bob', 'uncle bobby']
   module Dirty
+    extend ActiveSupport::Concern
+
     DIRTY_SUFFIXES = ['_changed?', '_change', '_will_change!', '_was']
 
-    def self.included(base)
-      base.attribute_method_suffix *DIRTY_SUFFIXES
-      base.alias_method_chain :write_attribute, :dirty
-      base.alias_method_chain :save,            :dirty
-      base.alias_method_chain :save!,           :dirty
-      base.alias_method_chain :update,          :dirty
-      base.alias_method_chain :reload,          :dirty
+    included do
+      attribute_method_suffix *DIRTY_SUFFIXES
 
-      base.superclass_delegating_accessor :partial_updates
-      base.partial_updates = true
+      alias_method_chain :write_attribute, :dirty
+      alias_method_chain :save,            :dirty
+      alias_method_chain :save!,           :dirty
+      alias_method_chain :update,          :dirty
+      alias_method_chain :reload,          :dirty
 
-      base.send(:extend, ClassMethods)
+      superclass_delegating_accessor :partial_updates
+      self.partial_updates = true
     end
 
     # Do any attributes have unsaved changes?
@@ -167,7 +168,9 @@ module ActiveRecord
 
     module ClassMethods
       def self.extended(base)
-        base.metaclass.alias_method_chain(:alias_attribute, :dirty)
+        class << base
+          alias_method_chain :alias_attribute, :dirty
+        end
       end
 
       def alias_attribute_with_dirty(new_name, old_name)