dm-validations 0.9.9 → 0.9.10

data/lib/dm-validations/uniqueness_validator.rb

@@ -43,8 +43,8 @@ module DataMapper
         # is target and found resource identic? same instance... but not ==
         return true if !target.new_record? && resource.repository.name == repository_name && resource.model == target.model && resource.key == target.key
 
-        error_message = @options[:message] || "%s is already taken".t(Extlib::Inflection.humanize(field_name))
-        add_error(target, error_message , field_name)
+        error_message = @options[:message] || ValidationErrors.default_error_message(:taken, field_name)
+        add_error(target, error_message, field_name)
 
         return false
       end

data/lib/dm-validations/validation_errors.rb

@@ -9,6 +9,38 @@ module DataMapper
 
       include Enumerable
 
+      @@default_error_messages = {
+        :absent => '%s must be absent',
+        :inclusion => '%s must be one of [%s]',
+        :invalid => '%s has an invalid format',
+        :confirmation => '%s does not match the confirmation',
+        :accepted  => "%s is not accepted",
+        :nil => '%s must not be nil',
+        :blank => '%s must not be blank',
+        :length_between => '%s must be between %s and %s characters long',
+        :too_long => '%s must be less than %s characters long',
+        :too_short => '%s must be more than %s characters long',
+        :wrong_length => '%s must be %s characters long',
+        :taken => '%s is already taken',
+        :not_a_number => '%s must be a number',
+        :not_an_integer => '%s must be an integer',
+        :greater_than => '%s must be greater than %s',
+        :greater_than_or_equal_to => "%s must be greater than or equal to %s",
+        :equal_to => "%s must be equal to %s",
+        :less_than => '%s must be less than %s',
+        :less_than_or_equal_to => "%s must be less than or equal to %s",
+        :value_between => '%s must be between %s and %s',
+        :primitive => '%s must be of type %s'
+      }
+
+      # Holds a hash with all the default error messages that can be replaced by your own copy or localizations.
+      cattr_writer :default_error_messages
+
+      def self.default_error_message(key, field, *values)
+        field = Extlib::Inflection.humanize(field)
+        @@default_error_messages[key] % [field, *values].flatten
+      end
+
       # Clear existing validation errors.
       def clear!
         errors.clear
@@ -25,7 +57,7 @@ module DataMapper
 
       # Collect all errors into a single list.
       def full_messages
-        errors.inject([]) do |list,pair|
+        errors.inject([]) do |list, pair|
           list += pair.last
         end
       end
@@ -39,7 +71,7 @@ module DataMapper
       end
 
       def each
-        errors.map.each do |k,v|
+        errors.map.each do |k, v|
           next if v.blank?
           yield(v)
         end

data/lib/dm-validations/version.rb

@@ -1,5 +1,5 @@
 module DataMapper
   module Validations
-    VERSION = '0.9.9'
+    VERSION = '0.9.10'
   end
 end

data/lib/dm-validations/within_validator.rb

@@ -14,23 +14,25 @@ module DataMapper
       end
 
       def call(target)
-        includes = @options[:set].include?(target.send(field_name))
-        return true if includes
-
-        field_name = Extlib::Inflection.humanize(@field_name)
-        if @options[:set].is_a?(Range)
-          if @options[:set].first != -n && @options[:set].last != n
-            error_message = @options[:message] || "%s must be between %s and %s".t(field_name, @options[:set].first, @options[:set].last)
-          elsif @options[:set].first == -n
-            error_message = @options[:message] || "%s must be less than %s".t(field_name, @options[:set].last)
-          elsif @options[:set].last == n
-            error_message = @options[:message] || "%s must be greater than %s".t(field_name, @options[:set].first)
+        value = target.send(field_name)
+        return true if @options[:allow_nil] && value.nil?
+        return true if @options[:set].include?(value)
+
+        set = @options[:set]
+        msg = @options[:message]
+        if set.is_a?(Range)
+          if set.first != -n && set.last != n
+            error_message = msg || ValidationErrors.default_error_message(:value_between, field_name, set.first, set.last)
+          elsif set.first == -n
+            error_message = msg || ValidationErrors.default_error_message(:less_than_or_equal_to, field_name, set.last)
+          elsif set.last == n
+            error_message = msg || ValidationErrors.default_error_message(:greater_than_or_equal_to, field_name, set.first)
           end
         else
-          error_message = "%s must be one of [%s]".t(field_name, @options[:set].join(', '))
+          error_message = ValidationErrors.default_error_message(:inclusion, field_name, set.join(', '))
         end
 
-        add_error(target, error_message , @field_name)
+        add_error(target, error_message, field_name)
         return false
       end
 

