dm-validations 0.10.2 → 1.0.0.rc1

data/spec/fixtures/mathematical_function.rb

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 module DataMapper
-  module Validate
+  module Validations
     module Fixtures
       class MathematicalFunction
         #
@@ -30,5 +30,5 @@ module DataMapper
         validates_within :output, :set => (-n..0), :message => "Negative values or zero only, please"
       end # MathematicalFunction
     end # Fixtures
-  end # Validate
+  end # Validations
 end # DataMapper

data/spec/fixtures/memory_object.rb

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 module DataMapper
-  module Validate
+  module Validations
     module Fixtures
       class MemoryObject
         #
@@ -22,8 +22,8 @@ module DataMapper
         # Validations
         #
 
-        validates_is_primitive :marked
-        validates_is_primitive :color
+        validates_primitive_type_of :marked
+        validates_primitive_type_of :color
       end
     end
   end

data/spec/fixtures/mittelschnauzer.rb

@@ -1,5 +1,5 @@
 module DataMapper
-  module Validate
+  module Validations
     module Fixtures
       class Mittelschnauzer
 
@@ -22,9 +22,9 @@ module DataMapper
         # Validations
         #
 
-        validates_length :name, :min => 2, :allow_nil => false
+        validates_length_of :name, :min => 2, :allow_nil => false
 
-        validates_is_number :height, :lt => 55.2
+        validates_numericality_of :height, :lt => 55.2
 
         def self.valid_instance
           new(:name => "Roudolf Wilde", :height => 50.4)

data/spec/fixtures/motor_launch.rb

@@ -1,5 +1,5 @@
 module DataMapper
-  module Validate
+  module Validations
     module Fixtures
 
       class MotorLaunch

data/spec/fixtures/page.rb

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 module DataMapper
-  module Validate
+  module Validations
     module Fixtures
 
       # see http://datamapper.lighthouseapp.com/projects/20609/tickets/671
@@ -25,8 +25,8 @@ module DataMapper
 
         # duplicates inferred validation for body (caused by
         # :required => true)
-        validates_present :body
+        validates_presence_of :body
       end
     end # Fixtures
-  end # Validate
+  end # Validations
 end # DataMapper

data/spec/fixtures/phone_number.rb

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 module DataMapper
-  module Validate
+  module Validations
     module Fixtures
       class PhoneNumber
         #
@@ -24,5 +24,5 @@ module DataMapper
         validates_within :type_of_number, :set => %w(home work cell), :message => "Should be one of: home, cell or work"
       end # PhoneNumber
     end # Fixtures
-  end # Validate
+  end # Validations
 end # DataMapper

data/spec/fixtures/pirogue.rb

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 module DataMapper
-  module Validate
+  module Validations
     module Fixtures
       class Pirogue
         #
@@ -21,7 +21,7 @@ module DataMapper
         # Validations
         #
 
-        validates_absent :salesman, :on => :sale
+        validates_absence_of :salesman, :on => :sale
       end
     end
   end

data/spec/fixtures/programming_language.rb

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 module DataMapper
-  module Validate
+  module Validations
     module Fixtures
       # If you think that this particular fixture class
       # and assumptions made below are full of bullshit
@@ -15,7 +15,7 @@ module DataMapper
         # Behaviors
         #
 
-        include ::DataMapper::Validate
+        include ::DataMapper::Validations
 
         #
         # Attributes
@@ -79,5 +79,5 @@ module DataMapper
         end
       end # ProgrammingLanguage
     end # Fixtures
-  end # Validate
+  end # Validations
 end # DataMapper

data/spec/fixtures/reservation.rb

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 module DataMapper
-  module Validate
+  module Validations
     module Fixtures
       class Reservation
         #
@@ -28,11 +28,11 @@ module DataMapper
         # Validations
         #
 
-        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]
+        validates_confirmation_of :person_name,     :allow_nil => false, :allow_blank => false
+        validates_confirmation_of :number_of_seats, :confirm => :seats_confirmation, :message => Proc.new { |resource, property|
+          '%s requires confirmation for %s' % [ActiveSupport::Inflector.demodulize(resource.model.name), property.name]
         }
       end # Reservation
     end # Fixtures
-  end # Validate
+  end # Validations
 end # DataMapper

data/spec/fixtures/scm_operation.rb

@@ -1,59 +1,56 @@
-if HAS_SQLITE3 || HAS_MYSQL || HAS_POSTGRES
+#
+# SCMs
+#
+# This example may look stupid (I am sure it is),
+# but it is way better than foobars and easier to read/add cases
+# compared to gardening examples because every software engineer has idea
+# about SCMs and not every software engineer does gardening often.
+#
+
+class ScmOperation
+  include DataMapper::Resource
 
   #
-  # SCMs
+  # Property
   #
-  # This example may look stupid (I am sure it is),
-  # but it is way better than foobars and easier to read/add cases
-  # compared to gardening examples because every software engineer has idea
-  # about SCMs and not every software engineer does gardening often.
-  #
-
-  class ScmOperation
-    include DataMapper::Resource
-
-    #
-    # Property
-    #
 
