dm-validations 0.10.1 → 0.10.2

data/Rakefile

@@ -1,24 +1,29 @@
-require 'pathname'
+require 'rubygems'
+require 'rake'
 
-ROOT    = Pathname(__FILE__).dirname.expand_path
-JRUBY   = RUBY_PLATFORM =~ /java/
-WINDOWS = Gem.win_platform?
-SUDO    = (WINDOWS || JRUBY) ? '' : ('sudo' unless ENV['SUDOLESS'])
+begin
+  gem 'jeweler', '~> 1.4'
+  require 'jeweler'
 
-require ROOT + 'lib/dm-validations/version'
+  Jeweler::Tasks.new do |gem|
+    gem.name        = 'dm-validations'
+    gem.summary     = 'Library for performing validations on DM models and pure Ruby object'
+    gem.description = gem.summary
+    gem.email       = 'vandenberg.guy [a] gmail [d] com'
+    gem.homepage    = 'http://github.com/datamapper/dm-more/tree/master/%s' % gem.name
+    gem.authors     = [ 'Guy van den Berg' ]
 
-AUTHOR = 'Guy van den Berg, DataMapper development team'
-EMAIL  = 'vandenberg.guy [a] gmail [d] com'
-GEM_NAME = 'dm-validations'
-GEM_VERSION = DataMapper::Validations::VERSION
-GEM_DEPENDENCIES = [['dm-core', GEM_VERSION]]
-GEM_CLEAN = %w[ log pkg coverage ]
-GEM_EXTRAS = { :has_rdoc => true, :extra_rdoc_files => %w[ README.rdoc LICENSE TODO History.rdoc ] }
+    gem.rubyforge_project = 'datamapper'
 
-PROJECT_NAME = 'datamapper'
-PROJECT_URL  = "http://github.com/datamapper/dm-more/tree/master/#{GEM_NAME}"
-PROJECT_DESCRIPTION = PROJECT_SUMMARY = 'Library for performing validations on DM models and pure Ruby object'
+    gem.add_dependency 'dm-core', '~> 0.10.2'
 
-[ ROOT, ROOT.parent ].each do |dir|
-  Pathname.glob(dir.join('tasks/**/*.rb').to_s).each { |f| require f }
+    gem.add_development_dependency 'rspec', '~> 1.2.9'
+    gem.add_development_dependency 'yard',  '~> 0.4.0'
+  end
+
+  Jeweler::GemcutterTasks.new
+
+  FileList['tasks/**/*.rake'].each { |task| import task }
+rescue LoadError
+  puts 'Jeweler (or a dependency) not available. Install it with: gem install jeweler'
 end

data/VERSION

@@ -0,0 +1 @@
+0.10.2

data/dm-validations.gemspec

