diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2014-05-20 19:14:02 +0200 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2014-05-20 19:14:02 +0200 |
| commit | b367830af7fb75cd59863b3a1311d4a5bc4b37a8 (patch) | |
| tree | 504082a2165a046bbd78213a5d111227e59887d8 | |
| parent | fd372e66f0934617bef3b840cd0ea75429a24544 (diff) | |
| download | rails-b367830af7fb75cd59863b3a1311d4a5bc4b37a8.tar.gz rails-b367830af7fb75cd59863b3a1311d4a5bc4b37a8.tar.bz2 rails-b367830af7fb75cd59863b3a1311d4a5bc4b37a8.zip | |
Clarify control flow
| -rw-r--r-- | lib/active_job/parameters.rb | 11 |
1 files 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 |