-    property :id,                 Serial
+  property :id,                 Serial
 
-    # operation name
-    property :name,               String,  :auto_validation => false
+  # operation name
+  property :name,               String,  :auto_validation => false
 
-    property :committer_name,     String,  :auto_validation => false, :default => "Just another Ruby hacker"
-    property :author_name,        String,  :auto_validation => false, :default => "Just another Ruby hacker"
-    property :network_connection, Boolean, :auto_validation => false
-    property :message,            Text,    :auto_validation => false
-    property :clean_working_copy, Boolean, :auto_validation => false
+  property :committer_name,     String,  :auto_validation => false, :default => "Just another Ruby hacker"
+  property :author_name,        String,  :auto_validation => false, :default => "Just another Ruby hacker"
+  property :network_connection, Boolean, :auto_validation => false
+  property :message,            Text,    :auto_validation => false
+  property :clean_working_copy, Boolean, :auto_validation => false
 
-    #
-    # Validations
-    #
+  #
+  # Validations
+  #
 
-    validates_present :name
-  end
+  validates_presence_of :name
+end
 
-  class SubversionOperation < ScmOperation
-    #
-    # Validations
-    #
+class SubversionOperation < ScmOperation
+  #
+  # Validations
+  #
 
-    validates_present :network_connection, :when => [:committing, :log_viewing]
-  end
+  validates_presence_of :network_connection, :when => [:committing, :log_viewing]
+end
 
-  class GitOperation < ScmOperation
-    #
-    # Validations
-    #
+class GitOperation < ScmOperation
+  #
+  # Validations
+  #
 
-    validates_present :author_name, :committer_name, :when => :committing
+  validates_presence_of :author_name, :committer_name, :when => :committing
 
-    validates_present :message,            :when => :committing
-    validates_present :network_connection, :when => [:pushing, :pulling], :message => {
-      :pushing => "though git is advanced, it cannot push without network connectivity",
-      :pulling => "you must have network connectivity to pull from others"
-    }
-    validates_present :clean_working_copy, :when => :pulling
-  end
+  validates_presence_of :message,            :when => :committing
+  validates_presence_of :network_connection, :when => [:pushing, :pulling], :message => {
+    :pushing => "though git is advanced, it cannot push without network connectivity",
+    :pulling => "you must have network connectivity to pull from others"
+  }
+  validates_presence_of :clean_working_copy, :when => :pulling
 end

data/spec/fixtures/sms_message.rb

@@ -1,5 +1,5 @@
 module DataMapper
-  module Validate
+  module Validations
     module Fixtures
 
       class SmsMessage

data/spec/fixtures/udp_packet.rb

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 module DataMapper
-  module Validate
+  module Validations
     module Fixtures
 
       class UDPPacket
@@ -41,9 +41,9 @@ module DataMapper
         # Validations
         #
 
-        validates_present :checksum_algorithm, :checksum, :if => Proc.new { |packet| packet.underlying_ip_version == 6 }, :message => "Checksum is mandatory when used with IPv6"
+        validates_presence_of :checksum_algorithm, :checksum, :if => Proc.new { |packet| packet.underlying_ip_version == 6 }, :message => "Checksum is mandatory when used with IPv6"
       end
 
     end # Fixtures
-  end # Validate
+  end # Validations
 end # DataMapper

data/spec/integration/absent_field_validator/absent_field_validator_spec.rb

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

data/spec/integration/acceptance_validator/acceptance_validator_spec.rb

@@ -1,13 +1,13 @@
 require 'spec_helper'
 require 'integration/acceptance_validator/spec_helper'
 
-describe 'DataMapper::Validate::Fixtures::BetaTesterAccount' do
+describe 'DataMapper::Validations::Fixtures::BetaTesterAccount' do
   before :all do
-    DataMapper::Validate::Fixtures::BetaTesterAccount.auto_migrate!
+    DataMapper::Validations::Fixtures::BetaTesterAccount.auto_migrate!
   end
 
   before do
