Kill AMo ivar attributes helper

7 files changed, 8 insertions, 58 deletions

diff --git a/activemodel/lib/active_model.rb b/activemodel/lib/active_model.rb
index c6f63d2fdc..eed74731fa 100644
--- a/activemodel/lib/active_model.rb
+++ b/activemodel/lib/active_model.rb
@@ -27,7 +27,6 @@ require 'active_support'
 
 module ActiveModel
   autoload :APICompliant, 'active_model/api_compliant'
-  autoload :Attributes, 'active_model/attributes'
   autoload :Base, 'active_model/base'
   autoload :DeprecatedErrorMethods, 'active_model/deprecated_error_methods'
   autoload :Errors, 'active_model/errors'
diff --git a/activemodel/lib/active_model/attributes.rb b/activemodel/lib/active_model/attributes.rb
deleted file mode 100644
index ea8c8d5f72..0000000000
--- a/activemodel/lib/active_model/attributes.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-require 'active_support/core_ext/object/instance_variables'
-
-module ActiveModel
-  module Attributes
-    def self.append_features(base)
-      unless base.instance_methods.include?('attributes')
-        super
-      else
-        false
-      end
-    end
-
-    def attributes
-      instance_values
-    end
-
-    def read_attribute(attr_name)
-      instance_variable_get(:"@#{attr_name}")
-    end
-
-    def write_attribute(attr_name, value)
-      instance_variable_set(:"@#{attr_name}", value)
-    end
-  end
-end
diff --git a/activemodel/lib/active_model/serializers/json.rb b/activemodel/lib/active_model/serializers/json.rb
index adf200597d..e94512fd64 100644
--- a/activemodel/lib/active_model/serializers/json.rb
+++ b/activemodel/lib/active_model/serializers/json.rb
@@ -5,7 +5,6 @@ module ActiveModel
   module Serializers
     module JSON
       extend ActiveSupport::Concern
-      include ActiveModel::Attributes
 
       included do
         extend ActiveModel::Naming
diff --git a/activemodel/lib/active_model/serializers/xml.rb b/activemodel/lib/active_model/serializers/xml.rb
index 7cdd281223..76a0e54a56 100644
--- a/activemodel/lib/active_model/serializers/xml.rb
+++ b/activemodel/lib/active_model/serializers/xml.rb
@@ -5,7 +5,6 @@ module ActiveModel
   module Serializers
     module Xml
       extend ActiveSupport::Concern
-      include ActiveModel::Attributes
 
       class Serializer < ActiveModel::Serializer #:nodoc:
         class Attribute #:nodoc:
diff --git a/activemodel/test/cases/attributes_test.rb b/activemodel/test/cases/attributes_test.rb
deleted file mode 100644
index 5f3ea839a4..0000000000
--- a/activemodel/test/cases/attributes_test.rb
+++ /dev/null
@@ -1,30 +0,0 @@
-require 'cases/helper'
-
-class AttributesTest < ActiveModel::TestCase
-  class Person
-    include ActiveModel::Attributes
-    attr_accessor :name
-  end
-
-  test "reads attribute" do
-    p = Person.new
-    assert_equal nil, p.read_attribute(:name)
-
-    p.name = "Josh"
-    assert_equal "Josh", p.read_attribute(:name)
-  end
-
-  test "writes attribute" do
-    p = Person.new
-    assert_equal nil, p.name
-
-    p.write_attribute(:name, "Josh")
-    assert_equal "Josh", p.name
-  end
-
-  test "returns all attributes" do
-    p = Person.new
-    p.name = "Josh"
-    assert_equal({"name" => "Josh"}, p.attributes)
-  end
-end
diff --git a/activemodel/test/cases/serializeration/json_serialization_test.rb b/activemodel/test/cases/serializeration/json_serialization_test.rb
index 3e69db110e..6227aedc39 100644
--- a/activemodel/test/cases/serializeration/json_serialization_test.rb
+++ b/activemodel/test/cases/serializeration/json_serialization_test.rb
@@ -3,6 +3,10 @@ require 'models/contact'
 
 class Contact
   include ActiveModel::Serializers::JSON
+
+  def attributes
+    instance_values
+  end
 end
 
 class JsonSerializationTest < ActiveModel::TestCase
diff --git a/activemodel/test/cases/serializeration/xml_serialization_test.rb b/activemodel/test/cases/serializeration/xml_serialization_test.rb
index 57792e900e..e459f6433a 100644
--- a/activemodel/test/cases/serializeration/xml_serialization_test.rb
+++ b/activemodel/test/cases/serializeration/xml_serialization_test.rb
@@ -3,6 +3,10 @@ require 'models/contact'
 
 class Contact
   include ActiveModel::Serializers::Xml
+
+  def attributes
+    instance_values
+  end
 end
 
 class XmlSerializationTest < ActiveModel::TestCase