Fix bug causing missing fields (#80)

- Fixes bug caused by commit #0623552e153f0a1a30660e4d2b5bd0ddfee9d8a4

Author: aribouius

lib/jsonapi_compliable/util/render_options.rb

@@ -16,8 +16,8 @@ def self.generate(object, query_hash, overrides = {})
         extra_fields = query_hash[:extra_fields]
 
         # Ensure fields doesnt clobber extra fields
-        if extra_fields.any? && fields.any?
-          extra_fields.each { |k,v| fields[k] = fields[k].to_a + v }
+        extra_fields.each do |k,v|
+          fields[k] = fields[k] + v if fields[k]
         end
 
         options            = {}

spec/integration/rails/finders_spec.rb

@@ -304,6 +304,22 @@ def json
         expect(hobby).to_not have_key('description')
       end
 
+      it 'allows extra fields and sparse fieldsets for multiple resources' do
+        get :index, params: {
+          include: 'hobbies,books',
+          fields: { hobbies: 'name', books: 'title',  },
+          extra_fields: { hobbies: 'reason', books: 'alternate_title' },
+        }
+        hobby = json_includes('hobbies')[0]['attributes']
+        book = json_includes('books')[0]['attributes']
+        expect(hobby).to have_key('name')
+        expect(hobby).to have_key('reason')
+        expect(hobby).to_not have_key('description')
+        expect(book).to have_key('title')
+        expect(book).to have_key('alternate_title')
+        expect(book).to_not have_key('pages')
+      end
+
       it 'does not duplicate results' do
         get :index, params: { include: 'hobbies' }
         author1_relationships = json['data'][0]['relationships']