From 616938dc63db90749f2a79b4f5d21c75021a051c Mon Sep 17 00:00:00 2001 From: Santiago Pastorino Date: Wed, 30 Oct 2013 23:37:36 -0200 Subject: [PATCH] Improve build_json_serializer readability a bit --- lib/action_controller/serialization.rb | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/lib/action_controller/serialization.rb b/lib/action_controller/serialization.rb index 4ac32093..3dbbfbb2 100644 --- a/lib/action_controller/serialization.rb +++ b/lib/action_controller/serialization.rb @@ -64,15 +64,12 @@ module ActionController def build_json_serializer(resource, options) options = default_serializer_options.merge(options || {}) - serializer = options.delete(:serializer) - serializer = ActiveModel::Serializer.serializer_for(resource) if serializer.nil? + if serializer = options.fetch(:serializer, ActiveModel::Serializer.serializer_for(resource)) + options[:scope] = serialization_scope unless options.has_key?(:scope) + options[:resource_name] = self.controller_name if resource.respond_to?(:to_ary) - return unless serializer - - options[:scope] = serialization_scope unless options.has_key?(:scope) - options[:resource_name] = self.controller_name if resource.respond_to?(:to_ary) - - serializer.new(resource, options) + serializer.new(resource, options) + end end end end