dm-validations 0.10.1 → 0.10.2

data/lib/dm-validations/validators/primitive_validator.rb

@@ -10,7 +10,7 @@ module DataMapper
         value    = target.validation_property_value(field_name)
         property = target.validation_property(field_name)
 
-        return true if value.nil? || value.kind_of?(property.primitive) || property.primitive == TrueClass && value.kind_of?(FalseClass)
+        return true if value.nil? || property.primitive?(value)
 
         error_message = @options[:message] || default_error(property)
         add_error(target, error_message, field_name)

data/lib/dm-validations/validators/uniqueness_validator.rb

@@ -12,30 +12,34 @@ module DataMapper
         assert_kind_of 'scope', options[:scope], Array, Symbol if options.has_key?(:scope)
         super
 
-        @options[:allow_nil] = true unless @options.include?(:allow_nil)
+        set_optional_by_default
       end
 
       def call(target)
-        value = target.send(field_name)
+        return true if valid?(target)
 
-        return true if @options[:allow_nil] && value.blank?
+        error_message = @options[:message] || ValidationErrors.default_error_message(:taken, field_name)
+        add_error(target, error_message, field_name)
+
+        false
+      end
+
+      def valid?(target)
+        value = target.validation_property_value(field_name)
+        return true if optional?(value)
 
         opts = {
           :fields    => target.model.key,
           field_name => value,
         }
 
-        Array(@options[:scope]).each { |subject| opts[subject] = target.send(subject) }
+        Array(@options[:scope]).each { |subject| opts[subject] = target.__send__(subject) }
 
         resource = DataMapper.repository(target.repository.name) { target.model.first(opts) }
 
         return true if resource.nil?
-        return true if target.saved? && resource.key == target.key
 
-        error_message = @options[:message] || ValidationErrors.default_error_message(:taken, field_name)
-        add_error(target, error_message, field_name)
-
-        false
+        target.saved? && resource.key == target.key
       end
     end # class UniquenessValidator
 

data/lib/dm-validations/validators/within_validator.rb

@@ -14,8 +14,8 @@ module DataMapper
       end
 
       def call(target)
-        value = target.send(field_name)
-        return true if @options[:allow_nil] && value.blank?
+        value = target.validation_property_value(field_name)
+        return true if optional?(value)
         return true if @options[:set].include?(value)
 
         set = @options[:set]
@@ -33,7 +33,8 @@ module DataMapper
         end
 
         add_error(target, error_message, field_name)
-        return false
+
+        false
       end
 
       def n

data/spec/fixtures/basketball_player.rb

@@ -29,9 +29,6 @@ module DataMapper
         # precision and scale need to be defined for length to be validated
         validates_is_number :height, :weight, :precision => 10
       end
-      BasketballPlayer.auto_migrate!
-
-
     end # Fixtures
   end # Validate
 end # DataMapper

data/spec/fixtures/bill_of_landing.rb

@@ -32,7 +32,7 @@ module DataMapper
         }
 
         validates_format :email, :as => :email_address
-        validates_format :url, :as => :url, :allow_nil => false
+        validates_format :url, :as => :url, :allow_nil => false, :allow_blank => false
 
         validates_format :username, :with => /[a-z]/, :message => 'Username must have at least one letter', :allow_nil => true
         validates_format :code,     :with => /\d{5,6}/, :message => 'Code format is invalid'

data/spec/fixtures/city.rb

@@ -22,4 +22,3 @@ class City
 
   validates_is_number :founded_in, :message => "Foundation year must be an integer"
 end
-City.auto_migrate!

data/spec/fixtures/company.rb

@@ -61,8 +61,6 @@ module DataMapper
         validates_present :title, :message => "Product company must have a name"
         validates_present :flagship_product
       end
-      ProductCompany.auto_migrate!
-
 
       class Product
         #
@@ -76,7 +74,7 @@ module DataMapper
         #
 
         property :id,   Serial
-        property :name, String, :nullable => false
+        property :name, String, :required => true
 
         #
         # Associations

data/spec/fixtures/corporate_world.rb

@@ -12,8 +12,6 @@ if HAS_SQLITE3 || HAS_MYSQL || HAS_POSTGRES
           property :domain, String, :unique_index => true
 
           validates_is_unique :domain, :allow_nil => true
-
-          auto_migrate!
         end
 
         class Department
@@ -23,8 +21,6 @@ if HAS_SQLITE3 || HAS_MYSQL || HAS_POSTGRES
           property :name, String, :unique_index => true
 
           validates_is_unique :name
-
-          auto_migrate!
         end
 
         class User
