dm-validations 0.10.2 → 1.0.0.rc1

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

@@ -1,5 +1,5 @@
 module DataMapper
-  module Validate
+  module Validations
 
     ##
     #
@@ -52,9 +52,9 @@ module DataMapper
         define_method(method_name, block)
         opts = opts_from_validator_args(fields)
         opts[:method] = method_name
-        add_validator_to_context(opts, fields.empty? ? [method_name] : fields, DataMapper::Validate::MethodValidator)
+        add_validator_to_context(opts, fields.empty? ? [method_name] : fields, DataMapper::Validations::MethodValidator)
       end
 
     end # module ValidatesWithMethod
-  end # module Validate
+  end # module Validations
 end # module DataMapper

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

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 module DataMapper
-  module Validate
+  module Validations
 
     ##
     #
@@ -40,7 +40,8 @@ module DataMapper
       end
     end # class ConfirmationValidator
 
-    module ValidatesIsConfirmed
+    module ValidatesConfirmation
+      extend Deprecate
 
       ##
       # Validates that the given attribute is confirmed by another attribute.
@@ -64,19 +65,21 @@ module DataMapper
       #     attr_accessor :password_confirmation
       #     attr_accessor :email_repeated
       #
-      #     validates_is_confirmed :password
-      #     validates_is_confirmed :email, :confirm => :email_repeated
+      #     validates_confirmation_of :password
+      #     validates_confirmation_of :email, :confirm => :email_repeated
       #
       #     # a call to valid? will return false unless:
       #     # password == password_confirmation
       #     # and
       #     # email == email_repeated
       #
-      def validates_is_confirmed(*fields)
+      def validates_confirmation_of(*fields)
         opts = opts_from_validator_args(fields)
-        add_validator_to_context(opts, fields, DataMapper::Validate::ConfirmationValidator)
+        add_validator_to_context(opts, fields, DataMapper::Validations::ConfirmationValidator)
       end
 
+      deprecate :validates_is_confirmed, :validates_confirmation_of
+
     end # module ValidatesIsConfirmed
-  end # module Validate
+  end # module Validations
 end # module DataMapper

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

@@ -5,7 +5,8 @@ require Pathname(__FILE__).dirname.expand_path + ".." + 'formats/email'
 require Pathname(__FILE__).dirname.expand_path + ".." + 'formats/url'
 
 module DataMapper
-  module Validate
+  module Validations
+    class UnknownValidationFormat < ::ArgumentError; end
 
     ##
     #
@@ -14,8 +15,8 @@ module DataMapper
     class FormatValidator < GenericValidator
 
       FORMATS = {}
-      include DataMapper::Validate::Format::Email
-      include DataMapper::Validate::Format::Url
+      include DataMapper::Validations::Format::Email
+      include DataMapper::Validations::Format::Url
 
       def initialize(field_name, options = {})
         super
@@ -56,6 +57,7 @@ module DataMapper
 
 
     module ValidatesFormat
+      extend Deprecate
 
       ##
       # Validates that the attribute is in the specified format. You may use the
@@ -69,8 +71,8 @@ module DataMapper
       # @option :with<Format, Proc, Regexp> an alias for :as
       #
       # @details [Pre-defined Formats]
-      #   :email_address (format is specified in DataMapper::Validate::Format::Email)
-      #   :url (format is specified in DataMapper::Validate::Format::Url)
+      #   :email_address (format is specified in DataMapper::Validations::Format::Email)
+      #   :url (format is specified in DataMapper::Validations::Format::Url)
       #
       # @example [Usage]
       #   require 'dm-validations'
@@ -81,19 +83,21 @@ module DataMapper
       #     property :email, String
       #     property :zip_code, String
       #
