From 5b2eb64ceb08cd005dc06b721935de5853971473 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Wed, 30 Nov 2011 18:38:28 +0100
Subject: Revert "Implement ArraySerializer and move old serialization API to a
 new namespace."

This reverts commit 8896b4fdc8a543157cdf4dfc378607ebf6c10ab0.

Conflicts:

	activemodel/lib/active_model.rb
	activemodel/lib/active_model/serializable.rb
	activemodel/lib/active_model/serializer.rb
	activemodel/test/cases/serializer_test.rb
---
 activemodel/lib/active_model/serializable.rb | 144 ---------------------------
 1 file changed, 144 deletions(-)
 delete mode 100644 activemodel/lib/active_model/serializable.rb

(limited to 'activemodel/lib/active_model/serializable.rb')

diff --git a/activemodel/lib/active_model/serializable.rb b/activemodel/lib/active_model/serializable.rb
deleted file mode 100644
index 86770a25e4..0000000000
--- a/activemodel/lib/active_model/serializable.rb
+++ /dev/null
@@ -1,144 +0,0 @@
-require 'active_support/core_ext/hash/except'
-require 'active_support/core_ext/hash/slice'
-require 'active_support/core_ext/array/wrap'
-require 'active_support/core_ext/string/inflections'
-
-module ActiveModel
-  # == Active Model Serializable
-  #
-  # Provides a basic serialization to a serializable_hash for your object.
-  #
-  # A minimal implementation could be:
-  #
-  #   class Person
-  #
-  #     include ActiveModel::Serializable
-  #
-  #     attr_accessor :name
-  #
-  #     def attributes
-  #       {'name' => name}
-  #     end
-  #
-  #   end
-  #
-  # Which would provide you with:
-  #
-  #   person = Person.new
-  #   person.serializable_hash   # => {"name"=>nil}
-  #   person.name = "Bob"
-  #   person.serializable_hash   # => {"name"=>"Bob"}
-  #
-  # You need to declare some sort of attributes hash which contains the attributes
-  # you want to serialize and their current value.
-  #
-  # Most of the time though, you will want to include the JSON or XML
-  # serializations. Both of these modules automatically include the
-  # ActiveModel::Serialization module, so there is no need to explicitly
-  # include it.
-  #
-  # So a minimal implementation including XML and JSON would be:
-  #
-  #   class Person
-  #
-  #     include ActiveModel::Serializable::JSON
-  #     include ActiveModel::Serializable::XML
-  #
-  #     attr_accessor :name
-  #
-  #     def attributes
-  #       {'name' => name}
-  #     end
-  #
-  #   end
-  #
-  # Which would provide you with:
-  #
-  #   person = Person.new
-  #   person.serializable_hash   # => {"name"=>nil}
-  #   person.as_json             # => {"name"=>nil}
-  #   person.to_json             # => "{\"name\":null}"
-  #   person.to_xml              # => "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<serial-person...
-  #
-  #   person.name = "Bob"
-  #   person.serializable_hash   # => {"name"=>"Bob"}
-  #   person.as_json             # => {"name"=>"Bob"}
-  #   person.to_json             # => "{\"name\":\"Bob\"}"
-  #   person.to_xml              # => "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<serial-person...
-  #
-  # Valid options are <tt>:only</tt>, <tt>:except</tt> and <tt>:methods</tt> .
-  module Serializable
-    extend ActiveSupport::Concern
-
-    autoload :JSON, "active_model/serializable/json"
-    autoload :XML,  "active_model/serializable/xml"
-
-    def serializable_hash(options = nil)
-      options ||= {}
-
-      attribute_names = attributes.keys.sort
-      if only = options[:only]
-        attribute_names &= Array.wrap(only).map(&:to_s)
-      elsif except = options[:except]
-        attribute_names -= Array.wrap(except).map(&:to_s)
-      end
-
-      hash = {}
-      attribute_names.each { |n| hash[n] = read_attribute_for_serialization(n) }
-
-      method_names = Array.wrap(options[:methods]).select { |n| respond_to?(n) }
-      method_names.each { |n| hash[n] = send(n) }
-
-      serializable_add_includes(options) do |association, records, opts|
-        hash[association] = if records.is_a?(Enumerable)
-          records.map { |a| a.serializable_hash(opts) }
-        else
-          records.serializable_hash(opts)
-        end
-      end
-
-      hash
-    end
-
-  private
-
-    # Hook method defining how an attribute value should be retrieved for
-    # serialization. By default this is assumed to be an instance named after
-    # the attribute. Override this method in subclasses should you need to
-    # retrieve the value for a given attribute differently:
-    #
-    #   class MyClass
-    #     include ActiveModel::Validations
-    #
-    #     def initialize(data = {})
-    #       @data = data
-    #     end
-    #
-    #     def read_attribute_for_serialization(key)
-    #       @data[key]
-    #     end
-    #   end
-    #
-    alias :read_attribute_for_serialization :send
-
-    # Add associations specified via the <tt>:include</tt> option.
-    #
-    # Expects a block that takes as arguments:
-    #   +association+ - name of the association
-    #   +records+     - the association record(s) to be serialized
-    #   +opts+        - options for the association records
-    def serializable_add_includes(options = {}) #:nodoc:
-      return unless include = options[:include]
-
-      unless include.is_a?(Hash)
-        include = Hash[Array.wrap(include).map { |n| n.is_a?(Hash) ? n.to_a.first : [n, {}] }]
-      end
-
-      include.each do |association, opts|
-        if records = send(association)
-          yield association, records, opts
-        end
-      end
-    end
-  end
-end
-- 
cgit v1.2.3