@@ -0,0 +1,188 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{dm-validations}
+  s.version = "0.10.2"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Guy van den Berg"]
+  s.date = %q{2009-12-11}
+  s.description = %q{Library for performing validations on DM models and pure Ruby object}
+  s.email = %q{vandenberg.guy [a] gmail [d] com}
+  s.extra_rdoc_files = [
+    "LICENSE",
+     "README.rdoc"
+  ]
+  s.files = [
+    "LICENSE",
+     "README.rdoc",
+     "Rakefile",
+     "VERSION",
+     "dm-validations.gemspec",
+     "lib/dm-validations.rb",
+     "lib/dm-validations/auto_validate.rb",
+     "lib/dm-validations/contextual_validators.rb",
+     "lib/dm-validations/exceptions.rb",
+     "lib/dm-validations/formats/email.rb",
+     "lib/dm-validations/formats/url.rb",
+     "lib/dm-validations/support/context.rb",
+     "lib/dm-validations/support/object.rb",
+     "lib/dm-validations/validation_errors.rb",
+     "lib/dm-validations/validators/absent_field_validator.rb",
+     "lib/dm-validations/validators/acceptance_validator.rb",
+     "lib/dm-validations/validators/block_validator.rb",
+     "lib/dm-validations/validators/confirmation_validator.rb",
+     "lib/dm-validations/validators/format_validator.rb",
+     "lib/dm-validations/validators/generic_validator.rb",
+     "lib/dm-validations/validators/length_validator.rb",
+     "lib/dm-validations/validators/method_validator.rb",
+     "lib/dm-validations/validators/numeric_validator.rb",
+     "lib/dm-validations/validators/primitive_validator.rb",
+     "lib/dm-validations/validators/required_field_validator.rb",
+     "lib/dm-validations/validators/uniqueness_validator.rb",
+     "lib/dm-validations/validators/within_validator.rb",
+     "spec/fixtures/barcode.rb",
+     "spec/fixtures/basketball_court.rb",
+     "spec/fixtures/basketball_player.rb",
+     "spec/fixtures/beta_tester_account.rb",
+     "spec/fixtures/bill_of_landing.rb",
+     "spec/fixtures/boat_dock.rb",
+     "spec/fixtures/city.rb",
+     "spec/fixtures/company.rb",
+     "spec/fixtures/corporate_world.rb",
+     "spec/fixtures/country.rb",
+     "spec/fixtures/currency.rb",
+     "spec/fixtures/ethernet_frame.rb",
+     "spec/fixtures/event.rb",
+     "spec/fixtures/g3_concert.rb",
+     "spec/fixtures/jabberwock.rb",
+     "spec/fixtures/kayak.rb",
+     "spec/fixtures/lernean_hydra.rb",
+     "spec/fixtures/mathematical_function.rb",
+     "spec/fixtures/memory_object.rb",
+     "spec/fixtures/mittelschnauzer.rb",
+     "spec/fixtures/motor_launch.rb",
+     "spec/fixtures/page.rb",
+     "spec/fixtures/phone_number.rb",
+     "spec/fixtures/pirogue.rb",
+     "spec/fixtures/programming_language.rb",
+     "spec/fixtures/reservation.rb",
+     "spec/fixtures/scm_operation.rb",
+     "spec/fixtures/sms_message.rb",
+     "spec/fixtures/udp_packet.rb",
+     "spec/integration/absent_field_validator/absent_field_validator_spec.rb",
+     "spec/integration/absent_field_validator/spec_helper.rb",
+     "spec/integration/acceptance_validator/acceptance_validator_spec.rb",
+     "spec/integration/acceptance_validator/spec_helper.rb",
+     "spec/integration/automatic_validation/custom_messages_for_inferred_validation_spec.rb",
+     "spec/integration/automatic_validation/disabling_inferred_validation_spec.rb",
+     "spec/integration/automatic_validation/inferred_boolean_properties_validation_spec.rb",
+     "spec/integration/automatic_validation/inferred_float_property_validation_spec.rb",
+     "spec/integration/automatic_validation/inferred_format_validation_spec.rb",
+     "spec/integration/automatic_validation/inferred_integer_properties_validation_spec.rb",
+     "spec/integration/automatic_validation/inferred_length_validation_spec.rb",
+     "spec/integration/automatic_validation/inferred_presence_validation_spec.rb",
+     "spec/integration/automatic_validation/inferred_primitive_validation_spec.rb",
+     "spec/integration/automatic_validation/inferred_within_validation_spec.rb",
+     "spec/integration/automatic_validation/spec_helper.rb",
+     "spec/integration/block_validator/block_validator_spec.rb",
+     "spec/integration/block_validator/spec_helper.rb",
+     "spec/integration/conditional_validation/if_condition_spec.rb",
+     "spec/integration/conditional_validation/spec_helper.rb",
+     "spec/integration/confirmation_validator/confirmation_validator_spec.rb",
+     "spec/integration/confirmation_validator/spec_helper.rb",
+     "spec/integration/datamapper_models/association_validation_spec.rb",
+     "spec/integration/datamapper_models/inheritance_spec.rb",
+     "spec/integration/duplicated_validations/duplicated_validations_spec.rb",
+     "spec/integration/duplicated_validations/spec_helper.rb",
+     "spec/integration/format_validator/email_format_validator_spec.rb",
+     "spec/integration/format_validator/format_validator_spec.rb",
+     "spec/integration/format_validator/regexp_validator_spec.rb",
+     "spec/integration/format_validator/spec_helper.rb",
+     "spec/integration/format_validator/url_format_validator_spec.rb",
+     "spec/integration/length_validator/default_value_spec.rb",
+     "spec/integration/length_validator/equality_spec.rb",
+     "spec/integration/length_validator/error_message_spec.rb",
+     "spec/integration/length_validator/maximum_spec.rb",
+     "spec/integration/length_validator/minimum_spec.rb",
+     "spec/integration/length_validator/range_spec.rb",
+     "spec/integration/length_validator/spec_helper.rb",
+     "spec/integration/method_validator/method_validator_spec.rb",
+     "spec/integration/method_validator/spec_helper.rb",
+     "spec/integration/numeric_validator/equality_with_float_type_spec.rb",
+     "spec/integration/numeric_validator/equality_with_integer_type_spec.rb",
+     "spec/integration/numeric_validator/float_type_spec.rb",
+     "spec/integration/numeric_validator/gt_with_float_type_spec.rb",
+     "spec/integration/numeric_validator/gte_with_float_type_spec.rb",
+     "spec/integration/numeric_validator/integer_only_true_spec.rb",
+     "spec/integration/numeric_validator/integer_type_spec.rb",
+     "spec/integration/numeric_validator/lt_with_float_type_spec.rb",
+     "spec/integration/numeric_validator/lte_with_float_type_spec.rb",
+     "spec/integration/numeric_validator/spec_helper.rb",
+     "spec/integration/primitive_validator/primitive_validator_spec.rb",
+     "spec/integration/primitive_validator/spec_helper.rb",
+     "spec/integration/pure_ruby_objects/plain_old_ruby_object_validation_spec.rb",
+     "spec/integration/required_field_validator/association_spec.rb",
+     "spec/integration/required_field_validator/boolean_type_value_spec.rb",
+     "spec/integration/required_field_validator/date_type_value_spec.rb",
+     "spec/integration/required_field_validator/datetime_type_value_spec.rb",
+     "spec/integration/required_field_validator/float_type_value_spec.rb",
+     "spec/integration/required_field_validator/integer_type_value_spec.rb",
+     "spec/integration/required_field_validator/plain_old_ruby_object_spec.rb",
+     "spec/integration/required_field_validator/shared_examples.rb",
+     "spec/integration/required_field_validator/spec_helper.rb",
+     "spec/integration/required_field_validator/string_type_value_spec.rb",
+     "spec/integration/required_field_validator/text_type_value_spec.rb",
+     "spec/integration/shared/default_validation_context.rb",
+     "spec/integration/shared/valid_and_invalid_model.rb",
+     "spec/integration/uniqueness_validator/spec_helper.rb",
+     "spec/integration/uniqueness_validator/uniqueness_validator_spec.rb",
+     "spec/integration/within_validator/spec_helper.rb",
+     "spec/integration/within_validator/within_validator_spec.rb",
+     "spec/public/resource_spec.rb",
+     "spec/rcov.opts",
+     "spec/spec.opts",
+     "spec/spec_helper.rb",
+     "spec/unit/contextual_validators/emptiness_spec.rb",
+     "spec/unit/contextual_validators/execution_spec.rb",
+     "spec/unit/contextual_validators/spec_helper.rb",
+     "spec/unit/generic_validator/equality_operator_spec.rb",
+     "spec/unit/validation_errors/adding_spec.rb",
+     "spec/unit/validation_errors/emptiness_spec.rb",
+     "spec/unit/validation_errors/enumerable_spec.rb",
+     "tasks/ci.rake",
+     "tasks/metrics.rake",
+     "tasks/spec.rake",
+     "tasks/yard.rake",
+     "tasks/yardstick.rake"
+  ]
+  s.homepage = %q{http://github.com/datamapper/dm-more/tree/master/dm-validations}
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.require_paths = ["lib"]
+  s.rubyforge_project = %q{datamapper}
+  s.rubygems_version = %q{1.3.5}
+  s.summary = %q{Library for performing validations on DM models and pure Ruby object}
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<dm-core>, ["~> 0.10.2"])
+      s.add_development_dependency(%q<rspec>, ["~> 1.2.9"])
+      s.add_development_dependency(%q<yard>, ["~> 0.4.0"])
+    else
+      s.add_dependency(%q<dm-core>, ["~> 0.10.2"])
+      s.add_dependency(%q<rspec>, ["~> 1.2.9"])
+      s.add_dependency(%q<yard>, ["~> 0.4.0"])
+    end
+  else
+    s.add_dependency(%q<dm-core>, ["~> 0.10.2"])
+    s.add_dependency(%q<rspec>, ["~> 1.2.9"])
+    s.add_dependency(%q<yard>, ["~> 0.4.0"])
+  end
+end
+

