dm-validations 0.10.1 → 0.10.2

data/spec/integration/uniqueness_validator/uniqueness_validator_spec.rb

@@ -3,14 +3,16 @@ require 'integration/uniqueness_validator/spec_helper'
 
 
 if HAS_SQLITE3 || HAS_MYSQL || HAS_POSTGRES
-  describe DataMapper::Validate::Fixtures::Department do
+  describe 'DataMapper::Validate::Fixtures::Department' do
     before :all do
-      ::DataMapper::Validate::Fixtures::Department.create(:name => "HR")
+      DataMapper::Validate::Fixtures::Department.auto_migrate!
+
+      DataMapper::Validate::Fixtures::Department.create(:name => "HR")
     end
 
     describe "with unique name" do
       before :all do
-        @model = ::DataMapper::Validate::Fixtures::Department.new(:name => "R & D")
+        @model = DataMapper::Validate::Fixtures::Department.new(:name => "R & D")
       end
 
       it_should_behave_like "valid model"
@@ -18,19 +20,19 @@ if HAS_SQLITE3 || HAS_MYSQL || HAS_POSTGRES
 
     describe "with a duplicate name" do
       before :all do
-        @model = ::DataMapper::Validate::Fixtures::Department.new(:name => "HR")
+        @model = DataMapper::Validate::Fixtures::Department.new(:name => "HR")
       end
 
       it_should_behave_like "invalid model"
     end
   end
 
-
-
-  describe DataMapper::Validate::Fixtures::Organisation do
+  describe 'DataMapper::Validate::Fixtures::Organisation' do
     before :all do
-       DataMapper.repository do
-         @model = ::DataMapper::Validate::Fixtures::Organisation.create(:name => 'Apple', :domain => 'apple.com')
+      DataMapper::Validate::Fixtures::Organisation.auto_migrate!
+
+      @model = DataMapper.repository do
+        DataMapper::Validate::Fixtures::Organisation.create(:name => 'Apple', :domain => 'apple.com')
       end
     end
 
@@ -44,8 +46,7 @@ if HAS_SQLITE3 || HAS_MYSQL || HAS_POSTGRES
 
     describe "with a duplicate domain" do
       before :all do
-        @model.name   = "Fake Apple"
-        @model.domain = "apple.com"
+        @model = DataMapper::Validate::Fixtures::Organisation.new(:name => 'Fake Apple', :domain => 'apple.com')
       end
 
       it_should_behave_like "invalid model"
@@ -62,19 +63,16 @@ if HAS_SQLITE3 || HAS_MYSQL || HAS_POSTGRES
     end
   end
 
-
-
-  describe DataMapper::Validate::Fixtures::User do
+  describe 'DataMapper::Validate::Fixtures::User' do
     before :all do
-      # remove data from previous spec runs
-      ::DataMapper::Validate::Fixtures::Organisation.all.destroy!
-      ::DataMapper::Validate::Fixtures::Department.all.destroy!
-      ::DataMapper::Validate::Fixtures::User.all.destroy!
+      DataMapper::Validate::Fixtures::Organisation.auto_migrate!
+      DataMapper::Validate::Fixtures::Department.auto_migrate!
+      DataMapper::Validate::Fixtures::User.auto_migrate!
 
       DataMapper.repository do
-        @organization = ::DataMapper::Validate::Fixtures::Organisation.create(:name => 'Org 101', :domain => '101')
-        @dept         = ::DataMapper::Validate::Fixtures::Department.create(:name => 'accounting')
-        @user         = ::DataMapper::Validate::Fixtures::User.create(:organisation => @organization, :user_name => 'guy', :department => @dept)
+        @organization = DataMapper::Validate::Fixtures::Organisation.create(:name => 'Org 101', :domain => '101')
+        @dept         = DataMapper::Validate::Fixtures::Department.create(:name => 'accounting')
+        @user         = DataMapper::Validate::Fixtures::User.create(:organisation => @organization, :user_name => 'guy', :department => @dept)
 
         @organization.should be_saved
         @dept.should be_saved
@@ -84,7 +82,7 @@ if HAS_SQLITE3 || HAS_MYSQL || HAS_POSTGRES
 
     describe "with username not valid across the organization" do
       before :all do
-        @model = ::DataMapper::Validate::Fixtures::User.new(:organisation => @organization, :user_name => 'guy')
+        @model = DataMapper::Validate::Fixtures::User.new(:organisation => @organization, :user_name => 'guy')
       end
 
       it "is not valid for signing up" do
