@@ -84,8 +84,8 @@ module DataMapper opts[:integer_only] = true validates_is_number property.name, opts elsif BigDecimal == property.type || Float == property.type - opts[:precision] = property.precision - opts[:scale] = property.scale + opts[:precision] = property.precision if property.precision > 0 + opts[:scale] = property.scale if property.scale != 10 validates_is_number property.name, opts end end dm-validations/lib/dm-validations/auto_validate.rb @@ -52,4 +52,30 @@ describe DataMapper::Validate::NumericValidator do h = Hillary.new h.should be_valid end + + it "should validate with autovalidate" do + + class RobotFish + include DataMapper::Resource + property :id, Integer, :serial => true + property :scales, Integer + property :average_weight, Float + end + + class PondFish + include DataMapper::Resource + property :id, Integer, :serial => true + property :scales, Integer + property :average_weight, Float, :scale => 10, :precision => 0, :auto_validation => false + validates_is_number :average_weight + end + + fish1 = PondFish.new + fish2 = RobotFish.new + fish1.scales = fish2.scales = 1 + fish1.average_weight = fish2.average_weight = 20.22 + fish1.valid?.should == true + fish2.valid?.should == true + end + end dm-validations/spec/integration/numeric_validator_spec.rb 28e69c642b8a534837913e2e0b6ffb63a977348e Alex Coles alexbcoles@mac.com http://github.com/sam/dm-more/commit/c88cc4e939519922e2a45db629443b955204f966 c88cc4e939519922e2a45db629443b955204f966 2008-05-22T05:32:30-07:00 2008-05-22T05:32:30-07:00 Fixed issue with auto-validation * Only pass through scale and precision to the numeric_validator if those values are explicitly specified in the property. * Fixes issue #300, where a RegexpError was being thrown for auto-validations on Floats without a specified precision and scale. c751adcdeee6de89b93e12fdaecbce5848606537 Alex Coles alexbcoles@mac.com