dm-validations 0.10.2 → 1.0.0.rc1

data/spec/integration/within_validator/within_validator_spec.rb

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

data/spec/public/resource_spec.rb

@@ -2,9 +2,9 @@ require 'spec_helper'
 
 describe 'DataMapper::Resource' do
   before :all do
-    DataMapper::Validate::Fixtures::Barcode.auto_migrate!
+    DataMapper::Validations::Fixtures::Barcode.all.destroy!
 
-    @resource = DataMapper::Validate::Fixtures::Barcode.new
+    @resource = DataMapper::Validations::Fixtures::Barcode.new
   end
 
   describe '#update' do
@@ -34,12 +34,12 @@ describe 'DataMapper::Resource' do
 
     describe 'when provided invalid attributes and a context' do
       before :all do
-        DataMapper::Validate::Fixtures::Organisation.auto_migrate!
-        DataMapper::Validate::Fixtures::Department.auto_migrate!
-        DataMapper::Validate::Fixtures::User.auto_migrate!
+        DataMapper::Validations::Fixtures::Organisation.all.destroy!
+        DataMapper::Validations::Fixtures::Department.all.destroy!
+        DataMapper::Validations::Fixtures::User.all.destroy!
 
-        organization = DataMapper::Validate::Fixtures::Organisation.create(:name => 'Org 101', :domain => '101')
-        dept         = DataMapper::Validate::Fixtures::Department.create(:name => 'accounting')
+        organization = DataMapper::Validations::Fixtures::Organisation.create(:name => 'Org 101', :domain => '101')
+        dept         = DataMapper::Validations::Fixtures::Department.create(:name => 'accounting')
 
         attributes = {
           :organisation => organization,
@@ -48,9 +48,9 @@ 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
+        DataMapper::Validations::Fixtures::User.create(attributes).should be_saved
 
-        @resource = DataMapper::Validate::Fixtures::User.create(attributes.merge(:user_name => 'other'))
+        @resource = DataMapper::Validations::Fixtures::User.create(attributes.merge(:user_name => 'other'))
 
         @response = @resource.update(attributes, :signing_up_for_department_account)
       end
@@ -64,4 +64,42 @@ describe 'DataMapper::Resource' do
       end
     end
   end
+
+  describe '#save' do
+    before :all do
+      @resource.code = 'a' * 10
+      @resource.save
+    end
+
+    describe 'on a new resource' do
+      it 'should call valid? once' do
+        @resource.valid_hook_call_count.should == 1
+      end
+    end
+
+    describe 'on a saved, non-dirty resource' do
+      before :all do
+        # reload the resource
+        @resource = @resource.model.get(*@resource.key)
+        @resource.save
+      end
+
+      it 'should not call valid?' do
+        @resource.valid_hook_call_count.should be_nil
+      end
+    end
+
+    describe 'on a saved, dirty resource' do
+      before :all do
+        # reload the resource
+        @resource = @resource.model.get(*@resource.key)
+        @resource.code = 'b' * 10
+        @resource.save
+      end
+
+      it 'should call valid? once' do
+        @resource.valid_hook_call_count.should == 1
+      end
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -1,34 +1,20 @@
-require 'rubygems'
+require 'dm-core/spec/setup'
+require 'dm-core/spec/lib/adapter_helpers'
 
-# use local dm-core if running from a typical dev checkout.
-lib = File.join('..', '..', 'dm-core', 'lib')
-$LOAD_PATH.unshift(lib) if File.directory?(lib)
-require 'dm-core'
+require 'dm-validations'
+require 'dm-types'
+require 'dm-migrations'
 
-# Support running specs with 'rake spec' and 'spec'
-$LOAD_PATH.unshift('lib') unless $LOAD_PATH.include?('lib')
+SPEC_ROOT = Pathname(__FILE__).dirname
+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 }
 
-require 'dm-validations'
+DataMapper::Spec.setup
 
-def load_driver(name, default_uri)
-  return false if ENV['ADAPTER'] != name.to_s
+Spec::Runner.configure do |config|
+  config.extend(DataMapper::Spec::Adapters::Helpers)
 
-  begin
-    DataMapper.setup(name, ENV["#{name.to_s.upcase}_SPEC_URI"] || default_uri)
-    DataMapper::Repository.adapters[:default] =  DataMapper::Repository.adapters[name]
-    true
-  rescue LoadError => e
-    warn "Could not load do_#{name}: #{e}"
-    false
+  config.before :suite do
+    DataMapper.auto_migrate!
   end
 end
