dm-validations 0.9.9 → 0.9.10

data/spec/integration/within_validator_spec.rb

@@ -3,30 +3,37 @@ require Pathname(__FILE__).dirname.expand_path.parent + 'spec_helper'
 
 describe DataMapper::Validate::WithinValidator do
   before(:all) do
-    class Telephone
+    class ::Telephone
       include DataMapper::Resource
       property :id, Integer, :serial => true
       property :type_of_number, String, :auto_validation => false
-      validates_within :type_of_number, :set => ['Home','Work','Cell']
+      validates_within :type_of_number, :set => ['Home', 'Work', 'Cell']
     end
 
-    class Inf
+    class ::Inf
       include DataMapper::Resource
       property :id, Integer, :serial => true
-      property :greater_than, String, :auto_validation => false
-      property :less_than, String, :auto_validation => false
-      property :between, String, :auto_validation => false
-      validates_within :greater_than, :set => (10..n)
-      validates_within :less_than, :set => (-n..10)
+      property :gte, Integer, :auto_validation => false
+      property :lte, Integer, :auto_validation => false
+      property :between, Integer, :auto_validation => false
+      validates_within :gte, :set => (10..n)
+      validates_within :lte, :set => (-n..10)
       validates_within :between, :set => (10..20)
     end
 
-    class Receiver
+    class ::Receiver
       include DataMapper::Resource
       property :id, Integer, :serial => true
       property :holder, String, :auto_validation => false, :default => 'foo'
       validates_within :holder, :set => ['foo', 'bar', 'bang']
     end
+
+    class ::Nullable
+      include DataMapper::Resource
+      property :id, Integer, :serial => true
+      property :nullable, Integer, :auto_validation => false
+      validates_within :nullable, :set => (1..5), :allow_nil => true
+    end
   end
 
   it "should validate a value on an instance of a resource within a predefined
@@ -42,13 +49,31 @@ describe DataMapper::Validate::WithinValidator do
   it "should validate a value within range with infinity" do
     inf = Inf.new
     inf.should_not be_valid
-    inf.errors.on(:greater_than).first.should == 'Greater than must be greater than 10'
-    inf.errors.on(:less_than).first.should == 'Less than must be less than 10'
+    inf.errors.on(:gte).first.should == 'Gte must be greater than or equal to 10'
+    inf.errors.on(:lte).first.should == 'Lte must be less than or equal to 10'
     inf.errors.on(:between).first.should == 'Between must be between 10 and 20'
+
+    inf.gte = 10
+    inf.lte = 10
+    inf.between = 10
+    inf.valid?.should == true
   end
 
   it "should validate a value by its default" do
     tel = Receiver.new
     tel.should be_valid
   end
+
+  it "should allow a nil value if :allow_nil is true" do
+    nullable = Nullable.new
+
+    nullable.nullable = nil
+    nullable.should be_valid
+
+    nullable.nullable = 11
+    nullable.should_not be_valid
+
+    nullable.nullable = 3
+    nullable.should be_valid
+  end
 end

data/tasks/spec.rb

@@ -8,7 +8,7 @@ begin
   desc 'Run specifications'
   Spec::Rake::SpecTask.new(:spec) do |t|
     t.spec_opts << '--options' << 'spec/spec.opts' if File.exists?('spec/spec.opts')
-    t.spec_files = Pathname.glob((ROOT + 'spec/**/*_spec.rb').to_s)
+    t.spec_files = Pathname.glob((ROOT + 'spec/**/*_spec.rb').to_s).map { |f| f.to_s }
 
     begin
       gem 'rcov', '~>0.8'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dm-validations
 version: !ruby/object:Gem::Version 
-  version: 0.9.9
+  version: 0.9.10
 platform: ruby
 authors: 
 - Guy van den Berg
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-04 00:00:00 -08:00
+date: 2009-01-19 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.9.9
+        version: 0.9.10
     version: 
 description: DataMapper plugin for performing validations on data models
 email: 
@@ -72,11 +72,30 @@ files:
 - spec/integration/custom_validator_spec.rb
 - spec/integration/format_validator_spec.rb
 - spec/integration/generic_validator_spec.rb
