diff options
author | José Valim <jose.valim@gmail.com> | 2011-04-11 18:01:10 +0200 |
---|---|---|
committer | José Valim <jose.valim@gmail.com> | 2011-04-11 18:01:10 +0200 |
commit | 7379114c2f2c2ec1f767a16cf2f8662ea6bd8db2 (patch) | |
tree | a2fece860e4fcca73782510aa3d64ffe73f6b50f /activemodel/lib/active_model/validations/exclusion.rb | |
parent | df5691aa94f209a59945d60d750a5040b24dbc40 (diff) | |
download | rails-7379114c2f2c2ec1f767a16cf2f8662ea6bd8db2.tar.gz rails-7379114c2f2c2ec1f767a16cf2f8662ea6bd8db2.tar.bz2 rails-7379114c2f2c2ec1f767a16cf2f8662ea6bd8db2.zip |
Remove code duplication.
Diffstat (limited to 'activemodel/lib/active_model/validations/exclusion.rb')
-rw-r--r-- | activemodel/lib/active_model/validations/exclusion.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/activemodel/lib/active_model/validations/exclusion.rb b/activemodel/lib/active_model/validations/exclusion.rb index d135d0164a..a85c23f725 100644 --- a/activemodel/lib/active_model/validations/exclusion.rb +++ b/activemodel/lib/active_model/validations/exclusion.rb @@ -9,13 +9,14 @@ module ActiveModel "and must be supplied as the :in option of the configuration hash" def check_validity! - unless [:include?, :call].any?{ |method| options[:in].respond_to?(method) } + unless [:include?, :call].any? { |method| options[:in].respond_to?(method) } raise ArgumentError, ERROR_MESSAGE end end def validate_each(record, attribute, value) - exclusions = options[:in].respond_to?(:call) ? options[:in].call(record) : options[:in] + delimiter = options[:in] + exclusions = delimiter.respond_to?(:call) ? delimiter.call(record) : delimiter if exclusions.send(inclusion_method(exclusions), value) record.errors.add(attribute, :exclusion, options.except(:in).merge!(:value => value)) end |