-
-ENV['ADAPTER'] ||= 'sqlite3'
-
-HAS_SQLITE3  = load_driver(:sqlite3,  'sqlite3::memory:')
-HAS_MYSQL    = load_driver(:mysql,    'mysql://localhost/dm_core_test')
-HAS_POSTGRES = load_driver(:postgres, 'postgres://postgres@localhost/dm_core_test')
-
-ROOT = Pathname(__FILE__).dirname.parent
-Dir[ROOT / 'spec' / 'integration' / 'shared' / '**' / '*.rb'].each { |rb| require(rb) }
-Dir[ROOT / 'spec' / 'fixtures' / '**' / '*.rb'].each { |rb| require(rb) }

data/spec/unit/contextual_validators/emptiness_spec.rb

@@ -2,9 +2,9 @@
 require 'spec_helper'
 require 'unit/contextual_validators/spec_helper'
 
-describe 'DataMapper::Validate::ContextualValidators' do
+describe 'DataMapper::Validations::ContextualValidators' do
   before :all do
-    @model = DataMapper::Validate::ContextualValidators.new
+    @model = DataMapper::Validations::ContextualValidators.new
   end
 
   describe "initially" do
@@ -27,7 +27,7 @@ describe 'DataMapper::Validate::ContextualValidators' do
 
   describe "after a context being added" do
     before :all do
-      @model.context(:default) << DataMapper::Validate::RequiredFieldValidator.new(:toc, :when => [:publishing])
+      @model.context(:default) << DataMapper::Validations::PresenceValidator.new(:toc, :when => [:publishing])
     end
 
     it "is no longer empty" do
@@ -38,7 +38,7 @@ describe 'DataMapper::Validate::ContextualValidators' do
 
   describe "when cleared" do
     before :all do
-      @model.context(:default) << DataMapper::Validate::RequiredFieldValidator.new(:toc, :when => [:publishing])
+      @model.context(:default) << DataMapper::Validations::PresenceValidator.new(:toc, :when => [:publishing])
       @model.should_not be_empty
       @model.clear!
     end

data/spec/unit/contextual_validators/execution_spec.rb

@@ -2,15 +2,15 @@
 require 'spec_helper'
 require 'unit/contextual_validators/spec_helper'
 
-describe 'DataMapper::Validate::ContextualValidators' do
+describe 'DataMapper::Validations::ContextualValidators' do
   before :all do
-    @model = DataMapper::Validate::ContextualValidators.new
+    @model = DataMapper::Validations::ContextualValidators.new
   end
 
   describe "#execute(name, target)" 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"])
+      @validator_one = DataMapper::Validations::PresenceValidator.new(:name)
+      @validator_two = DataMapper::Validations::WithinValidator.new(:operating_system, :set => ["Mac OS X", "Linux", "FreeBSD", "Solaris"])
 
       @model.context(:default) << @validator_one << @validator_two
     end
@@ -18,7 +18,7 @@ describe 'DataMapper::Validate::ContextualValidators' do
 
     describe "when target satisfies all validators" do
       before do
-        @target = DataMapper::Validate::Fixtures::PieceOfSoftware.new(:name => 'gcc', :operating_system => "Mac OS X")
+        @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
 
@@ -33,7 +33,7 @@ describe 'DataMapper::Validate::ContextualValidators' do
 
     describe "when target does not satisfy all validators" do
       before do
-        @target = DataMapper::Validate::Fixtures::PieceOfSoftware.new(:name => 'Skitch', :operating_system => "Haiku")
+        @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
 

data/spec/unit/contextual_validators/spec_helper.rb

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 module DataMapper
-  module Validate
+  module Validations
     module Fixtures
 
       class PieceOfSoftware
@@ -9,7 +9,7 @@ module DataMapper
         # Behaviors
         #
 
-        include DataMapper::Validate
+        include DataMapper::Validations
 
         #
         # Attributes
@@ -33,5 +33,5 @@ module DataMapper
       end
 
     end # Fixtures
-  end # Validate
+  end # Validations
 end # DataMapper

data/spec/unit/generic_validator/equality_operator_spec.rb

@@ -1,26 +1,26 @@
 require 'spec_helper'
 
-describe 'DataMapper::Validate::GenericValidator' do
+describe 'DataMapper::Validations::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)
+      DataMapper::Validations::PresenceValidator.new(:name).
+        should == DataMapper::Validations::PresenceValidator.new(:name)
     end
   end
 
 
   describe "when types differ" do
     it "returns false" do
