dm-validations 1.1.0 → 1.2.0.rc1

data/Gemfile

@@ -5,8 +5,8 @@ source 'http://rubygems.org'
 SOURCE         = ENV.fetch('SOURCE', :git).to_sym
 REPO_POSTFIX   = SOURCE == :path ? ''                                : '.git'
 DATAMAPPER     = SOURCE == :path ? Pathname(__FILE__).dirname.parent : 'http://github.com/datamapper'
-DM_VERSION     = '~> 1.1.0'
-DO_VERSION     = '~> 0.10.2'
+DM_VERSION     = '~> 1.2.0.rc1'
+DO_VERSION     = '~> 0.10.4'
 DM_DO_ADAPTERS = %w[ sqlite postgres mysql oracle sqlserver ]
 
 gem 'dm-core', DM_VERSION, SOURCE => "#{DATAMAPPER}/dm-core#{REPO_POSTFIX}"
@@ -14,18 +14,18 @@ gem 'dm-core', DM_VERSION, SOURCE => "#{DATAMAPPER}/dm-core#{REPO_POSTFIX}"
 group :development do
 
   gem 'dm-types', DM_VERSION, SOURCE => "#{DATAMAPPER}/dm-types#{REPO_POSTFIX}"
-  gem 'jeweler',  '~> 1.5.2'
-  gem 'rake',     '~> 0.8.7'
-  gem 'rspec',    '~> 1.3.1'
+  gem 'jeweler',  '~> 1.6.4'
+  gem 'rake',     '~> 0.9.2'
+  gem 'rspec',    '~> 1.3.2'
 
 end
 
 platforms :mri_18 do
   group :quality do
 
-    gem 'rcov',      '~> 0.9.9'
-    gem 'yard',      '~> 0.6'
-    gem 'yardstick', '~> 0.2'
+    gem 'rcov',      '~> 0.9.10'
+    gem 'yard',      '~> 0.7.2'
+    gem 'yardstick', '~> 0.4'
 
   end
 end

data/Rakefile

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'rake'
 
 begin
-  gem 'jeweler', '~> 1.5.2'
+  gem 'jeweler', '~> 1.6.4'
   require 'jeweler'
 
   Jeweler::Tasks.new do |gem|
@@ -21,5 +21,5 @@ begin
 
   FileList['tasks/**/*.rake'].each { |task| import task }
 rescue LoadError
-  puts 'Jeweler (or a dependency) not available. Install it with: gem install jeweler -v 1.5.2'
+  puts 'Jeweler (or a dependency) not available. Install it with: gem install jeweler -v 1.6.4'
 end

data/VERSION

@@ -1 +1 @@
-1.1.0
+1.2.0.rc1

data/dm-validations.gemspec

@@ -4,14 +4,14 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{dm-validations}
-  s.version = "1.1.0"
+  s.name = "dm-validations"
+  s.version = "1.2.0.rc1"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Guy van den Berg"]
-  s.date = %q{2011-03-16}
-  s.description = %q{Library for performing validations on DM models and pure Ruby object}
-  s.email = %q{vandenberg.guy [a] gmail [d] com}
+  s.date = "2011-09-09"
+  s.description = "Library for performing validations on DM models and pure Ruby object"
+  s.email = "vandenberg.guy [a] gmail [d] com"
   s.extra_rdoc_files = [
     "LICENSE",
     "README.rdoc"
@@ -25,11 +25,11 @@ Gem::Specification.new do |s|
     "dm-validations.gemspec",
     "lib/dm-validations.rb",
     "lib/dm-validations/auto_validate.rb",
+    "lib/dm-validations/context.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/support/ordered_hash.rb",
     "lib/dm-validations/validation_errors.rb",
@@ -62,6 +62,7 @@ Gem::Specification.new do |s|
     "spec/fixtures/jabberwock.rb",
     "spec/fixtures/kayak.rb",
     "spec/fixtures/lernean_hydra.rb",
+    "spec/fixtures/llama_spaceship.rb",
     "spec/fixtures/mathematical_function.rb",
     "spec/fixtures/memory_object.rb",
     "spec/fixtures/mittelschnauzer.rb",
@@ -99,6 +100,7 @@ Gem::Specification.new do |s|
     "spec/integration/confirmation_validator/spec_helper.rb",
     "spec/integration/datamapper_models/association_validation_spec.rb",
     "spec/integration/datamapper_models/inheritance_spec.rb",
+    "spec/integration/dirty_attributes/dirty_attributes_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",
@@ -159,151 +161,39 @@ Gem::Specification.new do |s|
     "spec/unit/validation_errors/enumerable_spec.rb",
     "spec/unit/validation_errors/reading_spec.rb",
     "spec/unit/validation_errors/respond_to_spec.rb",
+    "spec/unit/validators/within_validator_spec.rb",
     "tasks/spec.rake",
     "tasks/yard.rake",
     "tasks/yardstick.rake"
   ]