-- spec/integration/length_validator_spec.rb
+- spec/integration/length_validator/error_message_spec.rb
+- spec/integration/length_validator/maximum_spec.rb
+- spec/integration/length_validator/minimum_spec.rb
+- spec/integration/length_validator/range_spec.rb
+- spec/integration/length_validator/spec_helper.rb
+- spec/integration/length_validator/valid_objects_spec.rb
 - spec/integration/method_validator_spec.rb
+- spec/integration/numeric_validator/float_type_spec.rb
+- spec/integration/numeric_validator/integer_only_true_spec.rb
+- spec/integration/numeric_validator/integer_type_spec.rb
+- spec/integration/numeric_validator/spec_helper.rb
 - spec/integration/numeric_validator_spec.rb
 - spec/integration/primitive_validator_spec.rb
-- spec/integration/required_field_validator_spec.rb
+- spec/integration/required_field_validator/association_spec.rb
+- spec/integration/required_field_validator/boolean_type_value_spec.rb
+- spec/integration/required_field_validator/date_type_value_spec.rb
+- spec/integration/required_field_validator/datetime_type_value_spec.rb
+- spec/integration/required_field_validator/float_type_value_spec.rb
+- spec/integration/required_field_validator/integer_type_value_spec.rb
+- spec/integration/required_field_validator/plain_old_ruby_object_spec.rb
+- spec/integration/required_field_validator/shared_examples.rb
+- spec/integration/required_field_validator/spec_helper.rb
+- spec/integration/required_field_validator/string_type_value_spec.rb
+- spec/integration/required_field_validator/text_type_value_spec.rb
 - spec/integration/uniqueness_validator_spec.rb
 - spec/integration/validation_errors_spec.rb
 - spec/integration/validation_spec.rb

data/spec/integration/length_validator_spec.rb

@@ -1,115 +0,0 @@
-require 'pathname'
-require Pathname(__FILE__).dirname.expand_path.parent + 'spec_helper'
-
-describe DataMapper::Validate::LengthValidator do
-  before(:all) do
-    class MotorLaunch
-      include DataMapper::Resource
-      property :id, Integer, :serial => true
-      property :name, String, :auto_validation => false
-    end
-
-    class BoatDock
-      include DataMapper::Resource
-      property :id, Integer, :serial => true
-      property :name, String, :auto_validation => false, :default => "I'm a long string"
-      validates_length :name, :min => 3
-    end
-  end
-
-  it "should be able to consider things valid even if we have a custom error message" do
-    class Jabberwock
-      include DataMapper::Resource
-      property :id, Integer, :key => true
-      property :snickersnack, String
-      validates_length :snickersnack, :within => 3..40, :message => "worble warble"
-    end
-    wock = Jabberwock.new
-    wock.valid?.should == false
-    wock.errors.full_messages.sort.last.should == 'worble warble'
-    wock.snickersnack = "hello"
-    wock.id = 1
-    wock.valid?.should == true
-  end
-
-  it "should be able to set a minimum length of a string field" do
-    class MotorLaunch
-      validates_length :name, :min => 3
-    end
-
-    launch = MotorLaunch.new
-    launch.name = 'Ab'
-    launch.valid?.should == false
-    launch.errors.full_messages.first.should == 'Name must be more than 3 characters long'
-  end
-
-  it "should be able to alias :minimum for :min " do
-    class MotorLaunch
-      validators.clear!
-      validates_length :name, :minimum => 3
-    end
-
-    launch = MotorLaunch.new
-    launch.name = 'Ab'
-    launch.valid?.should == false
-    launch.errors.full_messages.first.should == 'Name must be more than 3 characters long'
-  end
-
-  it "should be able to set a maximum length of a string field" do
-    class MotorLaunch
-      validators.clear!
-      validates_length :name, :max => 5
-    end
-
-    launch = MotorLaunch.new
-    launch.name = 'Lip­smackin­thirst­quenchin­acetastin­motivatin­good­buzzin­cool­talkin­high­walkin­fast­livin­ever­givin­cool­fizzin'
-    launch.valid?.should == false
-    launch.errors.full_messages.first.should == 'Name must be less than 5 characters long'
-  end
-
-  it "should be able to alias :maximum for :max" do
-    class MotorLaunch
-      validators.clear!
-      validates_length :name, :maximum => 5
-    end
-    launch = MotorLaunch.new
-    launch.name = 'Lip­smackin­thirst­quenchin­acetastin­motivatin­good­buzzin­cool­talkin­high­walkin­fast­livin­ever­givin­cool­fizzin'
-    launch.valid?.should == false
-    launch.errors.full_messages.first.should == 'Name must be less than 5 characters long'
-  end
-
-  it "should be able to specify a length range of a string field" do
-    class MotorLaunch
-      validators.clear!
-      validates_length :name, :in => (3..5)
-    end
-
-    launch = MotorLaunch.new
-    launch.name = 'Lip­smackin­thirst­quenchin­acetastin­motivatin­good­buzzin­cool­talkin­high­walkin­fast­livin­ever­givin­cool­fizzin'
-    launch.valid?.should == false
-    launch.errors.full_messages.first.should == 'Name must be between 3 and 5 characters long'
-
-    launch.name = 'A'
-    launch.valid?.should == false
-    launch.errors.full_messages.first.should == 'Name must be between 3 and 5 characters long'
-
-    launch.name = 'Ride'
-    launch.valid?.should == true
-  end
-
-  it "should be able to alias :within for :in" do
-    class MotorLaunch
-      validators.clear!
-      validates_length :name, :within => (3..5)
-    end
-
-    launch = MotorLaunch.new
-    launch.name = 'Ride'
-    launch.valid?.should == true
-  end
-
-  it "should pass if a default fulfills the requirements" do
-    doc = BoatDock.new
-    doc.should be_valid
-  end
-end

