Kill AMo Base

activemodel/lib/active_model.rb

@@ -27,7 +27,6 @@ require 'active_support'
 
 module ActiveModel
   autoload :APICompliant, 'active_model/api_compliant'
-  autoload :Base, 'active_model/base'
   autoload :DeprecatedErrorMethods, 'active_model/deprecated_error_methods'
   autoload :Errors, 'active_model/errors'
   autoload :Name, 'active_model/naming'

activemodel/lib/active_model/base.rb

@@ -1,8 +0,0 @@
-module ActiveModel
-  class Base
-    include Observing
-    # disabled, until they're tested
-    # include Callbacks
-    # include Validations
-  end
-end

activemodel/test/cases/observing_test.rb

@@ -1,6 +1,8 @@
 require 'cases/helper'
 
-class ObservedModel < ActiveModel::Base
+class ObservedModel
+  include ActiveModel::Observing
+
   class Observer
   end
 end
@@ -17,7 +19,8 @@ class FooObserver < ActiveModel::Observer
   end
 end
 
-class Foo < ActiveModel::Base
+class Foo
+  include ActiveModel::Observing
 end
 
 class ObservingTest < ActiveModel::TestCase