data/lib/dm-validations.rb

@@ -50,15 +50,15 @@ module DataMapper
     end
 
     chainable do
-      def save_self(*)
-        return false unless validation_context_stack.empty? || valid?(current_validation_context)
-        super
+      def update(attributes = {}, context = default_validation_context)
+        validation_context(context) { super(attributes) }
       end
     end
 
     chainable do
-      def update(attributes = {}, context = default_validation_context)
-        validation_context(context) { super(attributes) }
+      def save_self(*)
+        return false unless validation_context_stack.empty? || valid?(current_validation_context)
+        super
       end
     end
 
@@ -89,33 +89,8 @@ module DataMapper
       klass.validators.execute(context, self)
     end
 
-    # Begin a recursive walk of the model checking validity
-    #
-    def all_valid?(context = :default)
-      recursive_valid?(self, context, true)
-    end
-
-    # Do recursive validity checking
-    #
-    def recursive_valid?(target, context, state)
-      valid = state
-      target.instance_variables.each do |ivar|
-        ivar_value = target.instance_variable_get(ivar)
-        if ivar_value.validatable?
-          valid = valid && recursive_valid?(ivar_value, context, valid)
-        elsif ivar_value.respond_to?(:each)
-          ivar_value.each do |item|
-            if item.validatable?
-              valid = valid && recursive_valid?(item, context, valid)
-            end
-          end
-        end
-      end
-      return valid && target.valid?
-    end
-
     def validation_property_value(name)
