From 66f92565348015ba4da7893690f36eeaad3adc74 Mon Sep 17 00:00:00 2001 From: Santiago Pastorino Date: Fri, 1 Nov 2013 14:22:48 -0200 Subject: [PATCH] Embed objects should return singular and not wrap in array Closes #437 --- lib/active_model/serializer.rb | 11 +++++---- lib/active_model/serializer/associations.rb | 24 +++++++++++-------- .../active_record/active_record_test.rb | 2 +- .../active_model/serializer/has_one_test.rb | 8 +++---- 4 files changed, 25 insertions(+), 20 deletions(-) diff --git a/lib/active_model/serializer.rb b/lib/active_model/serializer.rb index 4e215545..6d254ff0 100644 --- a/lib/active_model/serializer.rb +++ b/lib/active_model/serializer.rb @@ -131,7 +131,8 @@ end if association.embed_ids? hash[association.key] = serialize_ids association elsif association.embed_objects? - hash[association.embedded_key] = serialize association + associated_data = send(association.name) + hash[association.embedded_key] = serialize(association, associated_data) end end end @@ -147,15 +148,15 @@ end associations.each_with_object({}) do |(name, association), hash| if included_associations.include? name if association.embed_in_root? - hash[association.embedded_key] = serialize association + associated_data = Array(send(association.name)) + hash[association.root_key] = serialize(association, associated_data) end end end end - def serialize(association) - associated_data = send(association.name) - association.build_serializer(associated_data).serializable_object + def serialize(association, object) + association.build_serializer(object).serializable_object end def serialize_ids(association) diff --git a/lib/active_model/serializer/associations.rb b/lib/active_model/serializer/associations.rb index 93319e76..3d7451a8 100644 --- a/lib/active_model/serializer/associations.rb +++ b/lib/active_model/serializer/associations.rb @@ -17,24 +17,22 @@ module ActiveModel @embed_in_root = options.fetch(:embed_in_root) { options.fetch(:include) { CONFIG.embed_in_root } } @embed_key = options[:embed_key] || :id @key = options[:key] + @embedded_key = options[:root] || name self.serializer_class = @options[:serializer] end attr_reader :name, :embed_ids, :embed_objects, :serializer_class - attr_accessor :embed_in_root, :embed_key, :key, :embedded_key, :options + attr_accessor :embed_in_root, :embed_key, :key, :embedded_key, :root_key, :options alias embed_ids? embed_ids alias embed_objects? embed_objects alias embed_in_root? embed_in_root def serializer_class=(serializer) @serializer_class = serializer.is_a?(String) ? serializer.constantize : serializer - if @serializer_class && !(@serializer_class <= ArraySerializer) @options.merge!(each_serializer: @serializer_class) @serializer_class = ArraySerializer - else - @serializer_class ||= ArraySerializer end end @@ -43,24 +41,30 @@ module ActiveModel @embed_objects = embed == :object || embed == :objects end - def build_serializer(object) - @serializer_class.new(Array(object), @options) - end - class HasOne < Association def initialize(name, *args) super - @embedded_key = "#{@options[:root] || name}".pluralize + @root_key = @embedded_key.to_s.pluralize @key ||= "#{name}_id" end + + def build_serializer(object) + @serializer_class ||= Serializer.serializer_for(object) || DefaultSerializer + @serializer_class.new(object, @options) + end end class HasMany < Association def initialize(name, *args) super - @embedded_key = @options[:root] || name + @root_key = @embedded_key @key ||= "#{name.to_s.singularize}_ids" end + + def build_serializer(object) + @serializer_class ||= ArraySerializer + @serializer_class.new(object, @options) + end end end end diff --git a/test/integration/active_record/active_record_test.rb b/test/integration/active_record/active_record_test.rb index 8e42d446..9d9ac637 100644 --- a/test/integration/active_record/active_record_test.rb +++ b/test/integration/active_record/active_record_test.rb @@ -17,7 +17,7 @@ module ActiveModel ar_comments: [{ body: 'what a dumb post', ar_tags: [{ name: 'short' }, { name: 'whiny' }] }, { body: 'i liked it', ar_tags: [{:name=>"short"}, {:name=>"happy"}] }], ar_tags: [{ name: 'short' }, { name: 'whiny' }, { name: 'happy' }], - 'ar_sections' => [{ 'name' => 'ruby' }] + ar_section: { 'name' => 'ruby' } } }, post_serializer.as_json) end diff --git a/test/unit/active_model/serializer/has_one_test.rb b/test/unit/active_model/serializer/has_one_test.rb index b544670f..c39d79ad 100644 --- a/test/unit/active_model/serializer/has_one_test.rb +++ b/test/unit/active_model/serializer/has_one_test.rb @@ -50,7 +50,7 @@ module ActiveModel @association.embed = :objects assert_equal({ - name: 'Name 1', email: 'mail@server.com', 'profiles' => [{ name: 'N1', description: 'D1' }] + name: 'Name 1', email: 'mail@server.com', profile: { name: 'N1', description: 'D1' } }, @user_serializer.serializable_hash) end @@ -58,7 +58,7 @@ module ActiveModel @association.embed = :objects assert_equal({ - 'user' => { name: 'Name 1', email: 'mail@server.com', 'profiles' => [{ name: 'N1', description: 'D1' }] } + 'user' => { name: 'Name 1', email: 'mail@server.com', profile: { name: 'N1', description: 'D1' } } }, @user_serializer.as_json) end @@ -84,7 +84,7 @@ module ActiveModel end assert_equal({ - 'user' => { name: 'Name 1', email: 'mail@server.com', 'profiles' => [] } + 'user' => { name: 'Name 1', email: 'mail@server.com', profile: nil } }, @user_serializer.as_json) end @@ -93,7 +93,7 @@ module ActiveModel @association.embedded_key = 'root' assert_equal({ - name: 'Name 1', email: 'mail@server.com', 'root' => [{ name: 'N1', description: 'D1' }] + name: 'Name 1', email: 'mail@server.com', 'root' => { name: 'N1', description: 'D1' } }, @user_serializer.serializable_hash) end