add support for root keys

remove debugging gem

fix white space
This commit is contained in:
NullVoxPopuli
2014-10-12 21:51:41 -04:00
parent 97023db904
commit 7338b62b02
5 changed files with 54 additions and 15 deletions

View File

@@ -12,7 +12,7 @@ module ActionController
if serializer
# omg hax
object = serializer.new(resource)
object = serializer.new(resource, options)
adapter = ActiveModel::Serializer.adapter.new(object)
super(adapter, options)

View File

@@ -73,12 +73,12 @@ module ActiveModel
def self.adapter
adapter_class = case config.adapter
when Symbol
class_name = "ActiveModel::Serializer::Adapter::#{config.adapter.to_s.classify}"
class_name.safe_constantize
when Class
config.adapter
end
when Symbol
class_name = "ActiveModel::Serializer::Adapter::#{config.adapter.to_s.classify}"
class_name.safe_constantize
when Class
config.adapter
end
unless adapter_class
valid_adapters = Adapter.constants.map { |klass| ":#{klass.to_s.downcase}" }
raise ArgumentError, "Unknown adapter: #{config.adapter}. Valid adapters are: #{valid_adapters}"
@@ -87,10 +87,31 @@ module ActiveModel
adapter_class
end
attr_accessor :object
def self._root
@@root ||= false
end
def initialize(object)
def self._root=(root)
@@root = root
end
def self.root_name
name.demodulize.underscore.sub(/_serializer$/, '') if name
end
attr_accessor :object, :root
def initialize(object, options = {})
@object = object
@root = options[:root] || (self.class._root ? self.class.root_name : false)
end
def json_key
if root == true || root.nil?
self.class.root_name
else
root
end
end
def attributes(options = {})

View File

@@ -8,7 +8,7 @@ module ActiveModel
attr_reader :serializer
def initialize(serializer)
def initialize(serializer, options = {})
@serializer = serializer
end
@@ -16,8 +16,14 @@ module ActiveModel
raise NotImplementedError, 'This is an abstract method. Should be implemented at the concrete adapter.'
end
def to_json(options={})
serializable_hash(options).to_json
def to_json(options = {})
result = serializable_hash(options)
if root = options.fetch(:root, serializer.json_key)
result = { root => result }
end
result.to_json
end
end
end

View File

@@ -13,6 +13,7 @@ module ActiveModel
@hash[name] = association.attributes(options)
end
end
@hash
end
end