dm-validations 0.9.11 → 0.10.0

data/spec/unit/validation_errors/emptiness_spec.rb

@@ -0,0 +1,38 @@
+# -*- coding: utf-8 -*-
+require 'spec_helper'
+
+describe DataMapper::Validate::ValidationErrors do
+  before :all do
+    @model = DataMapper::Validate::ValidationErrors.new(Object.new)
+  end
+
+  describe "initially" do
+    it "is empty" do
+      @model.should be_empty
+    end
+  end
+
+  # Not sure if this is worth having at all,
+  # just keeping old spec suite bits in place
+  # if they make no harm — MK
+  describe "after enquiry" do
+    before :all do
+      @model.on(:property)
+    end
+
+    it "is still empty" do
+      @model.should be_empty
+    end
+  end
+
+
+  describe "after errors being added" do
+    before :all do
+      @model.add(:property, "can't be valid, no way")
+    end
+
+    it "is no longer empty" do
+      @model.should_not be_empty
+    end
+  end
+end

data/spec/unit/validation_errors/enumerable_spec.rb

@@ -0,0 +1,32 @@
+# -*- coding: utf-8 -*-
+require 'spec_helper'
+
+describe DataMapper::Validate::ValidationErrors do
+  before :all do
+    @model = DataMapper::Validate::ValidationErrors.new(Object.new)
+    @model.add(:ip_address, "must have valid format")
+    @model.add(:full_name, "can't be blank")
+  end
+
+  describe "#each" do
+    it "iterates over properties and yields error message arrays" do
+      params = []
+      @model.each do |param|
+        params << param
+      end
+
+      params.should == [ [ 'must have valid format' ], [ "can't be blank" ] ]
+    end
+  end
+
+
+  describe "#map" do
+    before :all do
+      @model.add(:ip_address, "must belong to a local subnet")
+    end
+    it "maps error message arrays using provided block" do
+      projection = @model.map { |ary| ary }
+      projection.should == [ [ 'must have valid format', 'must belong to a local subnet' ], [ "can't be blank" ] ]
+    end
+  end
+end

data/tasks/install.rb

@@ -4,7 +4,7 @@ end
 
 desc "Install #{GEM_NAME} #{GEM_VERSION}"
 task :install => [ :package ] do
-  sudo_gem "install --local pkg/#{GEM_NAME}-#{GEM_VERSION} --no-update-sources"
+  sudo_gem "install pkg/#{GEM_NAME}-#{GEM_VERSION} --no-update-sources"
 end
 
 desc "Uninstall #{GEM_NAME} #{GEM_VERSION}"

data/tasks/spec.rb

@@ -1,6 +1,4 @@
 begin
-  gem 'rspec', '~>1.2'
-  require 'spec'
   require 'spec/rake/spectask'
 
   task :default => [ :spec ]
@@ -8,16 +6,18 @@ begin
   desc 'Run specifications'
   Spec::Rake::SpecTask.new(:spec) do |t|
     t.spec_opts << '--options' << 'spec/spec.opts' if File.exists?('spec/spec.opts')
-    t.spec_files = Pathname.glob((ROOT + 'spec/**/*_spec.rb').to_s).map { |f| f.to_s }
+    t.libs      << 'lib' << 'spec' # needed for CI rake spec task, duplicated in spec_helper
 
     begin
-      gem 'rcov', '~>0.8'
+      require 'rcov'
       t.rcov = JRUBY ? false : (ENV.has_key?('NO_RCOV') ? ENV['NO_RCOV'] != 'true' : true)
       t.rcov_opts << '--exclude' << 'spec'
       t.rcov_opts << '--text-summary'
       t.rcov_opts << '--sort' << 'coverage' << '--sort-reverse'
     rescue LoadError
       # rcov not installed
+    rescue SyntaxError
+      # rcov syntax invalid
     end
   end
 rescue LoadError

metadata