data/spec/integration/absent_field_validator_spec.rb

@@ -3,14 +3,14 @@ require Pathname(__FILE__).dirname.expand_path.parent + 'spec_helper'
 
 describe DataMapper::Validate::AbsentFieldValidator do
   before(:all) do
-    class Kayak
+    class ::Kayak
       include DataMapper::Resource
       property :id, Integer, :key => true
       property :salesman, String, :auto_validation => false
       validates_absent :salesman, :when => :sold
     end
 
-    class Pirogue
+    class ::Pirogue
       include DataMapper::Resource
       property :id, Integer, :key => true
       property :salesman, String, :default => 'Layfayette'
@@ -24,11 +24,13 @@ describe DataMapper::Validate::AbsentFieldValidator do
 
     kayak.salesman = 'Joe'
     kayak.valid_for_sold?.should_not == true
+    kayak.errors.on(:salesman).should include('Salesman must be absent')
   end
 
   it "should validate the absence of a value and ensure defaults" do
     pirogue = Pirogue.new
     pirogue.should_not be_valid_for_sold
+    pirogue.errors.on(:salesman).should include('Salesman must be absent')
   end
 
 end

data/spec/integration/acceptance_validator_spec.rb

@@ -4,7 +4,7 @@ require Pathname(__FILE__).dirname.expand_path.parent + 'spec_helper'
 describe DataMapper::Validate::AcceptanceValidator do
   describe "with standard options" do
     before(:all) do
-      class SkimBat
+      class ::SkimBat
         include DataMapper::Resource
         property :id,        Integer, :serial => true
         property :sailyness, Boolean
@@ -31,7 +31,7 @@ describe DataMapper::Validate::AcceptanceValidator do
     it "should add the default message when invalid" do
       @s.sailyness = "0"
       @s.valid?.should == false
-      @s.errors.full_messages.join(" ").should =~ /#{DataMapper::Validate::AcceptanceValidator.default_message_for_field("sailyness")}/
+      @s.errors.on(:sailyness).should include('Sailyness is not accepted')
     end
   end
   describe "with :allow_nil => false" do
@@ -81,7 +81,7 @@ describe DataMapper::Validate::AcceptanceValidator do
     it "should append the custom message when invalid" do
       @s.sailyness = "0"
       @s.valid?.should == false
-      @s.errors.full_messages.join(" ").should =~ /hehu!/
+      @s.errors.on(:sailyness).should include('hehu!')
     end
   end
 end

data/spec/integration/auto_validate_spec.rb

@@ -4,7 +4,7 @@ require Pathname(__FILE__).dirname.expand_path.parent + 'spec_helper'
 module TypecastBypassSetter
   # Bypass typecasting so we can set values for specs
   def set(attributes)
-    attributes.each do |k,v|
+    attributes.each do |k, v|
       instance_variable_set("@#{k}", v)
     end
   end
@@ -65,6 +65,7 @@ describe "Automatic Validation from Property Definition" do
 
     boat = SailBoat.new
     boat.valid_for_presence_test?.should == false
+    boat.errors.on(:name).should include('Name must not be blank')
     boat.name = 'Float'
     boat.valid_for_presence_test?.should == true
   end
@@ -75,6 +76,7 @@ describe "Automatic Validation from Property Definition" do
     boat.valid_for_length_test_1?.should == true  #no minimum length
     boat.description = 'ABCDEFGHIJK' #11
     boat.valid_for_length_test_1?.should == false
+    boat.errors.on(:description).should include('Description must be less than 10 characters long')
     boat.description = 'ABCDEFGHIJ' #10
     boat.valid_for_length_test_1?.should == true
   end
@@ -88,6 +90,7 @@ describe "Automatic Validation from Property Definition" do
     boat.should be_valid_for_length_test_2
     boat.notes = 'ABCDEFGHIJK' #11
     boat.should_not be_valid_for_length_test_2
+    boat.errors.on(:notes).should include('Notes must be between 2 and 10 characters long')
     boat.notes = 'ABCDEFGHIJ' #10
     boat.should be_valid_for_length_test_2
   end
@@ -100,6 +103,7 @@ describe "Automatic Validation from Property Definition" do
     boat.should be_valid_for_format_test
     boat.code = 'BAD CODE'
     boat.should_not be_valid_for_format_test
+    boat.errors.on(:code).should include('Code has an invalid format')
   end
 
   it "should auto validate all strings for max length" do
@@ -110,9 +114,9 @@ describe "Automatic Validation from Property Definition" do
     end
     t = klass.new(:id => 1)
     t.should be_valid
