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

Fix global `` self.root = false ``

Browse Source 
Using the on_load hook does not change the defined root on
Serializer#inherited.

Related to #179
This commit is contained in:
Rafael Felix
2013-01-03 16:01:46 -02:00
parent cef10cf01d
commit 82951c1f8a
2 changed files with 25 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
lib/active_model/serializer.rb
View File

@@ -220,15 +220,6 @@ module ActiveModel
self._root = name
end
alias_method :root=, :root
def inherited(klass) #:nodoc:
return if klass.anonymous?
name = klass.name.demodulize.underscore.sub(/_serializer$/, '')
klass.class_eval do
root name.to_sym unless self._root == false
end
end
end
attr_reader :object, :options
@@ -237,6 +228,13 @@ module ActiveModel
@object, @options = object, options
end
def root_name
return false if self._root == false
class_name = self.class.name.demodulize.underscore.sub(/_serializer$/, '').to_sym unless self.class.name.blank?
self._root || class_name
end
def url_options
@options[:url_options] || {}
end
@@ -252,7 +250,7 @@ module ActiveModel
# Returns a json representation of the serializable
# object including the root.
def as_json(options={})
if root = options.fetch(:root, @options.fetch(:root, _root))
if root = options.fetch(:root, @options.fetch(:root, root_name))
@options[:hash] = hash = {}
@options[:unique_values] = {}