dm-validations 1.0.2 → 1.1.0.rc1

data/spec/integration/automatic_validation/inferred_float_property_validation_spec.rb

@@ -12,7 +12,7 @@ require 'integration/automatic_validation/spec_helper'
 
     describe "with an integer value" do
       before :all do
-        @model.set(column => 1)
+        @model.attributes = {column => 1}
       end
 
       it_should_behave_like "valid model"
@@ -20,7 +20,7 @@ require 'integration/automatic_validation/spec_helper'
 
     describe "with a float value" do
       before :all do
-        @model.set(column => 1.0)
+        @model.attributes = {column => 1.0}
       end
 
       it_should_behave_like "valid model"
@@ -28,10 +28,18 @@ require 'integration/automatic_validation/spec_helper'
 
     describe "with a BigDecimal value" do
       before :all do
-        @model.set(column => BigDecimal('1'))
+        @model.attributes = {column => BigDecimal('1')}
       end
 
       it_should_behave_like "valid model"
     end
+
+    describe "with an uncoercible value" do
+      before :all do
+        @model.attributes = {column => "foo"}
+      end
+
+      it_should_behave_like "invalid model"
+    end
   end
 end

data/spec/integration/automatic_validation/inferred_integer_properties_validation_spec.rb

@@ -8,31 +8,26 @@ describe "A model with an Integer property" do
     @model = SailBoat.new
   end
 
+  # success case
   describe "assigned to an integer" do
     before :all do
-      @model.set(:id => 1)
+      @model.id = 1
     end
 
     it_should_behave_like "valid model"
   end
 
-  describe "assigned to a float" do
+  describe "assigned a value coercible into an integer" do
     before :all do
-      @model.set(:id => 1.0)
+      @model.id = 1.0
     end
 
-    it "is invalid" do
-      @model.should_not be_valid
-    end
-
-    it "has a meaningful default error message" do
-      @model.errors.on(:id).should == [ 'Id must be an integer' ]
-    end
+    it_should_behave_like "valid model"
   end
 
-  describe "assigned to a BigDecimal" do
+  describe "assigned a value not coercible into an integer" do
     before :all do
-      @model.set(:id => BigDecimal('1'))
+      @model.id = "foo"
     end
 
     it "is invalid" do
@@ -46,7 +41,7 @@ describe "A model with an Integer property" do
 
   describe "assigned to a too-small integer" do
     before :all do
-      @model.set(:id => 0)
+      @model.id = 0
     end
 
     it "is invalid" do
@@ -60,7 +55,7 @@ describe "A model with an Integer property" do
 
   describe "assigned to a too-large integer" do
     before :all do
-      @model.set(:id => 11)
+      @model.id = 11
     end
 
     it "is invalid" do

data/spec/integration/automatic_validation/inferred_length_validation_spec.rb

@@ -122,4 +122,13 @@ describe 'DataMapper::Validations::Fixtures::SmsMessage' do
       @model.errors.on(:body).should == [ 'Body must be between 1 and 500 characters long' ]
     end
   end
+
+  describe 'with an infinitely long note' do
+    it "should raise when trying to set the upper bound of a property length range to Infinity" do
+      expected_msg = "Infinity is no valid upper bound for a length range"
+      lambda {
+        @model.class.property :body, String, :length => (1..1.0/0)
+      }.should raise_error(ArgumentError, expected_msg)
+    end
+  end
 end

data/spec/integration/automatic_validation/inferred_uniqueness_validation_spec.rb