-      DataMapper::Validate::RequiredFieldValidator.new(:name).
-        should_not == DataMapper::Validate::UniquenessValidator.new(:name)
+      DataMapper::Validations::PresenceValidator.new(:name).
+        should_not == DataMapper::Validations::UniquenessValidator.new(:name)
     end
   end
 
 
   describe "when property names differ" do
     it "returns false" do
-      DataMapper::Validate::RequiredFieldValidator.new(:first_name).
-        should_not == DataMapper::Validate::RequiredFieldValidator.new(:last_name)
+      DataMapper::Validations::PresenceValidator.new(:first_name).
+        should_not == DataMapper::Validations::PresenceValidator.new(:last_name)
     end
   end
 end

data/spec/unit/validation_errors/adding_spec.rb

@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
 require 'spec_helper'
 
-describe 'DataMapper::Validate::ValidationErrors' do
+describe 'DataMapper::Validations::ValidationErrors' do
   before :all do
-    @model = DataMapper::Validate::ValidationErrors.new(Object.new)
+    @model = DataMapper::Validations::ValidationErrors.new(Object.new)
   end
 
   describe "after first error being added" do

data/spec/unit/validation_errors/emptiness_spec.rb

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

data/spec/unit/validation_errors/enumerable_spec.rb

@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
 require 'spec_helper'
 
-describe 'DataMapper::Validate::ValidationErrors' do
+describe 'DataMapper::Validations::ValidationErrors' do
   before :all do
-    @model = DataMapper::Validate::ValidationErrors.new(Object.new)
+    @model = DataMapper::Validations::ValidationErrors.new(Object.new)
     @model.add(:ip_address, "must have valid format")
     @model.add(:full_name, "can't be blank")
   end

data/tasks/local_gemfile.rake

@@ -0,0 +1,18 @@
+desc "Support bundling from local source code (allows BUNDLE_GEMFILE=Gemfile.local bundle foo)"
+task :local_gemfile do |t|
+
+  root              = Pathname(__FILE__).dirname.parent
+  datamapper        = root.parent
+
+  source_regex     = /DATAMAPPER = 'git:\/\/github.com\/datamapper'/
+  gem_source_regex = /:git => \"#\{DATAMAPPER\}\/(.+?)(?:\.git)?\"/
+
+  root.join('Gemfile.local').open('w') do |f|
+    root.join('Gemfile').open.each do |line|
+      line.sub!(source_regex,     "DATAMAPPER = '#{datamapper}'")
+      line.sub!(gem_source_regex, ':path => "#{DATAMAPPER}/\1"')
+      f.puts line
+    end
+  end
+
+end

data/tasks/spec.rake

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

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dm-validations
 version: !ruby/object:Gem::Version 
-  version: 0.10.2
+  prerelease: true
+  segments: 
+  - 1
+  - 0
+  - 0
+  - rc1
+  version: 1.0.0.rc1
 platform: ruby
 authors: 
 - Guy van den Berg
@@ -9,39 +15,52 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-11 00:00:00 -08:00
+date: 2010-05-19 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 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.10.2
-    version: 
+        segments: 
+        - 1
+        - 0
+        - 0
+        - rc1
+        version: 1.0.0.rc1
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: rspec
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 1.2.9
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: yard
+        segments: 
+        - 1
+        - 3
+        version: "1.3"
   type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: dm-types
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.4.0
-    version: 
+        segments: 
+        - 1
+        - 0
+        - 0
+        - rc1
+        version: 1.0.0.rc1
+  type: :development
+  version_requirements: *id003
 description: Library for performing validations on DM models and pure Ruby object
 email: vandenberg.guy [a] gmail [d] com
 executables: []
@@ -52,6 +71,8 @@ extra_rdoc_files:
 - LICENSE
 - README.rdoc
 files: 
+- .gitignore
+- Gemfile
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -189,6 +210,7 @@ files:
 - spec/unit/validation_errors/emptiness_spec.rb
 - spec/unit/validation_errors/enumerable_spec.rb
 - tasks/ci.rake
+- tasks/local_gemfile.rake
 - tasks/metrics.rake
 - tasks/spec.rake
 - tasks/yard.rake
@@ -206,20 +228,130 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
+      segments: 
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: datamapper
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Library for performing validations on DM models and pure Ruby object
-test_files: []
-
+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/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/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