ditkrg/active_model_serializers
4
0
Fork 0
mirror of https://github.com/ditkrg/active_model_serializers.git synced 2026-01-23 06:16:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1185 from beauby/fix-attributes-include

Browse Source 
Fix options passing in Json and Attributes adapters
This commit is contained in:
L. Preston Sego III 2015-09-21 00:48:16 -05:00
commit 94cee192a9
3 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/active_model/serializer/adapter/attributes.rb
View File

@ -10,7 +10,7 @@ module ActiveModel
def serializable_hash(options = nil)
options ||= {}
if serializer.respond_to?(:each)
result = serializer.map { |s| Attributes.new(s).serializable_hash(options) }
result = serializer.map { |s| Attributes.new(s, instance_options).serializable_hash(options) }
else
hash = {}

2
lib/active_model/serializer/adapter/json.rb
View File

@ -7,7 +7,7 @@ module ActiveModel
def serializable_hash(options = nil)
options ||= {}
{ root => Attributes.new(serializer).serializable_hash(options) }
{ root => Attributes.new(serializer, instance_options).serializable_hash(options) }
end
private

10
test/adapter/json/collection_test.rb
View File

@ -75,6 +75,16 @@ module ActiveModel
assert_equal 1, adapter.serializable_hash[:virtual_values].length
end
def test_include_option
serializer = ArraySerializer.new([@first_post, @second_post])
adapter = ActiveModel::Serializer::Adapter::Json.new(serializer, include: '')
actual = adapter.serializable_hash
expected = { posts: [{ id: 1, title: 'Hello!!', body: 'Hello, world!!' },
{ id: 2, title: 'New Post', body: 'Body' }] }
assert_equal(expected, actual)
end
end
end
end