Revert "Implement ArraySerializer and move old serialization API to a…

… new namespace." This reverts commit 8896b4f. Conflicts: activemodel/lib/active_model.rb activemodel/lib/active_model/serializable.rb activemodel/lib/active_model/serializer.rb activemodel/test/cases/serializer_test.rb
treybean · Nov 30, 2011 · 5b2eb64 · 5b2eb64
1 parent be99f0c
commit 5b2eb64
Show file tree

Hide file tree

Showing 16 changed files with 431 additions and 734 deletions.
diff --git a/activemodel/CHANGELOG.md b/activemodel/CHANGELOG.md
@@ -5,14 +5,6 @@
 
     *Jon Leighton*
 
-*   Renamed (with a deprecation the following constants):
-
-        ActiveModel::Serialization     => ActiveModel::Serializable
-        ActiveModel::Serializers::JSON => ActiveModel::Serializable::JSON
-        ActiveModel::Serializers::Xml  => ActiveModel::Serializable::XML
-
-    *José Valim*
-
 *   Add ActiveModel::Errors#added? to check if a specific error has been added *Martin Svalin*
 
 *   Add ability to define strict validation(with :strict => true option) that always raises exception when fails *Bogdan Gusiev*

diff --git a/activemodel/lib/active_model.rb b/activemodel/lib/active_model.rb
@@ -43,7 +43,6 @@ module ActiveModel
   autoload :Observer, 'active_model/observing'
   autoload :Observing
   autoload :SecurePassword
-  autoload :Serializable
   autoload :Serialization
   autoload :TestCase
   autoload :Translation

diff --git a/activemodel/lib/active_model/serializable.rb b/activemodel/lib/active_model/serializable.rb
diff --git a/activemodel/lib/active_model/serializable/json.rb b/activemodel/lib/active_model/serializable/json.rb