-      respond_to?(name, true) ? send(name) : nil
+      __send__(name) if respond_to?(name, true)
     end
 
     # Get the corresponding Resource property, if it exists.
@@ -128,18 +103,6 @@ module DataMapper
       end
     end
 
-    def validation_association_keys(name)
-      if model.relationships.has_key?(name)
-        result = []
-        relation = model.relationships[name]
-        relation.child_key.each do |key|
-          result << key.name
-        end
-        return result
-      end
-      nil
-    end
-
     module ClassMethods
       include DataMapper::Validate::ValidatesPresent
       include DataMapper::Validate::ValidatesAbsent
@@ -158,18 +121,20 @@ module DataMapper
       # Return the set of contextual validators or create a new one
       #
       def validators
-        @validations ||= ContextualValidators.new
+        @validators ||= ContextualValidators.new
       end
 
+      private
+
       # Clean up the argument list and return a opts hash, including the
       # merging of any default opts. Set the context to default if none is
       # provided. Also allow :context to be aliased to :on, :when & group
       #
       def opts_from_validator_args(args, defaults = nil)
-        opts = args.last.kind_of?(Hash) ? args.pop : {}
+        opts = args.last.kind_of?(Hash) ? args.pop.dup : {}
         context = opts.delete(:group) || opts.delete(:on) || opts.delete(:when) || opts.delete(:context) || :default
-        opts[:context] = context
-        opts.merge!(defaults) unless defaults.nil?
+        opts[:context] = Array(context)
+        opts.update(defaults) unless defaults.nil?
         opts
       end
 
@@ -178,21 +143,12 @@ module DataMapper
       # if it does not already exist
       #
       def create_context_instance_methods(context)
-        name = "valid_for_#{context.to_s}?"           # valid_for_signup?
-        if !instance_methods.include?(name)
+        name = "valid_for_#{context.to_s}?"
+        unless respond_to?(:resource_method_defined) ? resource_method_defined?(name) : instance_methods.include?(name)
           class_eval <<-RUBY, __FILE__, __LINE__ + 1
