Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix options passing in Json and Attributes adapters #1185

Merged
merged 2 commits into from
Sep 21, 2015
Merged

Fix options passing in Json and Attributes adapters #1185

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
88785ea
Add failing test.
beauby Sep 21, 2015
4976837
Fix options passing in Json and Attributes adapters.
beauby Sep 21, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/active_model/serializer/adapter/attributes.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ def initialize(serializer, options = {})
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 = {}

Expand Down
2 changes: 1 addition & 1 deletion lib/active_model/serializer/adapter/json.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ class Json < Base

def serializable_hash(options = nil)
options ||= {}
{ root => Attributes.new(serializer).serializable_hash(options) }
{ root => Attributes.new(serializer, instance_options).serializable_hash(options) }
end

private
Expand Down
10 changes: 10 additions & 0 deletions test/adapter/json/collection_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,16 @@ def test_root_is_underscored

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: '')
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what did it do before?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It disregarded the include option.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It did so every time for the Json adapter, and only for collections for the Attribute adapter.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok, but when it failed, how was the output different? (lazy me)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It did include stuff, although it was explicitly told not to.

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
Expand Down