-      #     validates_format :email, :as => :email_address
-      #     validates_format :zip_code, :with => /^\d{5}$/
+      #     validates_format_of :email, :as => :email_address
+      #     validates_format_of :zip_code, :with => /^\d{5}$/
       #
       #     # a call to valid? will return false unless:
       #     # email is formatted like an email address
       #     # and
       #     # zip_code is a string of 5 digits
       #
-      def validates_format(*fields)
+      def validates_format_of(*fields)
         opts = opts_from_validator_args(fields)
-        add_validator_to_context(opts, fields, DataMapper::Validate::FormatValidator)
+        add_validator_to_context(opts, fields, DataMapper::Validations::FormatValidator)
       end
 
+      deprecate :validates_format, :validates_format_of
+
     end # module ValidatesFormat
-  end # module Validate
+  end # module Validations
 end # module DataMapper

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

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 module DataMapper
-  module Validate
+  module Validations
 
     # All validators extend this base class. Validators must:
     #
@@ -33,7 +33,7 @@ module DataMapper
         @options              = options.except(:if, :unless)
         @if_clause            = options[:if]
         @unless_clause        = options[:unless]
-        @humanized_field_name = Extlib::Inflection.humanize(@field_name)
+        @humanized_field_name = ActiveSupport::Inflector.humanize(@field_name)
       end
 
       # Add an error message to a target resource. If the error corresponds to a
@@ -145,5 +145,5 @@ module DataMapper
 
       alias to_s inspect
     end # class GenericValidator
-  end # module Validate
+  end # module Validations
 end # module DataMapper

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

@@ -1,5 +1,5 @@
 module DataMapper
-  module Validate
+  module Validations
     class LengthValidator < GenericValidator
 
       # Initialize a length validator
@@ -156,6 +156,7 @@ module DataMapper
     end # class LengthValidator
 
     module ValidatesLength
+      extend Deprecate
 
       # Validates that the length of the attribute is equal to, less than,
       # greater than or within a certain range (depending upon the options
@@ -186,20 +187,22 @@ module DataMapper
       #     property low, Integer
       #     property just_right, Integer
       #
-      #     validates_length :high, :min => 100000000000
-      #     validates_length :low, :equals => 0
-      #     validates_length :just_right, :within => 1..10
+      #     validates_length_of :high, :min => 100000000000
+      #     validates_length_of :low, :equals => 0
+      #     validates_length_of :just_right, :within => 1..10
       #
       #     # a call to valid? will return false unless:
       #     # high is greater than or equal to 100000000000
       #     # low is equal to 0
       #     # just_right is between 1 and 10 (inclusive of both 1 and 10)
       #
-      def validates_length(*fields)
+      def validates_length_of(*fields)
         opts = opts_from_validator_args(fields)
-        add_validator_to_context(opts, fields, DataMapper::Validate::LengthValidator)
+        add_validator_to_context(opts, fields, DataMapper::Validations::LengthValidator)
       end
 
+      deprecate :validates_length, :validates_length_of
+
     end # module ValidatesLength
-  end # module Validate
+  end # module Validations
 end # module DataMapper

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

@@ -1,5 +1,5 @@
 module DataMapper
-  module Validate
+  module Validations
 
     ##
     #
@@ -60,9 +60,9 @@ module DataMapper
       #  end
       def validates_with_method(*fields)
         opts = opts_from_validator_args(fields)
-        add_validator_to_context(opts, fields, DataMapper::Validate::MethodValidator)
+        add_validator_to_context(opts, fields, DataMapper::Validations::MethodValidator)
       end
 
     end # module ValidatesWithMethod
-  end # module Validate
+  end # module Validations
 end # module DataMapper

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

@@ -1,11 +1,11 @@
 module DataMapper
-  module Validate
+  module Validations
 
     ##
     #
     # @author Guy van den Berg
     # @since  0.9
-    class NumericValidator < GenericValidator
+    class NumericalityValidator < GenericValidator
 
       def call(target)
         value = target.validation_property_value(field_name)
@@ -32,7 +32,7 @@ module DataMapper
       private
 
       def integer_only?