data/spec/integration/required_field_validator_spec.rb

@@ -1,93 +0,0 @@
-require 'pathname'
-require Pathname(__FILE__).dirname.expand_path.parent + 'spec_helper'
-
-if HAS_SQLITE3 || HAS_MYSQL || HAS_POSTGRES
-  describe DataMapper::Validate::RequiredFieldValidator do
-
-    describe "Resources" do
-      before do
-        class Landscaper
-          include DataMapper::Resource
-          property :id, Integer, :key => true
-          property :name, String
-        end
-
-        class Garden
-          include DataMapper::Resource
-          property :id, Integer, :key => true
-          property :landscaper_id, Integer
-          property :name, String, :auto_validation => false
-
-          belongs_to :landscaper #has :landscaper, 1..n
-
-          validates_present :name, :when => :property_test
-          validates_present :landscaper, :when => :association_test
-        end
-
-        class Fertilizer
-          include DataMapper::Resource
-          property :id, Integer, :serial => true
-          property :brand, String, :auto_validation => false, :default => 'Scotts'
-          validates_present :brand, :when => :property_test
-        end
-
-        Landscaper.auto_migrate!
-        Garden.auto_migrate!
-        Fertilizer.auto_migrate!
-      end
-
-      it "should validate the presence of a property value on an instance of a resource" do
-        garden = Garden.new
-        garden.should_not be_valid_for_property_test
-        garden.errors.on(:name).should include('Name must not be blank')
-
-        garden.name = 'The Wilds'
-        garden.should be_valid_for_property_test
-      end
-
-      it "should validate the presence of an association value on an instance of a resource when dirty"
-      #do
-      #  garden = Garden.new
-      #  landscaper = garden.landscaper
-      #  puts landscaper.children.length
-      #  #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
-
-    describe "A plain class (not a DM resource)" do
-
-      before do
-        class PlainClass
-          extend DataMapper::Validate::ClassMethods
-          include DataMapper::Validate
-          attr_accessor :accessor
-          validates_present :here, :empty, :nil, :accessor
-          def here;  "here" end
-          def empty; ""     end
-          def nil;   nil    end
-        end
-
-        @pc = PlainClass.new
-      end
-
-      it "should fail validation with empty, nil, or blank fields" do
-        @pc.should_not be_valid
-        @pc.errors.on(:empty).should    include("Empty must not be blank")
-        @pc.errors.on(:nil).should      include("Nil must not be blank")
-        @pc.errors.on(:accessor).should include("Accessor must not be blank")
-      end
-
-      it "giving accessor a value should remove validation error" do
-        @pc.accessor = "full"
-        @pc.valid?
-        @pc.errors.on(:accessor).should be_nil
-      end
-    end
-
-  end
-end