@@ -9,7 +9,7 @@ module DataMapper end def call(target) - field_value = target.instance_variable_get("@#{@field_name}").blank? + field_value = target.attribute_get(field_name).blank? return true if field_value error_message = @options[:message] || "%s must be absent".t(DataMapper::Inflection.humanize(@field_name)) dm-validations/lib/dm-validations/absent_field_validator.rb @@ -10,7 +10,7 @@ module DataMapper end def call(target) - value = target.instance_variable_get("@#{@field_name}").to_s + value = target.attribute_get(field_name).to_s regex = @options[:integer_only] ? /\A[+-]?\d+\Z/ : /^\d*\.{0,1}\d+$/ return true if not (value =~ regex).nil? dm-validations/lib/dm-validations/numeric_validator.rb @@ -412,6 +412,14 @@ begin validates_presence_of :name, :when => :property_test validates_presence_of :landscaper, :when => :association_test end + + class Fertilizer + include DataMapper::Resource + include DataMapper::Validate + property :id, Fixnum, :serial => true + property :brand, String, :auto_validation => false, :default => 'Scotts' + validates_presence_of :brand, :when => :property_test + end end it "should validate the presence of a property value on an instance of a resource" do @@ -431,6 +439,10 @@ begin # #puts "Gardens landscaper is #{garden.landscaper.child_key}" #end + it "should pass when a default is available" do + fert = Fertilizer.new + fert.should be_valid_for_property_test + end end @@ -444,6 +456,13 @@ begin validates_absence_of :salesman, :when => :sold end + + class Pirogue + include DataMapper::Resource + include DataMapper::Validate + property :salesman, String, :default => 'Layfayette' + validates_absence_of :salesman, :when => :sold + end end it "should validate the absense of a value on an instance of a resource" do @@ -454,6 +473,11 @@ begin kayak.valid_for_sold?.should_not == true end + it "should validate the absense of a value and ensure defaults" do + pirogue = Pirogue.new + pirogue.should_not be_valid_for_sold + end + end #------------------------------------------------------------------------------- @@ -556,7 +580,7 @@ begin end end - it "should validate the confrimation of a value on an instance of a resource" do + it "should validate the confirmation of a value on an instance of a resource" do canoe = Canoe.new canoe.name = 'White Water' canoe.name_confirmation = 'Not confirmed' @@ -567,7 +591,7 @@ begin canoe.valid?.should == true end - it "should default the name of the confirimation field to <field>_confirmation if one is not specified" do + it "should default the name of the confirmation field to <field>_confirmation if one is not specified" do canoe = Canoe.new canoe.name = 'White Water' canoe.name_confirmation = 'White Water' @@ -740,6 +764,13 @@ end include DataMapper::Validate property :name, String, :auto_validation => false end + + class BoatDock + include DataMapper::Resource + include DataMapper::Validate + property :name, String, :auto_validation => false, :default => "I'm a long string" + validates_length_of :name, :min => 3 + end end it 'should be able to set a minimum length of a string field' do @@ -812,6 +843,11 @@ end launch.name = 'Ride' launch.valid?.should == true end + + it "should pass if a default fufills the requirements" do + doc = BoatDock.new + doc.should be_valid + end end #------------------------------------------------------------------------------- @@ -890,6 +926,14 @@ end validates_numericalnes_of :amount_1, :amount_2 end + + class Hillary + include DataMapper::Resource + include DataMapper::Validate + property :amount_1, Float, :auto_validation => false, :default => 0.01 + validates_numericalnes_of :amount_1 + + end end it "should validate a floating point value on the instance of a resource" do @@ -923,6 +967,11 @@ end end + it "should validate if a default fufills the requirements" do + h = Hillary.new + h.should be_valid + end + end dm-validations/spec/validation_spec.rb a55dc09669177299de9d8c6f9d4a67bc8e9db980 Adam French adam@adam.wieck.com http://github.com/sam/dm-more/commit/e3d72a8a9f1dd7fc68500c539e362444d6b118c6 e3d72a8a9f1dd7fc68500c539e362444d6b118c6 2008-05-07T10:29:49-07:00 2008-05-07T10:29:49-07:00 accounting for further defaults 9c61974e6af30deed99d2ec9bb89f4ca411b2b0b Adam French adam@adam.wieck.com