s/side_load/embed_in_root

This commit is contained in:
Arthur Neves
2013-10-24 14:11:58 -04:00
parent 2b70503896
commit 860acad9af
7 changed files with 19 additions and 19 deletions

View File

@@ -7,14 +7,14 @@ module ActiveModel
def initialize(name, options={})
if options.has_key?(:include)
ActiveSupport::Deprecation.warn <<-WARN
** Notice: include was renamed to side_load. **
** Notice: include was renamed to embed_in_root. **
WARN
end
@name = name.to_s
@options = options
self.embed = options.fetch(:embed) { CONFIG.embed }
@side_load = options.fetch(:side_load) { options.fetch(:include) { CONFIG.side_load } }
@embed_in_root = options.fetch(:embed_in_root) { options.fetch(:include) { CONFIG.embed_in_root } }
@embed_key = options[:embed_key] || :id
@key = options[:key]
@embedded_key = options[:root] || name
@@ -23,10 +23,10 @@ module ActiveModel
end
attr_reader :name, :embed_ids, :embed_objects, :serializer_class
attr_accessor :side_load, :embed_key, :key, :embedded_key, :options
attr_accessor :embed_in_root, :embed_key, :key, :embedded_key, :options
alias embed_ids? embed_ids
alias embed_objects? embed_objects
alias side_load? side_load
alias embed_in_root? embed_in_root
def serializer_class=(serializer)
@serializer_class = serializer.is_a?(String) ? serializer.constantize : serializer