@@ -0,0 +1,48 @@
+require 'spec_helper'
+require 'integration/automatic_validation/spec_helper'
+
+describe 'uniqueness' do
+  describe 'single column' do
+    before :all do
+      @klass = Class.new do
+        include DataMapper::Resource
+
+        storage_names[:default] = 'unique_events_single'
+
+        property :id,         Integer, :key => true
+        property :start_year, Integer, :unique => true
+      end
+      @klass.auto_migrate!
+
+      @existing = @klass.create(:id => 1, :start_year => 2008)
+      @new = @klass.new(:id => 2, :start_year => 2008)
+    end
+
+    it 'validates' do
+      @new.should_not be_valid
+    end
+  end
+
+  describe 'multiple columns' do
+    before :all do
+      @klass = Class.new do
+        include DataMapper::Resource
+
+        storage_names[:default] = 'unique_events_multiple'
+
+        property :id, Integer, :key => true
+        property :start_year, Integer, :unique => :years
+        property :stop_year,  Integer, :unique => :years
+      end
+      @klass.auto_migrate!
+
+      @new = @klass.new(:id => 1, :start_year => 2008, :stop_year => 2009)
+    end
+
+    it 'validates uniquness' do
+      lambda {
+        @new.should_not be_valid
+      }.should raise_error(ArgumentError)
+    end
+  end
+end

data/spec/integration/automatic_validation/spec_helper.rb

@@ -10,15 +10,6 @@
 # and use a few more realistic models with ParanoidBoolean and all
 # that
 
-module TypecastBypassSetter
-  # Bypass typecasting so we can set values for specs
-  def set(attributes)
-    attributes.each do |k, v|
-      instance_variable_set("@#{k}", v)
-    end
-  end
-end
-
 class SailBoat
   include DataMapper::Resource
 
@@ -36,8 +27,6 @@ class SailBoat
   property :build_date,    Date,                                                          :validates       => :primitive_test
   property :float,         Float,      :precision => 2, :scale => 1
   property :big_decimal,   Decimal, :precision => 2, :scale => 1
-
-  include TypecastBypassSetter
 end
 
 class HasNullableBoolean
@@ -47,28 +36,22 @@ class HasNullableBoolean
   # use Serial in real world apps
   property :id,   Integer, :key => true
   property :bool, Boolean # :required => false by default
-
-  include TypecastBypassSetter
 end
 
-class HasNotNullableBoolean
+class HasRequiredBoolean
   include DataMapper::Resource
 
   # this one is not Serial intentionally
   # use Serial in real world apps
   property :id,   Integer, :key => true
   property :bool, Boolean, :required => true
-
-  include TypecastBypassSetter
 end
 
-class HasNotNullableParanoidBoolean
+class HasRequiredParanoidBoolean
   include DataMapper::Resource
 
   # this one is not Serial intentionally
   # use Serial in real world apps
   property :id,   Integer,         :key => true
   property :bool, ParanoidBoolean, :required => true
-
-  include TypecastBypassSetter
 end

data/spec/integration/format_validator/email_format_validator_spec.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 require 'spec_helper'
 require 'integration/format_validator/spec_helper'
 
@@ -15,7 +16,6 @@ describe 'DataMapper::Validations::Fixtures::BillOfLading' do
         '{_dave_}@example.com',
         '"[[ dave ]]"@example.com',
         'dave."dave"@example.com',
-        'test@localhost',
         'test@example.com',
         'test@example.co.uk',
         'test@example.com.br',
@@ -40,6 +40,7 @@ describe 'DataMapper::Validations::Fixtures::BillOfLading' do
         '.dave@example.com',
         'Max@Job 3:14',
         'Job@Book of Job',
+        'test@localhost',
         'J. P. \'s-Gravezande, a.k.a. The Hacker!@example.com'].each do |email|
     describe "with email value of #{email} (non RFC2822 compliant)" do
       before :all do
@@ -50,6 +51,19 @@ describe 'DataMapper::Validations::Fixtures::BillOfLading' do
     end
   end
 
