@@ -42,3 +42,5 @@ Spec::Rake::SpecTask.new('spec') do |t| t.spec_opts = ["--format", "specdoc", "--colour"] t.spec_files = Pathname.glob(Pathname.new(__FILE__).parent.join("spec").join("**").join("*_spec.rb")) end + +task :default => ['spec'] \ No newline at end of file dm-validations/Rakefile @@ -9,7 +9,7 @@ module DataMapper end def call(target) - includes = @options[:set].include?(target.instance_variable_get("@#{@field_name}")) + includes = @options[:set].include?(target.attribute_get(field_name)) return true if includes s = '' dm-validations/lib/dm-validations/within_validator.rb @@ -823,6 +823,13 @@ end property :type_of_number, String, :auto_validation => false validates_within :type_of_number, :set => ['Home','Work','Cell'] end + + class Reciever + include DataMapper::Resource + include DataMapper::Validate + property :holder, String, :auto_validation => false, :default => 'foo' + validates_within :holder, :set => ['foo', 'bar', 'bang'] + end end it "should validate a value on an instance of a resource within a predefined set of values" do @@ -833,6 +840,11 @@ end tel.type_of_number = 'Cell' tel.valid?.should == true end + + it "should validate a value by it's default" do + tel = Reciever.new + tel.should be_valid + end end #------------------------------------------------------------------------------- dm-validations/spec/validation_spec.rb b3da5cd121ad16e4763dbd4cdc51cb53ed49988f Adam French adam@adam.wieck.com http://github.com/sam/dm-more/commit/a55dc09669177299de9d8c6f9d4a67bc8e9db980 a55dc09669177299de9d8c6f9d4a67bc8e9db980 2008-05-07T10:10:06-07:00 2008-05-07T10:10:06-07:00 default task is spec. failing spec for [#257]. fix for [#257] c54d16a93e1fb23913f71a2cd21298d1caa3f4b6 Adam French adam@adam.wieck.com