Refactor adapters to implement support for array serialization

lib/active_model/serializer/adapter.rb

@@ -17,13 +17,7 @@ module ActiveModel
       end
 
       def to_json(options = {})
-        result = serializable_hash(options)
-
-        if root = options.fetch(:root, serializer.json_key)
-          result = { root => result }
-        end
-
-        result.to_json
+        serializable_hash(options).to_json
       end
     end
   end

lib/active_model/serializer/adapter/json.rb

@@ -3,18 +3,26 @@ module ActiveModel
     class Adapter
       class Json < Adapter
         def serializable_hash(options = {})
-          @hash = serializer.attributes(options)
+          if serializer.respond_to?(:each)
+            @result = serializer.map{|s| self.class.new(s).serializable_hash }
+          else
+            @result = serializer.attributes(options)
 
-          serializer.each_association do |name, association, options|
-            if association.respond_to?(:each)
-              array_serializer = association
-              @hash[name] = array_serializer.map { |item| item.attributes(options) }
-            else
-              @hash[name] = association.attributes(options)
+            serializer.each_association do |name, association, opts|
+              if association.respond_to?(:each)
+                array_serializer = association
+                @result[name] = array_serializer.map { |item| item.attributes(opts) }
+              else
+                @result[name] = association.attributes(options)
+              end
             end
           end
 
-          @hash
+          if root = options.fetch(:root, serializer.json_key)
+            @result = { root => @result }
+          end
+
+          @result
         end
       end
     end

lib/active_model/serializer/adapter/json_api.rb

@@ -4,22 +4,29 @@ module ActiveModel
       class JsonApi < Adapter
         def initialize(serializer, options = {})
           super
-          serializer.root ||= true
+          serializer.root = true
         end
 
-        def serializable_hash(opts = {})
-          @hash = serializer.attributes
+        def serializable_hash(options = {})
+          @root = (options[:root] || serializer.json_key).to_s.pluralize.to_sym
+          @hash = {}
 
-          serializer.each_association do |name, association, options|
-            @hash[:links] ||= {}
-            unless options[:embed] == :ids
-              @hash[:linked] ||= {}
-            end
+          if serializer.respond_to?(:each)
+            @hash[@root] = serializer.map{|s| self.class.new(s).serializable_hash[@root] }
+          else
+            @hash[@root] = serializer.attributes
 
-            if association.respond_to?(:each)
-              add_links(name, association, options)
-            else
-              add_link(name, association, options)
+            serializer.each_association do |name, association, opts|
+              @hash[@root][:links] ||= {}
+              unless options[:embed] == :ids
+                @hash[:linked] ||= {}
+              end
+
+              if association.respond_to?(:each)
+                add_links(name, association, opts)
+              else
+                add_link(name, association, opts)
+              end
             end
           end
 
@@ -27,8 +34,8 @@ module ActiveModel
         end
 
         def add_links(name, serializers, options)
-          @hash[:links][name] ||= []
-          @hash[:links][name] += serializers.map(&:id)
+          @hash[@root][:links][name] ||= []
+          @hash[@root][:links][name] += serializers.map(&:id)
 
           unless options[:embed] == :ids
             @hash[:linked][name] ||= []
@@ -37,7 +44,7 @@ module ActiveModel
         end
 
         def add_link(name, serializer, options)
-          @hash[:links][name] = serializer.id
+          @hash[@root][:links][name] = serializer.id
 
           unless options[:embed] == :ids
             plural_name = name.to_s.pluralize.to_sym

lib/active_model/serializer/array_serializer.rb

@@ -10,6 +10,14 @@ module ActiveModel
           serializer_class.new(object)
         end
       end
+
+      def json_key
+        @objects.first.json_key if @objects.first
+      end
+
+      def root=(root)
+        @objects.first.root = root if @objects.first
+      end
     end
   end
 end