Revert "Implement ArraySerializer and move old serialization API to a new namespace."

This reverts commit 8896b4fdc8.

Conflicts:

	activemodel/lib/active_model.rb
	activemodel/lib/active_model/serializable.rb
	activemodel/lib/active_model/serializer.rb
	activemodel/test/cases/serializer_test.rb
This commit is contained in:
José Valim
2011-11-30 18:38:28 +01:00
parent be99f0c7eb
commit 5b2eb64ceb
16 changed files with 433 additions and 736 deletions

View File

@@ -3,7 +3,7 @@ require 'active_support/core_ext/object/instance_variables'
class SerializationTest < ActiveModel::TestCase
class User
include ActiveModel::Serializable
include ActiveModel::Serialization
attr_accessor :name, :email, :gender, :address, :friends
@@ -22,7 +22,7 @@ class SerializationTest < ActiveModel::TestCase
end
class Address
include ActiveModel::Serializable
include ActiveModel::Serialization
attr_accessor :street, :city, :state, :zip

View File

@@ -5,7 +5,7 @@ require 'active_support/core_ext/object/instance_variables'
class Contact
extend ActiveModel::Naming
include ActiveModel::Serializable::JSON
include ActiveModel::Serializers::JSON
include ActiveModel::Validations
def attributes=(hash)

View File

@@ -5,7 +5,7 @@ require 'ostruct'
class Contact
extend ActiveModel::Naming
include ActiveModel::Serializable::XML
include ActiveModel::Serializers::Xml
attr_accessor :address, :friends
@@ -26,7 +26,7 @@ end
class Address
extend ActiveModel::Naming
include ActiveModel::Serializable::XML
include ActiveModel::Serializers::Xml
attr_accessor :street, :city, :state, :zip