dm-validations 1.0.0.rc2 → 1.0.0.rc3

data/Gemfile

@@ -71,7 +71,7 @@
 source 'http://rubygems.org'
 
 DATAMAPPER = 'git://github.com/datamapper'
-DM_VERSION = '~> 1.0.0.rc2'
+DM_VERSION = '~> 1.0.0.rc3'
 
 group :runtime do # Runtime dependencies (as in the gemspec)
 

data/LICENSE

@@ -1,5 +1,5 @@
 Copyright (c) 2007 Guy van den Berg
-Copyright (c) 2008, 2009 DataMapper development team
+Copyright (c) 2008, 2009, 2010 DataMapper development team
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/Rakefile

@@ -10,15 +10,15 @@ begin
     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.homepage    = 'http://github.com/datamapper/%s' % gem.name
     gem.authors     = [ 'Guy van den Berg' ]
 
     gem.rubyforge_project = 'datamapper'
 
-    gem.add_dependency 'dm-core', '~> 1.0.0.rc2'
+    gem.add_dependency 'dm-core', '~> 1.0.0.rc3'
 
     gem.add_development_dependency 'rspec',    '~> 1.3'
-    gem.add_development_dependency 'dm-types', '~> 1.0.0.rc2'
+    gem.add_development_dependency 'dm-types', '~> 1.0.0.rc3'
   end
 
   Jeweler::GemcutterTasks.new

data/VERSION

@@ -1 +1 @@
-1.0.0.rc2
+1.0.0.rc3

data/dm-validations.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dm-validations}
-  s.version = "1.0.0.rc2"
+  s.version = "1.0.0.rc3"
 
   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{2010-05-19}
+  s.date = %q{2010-05-27}
   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 = [
@@ -155,6 +155,7 @@ Gem::Specification.new do |s|
      "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",
      "tasks/ci.rake",
      "tasks/local_gemfile.rake",
      "tasks/metrics.rake",
@@ -162,7 +163,7 @@ Gem::Specification.new do |s|
      "tasks/yard.rake",
      "tasks/yardstick.rake"
   ]
-  s.homepage = %q{http://github.com/datamapper/dm-more/tree/master/dm-validations}
+  s.homepage = %q{http://github.com/datamapper/dm-validations}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{datamapper}
@@ -275,7 +276,8 @@ Gem::Specification.new do |s|
      "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"
+     "spec/unit/validation_errors/enumerable_spec.rb",
+     "spec/unit/validation_errors/reading_spec.rb"
   ]
 
   if s.respond_to? :specification_version then
@@ -283,18 +285,18 @@ Gem::Specification.new do |s|
     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.0.0.rc2"])
+      s.add_runtime_dependency(%q<dm-core>, ["~> 1.0.0.rc3"])
       s.add_development_dependency(%q<rspec>, ["~> 1.3"])
-      s.add_development_dependency(%q<dm-types>, ["~> 1.0.0.rc2"])
+      s.add_development_dependency(%q<dm-types>, ["~> 1.0.0.rc3"])
     else
-      s.add_dependency(%q<dm-core>, ["~> 1.0.0.rc2"])
+      s.add_dependency(%q<dm-core>, ["~> 1.0.0.rc3"])
       s.add_dependency(%q<rspec>, ["~> 1.3"])
-      s.add_dependency(%q<dm-types>, ["~> 1.0.0.rc2"])
+      s.add_dependency(%q<dm-types>, ["~> 1.0.0.rc3"])
     end
   else
-    s.add_dependency(%q<dm-core>, ["~> 1.0.0.rc2"])
+    s.add_dependency(%q<dm-core>, ["~> 1.0.0.rc3"])
     s.add_dependency(%q<rspec>, ["~> 1.3"])
-    s.add_dependency(%q<dm-types>, ["~> 1.0.0.rc2"])
+    s.add_dependency(%q<dm-types>, ["~> 1.0.0.rc3"])
   end
 end
 

data/lib/dm-validations/validation_errors.rb

@@ -35,7 +35,9 @@ module DataMapper
       }
 
       # Holds a hash with all the default error messages that can be replaced by your own copy or localizations.
-      cattr_writer :default_error_messages
+      def self.default_error_messages=(default_error_messages)
+        @@default_error_messages = default_error_messages
+      end
 
       def self.default_error_message(key, field, *values)
         field = ActiveSupport::Inflector.humanize(field)
@@ -107,6 +109,12 @@ module DataMapper
         errors.send(meth, *args, &block)
       end
 
+      def [](property_name)
+        if property_errors = errors[property_name.to_sym]
+          property_errors
+        end
+      end
+
       private
       def errors
         @errors

data/spec/integration/method_validator/method_validator_spec.rb

