diff options
| author | José Valim <jose.valim@gmail.com> | 2011-11-25 19:29:39 +0000 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2011-11-25 19:29:39 +0000 |
| commit | 0a4035b12a6c59253cb60f9e3456513c6a6a9d33 (patch) | |
| tree | 513faab640a046e21c4b254b25f1bd601590ba2d /activemodel/lib | |
| parent | 2dab493867d35d27015e3ba00d20ee6d2337320e (diff) | |
| download | rails-0a4035b12a6c59253cb60f9e3456513c6a6a9d33.tar.gz rails-0a4035b12a6c59253cb60f9e3456513c6a6a9d33.tar.bz2 rails-0a4035b12a6c59253cb60f9e3456513c6a6a9d33.zip | |
Revert the serializers API as other alternatives are now also under discussion
Diffstat (limited to 'activemodel/lib')
| -rw-r--r-- | activemodel/lib/active_model.rb | 2 | ||||
| -rw-r--r-- | activemodel/lib/active_model/serializable.rb | 12 |
2 files changed, 0 insertions, 14 deletions
diff --git a/activemodel/lib/active_model.rb b/activemodel/lib/active_model.rb index 6c4fb44b0f..7ea04344f0 100644 --- a/activemodel/lib/active_model.rb +++ b/activemodel/lib/active_model.rb @@ -29,7 +29,6 @@ require 'active_model/version' module ActiveModel extend ActiveSupport::Autoload - autoload :ArraySerializer, 'active_model/serializer' autoload :AttributeMethods autoload :BlockValidator, 'active_model/validator' autoload :Callbacks @@ -46,7 +45,6 @@ module ActiveModel autoload :SecurePassword autoload :Serializable autoload :Serialization - autoload :Serializer autoload :TestCase autoload :Translation autoload :Validations diff --git a/activemodel/lib/active_model/serializable.rb b/activemodel/lib/active_model/serializable.rb index 70e27c5683..86770a25e4 100644 --- a/activemodel/lib/active_model/serializable.rb +++ b/activemodel/lib/active_model/serializable.rb @@ -73,13 +73,6 @@ module ActiveModel autoload :JSON, "active_model/serializable/json" autoload :XML, "active_model/serializable/xml" - module ClassMethods #:nodoc: - def active_model_serializer - return @active_model_serializer if defined?(@active_model_serializer) - @active_model_serializer = "#{self.name}Serializer".safe_constantize - end - end - def serializable_hash(options = nil) options ||= {} @@ -107,11 +100,6 @@ module ActiveModel hash end - # Returns a model serializer for this object considering its namespace. - def active_model_serializer - self.class.active_model_serializer - end - private # Hook method defining how an attribute value should be retrieved for |