dm-validations 0.10.2 → 1.0.0.rc1

data/spec/integration/numeric_validator/float_type_spec.rb

@@ -1,11 +1,11 @@
 require 'spec_helper'
 require 'integration/numeric_validator/spec_helper'
 
-describe 'DataMapper::Validate::Fixtures::BasketballPlayer' do
+describe 'DataMapper::Validations::Fixtures::BasketballPlayer' do
   before :all  do
-    DataMapper::Validate::Fixtures::BasketballPlayer.auto_migrate!
+    DataMapper::Validations::Fixtures::BasketballPlayer.auto_migrate!
 
-    @model = DataMapper::Validate::Fixtures::BasketballPlayer.new(:name => "Michael Jordan", :height => 198.1, :weight => 97.2)
+    @model = DataMapper::Validations::Fixtures::BasketballPlayer.new(:name => "Michael Jordan", :height => 198.1, :weight => 97.2)
   end
 
   describe "with height as float" do

data/spec/integration/numeric_validator/gt_with_float_type_spec.rb

@@ -1,11 +1,11 @@
 require 'spec_helper'
 require 'integration/numeric_validator/spec_helper'
 
-describe 'DataMapper::Validate::Fixtures::BasketballCourt' do
+describe 'DataMapper::Validations::Fixtures::BasketballCourt' do
   before :all do
-    DataMapper::Validate::Fixtures::BasketballCourt.auto_migrate!
+    DataMapper::Validations::Fixtures::BasketballCourt.auto_migrate!
 
-    @model = DataMapper::Validate::Fixtures::BasketballCourt.valid_instance
+    @model = DataMapper::Validations::Fixtures::BasketballCourt.valid_instance
     @model.valid?
   end
 

data/spec/integration/numeric_validator/gte_with_float_type_spec.rb

@@ -1,11 +1,11 @@
 require 'spec_helper'
 require 'integration/numeric_validator/spec_helper'
 
-describe 'DataMapper::Validate::Fixtures::BasketballCourt' do
+describe 'DataMapper::Validations::Fixtures::BasketballCourt' do
   before :all do
-    DataMapper::Validate::Fixtures::BasketballCourt.auto_migrate!
+    DataMapper::Validations::Fixtures::BasketballCourt.auto_migrate!
 
-    @model = DataMapper::Validate::Fixtures::BasketballCourt.valid_instance
+    @model = DataMapper::Validations::Fixtures::BasketballCourt.valid_instance
     @model.valid?
   end
 

data/spec/integration/numeric_validator/lt_with_float_type_spec.rb

@@ -1,11 +1,11 @@
 require 'spec_helper'
 require 'integration/numeric_validator/spec_helper'
 
-describe 'DataMapper::Validate::Fixtures::BasketballCourt' do
+describe 'DataMapper::Validations::Fixtures::BasketballCourt' do
   before :all do
-    DataMapper::Validate::Fixtures::BasketballCourt.auto_migrate!
+    DataMapper::Validations::Fixtures::BasketballCourt.auto_migrate!
 
-    @model = DataMapper::Validate::Fixtures::BasketballCourt.valid_instance
+    @model = DataMapper::Validations::Fixtures::BasketballCourt.valid_instance
     @model.valid?
   end
 

data/spec/integration/numeric_validator/lte_with_float_type_spec.rb

@@ -1,11 +1,11 @@
 require 'spec_helper'
 require 'integration/numeric_validator/spec_helper'
 
-describe 'DataMapper::Validate::Fixtures::BasketballCourt' do
+describe 'DataMapper::Validations::Fixtures::BasketballCourt' do
   before :all do
-    DataMapper::Validate::Fixtures::BasketballCourt.auto_migrate!
+    DataMapper::Validations::Fixtures::BasketballCourt.auto_migrate!
 
-    @model = DataMapper::Validate::Fixtures::BasketballCourt.valid_instance
+    @model = DataMapper::Validations::Fixtures::BasketballCourt.valid_instance
     @model.valid?
   end
 

data/spec/integration/primitive_validator/primitive_validator_spec.rb