@@ -1,28 +1,19 @@
 --- !ruby/object:Gem::Specification 
 name: dm-validations
 version: !ruby/object:Gem::Version 
-  version: 0.9.11
+  version: 0.10.0
 platform: ruby
 authors: 
-- Guy van den Berg
+- Guy van den Berg, DataMapper development team
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2009-03-29 00:00:00 -07:00
+date: 2009-09-16 00:00:00 -07:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: dm-core
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        version: 0.9.11
-    version: 
-description: DataMapper plugin for performing validations on data models
+dependencies: []
+
+description: Library for performing validations on DM models and pure Ruby object
 email: 
 - vandenberg.guy [a] gmail [d] com
 executables: []
@@ -30,61 +21,121 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
-- README.txt
+- README.rdoc
 - LICENSE
 - TODO
-- History.txt
+- History.rdoc
 files: 
-- History.txt
+- History.rdoc
 - LICENSE
 - Manifest.txt
-- README.txt
+- README.rdoc
 - Rakefile
 - TODO
 - lib/dm-validations.rb
-- lib/dm-validations/absent_field_validator.rb
-- lib/dm-validations/acceptance_validator.rb
 - lib/dm-validations/auto_validate.rb
-- lib/dm-validations/block_validator.rb
-- lib/dm-validations/confirmation_validator.rb
 - lib/dm-validations/contextual_validators.rb
-- lib/dm-validations/custom_validator.rb
-- lib/dm-validations/format_validator.rb
+- lib/dm-validations/exceptions.rb
 - lib/dm-validations/formats/email.rb
 - lib/dm-validations/formats/url.rb
-- lib/dm-validations/generic_validator.rb
-- lib/dm-validations/length_validator.rb
-- lib/dm-validations/method_validator.rb
-- lib/dm-validations/numeric_validator.rb
-- lib/dm-validations/primitive_validator.rb
-- lib/dm-validations/required_field_validator.rb
+- lib/dm-validations/support/context.rb
 - lib/dm-validations/support/object.rb
-- lib/dm-validations/uniqueness_validator.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
 - lib/dm-validations/version.rb
-- lib/dm-validations/within_validator.rb
-- spec/integration/absent_field_validator_spec.rb
-- spec/integration/acceptance_validator_spec.rb
-- spec/integration/auto_validate_spec.rb
-- spec/integration/block_validator_spec.rb
-- spec/integration/confirmation_validator_spec.rb
-- spec/integration/contextual_validators_spec.rb
-- spec/integration/custom_validator_spec.rb
-- spec/integration/format_validator_spec.rb
-- spec/integration/generic_validator_spec.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/length_validator/valid_objects_spec.rb
-- spec/integration/method_validator_spec.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/numeric_validator_spec.rb
-- spec/integration/primitive_validator_spec.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
@@ -96,20 +147,32 @@ files:
 - 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/uniqueness_validator_spec.rb
-- spec/integration/validation_errors_spec.rb
-- spec/integration/validation_spec.rb
-- spec/integration/within_validator_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.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/install.rb
 - tasks/spec.rb
 has_rdoc: true
-homepage: http://github.com/sam/dm-more/tree/master/dm-validations
+homepage: http://github.com/datamapper/dm-more/tree/master/dm-validations
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --main
-- README.txt
+- README.rdoc
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -127,9 +190,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: datamapper
-rubygems_version: 1.3.1
+rubygems_version: 1.3.5
 signing_key: 
-specification_version: 2
-summary: DataMapper plugin for performing validations on data models
+specification_version: 3
+summary: Library for performing validations on DM models and pure Ruby object
 test_files: []
 

data/README.txt