@@ -7,7 +7,7 @@ describe "a good fit for DSLs", :shared => true do
   end
 
   it "is totally fine for DSLs" do
-    @model.ensure_appropriate_for_dsls.should be_true
+    @model.ensure_appropriate_for_dsls.should be(true)
   end
 end
 
@@ -17,7 +17,7 @@ describe "a poor candidate for DSLs", :shared => true do
   end
 
   it "is unappropriate for DSLs" do
-    @model.ensure_appropriate_for_dsls.first.should be_false
+    @model.ensure_appropriate_for_dsls.first.should be(false)
   end
 
   it "has a (more or less) meaningful error message" do
@@ -32,7 +32,7 @@ describe "a good fit for game engine core", :shared => true do
   end
 
   it "is appropriate for system programming" do
-    @model.ensure_appropriate_for_system_programming.should be_true
+    @model.ensure_appropriate_for_system_programming.should be(true)
   end
 end
 
@@ -50,7 +50,7 @@ describe "a good fit for kernel hacking", :shared => true do
   end
 
   it "is appropriate for system programming" do
-    @model.ensure_appropriate_for_system_programming.should be_true
+    @model.ensure_appropriate_for_system_programming.should be(true)
   end
 end
 

data/spec/integration/uniqueness_validator/uniqueness_validator_spec.rb

@@ -6,7 +6,7 @@ describe 'uniqueness_validator/uniqueness_validator_spec' do
 
   describe 'DataMapper::Validations::Fixtures::Department' do
     before :all do
-      DataMapper::Validations::Fixtures::Department.all.destroy!
+      DataMapper::Validations::Fixtures::Department.destroy!
 
       DataMapper::Validations::Fixtures::Department.create(:name => "HR").should be_saved
     end
@@ -30,7 +30,7 @@ describe 'uniqueness_validator/uniqueness_validator_spec' do
 
   describe 'DataMapper::Validations::Fixtures::Organisation' do
     before :all do
-      DataMapper::Validations::Fixtures::Organisation.all.destroy!
+      DataMapper::Validations::Fixtures::Organisation.destroy!
 
       @model = DataMapper.repository do
         DataMapper::Validations::Fixtures::Organisation.create(:name => 'Apple', :domain => 'apple.com')
@@ -66,9 +66,9 @@ describe 'uniqueness_validator/uniqueness_validator_spec' do
 
   describe 'DataMapper::Validations::Fixtures::User' do
     before :all do
-      DataMapper::Validations::Fixtures::Organisation.all.destroy!
-      DataMapper::Validations::Fixtures::Department.all.destroy!
-      DataMapper::Validations::Fixtures::User.all.destroy!
+      DataMapper::Validations::Fixtures::Organisation.destroy!
+      DataMapper::Validations::Fixtures::Department.destroy!
+      DataMapper::Validations::Fixtures::User.destroy!
 
       DataMapper.repository do
         @organization = DataMapper::Validations::Fixtures::Organisation.create(:name => 'Org 101', :domain => '101')

data/spec/public/resource_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe 'DataMapper::Resource' do
   before :all do
-    DataMapper::Validations::Fixtures::Barcode.all.destroy!
+    DataMapper::Validations::Fixtures::Barcode.destroy!
 
     @resource = DataMapper::Validations::Fixtures::Barcode.new
   end
@@ -14,7 +14,7 @@ describe 'DataMapper::Resource' do
       end
 
       it 'should return true' do
-        @response.should be_true
+        @response.should be(true)
       end
     end
 
@@ -24,7 +24,7 @@ describe 'DataMapper::Resource' do
       end
 
       it 'should return false' do
-        @response.should be_false
+        @response.should be(false)
       end
 
       it 'should set errors' do
@@ -34,9 +34,9 @@ describe 'DataMapper::Resource' do
 
     describe 'when provided invalid attributes and a context' do
       before :all do
-        DataMapper::Validations::Fixtures::Organisation.all.destroy!
-        DataMapper::Validations::Fixtures::Department.all.destroy!
-        DataMapper::Validations::Fixtures::User.all.destroy!
+        DataMapper::Validations::Fixtures::Organisation.destroy!
+        DataMapper::Validations::Fixtures::Department.destroy!
+        DataMapper::Validations::Fixtures::User.destroy!
 
         organization = DataMapper::Validations::Fixtures::Organisation.create(:name => 'Org 101', :domain => '101')
         dept         = DataMapper::Validations::Fixtures::Department.create(:name => 'accounting')
@@ -56,7 +56,7 @@ describe 'DataMapper::Resource' do
       end
 
       it 'should return false' do
-        @response.should be_false
+        @response.should be(false)
       end
 
       it 'should set errors' do

data/spec/rcov.opts

@@ -1,4 +1,4 @@
---exclude "spec"
+--exclude "spec,^/"
 --sort coverage
 --callsites
 --xrefs

