Add support for Json adapter.

Author: beauby

lib/active_model/serializer.rb

@@ -6,6 +6,7 @@
 require 'active_model/serializer/configuration'
 require 'active_model/serializer/fieldset'
 require 'active_model/serializer/lint'
+require 'active_model/serializer/utils'
 
 module ActiveModel
   class Serializer

lib/active_model/serializer/adapter/attributes.rb

@@ -7,42 +7,39 @@ def initialize(serializer, options = {})
           @include_tree = IncludeTree.from_include_args(options[:include] || '*')
         end
 
+        def serializable_hash_for_collection(options)
+          serializer.map { |s| Attributes.new(s, instance_options).serializable_hash(options) }
+        end
+
+        def serializable_hash_for_single_resource(options)
+          hash = {}
+
+          core = cache_check(serializer) do
+            serializer.attributes(options)
+          end
+
+          serializer.associations(@include_tree).each do |association|
+            hash[association.key] =
+              if association.options[:virtual_value]
+                association.options[:virtual_value]
+              elsif association.serializer && association.serializer.object
+                Attributes.new(association.serializer, association.options.merge(include: @include_tree[association.key]))
+                  .serializable_hash(options)
+              end
+          end
+          result = core.merge hash
+
+          result
+        end
+
         def serializable_hash(options = nil)
           options ||= {}
+
           if serializer.respond_to?(:each)
-            result = serializer.map { |s| Attributes.new(s, instance_options).serializable_hash(options) }
+            serializable_hash_for_collection(options)
           else
-            hash = {}
-
-            core = cache_check(serializer) do
-              serializer.attributes(options)
-            end
-
-            serializer.associations(@include_tree).each do |association|
-              serializer = association.serializer
-              association_options = association.options
-
-              if serializer.respond_to?(:each)
-                array_serializer = serializer
-                hash[association.key] = array_serializer.map do |item|
-                  cache_check(item) do
-                    item.attributes(association_options)
-                  end
-                end
-              else
-                hash[association.key] =
-                  if serializer && serializer.object
-                    cache_check(serializer) do
-                      serializer.attributes(options)
-                    end
-                  elsif association_options[:virtual_value]
-                    association_options[:virtual_value]
-                  end
-              end
-            end
-            result = core.merge hash
+            serializable_hash_for_single_resource(options)
           end
-          result
         end
 
         def fragment_cache(cached_hash, non_cached_hash)

lib/active_model/serializer/adapter/json.rb

@@ -5,11 +5,6 @@ class Json < Base
         extend ActiveSupport::Autoload
         autoload :FragmentCache
 
-        def initialize(serializer, options = {})
-          super
-          @included = ActiveModel::Serializer::Utils.include_args_to_hash(instance_options[:include] || '*')
-        end
-
         def serializable_hash(options = nil)
           options ||= {}
 

test/adapter/json_api/nested_serializers_test.rb

@@ -2,7 +2,7 @@
 
 module ActiveModel
   class Serializer
-    class Adapter
+    module Adapter
       class JsonApi
         class NestedSerializersTest < Minitest::Test
           def setup
@@ -18,11 +18,15 @@ def setup
           end
 
           def test_nested_serializers
-            hash = with_adapter :json_api do
-              ActiveModel::SerializableResource.new(@tweet).serializable_hash
-            end
-
-            assert_equal(nil, hash)
+            actual = ActiveModel::SerializableResource.new(@tweet, adapter: :json_api).serializable_hash
+            expected = {
+              data: {
+                id: '1', type: 'tweets', attributes: { body: 'Tweet 1', date: 'Jan 15' },
+                relationships: { author: { data: { id: '1', type: 'authors' } },
+                                 shares: { data: [{ id: '1', type: 'shares' }] } }
+              }
+            }
+            assert_equal(expected, actual)
           end
         end
       end