Remove ActiveRecord::Model

In the end I think the pain of implementing this seamlessly was not
worth the gain provided.

The intention was that it would allow plain ruby objects that might not
live in your main application to be subclassed and have persistence
mixed in. But I've decided that the benefit of doing that is not worth
the amount of complexity that the implementation introduced.

1 files changed, 2 insertions, 9 deletions

diff --git a/activerecord/lib/active_record/serialization.rb b/activerecord/lib/active_record/serialization.rb
index e8dd312a47..6a511c307b 100644
--- a/activerecord/lib/active_record/serialization.rb
+++ b/activerecord/lib/active_record/serialization.rb
@@ -1,19 +1,12 @@
 module ActiveRecord #:nodoc:
-  ActiveSupport.on_load(:active_record_config) do
-    mattr_accessor :include_root_in_json, instance_accessor: false
-    self.include_root_in_json = true
-  end
-
   # = Active Record Serialization
   module Serialization
     extend ActiveSupport::Concern
     include ActiveModel::Serializers::JSON
 
     included do
-      singleton_class.class_eval do
-        remove_method :include_root_in_json
-        delegate :include_root_in_json, to: 'ActiveRecord::Model'
-      end
+      mattr_accessor :include_root_in_json, instance_accessor: false
+      self.include_root_in_json = true
     end
 
     def serializable_hash(options = nil)