@@ -1,13 +1,13 @@
 require 'spec_helper'
 require 'integration/primitive_validator/spec_helper'
 
-describe 'DataMapper::Validate::Fixtures::MemoryObject' do
-  include DataMapper::Validate::Fixtures
+describe 'DataMapper::Validations::Fixtures::MemoryObject' do
+  include DataMapper::Validations::Fixtures
 
   before :all do
-    DataMapper::Validate::Fixtures::MemoryObject.auto_migrate!
+    DataMapper::Validations::Fixtures::MemoryObject.auto_migrate!
 
-    @model = DataMapper::Validate::Fixtures::MemoryObject.new
+    @model = DataMapper::Validations::Fixtures::MemoryObject.new
   end
 
   describe "with color given as a string" do

data/spec/integration/pure_ruby_objects/plain_old_ruby_object_validation_spec.rb

@@ -7,18 +7,18 @@ module PureRubyObjects
     # Behaviors
     #
 
-    include DataMapper::Validate
+    include DataMapper::Validations
 
     #
     # Validations
     #
 
-    validates_present :name,       :when => [:default, :adding_to_encyclopedia]
-    validates_present :population, :when => :adding_to_encyclopedia, :message => Proc.new { |record|
+    validates_presence_of :name,       :when => [:default, :adding_to_encyclopedia]
+    validates_presence_of :population, :when => :adding_to_encyclopedia, :message => Proc.new { |record|
       "population really needs to be specified when adding %s to encyclopedia" % [record.class.name]
     }
 
-    validates_length  :name,       :in => (4..50)
+    validates_length_of  :name,       :in => (4..50)
 
     #
     # API

data/spec/integration/required_field_validator/association_spec.rb

@@ -1,71 +1,42 @@
 require 'spec_helper'
 require 'integration/required_field_validator/spec_helper'
 
-if HAS_SQLITE3 || HAS_MYSQL || HAS_POSTGRES
-  class Artist
-    #
-    # Behaviors
-    #
+describe 'required_field_validator/association_spec' do
 
-    include DataMapper::Resource
+  before :all do
 
-    #
-    # Properties
-    #
+    class ::Artist
 
-    property :id,   Serial
-    property :name, String,  :auto_validation => false
+      include DataMapper::Resource
 
-    #
-    # Associations
-    #
+      property :id,   Serial
+      property :name, String,  :auto_validation => false
 
-    has n, :albums
+      has n, :albums
 
-    #
-    # Validations
-    #
+      validates_presence_of :name
 
-    validates_present :name
-  end
-
-  class Album
-    #
-    # Behaviors
-    #
+    end
 
-    include DataMapper::Resource
+    class ::Album
 
-    #
-    # Properties
-    #
+      include DataMapper::Resource
 
-    property :id,        Serial
-    property :name,      String,  :auto_validation => false
-    property :artist_id, Integer, :index => :artist
+      property :id,        Serial
+      property :name,      String,  :auto_validation => false
+      property :artist_id, Integer, :index => :artist
 
-    #
-    # Associations
-    #
+      belongs_to :artist
 
-    belongs_to :artist
+      validates_presence_of :name, :artist
 
-    #
-    # Validations
-    #
+    end
 
-    validates_present :name, :artist
+    Artist.auto_migrate!
   end
-  Artist.auto_migrate!
-  Album.auto_migrate!
-
 
 
   describe 'Album' do
-    before :all do
-      Artist.auto_migrate!
-      Album.auto_migrate!
-    end
 
     before do
       @artist = Artist.create(:name => "Oceanlab")
@@ -88,13 +59,10 @@ if HAS_SQLITE3 || HAS_MYSQL || HAS_POSTGRES
     end
 
     describe 'with specified artist and name' do
-      before do
-        # no op
-      end
-
       it 'is valid' do
         @album.should be_valid
       end
     end
   end
+
 end

data/spec/integration/required_field_validator/boolean_type_value_spec.rb

@@ -1,7 +1,8 @@
 require 'spec_helper'
 require 'integration/required_field_validator/spec_helper'
 
-if HAS_SQLITE3 || HAS_MYSQL || HAS_POSTGRES
+describe 'required_field_validator/boolean_type_value_spec' do
+
   # keep in mind any ScmOperation has a default value for brand property
   # so it is used
   describe 'GitOperation' do
@@ -149,4 +150,6 @@ if HAS_SQLITE3 || HAS_MYSQL || HAS_POSTGRES
       end
     end
   end
+
+
 end

data/spec/integration/required_field_validator/date_type_value_spec.rb

@@ -1,7 +1,8 @@
 require 'spec_helper'
 require 'integration/required_field_validator/spec_helper'
 
-if HAS_SQLITE3 || HAS_MYSQL || HAS_POSTGRES
+describe 'required_field_validator/date_type_value_spec' do
+
   class Holiday
     #
     # Behaviors
@@ -20,7 +21,7 @@ if HAS_SQLITE3 || HAS_MYSQL || HAS_POSTGRES
     # Validations
     #
 
-    validates_present :on
+    validates_presence_of :on
   end
 
   describe 'Holiday' do
@@ -122,4 +123,5 @@ if HAS_SQLITE3 || HAS_MYSQL || HAS_POSTGRES
       end
     end
   end
+
 end

data/spec/integration/required_field_validator/datetime_type_value_spec.rb

@@ -1,7 +1,8 @@
 require 'spec_helper'
 require 'integration/required_field_validator/spec_helper'
 
-if HAS_SQLITE3 || HAS_MYSQL || HAS_POSTGRES
+describe 'required_field_validator/datetime_type_value_spec' do
+
   class ScheduledOperation
     #
     # Behaviors
@@ -20,7 +21,7 @@ if HAS_SQLITE3 || HAS_MYSQL || HAS_POSTGRES
     # Validations
     #
 
-    validates_present :at
+    validates_presence_of :at
   end
 
   describe 'ScheduledOperation' do
@@ -122,4 +123,5 @@ if HAS_SQLITE3 || HAS_MYSQL || HAS_POSTGRES
       end
     end
   end
+
 end

data/spec/integration/required_field_validator/float_type_value_spec.rb

@@ -1,7 +1,8 @@
 require 'spec_helper'
 require 'integration/required_field_validator/spec_helper'
 
-if HAS_SQLITE3 || HAS_MYSQL || HAS_POSTGRES
+describe 'required_field_validator/float_type_value_spec' do
+
   #
   # Especially stupid example since Hg adds local repository revision
   # to each new commit, but lets roll on with this SCM-ish classes and
@@ -25,7 +26,7 @@ if HAS_SQLITE3 || HAS_MYSQL || HAS_POSTGRES
     # Validations
     #
 
-    validates_present :percent
+    validates_presence_of :percent
   end
 
   describe 'CpuConsumption' do
@@ -126,4 +127,5 @@ if HAS_SQLITE3 || HAS_MYSQL || HAS_POSTGRES
       end
     end
   end
+
 end

data/spec/integration/required_field_validator/integer_type_value_spec.rb

@@ -1,7 +1,8 @@
 require 'spec_helper'
 require 'integration/required_field_validator/spec_helper'
 
-if HAS_SQLITE3 || HAS_MYSQL || HAS_POSTGRES
+describe 'required_field_validator/integer_type_value_spec' do
+
   #
   # Especially stupid example since Hg adds local repository revision
   # to each new commit, but lets roll on with this SCM-ish classes and
@@ -18,7 +19,7 @@ if HAS_SQLITE3 || HAS_MYSQL || HAS_POSTGRES
     # Validations
     #
 
-    validates_present :local_repo_revision_num
+    validates_presence_of :local_repo_revision_num
   end
 
   describe 'HgCommit' do
@@ -94,4 +95,5 @@ if HAS_SQLITE3 || HAS_MYSQL || HAS_POSTGRES
       end
     end
   end
+
 end

data/spec/integration/required_field_validator/plain_old_ruby_object_spec.rb

@@ -1,14 +1,15 @@
 require 'spec_helper'
 require 'integration/required_field_validator/spec_helper'
 
-if HAS_SQLITE3 || HAS_MYSQL || HAS_POSTGRES
+describe 'required_field_validator/plain_old_ruby_object_spec' do
+
   describe "A plain old Ruby object (not a DM resource)" do
     before do
       class PlainClass
-        extend DataMapper::Validate::ClassMethods
-        include DataMapper::Validate
+        extend DataMapper::Validations::ClassMethods
+        include DataMapper::Validations
         attr_accessor :accessor
-        validates_present :here, :empty, :nil, :accessor
+        validates_presence_of :here, :empty, :nil, :accessor
         def here;  "here" end
         def empty; ""     end
         def nil;   nil    end
@@ -30,4 +31,5 @@ if HAS_SQLITE3 || HAS_MYSQL || HAS_POSTGRES
       @pc.errors.on(:accessor).should be_nil
     end
   end
+
 end

data/spec/integration/required_field_validator/string_type_value_spec.rb

@@ -1,7 +1,8 @@
 require 'spec_helper'
 require 'integration/required_field_validator/spec_helper'
 
-if HAS_SQLITE3 || HAS_MYSQL || HAS_POSTGRES
+describe 'required_field_validator/string_type_value_spec' do
+
   # keep in mind any ScmOperation has a default value for brand property
   # so it is used
   describe 'GitOperation' do
@@ -162,4 +163,5 @@ if HAS_SQLITE3 || HAS_MYSQL || HAS_POSTGRES
       end
     end
   end
+
 end

data/spec/integration/required_field_validator/text_type_value_spec.rb

@@ -1,7 +1,8 @@
 require 'spec_helper'
 require 'integration/required_field_validator/spec_helper'
 
-if HAS_SQLITE3 || HAS_MYSQL || HAS_POSTGRES
+describe 'required_field_validator/text_type_value_spec' do
+
   # keep in mind any ScmOperation has a default value for brand property
   # so it is used
   describe 'GitOperation' do
@@ -44,4 +45,5 @@ if HAS_SQLITE3 || HAS_MYSQL || HAS_POSTGRES
       end
     end
   end
+
 end

data/spec/integration/shared/valid_and_invalid_model.rb

@@ -1,4 +1,8 @@
 describe "valid model", :shared => true do
+  before do
+    @model.valid?
+  end
+
   it "is valid" do
     @model.should be_valid
   end
@@ -13,6 +17,10 @@ describe "valid model", :shared => true do
 end
 
 describe "invalid model", :shared => true do
+  before do
+    @model.valid?
+  end
+
   it "is NOT valid" do
     @model.should_not be_valid
   end

data/spec/integration/uniqueness_validator/uniqueness_validator_spec.rb

@@ -2,42 +2,43 @@ require 'spec_helper'
 require 'integration/uniqueness_validator/spec_helper'
 
 
-if HAS_SQLITE3 || HAS_MYSQL || HAS_POSTGRES
-  describe 'DataMapper::Validate::Fixtures::Department' do
+describe 'uniqueness_validator/uniqueness_validator_spec' do
+
+  describe 'DataMapper::Validations::Fixtures::Department' do
     before :all do
-      DataMapper::Validate::Fixtures::Department.auto_migrate!
+      DataMapper::Validations::Fixtures::Department.all.destroy!
 
-      DataMapper::Validate::Fixtures::Department.create(:name => "HR")
+      DataMapper::Validations::Fixtures::Department.create(:name => "HR").should be_saved
     end
 
     describe "with unique name" do
-      before :all do
-        @model = DataMapper::Validate::Fixtures::Department.new(:name => "R & D")
+      before do
+        @model = DataMapper::Validations::Fixtures::Department.new(:name => "R & D")
       end
 
       it_should_behave_like "valid model"
     end
 
     describe "with a duplicate name" do
-      before :all do
-        @model = DataMapper::Validate::Fixtures::Department.new(:name => "HR")
+      before do
+        @model = DataMapper::Validations::Fixtures::Department.new(:name => "HR")
       end
 
       it_should_behave_like "invalid model"
     end
   end
 
-  describe 'DataMapper::Validate::Fixtures::Organisation' do
+  describe 'DataMapper::Validations::Fixtures::Organisation' do
     before :all do
-      DataMapper::Validate::Fixtures::Organisation.auto_migrate!
+      DataMapper::Validations::Fixtures::Organisation.all.destroy!
 
       @model = DataMapper.repository do
-        DataMapper::Validate::Fixtures::Organisation.create(:name => 'Apple', :domain => 'apple.com')
+        DataMapper::Validations::Fixtures::Organisation.create(:name => 'Apple', :domain => 'apple.com')
       end
     end
 
     describe "with missing domain" do
-      before :all do
+      before do
         @model.domain = nil
       end
 
@@ -45,8 +46,8 @@ if HAS_SQLITE3 || HAS_MYSQL || HAS_POSTGRES
     end
 
     describe "with a duplicate domain" do
-      before :all do
-        @model = DataMapper::Validate::Fixtures::Organisation.new(:name => 'Fake Apple', :domain => 'apple.com')
+      before do
+        @model = DataMapper::Validations::Fixtures::Organisation.new(:name => 'Fake Apple', :domain => 'apple.com')
       end
 
       it_should_behave_like "invalid model"
@@ -63,16 +64,16 @@ if HAS_SQLITE3 || HAS_MYSQL || HAS_POSTGRES
     end
   end
 
-  describe 'DataMapper::Validate::Fixtures::User' do
+  describe 'DataMapper::Validations::Fixtures::User' do
     before :all do
-      DataMapper::Validate::Fixtures::Organisation.auto_migrate!
-      DataMapper::Validate::Fixtures::Department.auto_migrate!
-      DataMapper::Validate::Fixtures::User.auto_migrate!
+      DataMapper::Validations::Fixtures::Organisation.all.destroy!
+      DataMapper::Validations::Fixtures::Department.all.destroy!
+      DataMapper::Validations::Fixtures::User.all.destroy!
 
       DataMapper.repository do
-        @organization = DataMapper::Validate::Fixtures::Organisation.create(:name => 'Org 101', :domain => '101')
-        @dept         = DataMapper::Validate::Fixtures::Department.create(:name => 'accounting')
-        @user         = DataMapper::Validate::Fixtures::User.create(:organisation => @organization, :user_name => 'guy', :department => @dept)
+        @organization = DataMapper::Validations::Fixtures::Organisation.create(:name => 'Org 101', :domain => '101')
+        @dept         = DataMapper::Validations::Fixtures::Department.create(:name => 'accounting')
+        @user         = DataMapper::Validations::Fixtures::User.create(:organisation => @organization, :user_name => 'guy', :department => @dept)
 
         @organization.should be_saved
         @dept.should be_saved
@@ -81,8 +82,8 @@ if HAS_SQLITE3 || HAS_MYSQL || HAS_POSTGRES
     end
 
     describe "with username not valid across the organization" do
-      before :all do
-        @model = DataMapper::Validate::Fixtures::User.new(:organisation => @organization, :user_name => 'guy')
+      before do
+        @model = DataMapper::Validations::Fixtures::User.new(:organisation => @organization, :user_name => 'guy')
       end
 
       it "is not valid for signing up" do
@@ -90,14 +91,15 @@ if HAS_SQLITE3 || HAS_MYSQL || HAS_POSTGRES
       end
 
       it "has a meaningful error message" do
+        @model.valid?(:signing_up_for_organization_account)
         @model.errors.on(:user_name).should == [ 'User name is already taken' ]
       end
     end
 
 
     describe "with username not valid across the department" do
-      before :all do
-        @model = DataMapper::Validate::Fixtures::User.new(:user_name => 'guy', :department => @dept)
+      before do
+        @model = DataMapper::Validations::Fixtures::User.new(:user_name => 'guy', :department => @dept)
       end
 
       it "is not valid for setting up the account" do
@@ -105,8 +107,10 @@ if HAS_SQLITE3 || HAS_MYSQL || HAS_POSTGRES
       end
 
       it "has a meaningful error message" do
+        @model.valid?(:signing_up_for_department_account)
         @model.errors.on(:user_name).should == [ 'User name is already taken' ]
       end
     end
   end
+
 end