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

Nest scope under context option

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/action_controller/serialization.rb
View File

@@ -65,7 +65,7 @@ module ActionController
options = default_serializer_options.merge(options)
if serializer = options.fetch(:serializer, ActiveModel::Serializer.serializer_for(resource))
options[:scope] = serialization_scope unless options.has_key?(:scope)
options[:context] = { scope: serialization_scope }.merge!(options[:context] || {})
options[:resource_name] = controller_name if resource.respond_to?(:to_ary)
serializer.new(resource, options)

7
lib/active_model/array_serializer.rb
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

7
lib/active_model/serializer.rb
View File

@@ -103,14 +103,13 @@ end
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]
@wrap_in_array = options[:_wrap_in_array]
end
attr_accessor :object, :context, :scope, :root, :meta_key, :meta
attr_accessor :object, :context, :root, :meta_key, :meta
def json_key
if root == true || root.nil?
@@ -167,7 +166,7 @@ end
def build_serializer(association)
object = send(association.name)
association.build_serializer(object, context: context, scope: scope)
association.build_serializer(object, context: context)
end
def serialize(association)