@@ -38,8 +34,6 @@ if HAS_SQLITE3 || HAS_MYSQL || HAS_POSTGRES
 
           validates_is_unique :user_name, :when => :signing_up_for_department_account,   :scope => [:department]
           validates_is_unique :user_name, :when => :signing_up_for_organization_account, :scope => [:organisation]
-
-          auto_migrate!
         end
       end
     end

data/spec/fixtures/country.rb

@@ -22,4 +22,3 @@ class Country
 
   validates_is_number :area, :message => "Please use integers to specify area"
 end
-Country.auto_migrate!

data/spec/fixtures/event.rb

@@ -16,7 +16,7 @@ module DataMapper
         #
 
         property :id,   Serial
-        property :name, String, :nullable => false
+        property :name, String, :required => true
 
         property :starts_at, DateTime
         property :ends_at,   DateTime

data/spec/fixtures/page.rb

@@ -17,14 +17,14 @@ module DataMapper
         #
 
         property :id,   Serial, :key      => true
-        property :body, Text,   :nullable => false
+        property :body, Text,   :required => true
 
         #
         # Validations
         #
 
         # duplicates inferred validation for body (caused by
-        # :nullable => false)
+        # :required => true)
         validates_present :body
       end
     end # Fixtures

data/spec/fixtures/reservation.rb

@@ -28,7 +28,7 @@ module DataMapper
         # Validations
         #
 
-        validates_is_confirmed :person_name,     :allow_nil => false
+        validates_is_confirmed :person_name,     :allow_nil => false, :allow_blank => false
         validates_is_confirmed :number_of_seats, :confirm => :seats_confirmation, :message => Proc.new { |resource, property|
           '%s requires confirmation for %s' % [Extlib::Inflection.demodulize(resource.model.name), property.name]
         }

data/spec/fixtures/scm_operation.rb

@@ -33,8 +33,6 @@ if HAS_SQLITE3 || HAS_MYSQL || HAS_POSTGRES
 
     validates_present :name
   end
-  ScmOperation.auto_migrate!
-
 
   class SubversionOperation < ScmOperation
     #
@@ -44,9 +42,6 @@ if HAS_SQLITE3 || HAS_MYSQL || HAS_POSTGRES
     validates_present :network_connection, :when => [:committing, :log_viewing]
   end
 
-  SubversionOperation.auto_migrate!
-
-
   class GitOperation < ScmOperation
     #
     # Validations
@@ -61,7 +56,4 @@ if HAS_SQLITE3 || HAS_MYSQL || HAS_POSTGRES
     }
     validates_present :clean_working_copy, :when => :pulling
   end
-
-
-  GitOperation.auto_migrate!
 end

data/spec/integration/absent_field_validator/absent_field_validator_spec.rb

@@ -1,8 +1,10 @@
 require 'spec_helper'
 require 'integration/absent_field_validator/spec_helper'
 
-describe DataMapper::Validate::Fixtures::Kayak do
+describe 'DataMapper::Validate::Fixtures::Kayak' do
   before :all do
+    DataMapper::Validate::Fixtures::Kayak.auto_migrate!
+
     @kayak = DataMapper::Validate::Fixtures::Kayak.new
     @kayak.should be_valid_for_sale
   end
@@ -68,8 +70,10 @@ describe DataMapper::Validate::Fixtures::Kayak do
 end
 
 
-describe DataMapper::Validate::Fixtures::Pirogue do
+describe 'DataMapper::Validate::Fixtures::Pirogue' do
   before :all do
+    DataMapper::Validate::Fixtures::Pirogue.auto_migrate!
+
     @kayak = DataMapper::Validate::Fixtures::Pirogue.new
     @kayak.should_not be_valid_for_sale
   end

data/spec/integration/acceptance_validator/acceptance_validator_spec.rb

@@ -1,16 +1,20 @@
 require 'spec_helper'
 require 'integration/acceptance_validator/spec_helper'
 
-describe DataMapper::Validate::Fixtures::BetaTesterAccount do
-  before :each do
+describe 'DataMapper::Validate::Fixtures::BetaTesterAccount' do
+  before :all do
+    DataMapper::Validate::Fixtures::BetaTesterAccount.auto_migrate!
+  end
+
+  before do
     @model = DataMapper::Validate::Fixtures::BetaTesterAccount.new(:user_agreement    => true,
-                                                                   :newsletter_signup => "",
+                                                                   :newsletter_signup => nil,
                                                                    :privacy_agreement => "accept")
     @model.should be_valid
   end
 
   describe "with a missing newsletter signup field" do
-    before :each do
+    before do
       @model.newsletter_signup = nil
     end
 
@@ -20,18 +24,17 @@ describe DataMapper::Validate::Fixtures::BetaTesterAccount do
   end
 
   describe "with a blank newsletter signup field" do