@@ -99,7 +97,7 @@ if HAS_SQLITE3 || HAS_MYSQL || HAS_POSTGRES
 
     describe "with username not valid across the department" do
       before :all do
-        @model = ::DataMapper::Validate::Fixtures::User.new(:user_name => 'guy', :department => @dept)
+        @model = DataMapper::Validate::Fixtures::User.new(:user_name => 'guy', :department => @dept)
       end
 
       it "is not valid for setting up the account" do
@@ -110,5 +108,5 @@ if HAS_SQLITE3 || HAS_MYSQL || HAS_POSTGRES
         @model.errors.on(:user_name).should == [ 'User name is already taken' ]
       end
     end
-  end # describe DataMapper::Validate::Fixtures::User
-end # if HAS_SQLITE3 || HAS_MYSQL || HAS_POSTGRES
+  end
+end

data/spec/integration/within_validator/within_validator_spec.rb

@@ -1,8 +1,10 @@
 require 'spec_helper'
 require 'integration/within_validator/spec_helper'
 
-describe DataMapper::Validate::Fixtures::PhoneNumber do
-  before(:all) do
+describe 'DataMapper::Validate::Fixtures::PhoneNumber' do
+  before :all do
+    DataMapper::Validate::Fixtures::PhoneNumber.auto_migrate!
+
     @model = DataMapper::Validate::Fixtures::PhoneNumber.new(:type_of_number => 'cell')
     @model.should be_valid
   end
@@ -49,8 +51,10 @@ end
 
 
 
-describe DataMapper::Validate::Fixtures::MathematicalFunction do
+describe 'DataMapper::Validate::Fixtures::MathematicalFunction' do
   before :all do
+    DataMapper::Validate::Fixtures::MathematicalFunction.auto_migrate!
+
     @model = DataMapper::Validate::Fixtures::MathematicalFunction.new(:input => 2, :output => -2)
     @model.should be_valid
   end

data/spec/public/resource_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe DataMapper::Resource do
+describe 'DataMapper::Resource' do
   before :all do
     DataMapper::Validate::Fixtures::Barcode.auto_migrate!
 
@@ -34,10 +34,9 @@ describe DataMapper::Resource do
 
     describe 'when provided invalid attributes and a context' do
       before :all do
-        # remove data from previous spec runs
-        ::DataMapper::Validate::Fixtures::Organisation.all.destroy!
-        ::DataMapper::Validate::Fixtures::Department.all.destroy!
-        ::DataMapper::Validate::Fixtures::User.all.destroy!
+        DataMapper::Validate::Fixtures::Organisation.auto_migrate!
+        DataMapper::Validate::Fixtures::Department.auto_migrate!
+        DataMapper::Validate::Fixtures::User.auto_migrate!
 
         organization = DataMapper::Validate::Fixtures::Organisation.create(:name => 'Org 101', :domain => '101')
         dept         = DataMapper::Validate::Fixtures::Department.create(:name => 'accounting')
@@ -51,7 +50,7 @@ describe DataMapper::Resource do
         # create a record that will be a dupe when User#update is executed below
         DataMapper::Validate::Fixtures::User.create(attributes).should be_saved
 
-        @resource = DataMapper::Validate::Fixtures::User.new
+        @resource = DataMapper::Validate::Fixtures::User.create(attributes.merge(:user_name => 'other'))
 
         @response = @resource.update(attributes, :signing_up_for_department_account)
       end

data/spec/rcov.opts

@@ -0,0 +1,6 @@
+--exclude "spec"
+--sort coverage
+--callsites
+--xrefs
+--profile
+--text-summary

data/spec/spec.opts

@@ -1,2 +1,4 @@
 --colour
 --loadby random
+--format profile
+--backtrace

data/spec/unit/contextual_validators/emptiness_spec.rb

@@ -2,7 +2,7 @@
 require 'spec_helper'
 require 'unit/contextual_validators/spec_helper'
 
-describe DataMapper::Validate::ContextualValidators do
+describe 'DataMapper::Validate::ContextualValidators' do
   before :all do
     @model = DataMapper::Validate::ContextualValidators.new
   end

data/spec/unit/contextual_validators/execution_spec.rb

@@ -2,30 +2,23 @@
 require 'spec_helper'
 require 'unit/contextual_validators/spec_helper'
 
-describe DataMapper::Validate::ContextualValidators do
+describe 'DataMapper::Validate::ContextualValidators' do
   before :all do
     @model = DataMapper::Validate::ContextualValidators.new
   end
 
   describe "#execute(name, target)" do
