Skip to content

Commit 2962f3f

Browse files
committed
Reimplement serialization scope and scope_name
1 parent a824376 commit 2962f3f

File tree

2 files changed

+32
-4
lines changed

2 files changed

+32
-4
lines changed

lib/action_controller/serialization.rb

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,16 @@ module Serialization
88

99
ADAPTER_OPTION_KEYS = [:include, :fields, :root, :adapter]
1010

11+
included do
12+
class_attribute :_serialization_scope
13+
self._serialization_scope = :current_user
14+
end
15+
16+
def serialization_scope
17+
send(_serialization_scope) if _serialization_scope &&
18+
respond_to?(_serialization_scope, true)
19+
end
20+
1121
def get_serializer(resource)
1222
@_serializer ||= @_serializer_opts.delete(:serializer)
1323
@_serializer ||= ActiveModel::Serializer.serializer_for(resource)
@@ -29,6 +39,10 @@ def use_adapter?
2939
options.partition { |k, _| ADAPTER_OPTION_KEYS.include? k }.map { |h| Hash[h] }
3040

3141
if use_adapter? && (serializer = get_serializer(resource))
42+
43+
@_serializer_opts[:scope] ||= serialization_scope
44+
@_serializer_opts[:scope_name] = _serialization_scope
45+
3246
# omg hax
3347
object = serializer.new(resource, @_serializer_opts)
3448
adapter = ActiveModel::Serializer::Adapter.create(object, @_adapter_opts)
@@ -38,5 +52,11 @@ def use_adapter?
3852
end
3953
end
4054
end
55+
56+
module ClassMethods
57+
def serialization_scope(scope)
58+
self._serialization_scope = scope
59+
end
60+
end
4161
end
4262
end

lib/active_model/serializer.rb

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -126,13 +126,21 @@ def self.root_name
126126
name.demodulize.underscore.sub(/_serializer$/, '') if name
127127
end
128128

129-
attr_accessor :object, :root, :meta, :meta_key
129+
attr_accessor :object, :root, :meta, :meta_key, :scope
130130

131131
def initialize(object, options = {})
132-
@object = object
133-
@root = options[:root] || (self.class._root ? self.class.root_name : false)
134-
@meta = options[:meta]
132+
@object = object
133+
@root = options[:root] || (self.class._root ? self.class.root_name : false)
134+
@meta = options[:meta]
135135
@meta_key = options[:meta_key]
136+
@scope = options[:scope]
137+
138+
scope_name = options[:scope_name]
139+
if scope_name && !respond_to?(scope_name)
140+
self.class.class_eval do
141+
define_method scope_name, lambda { scope }
142+
end
143+
end
136144
end
137145

138146
def json_key

0 commit comments

Comments
 (0)