dm-validations 1.1.0 → 1.2.0.rc1

data/spec/integration/format_validator/url_format_validator_spec.rb

@@ -10,7 +10,7 @@ describe 'DataMapper::Validations::Fixtures::BillOfLading' do
     { :id => 1, :doc_no => 'A1234', :email => 'user@example.com', :url => 'http://example.com' }
   end
 
-  [ 'http:// example.com', 'ftp://example.com', 'http://.com', 'http://', 'test', '...',
+  invalid_uris = [ 'http:// example.com', 'ftp://example.com', 'http://.com', 'http://', 'test', '...',
     # these are valid URIs from RFC perspective,
     # but too often not the case for web apps
     #
@@ -18,7 +18,9 @@ describe 'DataMapper::Validations::Fixtures::BillOfLading' do
     # RFC compliant so it can be used, for instance,
     # for internal apps that may refer to local domains
     # like http://backend:8080
-    "http://localhost:4000", "http://localhost" ].each do |uri|
+    "http://localhost:4000", "http://localhost" ]
+
+  invalid_uris.each do |uri|
     describe "with URL of #{uri}" do
       before :all do
         @model = DataMapper::Validations::Fixtures::BillOfLading.new(valid_attributes.merge(:url => uri))
@@ -32,6 +34,22 @@ describe 'DataMapper::Validations::Fixtures::BillOfLading' do
     end
   end
 
+  # http:// throws an exception in Addressable::URI, so it wouldn't make it to the validation part anyway :)
+  (invalid_uris - ['http://']).each do |uri|
+    describe "with dm-type URI of #{uri}" do
+      before(:all) do
+        @model = DataMapper::Validations::Fixtures::SurrenderBillOfLading.new(valid_attributes.merge(:bank_url => uri))
+      end
+
+      it_should_behave_like "invalid model"
+
+      it "has a meaningful error message" do
+        @model.errors.on(:bank_url).should == [ 'Bank url has an invalid format' ]
+      end
+
+    end
+  end
+
 
   [ 'http://apple.com',
     'http://www.apple.com',
@@ -63,5 +81,13 @@ describe 'DataMapper::Validations::Fixtures::BillOfLading' do
 
      it_should_behave_like "valid model"
    end
+
+   describe "with dm-type URI of #{uri}" do
+     before(:all) do
+       @model = DataMapper::Validations::Fixtures::SurrenderBillOfLading.new(valid_attributes.merge(:bank_url => uri))
+     end
+
+     it_should_behave_like "valid model"
+   end
  end
 end

data/spec/integration/required_field_validator/association_spec.rb

@@ -32,7 +32,11 @@ describe 'required_field_validator/association_spec' do
 
     end
 
-    Artist.auto_migrate!
+    DataMapper.finalize
+
+    if DataMapper.respond_to?(:auto_migrate!)
+      DataMapper.auto_migrate!
+    end
   end
 
 

data/spec/public/resource_spec.rb

@@ -84,8 +84,8 @@ describe 'DataMapper::Resource' do
         @resource.save
       end
 
-      it 'should not call valid?' do
-        @resource.valid_hook_call_count.should be_nil
+      it 'should call valid?' do
+        @resource.valid_hook_call_count.should == 1
       end
     end
 

data/spec/spec_helper.rb

@@ -24,6 +24,6 @@ Spec::Runner.configure do |config|
   config.extend(DataMapper::Spec::Adapters::Helpers)
 
   config.before :suite do
-    DataMapper.auto_migrate!
+    DataMapper.finalize.auto_migrate!
   end
 end

data/spec/unit/contextual_validators/emptiness_spec.rb

@@ -4,47 +4,47 @@ require 'unit/contextual_validators/spec_helper'
 
 describe 'DataMapper::Validations::ContextualValidators' do
   before :all do
-    @model = DataMapper::Validations::ContextualValidators.new
+    @validators = DataMapper::Validations::ContextualValidators.new
   end
 
   describe "initially" do
     it "is empty" do
-      @model.should be_empty
+      @validators.should be_empty
     end
   end
 
 
   describe "after first reference to context" do
     before :all do
-      @model.context(:create)
+      @validators.context(:create)
     end
 
     it "initializes list of validators for referred context" do
-      @model.context(:create).should be_empty
+      @validators.context(:create).should be_empty
     end
   end
 
 
   describe "after a context being added" do
     before :all do
-      @model.context(:default) << DataMapper::Validations::PresenceValidator.new(:toc, :when => [:publishing])
+      @validators.context(:default) << DataMapper::Validations::PresenceValidator.new(:toc, :when => [:publishing])
     end
 
     it "is no longer empty" do
-      @model.should_not be_empty
+      @validators.should_not be_empty
     end
   end
 
 
   describe "when cleared" do
     before :all do
-      @model.context(:default) << DataMapper::Validations::PresenceValidator.new(:toc, :when => [:publishing])
-      @model.should_not be_empty
-      @model.clear!
+      @validators.context(:default) << DataMapper::Validations::PresenceValidator.new(:toc, :when => [:publishing])
+      @validators.should_not be_empty
+      @validators.clear!
     end
 
     it "becomes empty again" do
-      @model.should be_empty
+      @validators.should be_empty
     end
   end
 end

data/spec/unit/contextual_validators/execution_spec.rb

@@ -4,7 +4,7 @@ require 'unit/contextual_validators/spec_helper'
 
 describe 'DataMapper::Validations::ContextualValidators' do
   before :all do
-    @model = DataMapper::Validations::ContextualValidators.new
+    @validators = DataMapper::Validations::ContextualValidators.new
   end
 
   describe "#execute(name, target)" do
@@ -12,7 +12,7 @@ describe 'DataMapper::Validations::ContextualValidators' do
       @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
+      @validators.context(:default) << @validator_one << @validator_two
     end
 
 
@@ -22,7 +22,7 @@ describe 'DataMapper::Validations::ContextualValidators' do
         @validator_one.call(@target).should be(true)
         @validator_two.call(@target).should be(true)
 
-        @result = @model.execute(:default, @target)
+        @result = @validators.execute(:default, @target)
       end
 
       it "returns true" do
@@ -37,7 +37,7 @@ describe 'DataMapper::Validations::ContextualValidators' do
         @validator_one.call(@target).should be(true)
         @validator_two.call(@target).should be(false)
 
-        @result = @model.execute(:default, @target)
+        @result = @validators.execute(:default, @target)
       end
 
       it "returns true" do

data/spec/unit/validators/within_validator_spec.rb

@@ -0,0 +1,23 @@
+require 'spec_helper'
+
+describe 'DataMapper::Validations::WithinValidator' do
+  it 'should allow Sets to be passed to the :set option' do
+    types = Set.new(%w(home mobile business))
+
+    @model = Class.new do
+      include DataMapper::Resource
+
+      def self.name
+        'WithinValidatorClass'
+      end
+
+      property :id,   DataMapper::Property::Serial
+      property :name, String, :auto_validation => false
+    end.new
+
+    validator = DataMapper::Validations::WithinValidator.new(:name, :set => types)
+    validator.call(@model)
+
+    @model.errors.should_not be_empty
+  end
+end

metadata

@@ -1,8 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: dm-validations
 version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 1.1.0
+  hash: 15424023
+  prerelease: 6
+  segments: 
+  - 1
+  - 2
+  - 0
+  - rc
+  - 1
+  version: 1.2.0.rc1
 platform: ruby
 authors: 
 - Guy van den Berg
@@ -10,64 +17,92 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-16 00:00:00 -07:00
-default_executable: 
+date: 2011-09-09 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: dm-core
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  type: :runtime
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 1.1.0
-  type: :runtime
+        hash: 15424023
+        segments: 
+        - 1
+        - 2
+        - 0
+        - rc
+        - 1
+        version: 1.2.0.rc1
   prerelease: false
-  version_requirements: *id001
+  requirement: *id001
+  name: dm-core
 - !ruby/object:Gem::Dependency 
-  name: dm-types
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  type: :development
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 1.1.0
-  type: :development
+        hash: 15424023
+        segments: 
+        - 1
+        - 2
+        - 0
+        - rc
+        - 1
+        version: 1.2.0.rc1
   prerelease: false
-  version_requirements: *id002
+  requirement: *id002
+  name: dm-types
 - !ruby/object:Gem::Dependency 
-  name: jeweler
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  type: :development
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 1.5.2
-  type: :development
+        hash: 7
+        segments: 
+        - 1
+        - 6
+        - 4
+        version: 1.6.4
   prerelease: false
-  version_requirements: *id003
+  requirement: *id003
+  name: jeweler
 - !ruby/object:Gem::Dependency 
-  name: rake
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  type: :development
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.8.7
-  type: :development
+        hash: 63
+        segments: 
+        - 0
+        - 9
+        - 2
+        version: 0.9.2
   prerelease: false
-  version_requirements: *id004
+  requirement: *id004
+  name: rake
 - !ruby/object:Gem::Dependency 
-  name: rspec
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  type: :development
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 1.3.1
-  type: :development
+        hash: 31
+        segments: 
+        - 1
+        - 3
+        - 2
+        version: 1.3.2
   prerelease: false
-  version_requirements: *id005
+  requirement: *id005
+  name: rspec
 description: Library for performing validations on DM models and pure Ruby object
 email: vandenberg.guy [a] gmail [d] com
 executables: []
@@ -86,11 +121,11 @@ files:
 - 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
@@ -123,6 +158,7 @@ files:
 - 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
@@ -160,6 +196,7 @@ files:
 - 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
@@ -220,10 +257,10 @@ files:
 - 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
-has_rdoc: true
 homepage: http://github.com/datamapper/dm-validations
 licenses: []
 
@@ -237,129 +274,27 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      version: "0"
+      hash: 25
+      segments: 
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: datamapper
-rubygems_version: 1.6.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Library for performing validations on DM models and pure Ruby object
-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
+test_files: []
+