Merge pull request #632 from gauthier-delacroix/Default_namespace_inheritance

Default namespace option
This commit is contained in:
Steve Klabnik
2014-09-25 19:41:33 -04:00
5 changed files with 56 additions and 2 deletions

View File

@@ -35,7 +35,7 @@ module ActiveModel
def serializer_for(item)
serializer_class = @each_serializer || Serializer.serializer_for(item, namespace: @namespace) || DefaultSerializer
serializer_class.new(item, scope: scope, key_format: key_format, only: @only, except: @except, polymorphic: @polymorphic)
serializer_class.new(item, scope: scope, key_format: key_format, only: @only, except: @except, polymorphic: @polymorphic, namespace: @namespace)
end
def serializable_object

View File

@@ -131,6 +131,7 @@ end
@except = options[:except] ? Array(options[:except]) : nil
@key_format = options[:key_format]
@context = options[:context]
@namespace = options[:namespace]
end
attr_accessor :object, :scope, :root, :meta_key, :meta, :key_format, :context, :polymorphic
@@ -216,7 +217,8 @@ end
end
def association_options_for_serializer(association)
prefix = association.options[:prefix]
prefix = association.options[:prefix]
namespace = association.options[:namespace] || @namespace || self.namespace
{ scope: scope }.tap do |opts|
opts[:namespace] = namespace if namespace