dm-validations 1.1.0 → 1.2.0.rc1

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

@@ -1,14 +1,12 @@
 module DataMapper
   module Validations
-
-    ##
-    #
     # @author Dirkjan Bussink
     # @since  0.9
     class PrimitiveTypeValidator < GenericValidator
+
       def call(target)
         value    = target.validation_property_value(field_name)
-        property = target.validation_property(field_name)
+        property = get_resource_property(target, field_name)
 
         return true if value.nil? || property.primitive?(value)
 
@@ -21,19 +19,22 @@ module DataMapper
       protected
 
       def default_error(property)
-        ValidationErrors.default_error_message(:primitive, field_name, property.primitive)
+        ValidationErrors.default_error_message(
+          :primitive,
+          field_name,
+          property.primitive
+        )
       end
 
     end # class PrimitiveTypeValidator
 
     module ValidatesPrimitiveType
-
       extend Deprecate
 
-      ##
-      # Validates that the specified attribute is of the correct primitive type.
+      # Validates that the specified attribute is of the correct primitive
+      # type.
       #
-      # @example [Usage]
+      # @example Usage
       #   require 'dm-validations'
       #
       #   class Person
@@ -48,12 +49,10 @@ module DataMapper
       #     # casted into a Date object.
       #   end
       def validates_primitive_type_of(*fields)
-        opts = opts_from_validator_args(fields)
-        add_validator_to_context(opts, fields, DataMapper::Validations::PrimitiveTypeValidator)
+        validators.add(PrimitiveTypeValidator, *fields)
       end
 
       deprecate :validates_is_primitive, :validates_primitive_type_of
-
     end # module ValidatesPresent
   end # module Validations
 end # module DataMapper

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

@@ -1,14 +1,12 @@
 module DataMapper
   module Validations
-
-    ##
-    #
     # @author Guy van den Berg
     # @since  0.9
     class PresenceValidator < GenericValidator
+
       def call(target)
-        value = target.validation_property_value(field_name)
-        property = target.validation_property(field_name)
+        value    = target.validation_property_value(field_name)
+        property = get_resource_property(target, field_name)
         return true if present?(value, property)
 
         error_message = @options[:message] || default_error(property)
@@ -31,11 +29,12 @@ module DataMapper
         ValidationErrors.default_error_message(actual, field_name)
       end
 
-      # Is +property+ a boolean property?
+      # Is the property a boolean property?
       #
-      # Returns true for Boolean, ParanoidBoolean, TrueClass, etc. properties.
-      # Returns false for other property types.
-      # Returns false for non-properties.
+      # @return [Boolean]
+      #   Returns true for Boolean, ParanoidBoolean, TrueClass and other
+      #   properties. Returns false for other property types or for
+      #   non-properties.
       def boolean_type?(property)
         property ? property.primitive == TrueClass : false
       end
@@ -55,9 +54,10 @@ module DataMapper
       #
       # @note
       #   dm-core's support lib adds the blank? method to many classes,
+      #
       # @see lib/dm-core/support/blank.rb (dm-core) for more information.
       #
-      # @example [Usage]
+      # @example Usage
       #   require 'dm-validations'
       #
       #   class Page
@@ -74,12 +74,10 @@ module DataMapper
       #     # all three attributes are !blank?
       #   end
       def validates_presence_of(*fields)
-        opts = opts_from_validator_args(fields)
-        add_validator_to_context(opts, fields, DataMapper::Validations::PresenceValidator)
+        validators.add(PresenceValidator, *fields)
       end
 
       deprecate :validates_present, :validates_presence_of
-
     end # module ValidatesPresent
   end # module Validations
 end # module DataMapper

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

@@ -1,15 +1,16 @@
 module DataMapper
   module Validations
-
-    ##
-    #
     # @author Guy van den Berg
     # @since  0.9
     class UniquenessValidator < GenericValidator
+
       include DataMapper::Assertions
 
       def initialize(field_name, options = {})