-        options.fetch(:integer_only, false)
+        options[:only_integer] || options.fetch(:integer_only, false)
       end
 
       def value_as_string(value)
@@ -62,6 +62,13 @@ module DataMapper
       def validate_with_comparison(value, cmp, expected, error_message_name, errors, negated = false)
         return if expected.nil?
 
+        # XXX: workaround for jruby. This is needed because the jruby
+        # compiler optimizes a bit too far with magic variables like $~.
+        # the value.send line sends $~. Inserting this line makes sure the
+        # jruby compiler does not optimise here.
+        # see http://jira.codehaus.org/browse/JRUBY-3765
+        $~ = nil if RUBY_PLATFORM[/java/]
+
         comparison = value.send(cmp, expected)
         return if negated ? !comparison : comparison
 
@@ -94,32 +101,33 @@ module DataMapper
       end
 
       def validate_gt(value, errors)
-        validate_with_comparison(value, :>, options[:gt], :greater_than, errors)
+        validate_with_comparison(value, :>, options[:gt] || options[:greater_than], :greater_than, errors)
       end
 
       def validate_lt(value, errors)
-        validate_with_comparison(value, :<, options[:lt], :less_than, errors)
+        validate_with_comparison(value, :<, options[:lt] || options[:less_than], :less_than, errors)
       end
 
       def validate_gte(value, errors)
-        validate_with_comparison(value, :>=, options[:gte], :greater_than_or_equal_to, errors)
+        validate_with_comparison(value, :>=, options[:gte] || options[:greater_than_or_equal_to], :greater_than_or_equal_to, errors)
       end
 
       def validate_lte(value, errors)
-        validate_with_comparison(value, :<=, options[:lte], :less_than_or_equal_to, errors)
+        validate_with_comparison(value, :<=, options[:lte] || options[:less_than_or_equal_to], :less_than_or_equal_to, errors)
       end
 
       def validate_eq(value, errors)
-        eq = options[:eq] || options[:equal] || options[:equals] || options[:exactly]
+        eq = options[:eq] || options[:equal] || options[:equals] || options[:exactly] || options[:equal_to]
         validate_with_comparison(value, :==, eq, :equal_to, errors)
       end
 
       def validate_ne(value, errors)
-        validate_with_comparison(value, :==, options[:ne], :not_equal_to, errors, true)
+        validate_with_comparison(value, :==, options[:ne] || options[:not_equal_to], :not_equal_to, errors, true)
       end
-    end # class NumericValidator
+    end # class NumericalityValidator
 
-    module ValidatesIsNumber
+    module ValidatesNumericality
+      extend Deprecate
 
       # Validate whether a field is numeric
       #
@@ -163,11 +171,14 @@ module DataMapper
       #
       # :integer_only => true
       #   Use to restrict allowed values to integers
-      def validates_is_number(*fields)
+      #
+      def validates_numericality_of(*fields)
         opts = opts_from_validator_args(fields)
-        add_validator_to_context(opts, fields, DataMapper::Validate::NumericValidator)
+        add_validator_to_context(opts, fields, DataMapper::Validations::NumericalityValidator)
       end
 
+      deprecate :validates_is_number, :validates_numericality_of
+
     end # module ValidatesIsNumber
-  end # module Validate
+  end # module Validations
 end # module DataMapper

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

@@ -1,11 +1,11 @@
 module DataMapper
-  module Validate
+  module Validations
 
     ##
     #
     # @author Dirkjan Bussink
     # @since  0.9
-    class PrimitiveValidator < GenericValidator
+    class PrimitiveTypeValidator < GenericValidator
       def call(target)
         value    = target.validation_property_value(field_name)
         property = target.validation_property(field_name)
@@ -24,9 +24,11 @@ module DataMapper
         ValidationErrors.default_error_message(:primitive, field_name, property.primitive)
       end
 
