dm-validations 0.10.2 → 1.0.0.rc1

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

@@ -1,5 +1,5 @@
 module DataMapper
-  module Validate
+  module Validations
 
     ##
     #
@@ -48,9 +48,9 @@ module DataMapper
       #
       def validates_within(*fields)
         opts = opts_from_validator_args(fields)
-        add_validator_to_context(opts, fields, DataMapper::Validate::WithinValidator)
+        add_validator_to_context(opts, fields, DataMapper::Validations::WithinValidator)
       end
 
     end # module ValidatesWithin
-  end # module Validate
+  end # module Validations
 end # module DataMapper

data/spec/fixtures/barcode.rb

@@ -1,7 +1,8 @@
 module DataMapper
-  module Validate
+  module Validations
     module Fixtures
       class Barcode
+        attr_accessor :valid_hook_call_count
 
         #
         # Behaviors
@@ -21,11 +22,18 @@ module DataMapper
         # Validations
         #
 
-        validates_length :code, :max => 10
+        validates_length_of :code, :max => 10
 
         def self.valid_instance
           new(:code => "3600029145")
         end
+
+        # measure the number of times #valid? is executed
+        before :valid? do
+          @valid_hook_call_count ||= 0
+          @valid_hook_call_count += 1
+        end
+
       end # Barcode
     end
   end

data/spec/fixtures/basketball_court.rb

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 module DataMapper
-  module Validate
+  module Validations
     module Fixtures
       class BasketballCourt
         #
@@ -32,14 +32,14 @@ module DataMapper
         #
 
         # obviously these are all metrics
-        validates_is_number :length, :gte => 15.0,  :lte => 15.24
-        validates_is_number :width,  :gte => 25.28, :lte => 28.65
+        validates_numericality_of :length, :gte => 15.0,  :lte => 15.24
+        validates_numericality_of :width,  :gte => 25.28, :lte => 28.65
 
         # 3 pt line distance may use :gte and :lte, but for
         # sake of spec example we make it up a little