-    t.name = 'Lip­smackin­thirst­quenchin­acetastin­motivatin­good­buzzin­cool­talkin­high­walkin­fast­livin­ever­givin­cool­fizzin'
+    t.name = 'a' * 51
     t.should_not be_valid
-    t.errors.full_messages.should include('Name must be less than 50 characters long')
+    t.errors.on(:name).should include('Name must be less than 50 characters long')
   end
 
   it "should auto validate the primitive type" do
@@ -122,6 +126,7 @@ describe "Automatic Validation from Property Definition" do
     boat.should be_valid_for_primitive_test
     boat.build_date = 'ABC'
     boat.should_not be_valid_for_primitive_test
+    boat.errors.on(:build_date).should include('Build date must be of type Date')
   end
 
   it "should not auto add any validators if the option :auto_validation => false was given" do
@@ -164,13 +169,13 @@ describe "Automatic Validation from Property Definition" do
     it 'should not allow floats' do
       @boat.set(:id => 1.0)
       @boat.should_not be_valid
-      @boat.errors.on(:id).should == [ 'Id must be an integer' ]
+      @boat.errors.on(:id).should include('Id must be an integer')
     end
 
     it 'should not allow decimals' do
       @boat.set(:id => BigDecimal('1'))
       @boat.should_not be_valid
-      @boat.errors.on(:id).should == [ 'Id must be an integer' ]
+      @boat.errors.on(:id).should include('Id must be an integer')
     end
   end
 
@@ -213,6 +218,7 @@ describe "Automatic Validation from Property Definition" do
     it 'should not allow nil' do
       @boat.set(:bool => nil)
       @boat.should_not be_valid
+      @boat.errors.on(:bool).should include('Bool must not be nil')
     end
   end
 
@@ -234,10 +240,11 @@ describe "Automatic Validation from Property Definition" do
     it 'should not allow nil' do
       @boat.set(:bool => nil)
       @boat.should_not be_valid
+      @boat.errors.on(:bool).should include('Bool must not be nil')
     end
   end
 
-  { :float => Float, :big_decimal => BigDecimal }.each do |column,type|
+  { :float => Float, :big_decimal => BigDecimal }.each do |column, type|
     describe "for #{type} properties" do
       before do
         @boat = SailBoat.new(:id => 1)
@@ -262,7 +269,7 @@ describe "Automatic Validation from Property Definition" do
 
   describe 'for within validator' do
     before :all do
-      class LimitedBoat
+      class ::LimitedBoat
         include DataMapper::Resource
         property :id,       Integer,  :serial => true
         property :limited,  String,   :set => ['foo', 'bar', 'bang'], :default => 'foo'
@@ -280,6 +287,7 @@ describe "Automatic Validation from Property Definition" do
     it 'should not accept value not in range' do
       @boat.limited = "blah"
       @boat.should_not be_valid
+      @boat.errors.on(:limited).should include('Limited must be one of [foo, bar, bang]')
     end
 
   end
@@ -293,8 +301,7 @@ describe "Automatic Validation from Property Definition" do
       end
       boat = custom_boat.new
       boat.should_not be_valid
-
-      boat.errors.on(:name).should eql(["This boat must have name"])
+      boat.errors.on(:name).should include('This boat must have name')
     end
 
     it "should have correct error messages" do

data/spec/integration/block_validator_spec.rb

@@ -3,7 +3,7 @@ require Pathname(__FILE__).dirname.expand_path.parent + 'spec_helper'
 
 describe DataMapper::Validate::ValidatesWithBlock do
   before(:all) do
-    class Ship
+    class ::Ship
       include DataMapper::Resource
       property :id, Integer, :key => true
       property :name, String
@@ -20,13 +20,7 @@ describe DataMapper::Validate::ValidatesWithBlock do
     end
   end
 
-  it "should validate via a block on the resource" do
-    Ship.new.valid_for_testing_failure?.should == false
-    Ship.new.valid_for_testing_success?.should == true
-    ship = Ship.new
-    ship.valid_for_testing_failure?.should == false
-    ship.errors.full_messages.include?('Validation failed').should == true
-  end
+  it "should validate via a block on the resource"
 
   it "should validate via a block and add error to field" do
     ship = Ship.new

data/spec/integration/confirmation_validator_spec.rb

@@ -3,7 +3,7 @@ require Pathname(__FILE__).dirname.expand_path.parent + 'spec_helper'
 
 describe DataMapper::Validate::ConfirmationValidator do
   before(:all) do
-    class Canoe
+    class ::Canoe
       include DataMapper::Resource
 
       property :id,                Integer, :serial => true
@@ -16,7 +16,7 @@ describe DataMapper::Validate::ConfirmationValidator do
   end
 
   it "should only validate if the attribute is dirty" do
