jro_apps/redmine Commit - r1087:e13f49d91951

Prevent unexpected nil in custom value validation....

Jean-Philippe Lang -

r1087:e13f49d91951

parent child

Context file:

r1087:e13f49d91951

Collapse all files

app/models/custom_value.rb +18 -13

              # redMine - project management software
              # Copyright (C) 2006  Jean-Philippe Lang
              #
              # This program is free software; you can redistribute it and/or
              # modify it under the terms of the GNU General Public License
              # as published by the Free Software Foundation; either version 2
              # of the License, or (at your option) any later version.
              #
              # This program is distributed in the hope that it will be useful,
              # but WITHOUT ANY WARRANTY; without even the implied warranty of
              # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
              # GNU General Public License for more details.
              #
              # You should have received a copy of the GNU General Public License
              # along with this program; if not, write to the Free Software
              # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
              class CustomValue < ActiveRecord::Base
                belongs_to :custom_field
                belongs_to :customized, :polymorphic => true
                def after_initialize
                  if custom_field && new_record? && (customized_type.blank? || (customized && customized.new_record?))
                    self.value ||= custom_field.default_value
                  end
                end
              protected
                def validate
-                 errors.add(:value, :activerecord_error_blank) and return if custom_field.is_required? and value.blank?
-                 errors.add(:value, :activerecord_error_invalid) unless custom_field.regexp.blank? or value =~ Regexp.new(custom_field.regexp)
-                 errors.add(:value, :activerecord_error_too_short) if custom_field.min_length > 0 and value.length < custom_field.min_length and value.length > 0
-                 errors.add(:value, :activerecord_error_too_long) if custom_field.max_length > 0 and value.length > custom_field.max_length
-                 case custom_field.field_format
-                 when 'int'
-                   errors.add(:value, :activerecord_error_not_a_number) unless value.blank? || value =~ /^[+-]?\d+$/
-                 when 'float'
-                   begin; !value.blank? && Kernel.Float(value); rescue; errors.add(:value, :activerecord_error_invalid) end
-                 when 'date'
-                   errors.add(:value, :activerecord_error_not_a_date) unless value =~ /^\d{4}-\d{2}-\d{2}$/ or value.blank?
-                 when 'list'
-                   errors.add(:value, :activerecord_error_inclusion) unless custom_field.possible_values.include?(value) or value.blank?
+                 if value.blank?
+                   errors.add(:value, :activerecord_error_blank) if custom_field.is_required? and value.blank?
+                 else
+                   errors.add(:value, :activerecord_error_invalid) unless custom_field.regexp.blank? or value =~ Regexp.new(custom_field.regexp)
+                   errors.add(:value, :activerecord_error_too_short) if custom_field.min_length > 0 and value.length < custom_field.min_length
+                   errors.add(:value, :activerecord_error_too_long) if custom_field.max_length > 0 and value.length > custom_field.max_length
+                   # Format specific validations
+                   case custom_field.field_format
+                   when 'int'
+                     errors.add(:value, :activerecord_error_not_a_number) unless value =~ /^[+-]?\d+$/
+                   when 'float'
+                     begin; Kernel.Float(value); rescue; errors.add(:value, :activerecord_error_invalid) end
+                   when 'date'
+                     errors.add(:value, :activerecord_error_not_a_date) unless value =~ /^\d{4}-\d{2}-\d{2}$/
+                   when 'list'
+                     errors.add(:value, :activerecord_error_inclusion) unless custom_field.possible_values.include?(value)
+                   end
                  end
                end
              end

test/unit/custom_value_test.rb +73 -1

              # redMine - project management software
              # Copyright (C) 2006-2007  Jean-Philippe Lang
              #
              # This program is free software; you can redistribute it and/or
              # modify it under the terms of the GNU General Public License
              # as published by the Free Software Foundation; either version 2
              # of the License, or (at your option) any later version.
              #
              # This program is distributed in the hope that it will be useful,
              # but WITHOUT ANY WARRANTY; without even the implied warranty of
              # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
              # GNU General Public License for more details.
              #
              # You should have received a copy of the GNU General Public License
              # along with this program; if not, write to the Free Software
              # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
              require File.dirname(__FILE__) + '/../test_helper'
              class CustomValueTest < Test::Unit::TestCase
                fixtures :custom_fields
-               def test_float_field
+               def test_string_field_validation_with_blank_value
+                 f = CustomField.new(:field_format => 'string')
+                 v = CustomValue.new(:custom_field => f)
+                 v.value = nil
+                 assert v.valid?
+                 v.value = ''
+                 assert v.valid?
+                 f.is_required = true
+                 v.value = nil
+                 assert !v.valid?
+                 v.value = ''
+                 assert !v.valid?
+               end
+               def test_string_field_validation_with_min_and_max_lengths
+                 f = CustomField.new(:field_format => 'string', :min_length => 2, :max_length => 5)
+                 v = CustomValue.new(:custom_field => f, :value => '')
+                 assert v.valid?
+                 v.value = 'a'
+                 assert !v.valid?
+                 v.value = 'a' * 2
+                 assert v.valid?
+                 v.value = 'a' * 6
+                 assert !v.valid?
+               end
+               def test_string_field_validation_with_regexp
+                 f = CustomField.new(:field_format => 'string', :regexp => '^[A-Z0-9]*$')
+                 v = CustomValue.new(:custom_field => f, :value => '')
+                 assert v.valid?
+                 v.value = 'abc'
+                 assert !v.valid?
+                 v.value = 'ABC'
+                 assert v.valid?
+               end
+               def test_date_field_validation
+                 f = CustomField.new(:field_format => 'date')
+                 v = CustomValue.new(:custom_field => f, :value => '')
+                 assert v.valid?
+                 v.value = 'abc'
+                 assert !v.valid?
+                 v.value = '1975-07-14'
+                 assert v.valid?
+               end
+               def test_list_field_validation
+                 f = CustomField.new(:field_format => 'list', :possible_values => ['value1', 'value2'])
+                 v = CustomValue.new(:custom_field => f, :value => '')
+                 assert v.valid?
+                 v.value = 'abc'
+                 assert !v.valid?
+                 v.value = 'value2'
+                 assert v.valid?
+               end
+               def test_int_field_validation
+                 f = CustomField.new(:field_format => 'int')
+                 v = CustomValue.new(:custom_field => f, :value => '')
+                 assert v.valid?
+                 v.value = 'abc'
+                 assert !v.valid?
+                 v.value = '123'
+                 assert v.valid?
+                 v.value = '+123'
+                 assert v.valid?
+                 v.value = '-123'
+                 assert v.valid?
+               end
+               def test_float_field_validation
                  v = CustomValue.new(:customized => User.find(:first), :custom_field => UserCustomField.find_by_name('Money'))
                  v.value = '11.2'
                  assert v.save
                  v.value = ''
                  assert v.save
                  v.value = '-6.250'
                  assert v.save
                  v.value = '6a'
                  assert !v.save
                end
                def test_default_value
                  field = CustomField.find_by_default_value('Default string')
                  assert_not_nil field
                  v = CustomValue.new(:custom_field => field)
                  assert_equal 'Default string', v.value
                  v = CustomValue.new(:custom_field => field, :value => 'Not empty')
                  assert_equal 'Not empty', v.value
                end
              end

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages