From 4d3d234dda666419f0bf1f958685b62821611067 Mon Sep 17 00:00:00 2001 From: Gauthier Delacroix Date: Wed, 3 Sep 2014 14:57:00 +0200 Subject: [PATCH] Fix default serializer option --- lib/action_controller/serialization.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/action_controller/serialization.rb b/lib/action_controller/serialization.rb index 9c537218..0e1d8fff 100644 --- a/lib/action_controller/serialization.rb +++ b/lib/action_controller/serialization.rb @@ -80,13 +80,14 @@ module ActionController def build_json_serializer(resource, options = {}) options = default_serializer_options.merge(options) + @namespace_for_serializer = options.fetch(:namespace, nil) if serializer = options.fetch(:serializer, default_serializer(resource)) options[:scope] = serialization_scope unless options.has_key?(:scope) if resource.respond_to?(:to_ary) - options[:resource_name] ||= controller_name - options[:namespace] ||= namespace_for_serializer if namespace_for_serializer + options[:resource_name]= controller_name + options[:namespace] = namespace_for_serializer if namespace_for_serializer end serializer.new(resource, options)