data/spec/spec_helper.rb

@@ -10,6 +10,7 @@ Pathname.glob((SPEC_ROOT + 'fixtures/**/*.rb').to_s).each { |file| require file
 Pathname.glob((SPEC_ROOT + 'integration/shared/**/*.rb').to_s).each { |file| require file }
 
 DataMapper::Spec.setup
+DataMapper.finalize
 
 Spec::Runner.configure do |config|
   config.extend(DataMapper::Spec::Adapters::Helpers)

data/spec/unit/contextual_validators/execution_spec.rb

@@ -19,14 +19,14 @@ describe 'DataMapper::Validations::ContextualValidators' do
     describe "when target satisfies all validators" do
       before do
         @target = DataMapper::Validations::Fixtures::PieceOfSoftware.new(:name => 'gcc', :operating_system => "Mac OS X")
-        @validator_one.call(@target).should be_true
-        @validator_two.call(@target).should be_true
+        @validator_one.call(@target).should be(true)
+        @validator_two.call(@target).should be(true)
 
         @result = @model.execute(:default, @target)
       end
 
       it "returns true" do
-        @result.should be_true
+        @result.should be(true)
       end
     end
 
@@ -34,14 +34,14 @@ describe 'DataMapper::Validations::ContextualValidators' do
     describe "when target does not satisfy all validators" do
       before do
         @target = DataMapper::Validations::Fixtures::PieceOfSoftware.new(:name => 'Skitch', :operating_system => "Haiku")
-        @validator_one.call(@target).should be_true
-        @validator_two.call(@target).should be_false
+        @validator_one.call(@target).should be(true)
+        @validator_two.call(@target).should be(false)
 
         @result = @model.execute(:default, @target)
       end
 
       it "returns true" do
-        @result.should be_false
+        @result.should be(false)
       end
     end
   end

data/spec/unit/validation_errors/reading_spec.rb

@@ -0,0 +1,35 @@
+# -*- coding: utf-8 -*-
+require 'spec_helper'
+
+shared_examples_for 'a validation error reader' do
+  context 'and that property has no associated errors' do
+    it 'should return an empty array' do
+      @errors[@property].should == []
+    end
+  end
+  context 'and that property has associated error(s)' do
+    it 'should return a non empty array' do
+      @errors.add(@property.to_sym, 'invalid')
+      @errors[@property].should_not be_empty
+    end
+  end
+end
+
+describe 'DataMapper::Validations::ValidationErrors' do
+  describe '[]' do
+    describe 'when passing the argument as a String' do
+      before(:each) do
+        @errors   = DataMapper::Validations::ValidationErrors.new(Object.new)
+        @property = 'name'
+      end
+      it_should_behave_like 'a validation error reader'
+    end
+    describe 'when passing the argument as a Symbol' do
+      before(:each) do
+        @errors   = DataMapper::Validations::ValidationErrors.new(Object.new)
+        @property = :name
+      end
+      it_should_behave_like 'a validation error reader'
+    end
+  end
+end

data/tasks/spec.rake

@@ -35,4 +35,7 @@ rescue LoadError
   end
 end
 
+task :spec => :check_dependencies
+task :rcov => :check_dependencies
+
 task :default => :spec

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: dm-validations
 version: !ruby/object:Gem::Version 
-  hash: 977940575
+  hash: 977940572
   prerelease: true
   segments: 
   - 1
   - 0
   - 0
-  - rc2
-  version: 1.0.0.rc2
+  - rc3
+  version: 1.0.0.rc3
 platform: ruby
 authors: 
 - Guy van den Berg
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-19 00:00:00 -07:00
+date: 2010-05-27 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,13 +27,13 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 977940575
+        hash: 977940572
         segments: 
         - 1
         - 0
         - 0
-        - rc2
-        version: 1.0.0.rc2
+        - rc3
+        version: 1.0.0.rc3
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -59,13 +59,13 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 977940575
+        hash: 977940572
         segments: 
         - 1
         - 0
         - 0
-        - rc2
-        version: 1.0.0.rc2
+        - rc3
+        version: 1.0.0.rc3
   type: :development
   version_requirements: *id003
 description: Library for performing validations on DM models and pure Ruby object
@@ -216,6 +216,7 @@ files:
 - 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
 - tasks/ci.rake
 - tasks/local_gemfile.rake
 - tasks/metrics.rake
@@ -223,7 +224,7 @@ files:
 - tasks/yard.rake
 - tasks/yardstick.rake
 has_rdoc: true
-homepage: http://github.com/datamapper/dm-more/tree/master/dm-validations
+homepage: http://github.com/datamapper/dm-validations
 licenses: []
 
 post_install_message: 
@@ -366,3 +367,4 @@ test_files:
 - 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