-    @model = DataMapper::Validate::Fixtures::BetaTesterAccount.new(:user_agreement    => true,
+    @model = DataMapper::Validations::Fixtures::BetaTesterAccount.new(:user_agreement    => true,
                                                                    :newsletter_signup => nil,
                                                                    :privacy_agreement => "accept")
     @model.should be_valid

data/spec/integration/automatic_validation/inferred_length_validation_spec.rb

@@ -26,7 +26,7 @@ describe 'SailBoat' do
       @model.description = 'ABCDEFGHIJK' #11
     end
 
-    # validates_length is inferred from property's :length option
+    # validates_length_of is inferred from property's :length option
     it "is invalid" do
       @model.should_not be_valid_for_length_test_1
       @model.errors.on(:description).should == [ 'Description must be at most 10 characters long' ]
@@ -39,7 +39,7 @@ describe 'SailBoat' do
       @model.description = 'ABCDEFGHI' # 9
     end
 
-    # validates_length is inferred from property's :length option
+    # validates_length_of is inferred from property's :length option
     it_should_behave_like "valid model"
   end
 
@@ -80,11 +80,11 @@ end
 
 
 
-describe 'DataMapper::Validate::Fixtures::SmsMessage' do
+describe 'DataMapper::Validations::Fixtures::SmsMessage' do
   before :all do
-    DataMapper::Validate::Fixtures::SmsMessage.auto_migrate!
+    DataMapper::Validations::Fixtures::SmsMessage.auto_migrate!
 
-    @model = DataMapper::Validate::Fixtures::SmsMessage.new(:id => 10)
+    @model = DataMapper::Validations::Fixtures::SmsMessage.new(:id => 10)
   end
 
   describe "with 2 character long note" do

data/spec/integration/automatic_validation/spec_helper.rb

@@ -35,7 +35,7 @@ class SailBoat
   property :allow_nil,     String,     :length => 5..10,          :required => false,      :validates       => :nil_test
   property :build_date,    Date,                                                          :validates       => :primitive_test
   property :float,         Float,      :precision => 2, :scale => 1
-  property :big_decimal,   BigDecimal, :precision => 2, :scale => 1
+  property :big_decimal,   Decimal, :precision => 2, :scale => 1
 
   include TypecastBypassSetter
 end

data/spec/integration/block_validator/block_validator_spec.rb

@@ -1,9 +1,9 @@
 require 'spec_helper'
 require 'integration/block_validator/spec_helper'
 
-describe 'DataMapper::Validate::Fixtures::G3Concert' do
+describe 'DataMapper::Validations::Fixtures::G3Concert' do
   before :all do
-    @model = DataMapper::Validate::Fixtures::G3Concert.new(:year => 2004, :participants => "Joe Satriani, Steve Vai, Yngwie Malmsteen", :city => "Denver")
+    @model = DataMapper::Validations::Fixtures::G3Concert.new(:year => 2004, :participants => "Joe Satriani, Steve Vai, Yngwie Malmsteen", :city => "Denver")
     @model.should be_valid
   end
 

data/spec/integration/conditional_validation/if_condition_spec.rb

@@ -1,11 +1,11 @@
 require 'spec_helper'
 require 'integration/conditional_validation/spec_helper'
 
-describe 'DataMapper::Validate::Fixtures::UDPPacket' do
+describe 'DataMapper::Validations::Fixtures::UDPPacket' do
   before :all do
-    DataMapper::Validate::Fixtures::UDPPacket.auto_migrate!
+    DataMapper::Validations::Fixtures::UDPPacket.auto_migrate!
 
-    @model = DataMapper::Validate::Fixtures::UDPPacket.new
+    @model = DataMapper::Validations::Fixtures::UDPPacket.new
   end
 
   describe "that is transported encapsulated into IPv4 packet" do

data/spec/integration/confirmation_validator/confirmation_validator_spec.rb

@@ -15,11 +15,11 @@ describe "reservation with mismatched seats number", :shared => true do
 end
 
 
-describe 'DataMapper::Validate::Fixtures::Reservation' do
+describe 'DataMapper::Validations::Fixtures::Reservation' do
   before :all do
-    DataMapper::Validate::Fixtures::Reservation.auto_migrate!
+    DataMapper::Validations::Fixtures::Reservation.auto_migrate!
 
-    @model = DataMapper::Validate::Fixtures::Reservation.new(:person_name                  => "Tyler Durden",
+    @model = DataMapper::Validations::Fixtures::Reservation.new(:person_name                  => "Tyler Durden",
                                                              :person_name_confirmation     => "Tyler Durden",
                                                              :number_of_seats              => 2,
                                                              :seats_confirmation           => 2)

data/spec/integration/datamapper_models/association_validation_spec.rb

@@ -1,14 +1,14 @@
 require 'spec_helper'
 
-describe 'DataMapper::Validate::Fixtures::Product' do
+describe 'DataMapper::Validations::Fixtures::Product' do
   before :all do
-    DataMapper::Validate::Fixtures::ProductCompany.auto_migrate!
-    DataMapper::Validate::Fixtures::Product.auto_migrate!
+    DataMapper::Validations::Fixtures::ProductCompany.auto_migrate!
+    DataMapper::Validations::Fixtures::Product.auto_migrate!
 
-    @parent = DataMapper::Validate::Fixtures::ProductCompany.create(:title => "Apple", :flagship_product => "Macintosh")
+    @parent = DataMapper::Validations::Fixtures::ProductCompany.create(:title => "Apple", :flagship_product => "Macintosh")
     @parent.should be_valid
 
-    @model  = DataMapper::Validate::Fixtures::Product.new(:name => "MacBook Pro", :company => @parent)
+    @model  = DataMapper::Validations::Fixtures::Product.new(:name => "MacBook Pro", :company => @parent)
     @model.should be_valid
   end