-  s.homepage = %q{http://github.com/datamapper/dm-validations}
+  s.homepage = "http://github.com/datamapper/dm-validations"
   s.require_paths = ["lib"]
-  s.rubyforge_project = %q{datamapper}
-  s.rubygems_version = %q{1.6.2}
-  s.summary = %q{Library for performing validations on DM models and pure Ruby object}
-  s.test_files = [
-    "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/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/multibyte.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_uniqueness_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/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/generic_validator/optional_spec.rb",
-    "spec/unit/validation_errors/adding_spec.rb",
-    "spec/unit/validation_errors/emptiness_spec.rb",
-    "spec/unit/validation_errors/enumerable_spec.rb",
-    "spec/unit/validation_errors/reading_spec.rb",
-    "spec/unit/validation_errors/respond_to_spec.rb"
-  ]
+  s.rubyforge_project = "datamapper"
+  s.rubygems_version = "1.8.10"
+  s.summary = "Library for performing validations on DM models and pure Ruby object"
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<dm-core>, ["~> 1.1.0"])
-      s.add_development_dependency(%q<dm-types>, ["~> 1.1.0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
-      s.add_development_dependency(%q<rake>, ["~> 0.8.7"])
-      s.add_development_dependency(%q<rspec>, ["~> 1.3.1"])
+      s.add_runtime_dependency(%q<dm-core>, ["~> 1.2.0.rc1"])
+      s.add_development_dependency(%q<dm-types>, ["~> 1.2.0.rc1"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
+      s.add_development_dependency(%q<rake>, ["~> 0.9.2"])
+      s.add_development_dependency(%q<rspec>, ["~> 1.3.2"])
     else
-      s.add_dependency(%q<dm-core>, ["~> 1.1.0"])
-      s.add_dependency(%q<dm-types>, ["~> 1.1.0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
-      s.add_dependency(%q<rake>, ["~> 0.8.7"])
-      s.add_dependency(%q<rspec>, ["~> 1.3.1"])
+      s.add_dependency(%q<dm-core>, ["~> 1.2.0.rc1"])
+      s.add_dependency(%q<dm-types>, ["~> 1.2.0.rc1"])
+      s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
+      s.add_dependency(%q<rake>, ["~> 0.9.2"])
+      s.add_dependency(%q<rspec>, ["~> 1.3.2"])
     end
   else
-    s.add_dependency(%q<dm-core>, ["~> 1.1.0"])
-    s.add_dependency(%q<dm-types>, ["~> 1.1.0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
-    s.add_dependency(%q<rake>, ["~> 0.8.7"])
-    s.add_dependency(%q<rspec>, ["~> 1.3.1"])
+    s.add_dependency(%q<dm-core>, ["~> 1.2.0.rc1"])
+    s.add_dependency(%q<dm-types>, ["~> 1.2.0.rc1"])
+    s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
+    s.add_dependency(%q<rake>, ["~> 0.9.2"])
+    s.add_dependency(%q<rspec>, ["~> 1.3.2"])
   end
 end
 

data/lib/dm-validations.rb

@@ -1,37 +1,12 @@
 require 'dm-core'
 require 'dm-validations/support/ordered_hash'
-
-class Object
-  # If receiver is callable, calls it and
-  # returns result. If not, just returns receiver
-  # itself
-  #
-  # @return [Object]
-  def try_call(*args)
-    if self.respond_to?(:call)
-      self.call(*args)
-    else
-      self
-    end
-  end
-end
-
-module DataMapper
-  class Property
-    def self.new(model, name, options = {})
-      property = super
-      property.model.auto_generate_validations(property)
-
-      # FIXME: explicit return needed for YARD to parse this properly
-      return property
-    end
-  end
-end
+require 'dm-validations/support/object'
 
 require 'dm-validations/exceptions'
 require 'dm-validations/validation_errors'
 require 'dm-validations/contextual_validators'
 require 'dm-validations/auto_validate'
+require 'dm-validations/context'
 
 require 'dm-validations/validators/generic_validator'
 require 'dm-validations/validators/required_field_validator'
@@ -47,16 +22,11 @@ require 'dm-validations/validators/block_validator'
 require 'dm-validations/validators/uniqueness_validator'
 require 'dm-validations/validators/acceptance_validator'
 
-require 'dm-validations/support/context'
-require 'dm-validations/support/object'
-
 module DataMapper
   module Validations
 
     Model.append_inclusions self
 
-    extend Chainable
-
     def self.included(model)
       model.extend ClassMethods
     end
@@ -64,66 +34,63 @@ module DataMapper
     # Ensures the object is valid for the context provided, and otherwise
     # throws :halt and returns false.
     #
-    chainable do
-      def save(context = default_validation_context)
-        validation_context(context) { super() }
-      end
+    # @api public
+    def save(context = default_validation_context)
+      model.validators.assert_valid(context)
+      Validations::Context.in_context(context) { super() }
     end
 
-    chainable do
-      def update(attributes = {}, context = default_validation_context)
-        validation_context(context) { super(attributes) }
-      end
+    # @api public
+    def update(attributes = {}, context = default_validation_context)
+      model.validators.assert_valid(context)
+      Validations::Context.in_context(context) { super(attributes) }
     end
 
-    chainable do
-      def save_self(*)
-        return false unless !dirty_self? || validation_context_stack.empty? || valid?(current_validation_context)
+    # @api private
+    def save_self(*)
+      if Validations::Context.any? && !valid?(model.validators.current_context)
+        false
+      else
         super
       end
     end
 
     # Return the ValidationErrors
     #
+    # @api public
     def errors
       @errors ||= ValidationErrors.new(self)
     end
 
     # Mark this resource as validatable. When we validate associations of a
     # resource we can check if they respond to validatable? before trying to
-    # recursivly validate them
+    # recursively validate them
     #
+    # @api semipublic
     def validatable?
       true
     end
 
     # Alias for valid?(:default)
     #
+    # TODO: deprecate
     def valid_for_default?
       valid?(:default)
     end
 
     # Check if a resource is valid in a given context
     #
+    # @api public
     def valid?(context = :default)
-      klass = respond_to?(:model) ? model : self.class
-      klass.validators.execute(context, self)
+      model = respond_to?(:model) ? self.model : self.class
+      model.validators.execute(context, self)
     end
 
+    # @api semipublic
     def validation_property_value(name)
       __send__(name) if respond_to?(name, true)
     end
 
-    # Get the corresponding Resource property, if it exists.
-    #
-    # Note: DataMapper validations can be used on non-DataMapper resources.
-    # In such cases, the return value will be nil.
-    def validation_property(field_name)
-      if respond_to?(:model) && (properties = model.properties(repository.name)) && properties.named?(field_name)
-        properties[field_name]
-      end
-    end
-
     module ClassMethods
       include DataMapper::Validations::ValidatesPresence
       include DataMapper::Validations::ValidatesAbsence
@@ -141,76 +108,57 @@ module DataMapper
 
       # Return the set of contextual validators or create a new one
       #
+      # @api public
       def validators
-        @validators ||= ContextualValidators.new
+        @validators ||= ContextualValidators.new(self)
       end
 
+      # @api private
       def inherited(base)
         super
-        validators.contexts.each do |context, validators|
-          base.validators.context(context).concat(validators)
+        self.validators.contexts.each do |context, validators|
+          validators.each do |v|
+            options = v.options.merge(:context => context)
+            base.validators.add(v.class, v.field_name, options)
+          end
         end
       end
 
+      # @api public
       def create(attributes = {}, *args)
         resource = new(attributes)
         resource.save(*args)
         resource
       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.dup : {}
-        context = opts.delete(:group) || opts.delete(:on) || opts.delete(:when) || opts.delete(:context) || :default
-        opts[:context] = Array(context)
-        opts.update(defaults) unless defaults.nil?
-        opts
-      end
+    private
 
       # Given a new context create an instance method of
       # valid_for_<context>? which simply calls valid?(context)
       # if it does not already exist
       #
-      def create_context_instance_methods(context)
-        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
+      # @api private
+      def self.create_context_instance_methods(model, context)
+        # TODO: deprecate `valid_for_#{context}?`
+        # what's wrong with requiring the caller to pass the context as an arg?
+        #   eg, `valid?(:context)`
+        # these methods are handy for symbol-based callbacks,
+        #   eg. `:if => :valid_for_context?`
+        # but these methods are so trivial to add where needed, making it
+        # overkill to do this for all contexts on all validated objects.
+        context = context.to_sym
+
+        name = "valid_for_#{context}?"
+        present = model.respond_to?(:resource_method_defined) ? model.resource_method_defined?(name) : model.instance_methods.include?(name)
+        unless present
+          model.class_eval <<-RUBY, __FILE__, __LINE__ + 1
+            def #{name}                         # def valid_for_signup?
+              valid?(#{context.inspect})        #   valid?(:signup)
+            end                                 # end
           RUBY
         end
       end
 
-      # Create a new validator of the given klazz and push it onto the
-      # requested context for each of the attributes in the fields list
-      # @param [Hash]          opts
-      #    Options supplied to validation macro, example:
-      #    {:context=>:default, :maximum=>50, :allow_nil=>true, :message=>nil}
-      #
-      # @param [Array<Symbol>] fields
-      #    Fields given to validation macro, example:
-      #    [:first_name, :last_name] in validates_presence_of :first_name, :last_name
-      #
-      # @param [Class] klazz
-      #    Validator class, example: DataMapper::Validations::LengthValidator
-      def add_validator_to_context(opts, fields, validator_class)
-        fields.each do |field|
-          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
     end # module ClassMethods
   end # module Validations