-    before :each do
+    before do
       @validator_one = DataMapper::Validate::RequiredFieldValidator.new(:name)
       @validator_two = DataMapper::Validate::WithinValidator.new(:operating_system, :set => ["Mac OS X", "Linux", "FreeBSD", "Solaris"])
 
       @model.context(:default) << @validator_one << @validator_two
     end
 
-    describe "when context was never referred to before" do
-      it "raises ArgumentError" do
-        lambda { @model.execute(:some_unknown_context, Object.new) }.
-          should raise_error(ArgumentError, /validation context some_unknown_context doesn't seem to be defined/)
-      end
-    end
-
 
     describe "when target satisfies all validators" do
-      before :each do
-        @target = ::DataMapper::Validate::Fixtures::PieceOfSoftware.new(:name => 'gcc', :operating_system => "Mac OS X")
+      before do
+        @target = DataMapper::Validate::Fixtures::PieceOfSoftware.new(:name => 'gcc', :operating_system => "Mac OS X")
         @validator_one.call(@target).should be_true
         @validator_two.call(@target).should be_true
 
@@ -39,8 +32,8 @@ describe DataMapper::Validate::ContextualValidators do
 
 
     describe "when target does not satisfy all validators" do
-      before :each do
-        @target = ::DataMapper::Validate::Fixtures::PieceOfSoftware.new(:name => 'Skitch', :operating_system => "Haiku")
+      before do
+        @target = DataMapper::Validate::Fixtures::PieceOfSoftware.new(:name => 'Skitch', :operating_system => "Haiku")
         @validator_one.call(@target).should be_true
         @validator_two.call(@target).should be_false
 
@@ -50,6 +43,6 @@ describe DataMapper::Validate::ContextualValidators do
       it "returns true" do
         @result.should be_false
       end
-    end # describe "when target does not satisfy all validators"
-  end # describe "#execute(name, target)"
-end # describe DataMapper::Validate::ContextualValidators
+    end
+  end
+end

data/spec/unit/generic_validator/equality_operator_spec.rb

@@ -1,12 +1,12 @@
 require 'spec_helper'
 
-describe DataMapper::Validate::GenericValidator do
+describe 'DataMapper::Validate::GenericValidator' do
   describe "when types and fields are equal" do
     it "returns true" do
       DataMapper::Validate::RequiredFieldValidator.new(:name).
         should == DataMapper::Validate::RequiredFieldValidator.new(:name)
     end
-  end # describe "#==" do
+  end
 
 
   describe "when types differ" do
@@ -23,4 +23,4 @@ describe DataMapper::Validate::GenericValidator do
         should_not == DataMapper::Validate::RequiredFieldValidator.new(:last_name)
     end
   end
-end # describe DataMapper::Validate::GenericValidator
+end

data/spec/unit/validation_errors/adding_spec.rb

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 require 'spec_helper'
 
-describe DataMapper::Validate::ValidationErrors do
+describe 'DataMapper::Validate::ValidationErrors' do
   before :all do
     @model = DataMapper::Validate::ValidationErrors.new(Object.new)
   end

data/spec/unit/validation_errors/emptiness_spec.rb

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 require 'spec_helper'
 
-describe DataMapper::Validate::ValidationErrors do
+describe 'DataMapper::Validate::ValidationErrors' do
   before :all do
     @model = DataMapper::Validate::ValidationErrors.new(Object.new)
   end

data/spec/unit/validation_errors/enumerable_spec.rb

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 require 'spec_helper'
 
-describe DataMapper::Validate::ValidationErrors do
+describe 'DataMapper::Validate::ValidationErrors' do
   before :all do
     @model = DataMapper::Validate::ValidationErrors.new(Object.new)
     @model.add(:ip_address, "must have valid format")

data/tasks/ci.rake

@@ -0,0 +1 @@
+task :ci => [ :verify_measurements, 'metrics:all' ]

data/tasks/metrics.rake

@@ -0,0 +1,36 @@
+begin
+  require 'metric_fu'
+rescue LoadError
+  namespace :metrics do
+    task :all do
+      abort 'metric_fu is not available. In order to run metrics:all, you must: gem install metric_fu'
+    end
+  end
+end
+
+begin
+  require 'reek/adapters/rake_task'
+
+  Reek::RakeTask.new do |t|
+    t.fail_on_error = true
+    t.verbose       = false
+    t.source_files  = 'lib/**/*.rb'
+  end
+rescue LoadError
+  task :reek do
+    abort 'Reek is not available. In order to run reek, you must: gem install reek'
+  end
+end
+
+begin
+  require 'roodi'
+  require 'roodi_task'
+
+  RoodiTask.new do |t|
+    t.verbose = false
+  end
+rescue LoadError
+  task :roodi do
+    abort 'Roodi is not available. In order to run roodi, you must: gem install roodi'
+  end
+end

data/tasks/spec.rake

@@ -0,0 +1,41 @@
+spec_defaults = lambda do |spec|
+  spec.pattern    = 'spec/**/*_spec.rb'
+  spec.libs      << 'lib' << 'spec'
+  spec.spec_opts << '--options' << 'spec/spec.opts'
+end
+
+begin
+  require 'spec/rake/spectask'
+
+  Spec::Rake::SpecTask.new(:spec, &spec_defaults)
+rescue LoadError
+  task :spec do
+    abort 'rspec is not available. In order to run spec, you must: gem install rspec'
+  end
+end
+
+begin
+  require 'rcov'
+  require 'spec/rake/verify_rcov'
+
+  Spec::Rake::SpecTask.new(:rcov) do |rcov|
+    spec_defaults.call(rcov)
+    rcov.rcov      = true
+    rcov.rcov_opts = File.read('spec/rcov.opts').split(/\s+/)
+  end
+
+  RCov::VerifyTask.new(:verify_rcov => :rcov) do |rcov|
+    rcov.threshold = 100
+  end
+rescue LoadError
+  %w[ rcov verify_rcov ].each do |name|
+    task name do
+      abort "rcov is not available. In order to run #{name}, you must: gem install rcov"
+    end
+  end
+end
+
+task :spec => :check_dependencies
+task :rcov => :check_dependencies
+
+task :default => :spec

data/tasks/yard.rake

@@ -0,0 +1,9 @@
+begin
+  require 'yard'
+
+  YARD::Rake::YardocTask.new
+rescue LoadError
+  task :yard do
+    abort 'YARD is not available. In order to run yard, you must: gem install yard'
+  end
+end

data/tasks/yardstick.rake

@@ -0,0 +1,19 @@
+begin
+  require 'pathname'
+  require 'yardstick/rake/measurement'
+  require 'yardstick/rake/verify'
+
+  # yardstick_measure task
+  Yardstick::Rake::Measurement.new
+
+  # verify_measurements task
+  Yardstick::Rake::Verify.new do |verify|
+    verify.threshold = 100
+  end
+rescue LoadError
+  %w[ yardstick_measure verify_measurements ].each do |name|
+    task name.to_s do
+      abort "Yardstick is not available. In order to run #{name}, you must: gem install yardstick"
+    end
+  end
+end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: dm-validations
 version: !ruby/object:Gem::Version 
-  version: 0.10.1
+  version: 0.10.2
 platform: ruby
 authors: 
-- Guy van den Berg, DataMapper development team
+- Guy van den Berg
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2009-09-30 00:00:00 -07:00
+date: 2009-12-11 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -18,29 +18,45 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.10.1
+        version: 0.10.2
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 1.2.9
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: yard
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 0.4.0
     version: 
 description: Library for performing validations on DM models and pure Ruby object
-email: 
-- vandenberg.guy [a] gmail [d] com
+email: vandenberg.guy [a] gmail [d] com
 executables: []
 
 extensions: []
 
 extra_rdoc_files: 
-- README.rdoc
 - LICENSE
-- TODO
-- History.rdoc
+- README.rdoc
 files: 
-- History.rdoc
 - LICENSE
-- Manifest.txt
 - README.rdoc
 - Rakefile
-- TODO
+- VERSION
+- dm-validations.gemspec
 - lib/dm-validations.rb
 - lib/dm-validations/auto_validate.rb
 - lib/dm-validations/contextual_validators.rb
@@ -63,7 +79,6 @@ files:
 - 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
 - spec/fixtures/barcode.rb
 - spec/fixtures/basketball_court.rb
 - spec/fixtures/basketball_player.rb
@@ -163,6 +178,7 @@ files:
 - 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
@@ -172,16 +188,18 @@ files:
 - 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
+- tasks/ci.rake
+- tasks/metrics.rake
+- tasks/spec.rake
+- tasks/yard.rake
+- tasks/yardstick.rake
 has_rdoc: true
 homepage: http://github.com/datamapper/dm-more/tree/master/dm-validations
 licenses: []
 
 post_install_message: 
 rdoc_options: 
-- --main
-- README.rdoc
+- --charset=UTF-8
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement