@@ -27,13 +27,16 @@ module DataMapper return true if value =~ /\A[+-]?\d+\z/ error_message ||= '%s must be an integer'.t(Extlib::Inflection.humanize(@field_name)) else + # FIXME: if precision and scale are not specified, can we assume that it is an integer? if precision && scale - if precision == scale - return true if value =~ /\A[+-]?(?:0(?:\.\d{1,#{scale}})?)\z/ - elsif scale == 0 + if precision > scale && scale > 0 + return true if value =~ /\A[+-]?(?:\d{1,#{precision - scale}}|\d{0,#{precision - scale}}\.\d{1,#{scale}})\z/ + elsif precision > scale && scale == 0 return true if value =~ /\A[+-]?(?:\d{1,#{precision}}(?:\.0)?)\z/ + elsif precision == scale + return true if value =~ /\A[+-]?(?:0(?:\.\d{1,#{scale}})?)\z/ else - return true if value =~ /\A[+-]?(?:\d{1,#{precision - scale}}|\d{0,#{precision - scale}}\.\d{1,#{scale}})\z/ + raise ArgumentError, "Invalid precision #{precision.inspect} and scale #{scale.inspect} for #{field_name} (value: #{value.inspect} #{value.class})" end else return true if value =~ /\A[+-]?(?:\d+|\d*\.\d+)\z/ dm-validations/lib/dm-validations/numeric_validator.rb e602a514b011d7d510950414b45ce5b9309c4012 Dan Kubb dan.kubb@autopilotmarketing.com http://github.com/sam/dm-more/commit/47b8a82b187f95dfb4702ebd0b99903fcf2daf44 47b8a82b187f95dfb4702ebd0b99903fcf2daf44 2008-06-24T08:57:41-07:00 2008-06-24T08:55:58-07:00 Updated numeric validator to raise if precision and scale are invalid ea62155c04ac75f2762f0fc35017e816d7a5d72c Dan Kubb dan.kubb@autopilotmarketing.com