+  describe "with valid email including unicode characters" do
+    before :all do
+      @model = DataMapper::Validations::Fixtures::BillOfLading.new(valid_attributes.merge(:email => 'pelé@gmail.com'))
+    end
+
+    # Unicode emails not supported on MRI18
+    unless !defined?(RUBY_ENGINE) && RUBY_VERSION == '1.8.7'
+      it 'should behave like valid model' do
+        @model.should be_valid
+      end
+    end
+  end
+
 
   it 'should have a pre-defined URL format' do
     bad = [ 'http:// example.com',

data/spec/unit/generic_validator/optional_spec.rb

@@ -0,0 +1,54 @@
+require 'spec_helper'
+
+describe 'DataMapper::Validations::GenericValidator', '#optional?' do
+  def validator(opts = {})
+    DataMapper::Validations::LengthValidator.new(:name, opts)
+  end
+
+  describe 'allowing blank' do
+    subject do
+      validator(
+        :allow_blank => true
+      )
+    end
+
+    it { subject.optional?("" ).should be }
+    it { subject.optional?(nil).should be }
+  end
+
+  describe 'allowing nil' do
+    subject do
+      validator(
+        :allow_nil => true
+      )
+    end
+
+    it { subject.optional?("" ).should_not be }
+    it { subject.optional?(nil).should be }
+  end
+
+  describe 'allowing blank, but now allowing nil' do
+    subject do
+      validator(
+        :allow_blank => true,
+        :allow_nil   => false
+      )
+    end
+
+    it { subject.optional?("" ).should be }
+    it { subject.optional?(nil).should_not be }
+  end
+
+  describe 'allowing nil, but now allowing blank' do
+    subject do
+      validator(
+        :allow_blank => false,
+        :allow_nil   => true
+      )
+    end
+
+    it { subject.optional?("" ).should_not be }
+    it { subject.optional?(nil).should be }
+  end
+
+end

data/spec/unit/validation_errors/respond_to_spec.rb

@@ -0,0 +1,15 @@
+require 'spec_helper'
+
+describe 'DataMapper::Validations::ValidationErrors#respond_to?' do
+
+  subject { DataMapper::Validations::ValidationErrors.new(Object.new) }
+
+  it 'should look for the method in self' do
+    subject.should respond_to(:full_messages)
+  end
+
+  it 'should delegate lookup to the underlying errors hash' do
+    subject.should respond_to(:size)
+  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,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: dm-validations
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 1
-  - 0
-  - 2
-  version: 1.0.2
+  prerelease: 6
+  version: 1.1.0.rc1
 platform: ruby
 authors: 
 - Guy van den Berg
@@ -14,53 +10,86 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-07 00:00:00 -07:00
+date: 2011-02-28 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: dm-core
-  prerelease: false
+  name: activesupport
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        - 2
-        version: 1.0.2
+        version: 3.0.4
   type: :runtime
+  prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: rspec
-  prerelease: false
+  name: i18n
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 3
-        version: "1.3"
-  type: :development
+        version: 0.5.0
+  type: :runtime
+  prerelease: false
   version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: dm-core
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 1.1.0.rc1
+  type: :runtime
+  prerelease: false
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: dm-types
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 1.1.0.rc1
+  type: :development
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: jeweler
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        - 2
-        version: 1.0.2
+        version: 1.5.2
   type: :development
-  version_requirements: *id003
+  prerelease: false
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: rake
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 0.8.7
+  type: :development
+  prerelease: false
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 1.3.1
+  type: :development
+  prerelease: false
+  version_requirements: *id007
 description: Library for performing validations on DM models and pure Ruby object
 email: vandenberg.guy [a] gmail [d] com
 executables: []
@@ -71,7 +100,6 @@ extra_rdoc_files:
 - LICENSE
 - README.rdoc
 files: 
-- .gitignore
 - Gemfile
 - LICENSE
 - README.rdoc
@@ -142,6 +170,7 @@ files:
 - 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
@@ -206,23 +235,22 @@ files:
 - 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
-- tasks/ci.rake
-- tasks/local_gemfile.rake
-- tasks/metrics.rake
+- spec/unit/validation_errors/respond_to_spec.rb
 - tasks/spec.rake
 - tasks/yard.rake
 - tasks/yardstick.rake
-has_rdoc: yard
+has_rdoc: true
 homepage: http://github.com/datamapper/dm-validations
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -230,21 +258,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: datamapper
-rubygems_version: 1.3.7
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: Library for performing validations on DM models and pure Ruby object
@@ -291,6 +315,7 @@ test_files:
 - 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
@@ -353,7 +378,9 @@ test_files:
 - 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