add fields to adapter initialize function, pull in master, add tests using includes with fields

Author: arenoir

lib/action_controller/serialization.rb

@@ -6,7 +6,7 @@ module Serialization
 
     include ActionController::Renderers
 
-    ADAPTER_OPTION_KEYS = [:include, :root]
+    ADAPTER_OPTION_KEYS = [:include, :fields, :root]
 
     [:_render_option_json, :_render_with_renderer_json].each do |renderer_method|
       define_method renderer_method do |resource, options|

lib/active_model/serializer/adapter.rb

@@ -18,11 +18,7 @@ def serializable_hash(options = {})
       end
 
       def as_json(options = {})
-        if fields = options.delete(:fields)
-          options[:fieldset] = ActiveModel::Serializer::Fieldset.new(fields, serializer.json_key)
-        end
-
-        serializable_hash(options).to_json
+        serializable_hash(options)
       end
     end
   end

lib/active_model/serializer/adapter/json_api.rb

@@ -7,15 +7,20 @@ def initialize(serializer, options = {})
           serializer.root = true
           @hash = {}
           @top = @options.fetch(:top) { @hash }
+
+          if fields = options.delete(:fields)
+            @fieldset = ActiveModel::Serializer::Fieldset.new(fields, serializer.json_key)
+          else
+            @fieldset = options[:fieldset]
+          end
         end
 
         def serializable_hash(options = {})
           @root = (@options[:root] || serializer.json_key.to_s.pluralize).to_sym
-          @fieldset = options[:fieldset]
 
           if serializer.respond_to?(:each)
             @hash[@root] = serializer.map do |s|
-              self.class.new(s, @options.merge(top: @top)).serializable_hash[@root]
+              self.class.new(s, @options.merge(top: @top, fieldset: @fieldset)).serializable_hash[@root]
             end
           else
             @hash[@root] = attributes_for_serializer(serializer, @options)
@@ -94,7 +99,6 @@ def add_linked(resource, serializer, parent = nil)
         private
 
         def attributes_for_serializer(serializer, options)
-
           if fields = @fieldset && @fieldset.fields_for(serializer)
             options[:fields] = fields
           end

test/adapter/json_api/belongs_to_test.rb

@@ -34,6 +34,11 @@ def test_includes_linked_post
             assert_equal([{id: "42", title: 'New Post', body: 'Body'}], @adapter.serializable_hash[:linked][:posts])
           end
 
+          def test_limiting_linked_post_fields
+            @adapter = ActiveModel::Serializer::Adapter::JsonApi.new(@serializer, include: 'post', fields: {post: [:title]})
+            assert_equal([{title: 'New Post'}], @adapter.serializable_hash[:linked][:posts])
+          end
+
           def test_include_nil_author
             serializer = PostSerializer.new(@anonymous_post)
             adapter = ActiveModel::Serializer::Adapter::JsonApi.new(serializer)

test/adapter/json_api/collection_test.rb

@@ -25,6 +25,15 @@ def test_include_multiple_posts
                            { title: "New Post", body: "Body", id: "2", links: { comments: [], author: "1" } }
                          ], @adapter.serializable_hash[:posts])
           end
+
+          def test_limiting_fields
+            @adapter = ActiveModel::Serializer::Adapter::JsonApi.new(@serializer, fields: ['title'])
+            assert_equal([
+              { title: "Hello!!", links: { comments: [], author: "1" } },
+              { title: "New Post", links: { comments: [], author: "1" } }
+            ], @adapter.serializable_hash[:posts])
+          end
+
         end
       end
     end

test/adapter/json_api/fieldset_test.rb

@@ -40,6 +40,14 @@ def test_includes_linked_comments
                          ], @adapter.serializable_hash[:linked][:comments])
           end
 
+          def test_limit_fields_of_linked_comments
+            @adapter = ActiveModel::Serializer::Adapter::JsonApi.new(@serializer, include: 'comments', fields: {comment: [:body]})
+            assert_equal([
+                           {body: 'ZOMG A COMMENT'},
+                           {body: 'ZOMG ANOTHER COMMENT'}
+                         ], @adapter.serializable_hash[:linked][:comments])
+          end
+
           def test_no_include_linked_if_comments_is_empty
             serializer = PostSerializer.new(@post_without_comments)
             adapter = ActiveModel::Serializer::Adapter::JsonApi.new(serializer)