-    class Transformer
+    class ::Transformer
       include DataMapper::Resource
 
       property :id,                Integer, :serial => true
@@ -41,6 +41,7 @@ describe DataMapper::Validate::ConfirmationValidator do
     canoe.name = 'White Water'
     canoe.name_confirmation = 'Not confirmed'
     canoe.should_not be_valid
+    canoe.errors.on(:name).should include('Name does not match the confirmation')
     canoe.errors.full_messages.first.should == 'Name does not match the confirmation'
 
     canoe.name_confirmation = 'White Water'
@@ -60,15 +61,17 @@ describe DataMapper::Validate::ConfirmationValidator do
   end
 
   it "should not pass validation with a nil value when specified to" do
-    class Canoe
+    class ::Canoe
       validators.clear!
       validates_is_confirmed :name, :allow_nil => false
     end
-    Canoe.new.should_not be_valid
+    canoe = Canoe.new
+    canoe.should_not be_valid
+    canoe.errors.on(:name).should include('Name does not match the confirmation')
   end
 
   it "should allow the name of the confirmation field to be set" do
-    class Canoe
+    class ::Canoe
       validators.clear!
       validates_is_confirmed :name, :confirm => :name_check
       def name_check=(value)
@@ -86,7 +89,7 @@ describe DataMapper::Validate::ConfirmationValidator do
   end
 
   it "should not require that the confirmation field be a property" do
-    class Raft
+    class ::Raft
       include DataMapper::Resource
       attr_accessor :name, :name_confirmation
 
@@ -95,8 +98,8 @@ describe DataMapper::Validate::ConfirmationValidator do
       validates_is_confirmed :name
     end
 
-    raft = Raft.new
+    raft = Raft.new(:id => 10)
     raft.name = 'Lifeboat'
-    lambda { raft.should_not be_valid }.should_not raise_error
+    raft.should_not be_valid
   end
 end

data/spec/integration/contextual_validators_spec.rb

@@ -4,7 +4,7 @@ require Pathname(__FILE__).dirname.expand_path.parent + 'spec_helper'
 describe DataMapper::Validate::ContextualValidators do
 
   before :all do
-    class Kayak
+    class ::Kayak
       include DataMapper::Resource
       property :id, Integer, :key => true
       property :salesman, String, :auto_validation => false
@@ -17,6 +17,7 @@ describe DataMapper::Validate::ContextualValidators do
     k.valid?(:sold).should == true
     k.salesman = 'John Doe'
     k.valid?(:sold).should_not == true
+    k.errors.on(:salesman).should include('Salesman must be absent')
   end
 
   it "should raise an exception if you provide an invalid context to save" do

data/spec/integration/format_validator_spec.rb

@@ -3,7 +3,7 @@ require Pathname(__FILE__).dirname.expand_path.parent + 'spec_helper'
 
 describe DataMapper::Validate::FormatValidator do
   before :all do
-    class BillOfLading
+    class ::BillOfLading
       include DataMapper::Resource
 
       property :id,       Serial

data/spec/integration/length_validator/error_message_spec.rb

@@ -0,0 +1,23 @@
+require 'pathname'
+__dir__ = Pathname(__FILE__).dirname.expand_path
+
+# global first, then local to length validators
+require __dir__.parent.parent + "spec_helper"
+require __dir__ + 'spec_helper'
+
+describe DataMapper::Validate::LengthValidator do
+  it "lets user specify 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.should_not be_valid
+    wock.errors.on(:snickersnack).should include('worble warble')
+    wock.snickersnack = "hello"
+    wock.id = 1
+    wock.should be_valid
+  end
+end

data/spec/integration/length_validator/maximum_spec.rb

@@ -0,0 +1,31 @@
+require 'pathname'
+__dir__ = Pathname(__FILE__).dirname.expand_path
+
+# global first, then local to length validators
+require __dir__.parent.parent + "spec_helper"
+require __dir__ + 'spec_helper'
+
+describe DataMapper::Validate::LengthValidator do
+  it "lets user specify a maximum length of a string field" do
+    class ::MotorLaunch
+      validators.clear!
+      validates_length :name, :max => 5
+    end
+
+    launch = MotorLaunch.new
+    launch.name = 'a' * 6
+    launch.should_not be_valid
+    launch.errors.on(:name).should include('Name must be less than 5 characters long')
+  end
+
+  it "aliases :maximum for :max" do
+    class ::MotorLaunch
+      validators.clear!
+      validates_length :name, :maximum => 5
+    end
+    launch = MotorLaunch.new
+    launch.name = 'a' * 6
+    launch.should_not be_valid
+    launch.errors.on(:name).should include('Name must be less than 5 characters long')
+  end
+end