mirror of
https://github.com/ditkrg/active_model_serializers.git
synced 2026-01-25 07:16:49 +00:00
Remove dynamically defined instance methods
This commit is contained in:
parent
0bf45ec2a7
commit
8804d758ef
@ -119,17 +119,13 @@ module ActiveModel
|
|||||||
key = options.fetch(:key, attr)
|
key = options.fetch(:key, attr)
|
||||||
reader = if block
|
reader = if block
|
||||||
->(instance) { instance.instance_eval(&block) }
|
->(instance) { instance.instance_eval(&block) }
|
||||||
|
elsif _fragmented
|
||||||
|
->(instance) { instance.class._fragmented.read_attribute_for_serialization(attr) }
|
||||||
else
|
else
|
||||||
->(instance) { instance.send(attr) }
|
->(instance) { instance.read_attribute_for_serialization(attr) }
|
||||||
end
|
end
|
||||||
|
|
||||||
_attribute_mappings[key] = Attribute.new(attr, reader)
|
_attribute_mappings[key] = Attribute.new(attr, reader)
|
||||||
|
|
||||||
ActiveModelSerializers.silence_warnings do
|
|
||||||
define_method attr do
|
|
||||||
object.read_attribute_for_serialization(attr)
|
|
||||||
end unless method_defined?(attr) || _fragmented.respond_to?(attr)
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|
||||||
# @api private
|
# @api private
|
||||||
@ -278,12 +274,16 @@ module ActiveModel
|
|||||||
def attributes(requested_attrs = nil)
|
def attributes(requested_attrs = nil)
|
||||||
self.class._attribute_mappings.each_with_object({}) do |(key, attribute_mapping), hash|
|
self.class._attribute_mappings.each_with_object({}) do |(key, attribute_mapping), hash|
|
||||||
next unless requested_attrs.nil? || requested_attrs.include?(key)
|
next unless requested_attrs.nil? || requested_attrs.include?(key)
|
||||||
if self.class._fragmented
|
|
||||||
hash[key] = self.class._fragmented.public_send(attribute_mapping.name)
|
|
||||||
else
|
|
||||||
hash[key] = attribute_mapping.call(self)
|
hash[key] = attribute_mapping.call(self)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def read_attribute_for_serialization(attr)
|
||||||
|
if _serializer_method_defined?(attr)
|
||||||
|
send(attr)
|
||||||
|
else
|
||||||
|
object.read_attribute_for_serialization(attr)
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
# @api private
|
# @api private
|
||||||
@ -295,5 +295,15 @@ module ActiveModel
|
|||||||
protected
|
protected
|
||||||
|
|
||||||
attr_accessor :instance_options
|
attr_accessor :instance_options
|
||||||
|
|
||||||
|
private
|
||||||
|
|
||||||
|
def _serializer_instance_methods
|
||||||
|
@_serializer_instance_methods ||= (public_methods - Object.public_instance_methods).to_set
|
||||||
|
end
|
||||||
|
|
||||||
|
def _serializer_method_defined?(name)
|
||||||
|
_serializer_instance_methods.include?(name)
|
||||||
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
2
test/fixtures/poro.rb
vendored
2
test/fixtures/poro.rb
vendored
@ -116,7 +116,7 @@ RoleSerializer = Class.new(ActiveModel::Serializer) do
|
|||||||
attributes :id, :name, :description, :slug
|
attributes :id, :name, :description, :slug
|
||||||
|
|
||||||
def slug
|
def slug
|
||||||
"#{name}-#{id}"
|
"#{object.name}-#{object.id}"
|
||||||
end
|
end
|
||||||
|
|
||||||
belongs_to :author
|
belongs_to :author
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user