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

Move key's initialization code to initializers

Browse Source
This commit is contained in:
Santiago Pastorino 2013-08-26 15:43:59 -03:00
parent 280fd65db8
commit af34adc7b5
3 changed files with 30 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
lib/active_model/serializer/associations.rb
View File

@ -7,15 +7,17 @@ module ActiveModel
@name = name
@options = options
self.embed = options[:embed]
@embed_key = options[:embed_key] || :id
@include = options[:include]
self.embed = options[:embed]
@embed_key = options[:embed_key] || :id
@include = options[:include]
@key = options[:key]
@embedded_key = options[:root]
self.serializer_class = @options[:serializer]
end
attr_reader :name, :embed_ids, :embed_objects, :embed_key, :serializer_class, :options
attr_accessor :include
attr_accessor :include, :key, :embedded_key
alias embed_ids? embed_ids
alias embed_objects? embed_objects
alias include? include
@ -44,22 +46,18 @@ module ActiveModel
end
class HasOne < Association
def key
@options[:key] || "#{name}_id"
end
def embedded_key
@options[:root] || name.pluralize
def initialize(*args)
super
@key ||= "#{name}_id"
@embedded_key ||= name.pluralize
end
end
class HasMany < Association
def key
@options[:key] || "#{name.singularize}_ids"
end
def embedded_key
@options[:root] || name
def initialize(*args)
super
@key ||= "#{name.singularize}_ids"
@embedded_key ||= name
end
end
end

12
test/unit/active_model/serializer/has_many_test.rb
View File

@ -9,8 +9,6 @@ module ActiveModel
@association = PostSerializer._associations[0]
@association.include = false
@association.embed = :ids
@association.options[:root] = nil
@association.options[:key] = nil
end
def test_associations_definition
@ -32,10 +30,13 @@ module ActiveModel
end
def test_associations_embedding_ids_serialization_using_serializable_hash_and_key_from_options
@association.options[:key] = 'key'
old_key = @association.key
@association.key = 'key'
assert_equal({
'title' => 'Title 1', 'body' => 'Body 1', 'key' => @post.comments.map { |c| c.object_id }
}, @post_serializer.serializable_hash)
ensure
@association.key = old_key
end
def test_associations_embedding_objects_serialization_using_serializable_hash
@ -54,10 +55,13 @@ module ActiveModel
def test_associations_embedding_objects_serialization_using_serializable_hash_and_root_from_options
@association.embed = :objects
@association.options[:root] = 'root'
old_embedded_key = @association.embedded_key
@association.embedded_key = 'root'
assert_equal({
'title' => 'Title 1', 'body' => 'Body 1', 'root' => [{ 'content' => 'C1' }, { 'content' => 'C2' }]
}, @post_serializer.serializable_hash)
ensure
@association.embedded_key = old_embedded_key
end
def test_associations_embedding_ids_including_objects_serialization_using_serializable_hash

12
test/unit/active_model/serializer/has_one_test.rb
View File

@ -9,8 +9,6 @@ module ActiveModel
@association = UserSerializer._associations[0]
@association.include = false
@association.embed = :ids
@association.options[:root] = nil
@association.options[:key] = nil
end
def test_associations_definition
@ -32,10 +30,13 @@ module ActiveModel
end
def test_associations_embedding_ids_serialization_using_serializable_hash_and_key_from_options
@association.options[:key] = 'key'
old_key = @association.key
@association.key = 'key'
assert_equal({
'name' => 'Name 1', 'email' => 'mail@server.com', 'key' => @user.profile.object_id
}, @user_serializer.serializable_hash)
ensure
@association.key = old_key
end
def test_associations_embedding_objects_serialization_using_serializable_hash
@ -54,10 +55,13 @@ module ActiveModel
def test_associations_embedding_objects_serialization_using_serializable_hash_and_root_from_options
@association.embed = :objects
@association.options[:root] = 'root'
old_embedded_key = @association.embedded_key
@association.embedded_key = 'root'
assert_equal({
'name' => 'Name 1', 'email' => 'mail@server.com', 'root' => [{ 'name' => 'N1', 'description' => 'D1' }]
}, @user_serializer.serializable_hash)
ensure
@association.embedded_key = old_embedded_key
end
def test_associations_embedding_ids_including_objects_serialization_using_serializable_hash