dm-validations 0.9.4 → 0.9.5

data/lib/dm-validations.rb

@@ -1,7 +1,7 @@
 require 'rubygems'
 require 'pathname'
 
-gem 'dm-core', '=0.9.4'
+gem 'dm-core', '=0.9.5'
 require 'dm-core'
 
 dir = Pathname(__FILE__).dirname.expand_path / 'dm-validations'

data/lib/dm-validations/generic_validator.rb

@@ -87,6 +87,7 @@ module DataMapper
       end
 
       def ==(other)
+        self.class == other.class &&
         self.field_name == other.field_name &&
         self.if_clause == other.if_clause &&
         self.unless_clause == other.unless_clause &&

data/lib/dm-validations/primitive_validator.rb

@@ -15,7 +15,7 @@ module DataMapper
       def call(target)
         value = target.validation_property_value(@field_name)
         property = target.validation_property(@field_name)
-        return true if value.nil? || value.kind_of?(property.primitive)
+        return true if value.nil? || value.kind_of?(property.primitive) || property.primitive == TrueClass && value.kind_of?(FalseClass)
 
         error_message = @options[:message] || default_error(property)
         add_error(target, error_message, @field_name)

data/lib/dm-validations/version.rb

@@ -1,5 +1,5 @@
 module DataMapper
   module Validations
-    VERSION = "0.9.4"
+    VERSION = "0.9.5"
   end
 end

data/spec/integration/primitive_validator_spec.rb

@@ -5,6 +5,7 @@ class Monica # :nodoc:
   include DataMapper::Resource
   property :id, Integer, :serial => true
   property :birth_date, Date, :auto_validation => false
+  property :happy, TrueClass
   validates_is_primitive :birth_date
 end
 
@@ -22,4 +23,9 @@ describe DataMapper::Validate::PrimitiveValidator do
     b.should be_valid
     b.birth_date.should eql(Date.civil(2008,1,1))
   end
+  it "should accept FalseClass even when the property type is TrueClass" do
+    b = Monica.new
+    b.happy = false
+    b.valid?.should == true
+  end
 end

data/spec/spec_helper.rb

@@ -9,7 +9,7 @@ def load_driver(name, default_uri)
   lib = "do_#{name}"
 
   begin
-    gem lib, '=0.9.4'
+    gem lib, '=0.9.5'
     require lib
     DataMapper.setup(name, ENV["#{name.to_s.upcase}_SPEC_URI"] || default_uri)
     DataMapper::Repository.adapters[:default] =  DataMapper::Repository.adapters[name]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dm-validations
 version: !ruby/object:Gem::Version 
-  version: 0.9.4
+  version: 0.9.5
 platform: ruby
 authors: 
 - Guy van den Berg
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-08-21 00:00:00 -05:00
+date: 2008-08-26 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.9.4
+        version: 0.9.5
     version: 
 - !ruby/object:Gem::Dependency 
   name: hoe