@@ -1,72 +0,0 @@
-This is a DataMapper plugin that provides validations for DataMapper model
-classes.
-
-== Setup
-DataMapper validation capabilities are automatically available when you
-'require dm-validations' into your application.
-
-More specifically, DataMapper::Validate is automatically included into
-DataMapper::Resource when you require dm-validations.
-
-== Specifying Model Validations
-There are two primary ways to implement validations for your models:
-
-1) Placing validation methods with properties as params in your class
-   definitions like:
-   - validates_length :name
-   - validates_length [:name, :description]
-
-2) Using auto-validations, please see DataMapper::Validate::AutoValidate
-
-An example class with validations declared:
-
-  require 'dm-validations'
-
-  class Account
-    include DataMapper::Resource
-
-    property :name, String
-    validates_length :name
-  end
-
-See all of the DataMapper::Validate module's XYZValidator(s) to learn about the
-complete collections of validators available to you.
-
-== Validating
-DataMapper validations, when included, alter the default save/create/update
-process for a model.  Unless you specify a context the resource must be
-valid in the :default context before saving.
-
-You may manually validate a resource using the valid? method, which will
-return true if the resource is valid, and false if it is invalid.
-
-In addition to the valid? method, there is also an all_valid? method that
-recursively walks both the current object and its associated objects and returns
-its true/false result for the entire walk.
-
-== Working with Validation Errors
-If your validators find errors in your model, they will populate the
-DataMapper::Validate::ValidationErrors object that is available through each of
-your models via calls to your model's errors method.
-
-For example:
-
-  my_account = Account.new(:name => "Jose")
-  if my_account.save
-    # my_account is valid and has been saved
-  else
-    my_account.errors.each do |e|
-      puts e
-    end
-  end
-
-See DataMapper::Validate::ValidationErrors for all you can do with your model's
-errors method.
-
-== Contextual Validations
-
-DataMapper Validations also provide a means of grouping your validations into
-contexts. This enables you to run different sets of validations under ...
-different contexts.
-
-TO BE ADDED... For now, see

data/lib/dm-validations/custom_validator.rb

@@ -1,72 +0,0 @@
-#require File.dirname(__FILE__) + '/formats/email'
-
-module DataMapper
-  module Validate
-
-    ##
-    #
-    # @author Guy van den Berg
-    # @since  0.9
-    class CustomValidator < GenericValidator
-
-      def initialize(field_name, options = {}, &b)
-        #super(field_name, options)
-        #@field_name, @options = field_name, options
-        #@options[:allow_nil] = false unless @options.has_key?(:allow_nil)
-      end
-
-      def call(target)
-        #field_value = target.instance_variable_get("@#{@field_name}")
-        #return true if @options[:allow_nil] && field_value.nil?
-
-        #validation = (@options[:as] || @options[:with])
-        #error_message = nil
-
-        # Figure out what to use as the actual validator.
-        # If a symbol is passed to :as, look up
-        # the canned validation in FORMATS.
-        #
-        #validator = if validation.is_a? Symbol
-        #  if FORMATS[validation].is_a? Array
-        #    error_message = FORMATS[validation][1]
-        #    FORMATS[validation][0]
-        #  else
-        #    FORMATS[validation] || validation
-        #  end
-        #else
-        #  validation
-        #end
-
-        #valid = case validator
-        #when Proc then validator.call(field_value)
-        #when Regexp then validator =~ field_value
-        #else raise UnknownValidationFormat, "Can't determine how to validate #{target.class}##{@field_name} with #{validator.inspect}"
-        #end
-
-        #unless valid
-        #  field = Inflector.humanize(@field_name)
-        #  value = field_value
-        #
-        #  error_message = @options[:message] || error_message || '%s is invalid'.t(field)
-        #  error_message = error_message.call(field, value) if Proc === error_message
-        #
-        #  add_error(target, error_message, @field_name)
-        #end
-
-        #return valid
-      end
-
-      #class UnknownValidationFormat < StandardError; end
-
-    end # class CustomValidator
-
-    module ValidatesFormatOf
-
-      #def validates_format_of(*fields)
-        #opts = opts_from_validator_args(fields)
-        #add_validator_to_context(opts, fields, DataMapper::Validate::FormatValidator)
-      #end
-
-    end # module ValidatesFormatOf
-  end # module Validate
-end # module DataMapper