-    end # class PrimitiveValidator
+    end # class PrimitiveTypeValidator
 
-    module ValidatesIsPrimitive
+    module ValidatesPrimitiveType
+
+      extend Deprecate
 
       ##
       # Validates that the specified attribute is of the correct primitive type.
@@ -39,17 +41,19 @@ module DataMapper
       #
       #     property :birth_date, Date
       #
-      #     validates_is_primitive :birth_date
+      #     validates_primitive_type_of :birth_date
       #
       #     # a call to valid? will return false unless
       #     # the birth_date is something that can be properly
       #     # casted into a Date object.
       #   end
-      def validates_is_primitive(*fields)
+      def validates_primitive_type_of(*fields)
         opts = opts_from_validator_args(fields)
-        add_validator_to_context(opts, fields, DataMapper::Validate::PrimitiveValidator)
+        add_validator_to_context(opts, fields, DataMapper::Validations::PrimitiveTypeValidator)
       end
 
+      deprecate :validates_is_primitive, :validates_primitive_type_of
+
     end # module ValidatesPresent
-  end # module Validate
+  end # module Validations
 end # module DataMapper

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

@@ -1,11 +1,11 @@
 module DataMapper
-  module Validate
+  module Validations
 
     ##
     #
     # @author Guy van den Berg
     # @since  0.9
-    class RequiredFieldValidator < GenericValidator
+    class PresenceValidator < GenericValidator
       def call(target)
         value = target.validation_property_value(field_name)
         property = target.validation_property(field_name)
@@ -40,9 +40,10 @@ module DataMapper
         property ? property.primitive == TrueClass : false
       end
 
-    end # class RequiredFieldValidator
+    end # class PresenceValidator
 
-    module ValidatesPresent
+    module ValidatesPresence
+      extend Deprecate
 
       ##
       # Validates that the specified attribute is present.
@@ -66,17 +67,19 @@ module DataMapper
       #     property :another_required, String
       #     property :yet_again, String
       #
-      #     validates_present :required_attribute
-      #     validates_present :another_required, :yet_again
+      #     validates_presence_of :required_attribute
+      #     validates_presence_of :another_required, :yet_again
       #
       #     # a call to valid? will return false unless
       #     # all three attributes are !blank?
       #   end
-      def validates_present(*fields)
+      def validates_presence_of(*fields)
         opts = opts_from_validator_args(fields)
-        add_validator_to_context(opts, fields, DataMapper::Validate::RequiredFieldValidator)
+        add_validator_to_context(opts, fields, DataMapper::Validations::PresenceValidator)
       end
 
+      deprecate :validates_present, :validates_presence_of
+
     end # module ValidatesPresent
-  end # module Validate
+  end # module Validations
 end # module DataMapper

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

@@ -1,12 +1,12 @@
 module DataMapper
-  module Validate
+  module Validations
 
     ##
     #
     # @author Guy van den Berg
     # @since  0.9
     class UniquenessValidator < GenericValidator
-      include Extlib::Assertions
+      include DataMapper::Assertions
 
       def initialize(field_name, options = {})
         assert_kind_of 'scope', options[:scope], Array, Symbol if options.has_key?(:scope)
@@ -43,15 +43,18 @@ module DataMapper
       end
     end # class UniquenessValidator
 
-    module ValidatesIsUnique
+    module ValidatesUniqueness
+      extend Deprecate
 
       # Validate the uniqueness of a field
       #
-      def validates_is_unique(*fields)
+      def validates_uniqueness_of(*fields)
         opts = opts_from_validator_args(fields)
-        add_validator_to_context(opts, fields, DataMapper::Validate::UniquenessValidator)
+        add_validator_to_context(opts, fields, DataMapper::Validations::UniquenessValidator)
       end
 
+      deprecate :validates_is_unique, :validates_uniqueness_of
+
     end # module ValidatesIsUnique
-  end # module Validate
+  end # module Validations
 end # module DataMapper