-            def #{name}                               # def valid_for_signup?
-              valid?(#{context.to_sym.inspect})       #   valid?(:signup)
-            end                                       # end
-          RUBY
-        end
-
-        all = "all_valid_for_#{context.to_s}?"        # all_valid_for_signup?
-        if !instance_methods.include?(all)
-          class_eval <<-RUBY, __FILE__, __LINE__ + 1
-            def #{all}                                # def all_valid_for_signup?
-              all_valid?(#{context.to_sym.inspect})   #   all_valid?(:signup)
-            end                                       # end
+            def #{name}                          # def valid_for_signup?
+              valid?(#{context.to_sym.inspect})  #   valid?(:signup)
+            end                                  # end
           RUBY
         end
       end
@@ -209,21 +165,15 @@ module DataMapper
       #
       # @param [Class] klazz
       #    Validator class, example: DataMapper::Validate::LengthValidator
-      def add_validator_to_context(opts, fields, klazz)
+      def add_validator_to_context(opts, fields, validator_class)
         fields.each do |field|
-          validator = klazz.new(field, opts.dup)
-          if opts[:context].is_a?(Symbol)
-            unless validators.context(opts[:context]).include?(validator)
-              validators.context(opts[:context]) << validator
-              create_context_instance_methods(opts[:context])
-            end
-          elsif opts[:context].is_a?(Array)
-            opts[:context].each do |c|
-              unless validators.context(c).include?(validator)
-                validators.context(c) << validator
-                create_context_instance_methods(c)
-              end
-            end
+          validator = validator_class.new(field, opts.dup)
+
+          opts[:context].each do |context|
+            validator_contexts = validators.context(context)
+            next if validator_contexts.include?(validator)
+            validator_contexts << validator
+            create_context_instance_methods(context)
           end
         end
       end

data/lib/dm-validations/auto_validate.rb

@@ -39,9 +39,9 @@ module DataMapper
       # @details [Triggers]
       #   Triggers that generate validator creation
       #
-      #   :nullable => false
-      #       Setting the option :nullable to false causes a
-      #       validates_presence_of validator to be automatically created on
+      #   :required => true
+      #       Setting the option :required to true causes a
+      #       validates_present validator to be automatically created on
       #       the property
       #
       #   :length => 20
@@ -111,8 +111,8 @@ module DataMapper
       def disabled_auto_validations?
         @disable_auto_validations || false
       end
-      alias auto_validations_disabled? disabled_auto_validations?
 
+      alias auto_validations_disabled? disabled_auto_validations?
 
       # Checks whether or not property should be auto validated.
       # It is the case for properties with :auto_validation option
@@ -125,7 +125,7 @@ module DataMapper
       end
 
       def infer_presence_validation_for(property, options)
-        return if allow_nil?(property)
+        return if skip_presence_validation?(property)
 
         validates_present property.name, options_with_message(options, property, :presence)
       end
@@ -193,8 +193,8 @@ module DataMapper
 
       private
 
-      def allow_nil?(property)
-        property.nullable? || property.serial?
+      def skip_presence_validation?(property)
+        property.allow_blank? || property.serial?
       end
     end # module AutoValidate
   end # module Validate

data/lib/dm-validations/contextual_validators.rb

@@ -1,4 +1,4 @@
-require "forwardable"
+require 'forwardable'
 
 module DataMapper
   module Validate
@@ -27,13 +27,6 @@ module DataMapper
       # API
       #
 
-      def dump
-        contexts.each_pair do |key, context|
-          puts "Key=#{key} Context: #{context}"
-        end
-      end
-      alias_method :inspect, :dump
-
       # Return an array of validators for a named context
       #
       # @param  [String]
@@ -59,18 +52,11 @@ module DataMapper
       # @return [Boolean]
       #   true if all are valid, otherwise false
       def execute(named_context, target)
-        raise(ArgumentError, "validation context #{named_context} doesn't seem to be defined. Known contexts are #{contexts.keys.inspect}") if !named_context || (contexts.length > 0 && !contexts[named_context])
         target.errors.clear!
-        result = true
-        # note that all? and any? stop iteration on first negative or positive result,
-        # so we really have to use each here to make sure all validators are
-        # executed
-        context(named_context).select { |validator| validator.execute?(target) }.each do |validator|
-          result = false unless validator.call(target)
-        end
-
 
-        result
+        context(named_context).map do |validator|
+          validator.execute?(target) ? validator.call(target) : true
+        end.all?
       end
 
     end # module ContextualValidators