ditkrg/active_model_serializers
5
0
Fork 0
mirror of https://github.com/ditkrg/active_model_serializers.git synced 2026-01-25 07:16:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

test for namespaced associations + bug fixed

Browse Source
This commit is contained in:
Theodore Konukhov
2014-08-29 06:11:40 +02:00
parent dde1492934
commit b297f17e53
4 changed files with 23 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -38,8 +38,8 @@ module ActiveModel
@embed_objects = embed == :object || embed == :objects
end
def serializer_from_object(object)
Serializer.serializer_for(object)
def serializer_from_object(object, options = {})
Serializer.serializer_for(object, options)
end
def default_serializer
@@ -47,7 +47,7 @@ module ActiveModel
end
def build_serializer(object, options = {})
serializer_class(object).new(object, options.merge(self.options))
serializer_class(object, options).new(object, options.merge(self.options))
end
class HasOne < Association
@@ -57,8 +57,8 @@ module ActiveModel
@key ||= "#{name}_id"
end
def serializer_class(object)
serializer_from_options || serializer_from_object(object) || default_serializer
def serializer_class(object, options = {})
serializer_from_options || serializer_from_object(object, options) || default_serializer
end
def build_serializer(object, options = {})
@@ -74,7 +74,7 @@ module ActiveModel
@key ||= "#{name.to_s.singularize}_ids"
end
def serializer_class(object)
def serializer_class(object, _ = {})
if use_array_serializer?
ArraySerializer
else