-        validates_is_number :three_point_line_distance, :gt => 6.7, :lt => 7.24
-        validates_is_number :free_throw_line_distance,  :equals => 4.57
-        validates_is_number :rim_height,                :eq     => 3.05
+        validates_numericality_of :three_point_line_distance, :gt => 6.7, :lt => 7.24
+        validates_numericality_of :free_throw_line_distance,  :equals => 4.57
+        validates_numericality_of :rim_height,                :eq     => 3.05
 
         def self.valid_instance(overrides = {})
           defaults = {
@@ -54,5 +54,5 @@ module DataMapper
         end
       end
     end # Fixtures
-  end # Validate
+  end # Validations
 end # DataMapper

data/spec/fixtures/basketball_player.rb

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 module DataMapper
-  module Validate
+  module Validations
     module Fixtures
       class BasketballPlayer
         #
@@ -27,8 +27,8 @@ module DataMapper
         #
 
         # precision and scale need to be defined for length to be validated
-        validates_is_number :height, :weight, :precision => 10
+        validates_numericality_of :height, :weight, :precision => 10
       end
     end # Fixtures
-  end # Validate
+  end # Validations
 end # DataMapper

data/spec/fixtures/beta_tester_account.rb

@@ -1,5 +1,5 @@
 module DataMapper
-  module Validate
+  module Validations
     module Fixtures
       class BetaTesterAccount
         #
@@ -24,9 +24,9 @@ module DataMapper
         # Validations
         #
 
-        validates_is_accepted :user_agreement, :allow_nil => false
-        validates_is_accepted :newsletter_signup
-        validates_is_accepted :privacy_agreement, :accept => %w(agreed accept), :message => "You must accept this agreement in order to proceed"
+        validates_acceptance_of :user_agreement, :allow_nil => false
+        validates_acceptance_of :newsletter_signup
+        validates_acceptance_of :privacy_agreement, :accept => %w(agreed accept), :message => "You must accept this agreement in order to proceed"
       end # BetaTesterAccount
     end
   end

data/spec/fixtures/bill_of_landing.rb

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 module DataMapper
-  module Validate
+  module Validations
     module Fixtures
       class BillOfLading
         #
@@ -27,16 +27,16 @@ module DataMapper
         #
 
         # this is a trivial example
-        validates_format :doc_no, :with => lambda { |code|
+        validates_format_of :doc_no, :with => lambda { |code|
           code =~ /\AA\d{4}\z/ || code =~ /\A[B-Z]\d{6}X12\z/
         }
 
-        validates_format :email, :as => :email_address
-        validates_format :url, :as => :url, :allow_nil => false, :allow_blank => false
+        validates_format_of :email, :as => :email_address
+        validates_format_of :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'
+        validates_format_of :username, :with => /[a-z]/, :message => 'Username must have at least one letter', :allow_nil => true
+        validates_format_of :code,     :with => /\d{5,6}/, :message => 'Code format is invalid'
       end
     end # Fixtures
-  end # Validate
+  end # Validations
 end # DataMapper

data/spec/fixtures/boat_dock.rb

@@ -1,5 +1,5 @@
 module DataMapper
-  module Validate
+  module Validations
     module Fixtures
       class BoatDock
         #
@@ -19,7 +19,7 @@ module DataMapper
         # Validations
         #
 
-        validates_length :name, :min => 3
+        validates_length_of :name, :min => 3
       end
     end
   end

data/spec/fixtures/city.rb

@@ -20,5 +20,5 @@ class City
   # Validations
   #
 
-  validates_is_number :founded_in, :message => "Foundation year must be an integer"
+  validates_numericality_of :founded_in, :message => "Foundation year must be an integer"
 end

data/spec/fixtures/company.rb

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 module DataMapper
-  module Validate
+  module Validations
     module Fixtures
       class Company
         #
@@ -23,7 +23,7 @@ module DataMapper
         # Validations
         #
 
-        validates_present :title, :message => "Company name is a required field"
+        validates_presence_of :title, :message => "Company name is a required field"
 
       end
 
@@ -41,7 +41,7 @@ module DataMapper
         # Validations
         #
 
-        validates_present :area_of_expertise
+        validates_presence_of :area_of_expertise
       end
 
       class ProductCompany < Company
@@ -58,8 +58,8 @@ module DataMapper
         # Validations
         #
 
-        validates_present :title, :message => "Product company must have a name"
-        validates_present :flagship_product
+        validates_presence_of :title, :message => "Product company must have a name"
+        validates_presence_of :flagship_product
       end
 
       class Product
@@ -80,13 +80,13 @@ module DataMapper
         # Associations
         #
 
-        belongs_to :company, :model => DataMapper::Validate::Fixtures::ProductCompany
+        belongs_to :company, :model => DataMapper::Validations::Fixtures::ProductCompany
 
         #
         # Validations
         #
 
-        validates_present :company
+        validates_presence_of :company
       end
     end
   end

data/spec/fixtures/corporate_world.rb

@@ -1,40 +1,38 @@
 # -*- coding: utf-8 -*-
 
-if HAS_SQLITE3 || HAS_MYSQL || HAS_POSTGRES
-  module DataMapper
-    module Validate
-      module Fixtures
-        class Organisation
-          include DataMapper::Resource
+module DataMapper
+  module Validations
+    module Fixtures
+      class Organisation
+        include DataMapper::Resource
 
-          property :id, Serial
-          property :name, String
-          property :domain, String, :unique_index => true
+        property :id, Serial
+        property :name, String
+        property :domain, String, :unique_index => true
 
-          validates_is_unique :domain, :allow_nil => true
-        end
+        validates_uniqueness_of :domain, :allow_nil => true
+      end
 
-        class Department
-          include DataMapper::Resource
+      class Department
+        include DataMapper::Resource
 
-          property :id, Serial
-          property :name, String, :unique_index => true
+        property :id, Serial
+        property :name, String, :unique_index => true
 
-          validates_is_unique :name
-        end
+        validates_uniqueness_of :name
+      end
 
-        class User
-          include DataMapper::Resource
+      class User
+        include DataMapper::Resource
 
-          property :id, Serial
-          property :user_name, String
+        property :id, Serial
+        property :user_name, String
 
-          belongs_to :organisation
-          belongs_to :department
+        belongs_to :organisation
+        belongs_to :department
 
-          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]
-        end
+        validates_uniqueness_of :user_name, :when => :signing_up_for_department_account,   :scope => [:department]
+        validates_uniqueness_of :user_name, :when => :signing_up_for_organization_account, :scope => [:organisation]
       end
     end
   end

data/spec/fixtures/country.rb

@@ -20,5 +20,5 @@ class Country
   # Validations
   #
 
-  validates_is_number :area, :message => "Please use integers to specify area"
+  validates_numericality_of :area, :message => "Please use integers to specify area"
 end

data/spec/fixtures/currency.rb

@@ -1,5 +1,5 @@
 module DataMapper
-  module Validate
+  module Validations
     module Fixtures
       class Currency
 
@@ -23,9 +23,9 @@ module DataMapper
         # Validations
         #
 
-        validates_length :name,   :within => 1..50
-        validates_length :code,   :is => 3
-        validates_length :symbol, :is => 1
+        validates_length_of :name,   :within => 1..50
+        validates_length_of :code,   :is => 3
+        validates_length_of :symbol, :is => 1
 
         def self.valid_instance(overrides = {})
           defaults = {

data/spec/fixtures/ethernet_frame.rb

@@ -1,5 +1,5 @@
 module DataMapper
-  module Validate
+  module Validations
     module Fixtures
 
       # for pedants: we refer to DIX Ethernet here
@@ -32,11 +32,11 @@ module DataMapper
         # Validations
         #
 
-        validates_length :destination_mac, :source_mac, :equals => 6
-        validates_length :ether_type, :equals => 2
-        validates_length :payload, :min => 46, :max => 1500, :unless => :link_support_fragmentation
+        validates_length_of :destination_mac, :source_mac, :equals => 6
+        validates_length_of :ether_type, :equals => 2
+        validates_length_of :payload, :min => 46, :max => 1500, :unless => :link_support_fragmentation
         # :is is alias for :equal
-        validates_length :crc, :is => 4
+        validates_length_of :crc, :is => 4
 
         def self.valid_instance
           # these are obvisouly not bits, and not in hexadecimal

data/spec/fixtures/event.rb

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 module DataMapper
-  module Validate
+  module Validations
     module Fixtures
 
       class Event
@@ -40,5 +40,5 @@ module DataMapper
         end
       end # Event
     end # Fixtures
-  end # Validate
+  end # Validations
 end # DataMapper

data/spec/fixtures/g3_concert.rb

@@ -1,14 +1,14 @@
 # -*- coding: utf-8 -*-
 
 module DataMapper
-  module Validate
+  module Validations
     module Fixtures
       class G3Concert
         #
         # Bahaviors
         #
 
-        include ::DataMapper::Validate
+        include ::DataMapper::Validations
 
         #
         # Attributes
@@ -53,5 +53,5 @@ module DataMapper
         end
       end # G3Concert
     end # Fixtures
-  end # Validate
+  end # Validations
 end # DataMapper

data/spec/fixtures/jabberwock.rb

@@ -1,5 +1,5 @@
 module DataMapper
-  module Validate
+  module Validations
     module Fixtures
 
       class Jabberwock
@@ -20,7 +20,7 @@ module DataMapper
         # Validations
         #
 
-        validates_length :snickersnack, :within => 3..40, :message => "worble warble"
+        validates_length_of :snickersnack, :within => 3..40, :message => "worble warble"
       end # Jabberwock
     end
   end

data/spec/fixtures/kayak.rb

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

data/spec/fixtures/lernean_hydra.rb

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 module DataMapper
-  module Validate
+  module Validations
     module Fixtures
       class LerneanHydra
         #
@@ -24,7 +24,7 @@ module DataMapper
         # Validations
         #
 
-        validates_is_number :head_count, :eq => 9, :message => "Lernean hydra is said to have exactly 9 heads"
+        validates_numericality_of :head_count, :eq => 9, :message => "Lernean hydra is said to have exactly 9 heads"
 
         def self.valid_instance(overrides = {})
           defaults = {
@@ -35,5 +35,5 @@ module DataMapper
         end
       end
     end # Fixtures
-  end # Validate
+  end # Validations
 end # DataMapper