-        assert_kind_of 'scope', options[:scope], Array, Symbol if options.has_key?(:scope)
+        if options.has_key?(:scope)
+          assert_kind_of('scope', options[:scope], Array, Symbol)
+        end
+
         super
 
         set_optional_by_default
@@ -33,20 +34,22 @@ module DataMapper
           field_name => value,
         }
 
-        Array(@options[:scope]).each {|subject|
-          if target.respond_to?(subject)
-            opts[subject] = target.__send__(subject)
-          else
-            raise ArgumentError, "Could not find property to scope by: #{subject}. Note that :unique does not currently support arbitrarily named groups, for that you should use :unique_index with an explicit validates_uniqueness_of."
+        Array(@options[:scope]).each { |subject|
+          unless target.respond_to?(subject)
+            raise(ArgumentError,"Could not find property to scope by: #{subject}. Note that :unique does not currently support arbitrarily named groups, for that you should use :unique_index with an explicit validates_uniqueness_of.")
           end
+
+          opts[subject] = target.__send__(subject)
         }
 
-        resource = DataMapper.repository(target.repository.name) { target.model.first(opts) }
+        resource = DataMapper.repository(target.repository.name) do
+          target.model.first(opts)
+        end
 
         return true if resource.nil?
-
         target.saved? && resource.key == target.key
       end
+
     end # class UniquenessValidator
 
     module ValidatesUniqueness
@@ -55,12 +58,10 @@ module DataMapper
       # Validate the uniqueness of a field
       #
       def validates_uniqueness_of(*fields)
-        opts = opts_from_validator_args(fields)
-        add_validator_to_context(opts, fields, DataMapper::Validations::UniquenessValidator)
+        validators.add(UniquenessValidator, *fields)
       end
 
       deprecate :validates_is_unique, :validates_uniqueness_of
-
     end # module ValidatesIsUnique
   end # module Validations
 end # module DataMapper

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

@@ -1,8 +1,5 @@
 module DataMapper
   module Validations
-
-    ##
-    #
     # @author Guy van den Berg
     # @since  0.9
     class WithinValidator < GenericValidator
@@ -18,8 +15,10 @@ module DataMapper
         return true if optional?(value)
         return true if @options[:set].include?(value)
 
+        n = 1.0/0
         set = @options[:set]
         msg = @options[:message]
+
         if set.is_a?(Range)
           if set.first != -n && set.last != n
             error_message = msg || ValidationErrors.default_error_message(:value_between, field_name, set.first, set.last)
@@ -29,7 +28,7 @@ module DataMapper
             error_message = msg || ValidationErrors.default_error_message(:greater_than_or_equal_to, field_name, set.first)
           end
         else
-          error_message = msg || ValidationErrors.default_error_message(:inclusion, field_name, set.join(', '))
+          error_message = msg || ValidationErrors.default_error_message(:inclusion, field_name, set.to_a.join(', '))
         end
 
         add_error(target, error_message, field_name)
@@ -37,20 +36,39 @@ module DataMapper
         false
       end
 
-      def n
-        1.0/0
-      end
+
     end # class WithinValidator
 
     module ValidatesWithin
-
-      # Validate that value of a field if within a range/set
+      ##
+      # Validates that the value of a field is within a range/set.
+      #
+      # This validation is defined by passing a field along with a :set
+      # parameter. The :set can be a Range or any object which responds
+      # to the #include? method (an array, for example).
       #
+      # @example Usage
+      #   require 'dm-validations'
+      #
+      #   class Review
+      #     include DataMapper::Resource
+      #
+      #     STATES = ['new', 'in_progress', 'published', 'archived']
+      #
+      #     property :title, String
+      #     property :body, String
+      #     property :review_state, String
+      #     property :rating, Integer
+      #
+      #     validates_within :review_state, :set => STATES
+      #     validates_within :rating,       :set => 1..5
+      #
+      #     # a call to valid? will return false unless
+      #     # the two properties conform to their sets
+      #   end
       def validates_within(*fields)
-        opts = opts_from_validator_args(fields)
-        add_validator_to_context(opts, fields, DataMapper::Validations::WithinValidator)
+        validators.add(WithinValidator, *fields)
       end
-
     end # module ValidatesWithin
   end # module Validations
 end # module DataMapper

data/spec/fixtures/bill_of_landing.rb

@@ -20,6 +20,7 @@ module DataMapper
         property :email,    String, :auto_validation => false
         property :username, String, :auto_validation => false
         property :url,      String, :auto_validation => false
+        property :bank_url, URI,    :auto_validation => false
         property :code,     String, :auto_validation => false, :default => "123456"
 
         #
@@ -37,6 +38,10 @@ module DataMapper
         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
+
+      class SurrenderBillOfLading < BillOfLading
+        validates_format_of :bank_url, :as => :url, :allow_nil => false, :allow_blank => false
+      end
     end # Fixtures
   end # Validations
 end # DataMapper

data/spec/fixtures/llama_spaceship.rb

@@ -0,0 +1,15 @@
+module DataMapper
+  module Validations
+    module Fixtures
+      class LlamaSpaceship
+        include DataMapper::Resource
+
+        property :id, Serial
+        property :type, String
+        property :color, String
+
+        validates_format_of :color, :with => /^red|black$/, :if => Proc.new { |spaceship| spaceship.type == "standard" }
+      end
+    end
+  end
+end

data/spec/integration/automatic_validation/custom_messages_for_inferred_validation_spec.rb

@@ -5,6 +5,11 @@ describe 'Inferred validations' do
   it "allow overriding a single error message" do
     custom_boat = Class.new do
       include DataMapper::Resource
+
+      def self.name
+        'Boat'
+      end
+
       property :id,   DataMapper::Property::Serial
       property :name, String, :required => true, :message => "This boat must have name"
     end
@@ -16,6 +21,11 @@ describe 'Inferred validations' do
   it "should have correct error messages" do
     custom_boat = Class.new do
       include DataMapper::Resource
+
+      def self.name
+        'Boat'
+      end
+
       property :id,   DataMapper::Property::Serial
       property :name, String, :required => true, :length => 5..20, :format => /^[a-z]+$/,
                :messages => {

data/spec/integration/automatic_validation/disabling_inferred_validation_spec.rb

@@ -6,6 +6,10 @@ describe "A class with inferred validations disabled for all properties with an
     @klass = Class.new do
       include DataMapper::Resource
 
+      def self.name
+        'InferredValidation'
+      end
+
       property :id,   DataMapper::Property::Serial,                     :auto_validation => false
       property :name, String,                        :required => true, :auto_validation => false
       property :bool, DataMapper::Property::Boolean, :required => true, :auto_validation => false
@@ -25,6 +29,10 @@ describe "A class with inferred validations disabled for all properties with a b
     @klass = Class.new do
       include DataMapper::Resource
 
+      def self.name
+        'InferredValidation'
+      end
+
       without_auto_validations do
         property :id,   DataMapper::Property::Serial
         property :name, String,                        :required => true

data/spec/integration/automatic_validation/inferred_length_validation_spec.rb

@@ -124,6 +124,14 @@ describe 'DataMapper::Validations::Fixtures::SmsMessage' do
   end
 
   describe 'with an infinitely long note' do
+    before do
+      @original = @model.class.properties[:body]
+    end
+
+    after do
+      @model.class.property(@original.name, @original.class, @original.options)
+    end
+
     it "should raise when trying to set the upper bound of a property length range to Infinity" do
       expected_msg = "Infinity is no valid upper bound for a length range"
       lambda {

data/spec/integration/automatic_validation/inferred_uniqueness_validation_spec.rb

@@ -7,7 +7,9 @@ describe 'uniqueness' do
       @klass = Class.new do
         include DataMapper::Resource
 
-        storage_names[:default] = 'unique_events_single'
+        def self.name
+          'UniqueEventsSingle'
+        end
 
         property :id,         Integer, :key => true
         property :start_year, Integer, :unique => true
@@ -28,7 +30,9 @@ describe 'uniqueness' do
       @klass = Class.new do
         include DataMapper::Resource
 
-        storage_names[:default] = 'unique_events_multiple'
+        def self.name
+          'UniqueEventsMultiple'
+        end
 
         property :id, Integer, :key => true
         property :start_year, Integer, :unique => :years

data/spec/integration/automatic_validation/inferred_within_validation_spec.rb

@@ -8,6 +8,12 @@ describe 'A model with a :set & :default options on a property' do
       property :id,      DataMapper::Property::Serial
       property :limited, String, :set => %w[ foo bar bang ], :default => 'foo'
     end
+
+    DataMapper.finalize
+
+    if DataMapper.respond_to?(:auto_migrate!)
+      DataMapper.auto_migrate!
+    end
   end
 
   describe "without value on that property" do

data/spec/integration/datamapper_models/association_validation_spec.rb

@@ -5,10 +5,13 @@ describe 'DataMapper::Validations::Fixtures::Product' do
     DataMapper::Validations::Fixtures::ProductCompany.auto_migrate!
     DataMapper::Validations::Fixtures::Product.auto_migrate!
 
-    @parent = DataMapper::Validations::Fixtures::ProductCompany.create(:title => "Apple", :flagship_product => "Macintosh")
+    parent_model = DataMapper::Validations::Fixtures::ProductCompany
+    @parent = parent_model.new(:title => "Apple", :flagship_product => "Macintosh")
     @parent.should be_valid
+    @parent.save.should be_true
 
-    @model  = DataMapper::Validations::Fixtures::Product.new(:name => "MacBook Pro", :company => @parent)
+    model_model = DataMapper::Validations::Fixtures::Product
+    @model = model_model.new(:name => "MacBook Pro", :company => @parent)
     @model.should be_valid
   end
 

data/spec/integration/dirty_attributes/dirty_attributes_spec.rb

@@ -0,0 +1,13 @@
+require 'spec_helper'
+
+describe 'DataMapper::Validations::Fixtures::LlamaSpaceship' do
+  before :all do
+    DataMapper::Validations::Fixtures::LlamaSpaceship.auto_migrate!
+  end
+
+  it "validates even non dirty attributes" do
+    spaceship = DataMapper::Validations::Fixtures::LlamaSpaceship.create(:type => "custom", :color => "pink")
+    spaceship.type = "standard"
+    spaceship.should_not be_valid
+  end
+end

data/spec/integration/format_validator/email_format_validator_spec.rb

@@ -41,7 +41,8 @@ describe 'DataMapper::Validations::Fixtures::BillOfLading' do
         'Max@Job 3:14',
         'Job@Book of Job',
         'test@localhost',
-        'J. P. \'s-Gravezande, a.k.a. The Hacker!@example.com'].each do |email|
+        'J. P. \'s-Gravezande, a.k.a. The Hacker!@example.com',
+        "test@example.com\nsomething after the newline"].each do |email|
     describe "with email value of #{email} (non RFC2822 compliant)" do
       before :all do
         @model = DataMapper::Validations::Fixtures::BillOfLading.new(valid_attributes.merge(:email => email))
@@ -56,10 +57,17 @@ describe 'DataMapper::Validations::Fixtures::BillOfLading' do
       @model = DataMapper::Validations::Fixtures::BillOfLading.new(valid_attributes.merge(:email => 'pelé@gmail.com'))
     end
 
-    # Unicode emails not supported on MRI18
-    unless !defined?(RUBY_ENGINE) && RUBY_VERSION == '1.8.7'
-      it 'should behave like valid model' do
-        @model.should be_valid
+    if (RUBY_VERSION == '1.9.2' && RUBY_ENGINE == 'jruby') || RUBY_VERSION == '1.9.3'
+      # Not supported on jruby 1.9 or 1.9.3 yet - see formats/email.rb
+      it 'should not raise an error' do
+        lambda { @model.valid? }.should_not raise_error
+      end
+    else
+      # Unicode emails not supported on MRI18
+      unless !defined?(RUBY_ENGINE) && RUBY_VERSION == '1.8.7'
+        it 'should behave like valid model' do
+          @model.should be_valid
+        end
       end
     end
   end