Nest scope under context option

This commit is contained in:
Adrian Mugnolo and Santiago Pastorino
2014-01-06 15:35:21 -02:00
committed by Santiago Pastorino
parent 8bd2542ed2
commit 0d8ef2b165
9 changed files with 56 additions and 85 deletions

View File

@@ -14,15 +14,14 @@ module ActiveModel
def initialize(object, options={})
@object = object
@context = options[:context]
@scope = options[:scope]
@context = options[:context] || {}
@root = options.fetch(:root, self.class._root)
@meta_key = options[:meta_key] || :meta
@meta = options[@meta_key]
@each_serializer = options[:each_serializer]
@resource_name = options[:resource_name]
end
attr_accessor :object, :context, :scope, :root, :meta_key, :meta
attr_accessor :object, :context, :root, :meta_key, :meta
def json_key
if root.nil?
@@ -34,7 +33,7 @@ module ActiveModel
def serializer_for(item)
serializer_class = @each_serializer || Serializer.serializer_for(item) || DefaultSerializer
serializer_class.new(item, context: context, scope: scope)
serializer_class.new(item, context: context)
end
def serializable_object