From b367830af7fb75cd59863b3a1311d4a5bc4b37a8 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Tue, 20 May 2014 19:14:02 +0200 Subject: Clarify control flow --- lib/active_job/parameters.rb | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/lib/active_job/parameters.rb b/lib/active_job/parameters.rb index 5f814f846d..955fd887d7 100644 --- a/lib/active_job/parameters.rb +++ b/lib/active_job/parameters.rb @@ -3,12 +3,17 @@ require 'active_support/core_ext/object/try' module ActiveJob class Parameters - TYPE_WHITELIST = [NilClass, Fixnum, Float, String, TrueClass, FalseClass, Hash, Array, Bignum] + TYPE_WHITELIST = [ NilClass, Fixnum, Float, String, TrueClass, FalseClass, Hash, Array, Bignum ] def self.serialize(params) params.collect do |param| - raise "Unsupported parameter type: #{param.class.name}" unless param.respond_to?(:global_id) || TYPE_WHITELIST.include?(param.class) - param.try(:global_id) || param + if param.respond_to?(:global_id) + param.global_id + elsif TYPE_WHITELIST.include?(param.class) + param + else + raise "Unsupported parameter type: #{param.class.name}" + end end end -- cgit v1.2.3