-    before :each do
+    before do
       @model.newsletter_signup = ""
     end
 
-    it "is perfectly valid" do
-      @model.should be_valid
+    it "is NOT valid" do
+      @model.should_not be_valid
     end
   end
 
-
   describe "with a blank user agreement field" do
-    before :each do
+    before do
       @model.user_agreement = ""
     end
 
@@ -40,9 +43,8 @@ describe DataMapper::Validate::Fixtures::BetaTesterAccount do
     end
   end
 
-
   describe "with a nil user agreement field" do
-    before :each do
+    before do
       @model.user_agreement = nil
     end
 
@@ -51,9 +53,8 @@ describe DataMapper::Validate::Fixtures::BetaTesterAccount do
     end
   end
 
-
   describe "with user agreement field having value of 1 (as integer)" do
-    before :each do
+    before do
       @model.user_agreement = 1
     end
 
@@ -62,9 +63,8 @@ describe DataMapper::Validate::Fixtures::BetaTesterAccount do
     end
   end
 
-
   describe "with user agreement field having value of 1 (as a string)" do
-    before :each do
+    before do
       @model.user_agreement = "1"
     end
 
@@ -73,9 +73,8 @@ describe DataMapper::Validate::Fixtures::BetaTesterAccount do
     end
   end
 
-
   describe "with user agreement field having value of 'true' (as a string)" do
-    before :each do
+    before do
       @model.user_agreement = 'true'
     end
 
@@ -84,9 +83,8 @@ describe DataMapper::Validate::Fixtures::BetaTesterAccount do
     end
   end
 
-
   describe "with user agreement field having value of true (TrueClass instance)" do
-    before :each do
+    before do
       @model.user_agreement = true
     end
 
@@ -95,9 +93,8 @@ describe DataMapper::Validate::Fixtures::BetaTesterAccount do
     end
   end
 
-
   describe "with user agreement field having value of 't' (The Lisp Way)" do
-    before :each do
+    before do
       @model.user_agreement = 't'
     end
 
@@ -106,9 +103,8 @@ describe DataMapper::Validate::Fixtures::BetaTesterAccount do
     end
   end
 
-
   describe "with user agreement field having value of 'f'" do
-    before :each do
+    before do
       @model.user_agreement = 'f'
     end
 
@@ -117,9 +113,18 @@ describe DataMapper::Validate::Fixtures::BetaTesterAccount do
     end
   end
 
+  describe "with user agreement field having value of false" do
+    before do
+      @model.user_agreement = false
+    end
+
+    it "is NOT valid" do
+      @model.should_not be_valid
+    end
+  end
 
   describe "with privacy agreement field having value of 1" do
-    before :each do
+    before do
       @model.privacy_agreement = 1
     end
 
@@ -129,7 +134,7 @@ describe DataMapper::Validate::Fixtures::BetaTesterAccount do
   end
 
   describe "with privacy agreement field having value of true" do
-    before :each do
+    before do
       @model.privacy_agreement = true
     end
 
@@ -138,9 +143,8 @@ describe DataMapper::Validate::Fixtures::BetaTesterAccount do
     end
   end
 
-
   describe "with privacy agreement field having value of '1'" do
-    before :each do
+    before do
       @model.privacy_agreement = '1'
     end
 
@@ -149,9 +153,8 @@ describe DataMapper::Validate::Fixtures::BetaTesterAccount do
     end
   end
 
-
   describe "with privacy agreement field having value of 't'" do
-    before :each do
+    before do
       @model.privacy_agreement = 't'
     end
 
@@ -160,9 +163,8 @@ describe DataMapper::Validate::Fixtures::BetaTesterAccount do
     end
   end
 
-
   describe "with privacy agreement field having value of 'accept'" do
-    before :each do
+    before do
       @model.privacy_agreement = 'accept'
     end
 
@@ -171,9 +173,8 @@ describe DataMapper::Validate::Fixtures::BetaTesterAccount do
     end
   end
 
-
   describe "with privacy agreement field having value of 'agreed'" do
-    before :each do
+    before do
       @model.privacy_agreement = 'agreed'
     end
 
@@ -182,9 +183,8 @@ describe DataMapper::Validate::Fixtures::BetaTesterAccount do
     end
   end
 
-
   describe "with privacy agreement field having value of 'ah, greed'" do
-    before :each do
+    before do
       @model.privacy_agreement = 'ah, greed'
     end
 
@@ -193,4 +193,4 @@ describe DataMapper::Validate::Fixtures::BetaTesterAccount do
       @model.should_not be_valid
     end
   end
-end # describe DataMapper::Validate::Fixtures::BetaTesterAccount do
+end