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.

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

Add support for embed: :ids option for in associations #677

Merged
merged 1 commit into from
Oct 14, 2014
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
24 changes: 16 additions & 8 deletions lib/active_model/serializer/adapter/json_api.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,14 @@ module ActiveModel
class Serializer
class Adapter
class JsonApi < Adapter
def serializable_hash(options = {})
def serializable_hash(opts = {})
@hash = serializer.attributes

serializer.each_association do |name, association, options|
@hash[:links] ||= {}
@hash[:linked] ||= {}
unless options[:embed] == :ids
@hash[:linked] ||= {}
end

if association.respond_to?(:each)
add_links(name, association, options)
Expand All @@ -21,17 +23,23 @@ def serializable_hash(options = {})

def add_links(name, serializers, options)
@hash[:links][name] ||= []
@hash[:linked][name] ||= []
@hash[:links][name] += serializers.map(&:id)
@hash[:linked][name] += serializers.map { |item| item.attributes(options) }

unless options[:embed] == :ids
@hash[:linked][name] ||= []
@hash[:linked][name] += serializers.map { |item| item.attributes(options) }
end
end

def add_link(name, serializer, options)
plural_name = name.to_s.pluralize.to_sym
@hash[:linked][plural_name] ||= []

@hash[:links][name] = serializer.id
@hash[:linked][plural_name].push serializer.attributes(options)

unless options[:embed] == :ids
plural_name = name.to_s.pluralize.to_sym

@hash[:linked][plural_name] ||= []
@hash[:linked][plural_name].push serializer.attributes(options)
end
end
end
end
Expand Down
31 changes: 31 additions & 0 deletions test/adapter/json_api/has_many_embed_ids.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
require 'test_helper'

module ActiveModel
class Serializer
class Adapter
class JsonApi
class HasManyEmbedIdsTest < Minitest::Test
def setup
@author = Author.new(name: 'Steve K.')
@first_post = Post.new(id: 1, title: 'Hello!!', body: 'Hello, world!!')
@second_post = Post.new(id: 2, title: 'New Post', body: 'Body')
@author.posts = [@first_post, @second_post]
@first_post.author = @author
@second_post.author = @author

@serializer = AuthorSerializer.new(@author)
@adapter = ActiveModel::Serializer::Adapter::JsonApi.new(@serializer)
end

def test_includes_comment_ids
assert_equal([1, 2], @adapter.serializable_hash[:links][:posts])
end

def test_no_includes_linked_comments
assert_nil @adapter.serializable_hash[:linked]
end
end
end
end
end
end
7 changes: 7 additions & 0 deletions test/fixtures/poro.rb
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ class ProfileSerializer < ActiveModel::Serializer

Post = Class.new(Model)
Comment = Class.new(Model)
Author = Class.new(Model)

PostSerializer = Class.new(ActiveModel::Serializer) do
attributes :title, :body, :id
Expand All @@ -47,3 +48,9 @@ class ProfileSerializer < ActiveModel::Serializer

belongs_to :post
end

AuthorSerializer = Class.new(ActiveModel::Serializer) do
attributes :id, :name

has_many :posts, embed: :ids
end