dm-validations 0.9.2 → 0.9.3

data/History.txt

@@ -0,0 +1 @@
+

data/Manifest.txt

@@ -0,0 +1,45 @@
+History.txt
+LICENSE
+Manifest.txt
+README.txt
+Rakefile
+TODO
+lib/dm-validations.rb
+lib/dm-validations/absent_field_validator.rb
+lib/dm-validations/acceptance_validator.rb
+lib/dm-validations/auto_validate.rb
+lib/dm-validations/confirmation_validator.rb
+lib/dm-validations/contextual_validators.rb
+lib/dm-validations/custom_validator.rb
+lib/dm-validations/format_validator.rb
+lib/dm-validations/formats/email.rb
+lib/dm-validations/generic_validator.rb
+lib/dm-validations/length_validator.rb
+lib/dm-validations/method_validator.rb
+lib/dm-validations/numeric_validator.rb
+lib/dm-validations/primitive_validator.rb
+lib/dm-validations/required_field_validator.rb
+lib/dm-validations/support/object.rb
+lib/dm-validations/uniqueness_validator.rb
+lib/dm-validations/validation_errors.rb
+lib/dm-validations/version.rb
+lib/dm-validations/within_validator.rb
+spec/integration/absent_field_validator_spec.rb
+spec/integration/acceptance_validator_spec.rb
+spec/integration/auto_validate_spec.rb
+spec/integration/confirmation_validator_spec.rb
+spec/integration/contextual_validators_spec.rb
+spec/integration/custom_validator_spec.rb
+spec/integration/format_validator_spec.rb
+spec/integration/generic_validator_spec.rb
+spec/integration/length_validator_spec.rb
+spec/integration/method_validator_spec.rb
+spec/integration/numeric_validator_spec.rb
+spec/integration/primitive_validator_spec.rb
+spec/integration/required_field_validator_spec.rb
+spec/integration/uniqueness_validator_spec.rb
+spec/integration/validation_errors_spec.rb
+spec/integration/validation_spec.rb
+spec/integration/within_validator_spec.rb
+spec/spec.opts
+spec/spec_helper.rb

data/Rakefile

@@ -1,12 +1,24 @@
 require 'rubygems'
 require 'spec'
-require 'rake/clean'
-require 'rake/rdoctask'
-require 'rake/gempackagetask'
 require 'spec/rake/spectask'
 require 'pathname'
 
-CLEAN.include '{log,pkg}/'
+ROOT = Pathname(__FILE__).dirname.expand_path
+require ROOT + 'lib/dm-validations/version'
+
+AUTHOR = "Guy van den Berg"
+EMAIL  = "vandenberg.guy@gmail.com"
+GEM_NAME = "dm-validations"
+GEM_VERSION = DataMapper::Validations::VERSION
+GEM_DEPENDENCIES = [["dm-core", GEM_VERSION]]
+GEM_CLEAN = ["log", "pkg", "coverage"]
+GEM_EXTRAS = { :has_rdoc => true, :extra_rdoc_files => %w[ README.txt LICENSE TODO ] }
+
+PROJECT_NAME = "datamapper"
+PROJECT_URL  = "http://github.com/sam/dm-more/tree/master/dm-validations"
+PROJECT_DESCRIPTION = PROJECT_SUMMARY = "DataMapper plugin for performing validations on data models"
+
+require ROOT.parent + 'tasks/hoe'
 
 desc "Generate Documentation"
 rd = Rake::RDocTask.new do |rdoc|
@@ -16,45 +28,25 @@ rd = Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_files.include(FileList[ 'lib/**/*.rb', 'README', 'LICENSE'])
 end
 
-spec = Gem::Specification.new do |s|
-  s.name             = 'dm-validations'
-  s.version          = '0.9.2'
-  s.platform         = Gem::Platform::RUBY
-  s.has_rdoc         = true
-  s.extra_rdoc_files = %w[ README LICENSE TODO ]
-  s.summary          = 'DataMapper plugin for performing validations on data models'
-  s.description      = s.summary
-  s.author           = 'Guy van den Berg'
-  s.email            = 'vandenberg.guy@gmail.com'
-  s.homepage         = 'http://github.com/sam/dm-more/tree/master/dm-validations'
-  s.require_path     = 'lib'
-  s.files            = FileList[ '{lib,spec}/**/*.rb', 'spec/spec.opts', 'Rakefile', *s.extra_rdoc_files ]
-  s.add_dependency('dm-core', "=#{s.version}")
-end
-
 task :default => [ :spec ]
 
 WIN32 = (RUBY_PLATFORM =~ /win32|mingw|cygwin/) rescue nil
 SUDO  = WIN32 ? '' : ('sudo' unless ENV['SUDOLESS'])
 
-Rake::GemPackageTask.new(spec) do |pkg|
-  pkg.gem_spec = spec
-end
-
-desc "Install #{spec.name} #{spec.version} (default ruby)"
+desc "Install #{GEM_NAME} #{GEM_VERSION} (default ruby)"
 task :install => [ :package ] do
-  sh "#{SUDO} gem install --local pkg/#{spec.name}-#{spec.version} --no-update-sources", :verbose => false
+  sh "#{SUDO} gem install --local pkg/#{GEM_NAME}-#{GEM_VERSION} --no-update-sources", :verbose => false
 end
 
-desc "Uninstall #{spec.name} #{spec.version} (default ruby)"
+desc "Uninstall #{GEM_NAME} #{GEM_VERSION} (default ruby)"
 task :uninstall => [ :clobber ] do
-  sh "#{SUDO} gem uninstall #{spec.name} -v#{spec.version} -I -x", :verbose => false
+  sh "#{SUDO} gem uninstall #{GEM_NAME} -v#{GEM_VERSION} -I -x", :verbose => false
 end
 
 namespace :jruby do
-  desc "Install #{spec.name} #{spec.version} with JRuby"
+  desc "Install #{GEM_NAME} #{GEM_VERSION} with JRuby"
   task :install => [ :package ] do
-    sh %{#{SUDO} jruby -S gem install --local pkg/#{spec.name}-#{spec.version} --no-update-sources}, :verbose => false
+    sh %{#{SUDO} jruby -S gem install --local pkg/#{GEM_NAME}-#{GEM_VERSION} --no-update-sources}, :verbose => false
   end
 end
 

data/lib/dm-validations.rb

@@ -1,7 +1,7 @@
 require 'rubygems'
 require 'pathname'
 
-gem 'dm-core', '=0.9.2'
+gem 'dm-core', '=0.9.3'
 require 'dm-core'
 
 dir = Pathname(__FILE__).dirname.expand_path / 'dm-validations'
@@ -34,6 +34,23 @@ module DataMapper
         model.send(:alias_method, :save!, :save)
         model.send(:alias_method, :save,  :save_with_validations)
       end
+      model.class_eval <<-EOS
+      class << self
+        method_defined?(:create) && !method_defined?(:create!)
+          def create(attributes = {}, context = :default)
+            resource = new(attributes)
+            return resource unless resource.valid?(context)
+            resource.save
+            resource
+          end
+
+          def create!(attributes = {})
+            resource = new(attributes)
+            resource.save!
+            resource
+          end
+        end
+      EOS
     end
 
     # Validate the resource before saving. Use #save! to save
@@ -97,9 +114,7 @@ module DataMapper
 
 
     def validation_property_value(name)
-      return self.instance_variable_get("@#{name}") if self.instance_variables.include?(name)
-      return self.send(name) if self.respond_to?(name)
-      nil
+      self.respond_to?(name, true) ? self.send(name) : nil
     end
 
     # Get the corresponding Resource property, if it exists.
@@ -107,15 +122,15 @@ module DataMapper
     # Note: DataMapper validations can be used on non-DataMapper resources.
     # In such cases, the return value will be nil.
     def validation_property(field_name)
-      if DataMapper::Resource > self.class
-        self.class.properties(self.repository.name)[field_name]
+      if respond_to?(:model) && (properties = model.properties(self.repository.name)) && properties.has_property?(field_name)
+        properties[field_name]
       end
     end
 
     def validation_association_keys(name)
-      if self.class.relationships.has_key?(name)
+      if model.relationships.has_key?(name)
         result = []
-        relation = self.class.relationships[name]
+        relation = model.relationships[name]
         relation.child_key.each do |key|
           result << key.name
         end
@@ -167,7 +182,7 @@ module DataMapper
       def create_context_instance_methods(context)
         name = "valid_for_#{context.to_s}?"
         if !self.instance_methods.include?(name)
-          class_eval <<-EOS
+          class_eval <<-EOS, __FILE__, __LINE__
             def #{name}
               valid?('#{context.to_s}'.to_sym)
             end
@@ -176,7 +191,7 @@ module DataMapper
 
         all = "all_valid_for_#{context.to_s}?"
         if !self.instance_methods.include?(all)
-          class_eval <<-EOS
+          class_eval <<-EOS, __FILE__, __LINE__
             def #{all}
               all_valid?('#{context.to_s}'.to_sym)
             end
@@ -189,13 +204,18 @@ module DataMapper
       #
       def add_validator_to_context(opts, fields, klazz)
         fields.each do |field|
+          validator = klazz.new(field, opts)
           if opts[:context].is_a?(Symbol)
-            validators.context(opts[:context]) << klazz.new(field, opts)
-            create_context_instance_methods(opts[:context])
+            unless validators.context(opts[:context]).include?(validator)
+              validators.context(opts[:context]) << validator
+              create_context_instance_methods(opts[:context])
+            end
           elsif opts[:context].is_a?(Array)
             opts[:context].each do |c|
-              validators.context(c) << klazz.new(field, opts)
-              create_context_instance_methods(c)
+              unless validators.context(c).include?(validator)
+                validators.context(c) << validator
+                create_context_instance_methods(c)
+              end
             end
           end
         end

data/lib/dm-validations/auto_validate.rb

@@ -1,6 +1,29 @@
 module DataMapper
+  class Property
+    # for options_with_message
+    PROPERTY_OPTIONS << :message << :messages
+  end
+
   module Validate
     module AutoValidate
+      # adds message for validator
+      def options_with_message(base_options, property, validator_name)
+        options = base_options.clone
+        opts = property.options
+        options[:message] = if opts[:messages]
+          if opts[:messages].is_a?(Hash) and msg = opts[:messages][validator_name]
+            msg
+          else
+            nil
+          end
+        elsif opts[:message]
+          opts[:message]
+        else
+          nil
+        end
+        options
+      end
+
 
       ##
       # Auto-generate validations for a given property. This will only occur
@@ -33,6 +56,21 @@ module DataMapper
       #       Using a Integer type causes a validates_is_number
       #       validator to be created for the property.  integer_only
       #       is set to false, and precision/scale match the property
+      #
+      #
+      #   Messages
+      #
+      #   :messages => {..}
+      #       Setting :messages hash replaces standard error messages
+      #       with custom ones. For instance:
+      #       :messages => {:presence => "Field is required",
+      #                     :format => "Field has invalid format"}
+      #       Hash keys are: :presence, :format, :length, :is_unique, 
+      #                      :is_number, :is_primitive
+      #
+      #   :message => "Some message"
+      #       It is just shortcut if only one validation option is set
+      #
       def auto_generate_validations(property)
         property.options[:auto_validation] = true unless property.options.has_key?(:auto_validation)
         return unless property.options[:auto_validation]
@@ -44,7 +82,8 @@ module DataMapper
 
         # presence
         unless opts[:allow_nil]
-          validates_present property.name, opts
+          # validates_present property.name, opts
+          validates_present property.name, options_with_message(opts, property, :presence)
         end
 
         # length
@@ -56,39 +95,46 @@ module DataMapper
           else
             opts[:maximum] = len
           end
-          validates_length property.name, opts
+          # validates_length property.name, opts
+          validates_length property.name, options_with_message(opts, property, :length)
         end
 
         # format
         if property.options.has_key?(:format)
           opts[:with] = property.options[:format]
-          validates_format property.name, opts
+          # validates_format property.name, opts
+          validates_format property.name, options_with_message(opts, property, :format)
         end
 
         # uniqueness validator
         if property.options.has_key?(:unique)
           value = property.options[:unique]
           if value.is_a?(Array) || value.is_a?(Symbol)
-            validates_is_unique property.name, :scope => Array(value)
+            # validates_is_unique property.name, :scope => Array(value)
+            validates_is_unique property.name, options_with_message({:scope => Array(value)}, property, :is_unique)
           elsif value.is_a?(TrueClass)
-            validates_is_unique property.name
+            # validates_is_unique property.name
+            validates_is_unique property.name, options_with_message({}, property, :is_unique)
           end
         end
 
         # numeric validator
         if Integer == property.type
           opts[:integer_only] = true
-          validates_is_number property.name, opts
+          # validates_is_number property.name, opts
+          validates_is_number property.name, options_with_message(opts, property, :is_number)
         elsif BigDecimal == property.type || Float == property.type
           opts[:precision] = property.precision
           opts[:scale]     = property.scale
-          validates_is_number property.name, opts
+          # validates_is_number property.name, opts
+          validates_is_number property.name, options_with_message(opts, property, :is_number)
         else
           # We only need this in the case we don't already
           # have a numeric validator, because otherwise
           # it will cause duplicate validation errors
           unless property.custom?
-            validates_is_primitive property.name, opts
+            # validates_is_primitive property.name, opts
+            validates_is_primitive property.name, options_with_message(opts, property, :is_primitive)
           end
         end
       end

data/lib/dm-validations/confirmation_validator.rb

@@ -29,6 +29,10 @@ module DataMapper
         return true if @options[:allow_nil] && field_value.nil?
         return false if !@options[:allow_nil] && field_value.nil?
 
+        if target.class.properties.has_property?(@field_name)
+          return true unless target.attribute_dirty?(@field_name)
+        end
+
         confirm_value = target.instance_variable_get("@#{@confirm_field_name}")
         field_value == confirm_value
       end

data/lib/dm-validations/length_validator.rb

@@ -55,7 +55,7 @@ module DataMapper
           end
         end
 
-        error_message ||= @options[:message]
+        error_message = @options[:message] || error_message
 
         add_error(target, error_message, @field_name) unless valid
 

data/lib/dm-validations/numeric_validator.rb

@@ -28,7 +28,16 @@ module DataMapper
           error_message ||= '%s must be an integer'.t(Extlib::Inflection.humanize(@field_name))
         else
           # FIXME: if precision and scale are not specified, can we assume that it is an integer?
+          #        probably not, as floating point numbers don't have hard
+          #        defined scale. the scale floats with the length of the
+          #        integral and precision. Ie. if precision = 10 and integral
+          #        portion of the number is 9834 (4 digits), the max scale will
+          #        be 6 (10 - 4). But if the integral length is 1, max scale
+          #        will be (10 - 1) = 9, so 1.234567890.
+          #        In MySQL somehow you can hard-define scale on floats. Not
+          #        quite sure how that works...
           if precision && scale
+            #handles both Float when it has scale specified and BigDecimal
             if precision > scale && scale > 0
               return true if value =~ /\A[+-]?(?:\d{1,#{precision - scale}}|\d{0,#{precision - scale}}\.\d{1,#{scale}})\z/
             elsif precision > scale && scale == 0
@@ -38,6 +47,14 @@ module DataMapper
             else
               raise ArgumentError, "Invalid precision #{precision.inspect} and scale #{scale.inspect} for #{field_name} (value: #{value.inspect} #{value.class})"
             end
+          elsif precision && scale.nil?
+            # for floats, if scale is not set
+            
+            #total number of digits is less or equal precision
+            return true if value.gsub(/[^\d]/,'').length <= precision
+            
+            #number of digits before decimal == precision, and the number is x.0. same as scale = 0
+            return true if value =~ /\A[+-]?(?:\d{1,#{precision}}(?:\.0)?)\z/
           else
             return true if value =~ /\A[+-]?(?:\d+|\d*\.\d+)\z/
           end

data/lib/dm-validations/uniqueness_validator.rb

@@ -24,7 +24,7 @@ module DataMapper
         opts = { field_name => target.validation_property_value(field_name) }
 
         scope.each do |item|
-          if !target.model.properties(repository_name)[item].nil?
+          if target.model.properties(repository_name).has_property?(item)
             opts[item] = target.validation_property_value(item)
           elsif target.model.relationships(repository_name).has_key?(item)
             target.validation_association_keys(item).each do |key|

data/lib/dm-validations/version.rb

@@ -0,0 +1,5 @@
+module DataMapper
+  module Validations
+    VERSION = "0.9.3"
+  end
+end

data/spec/integration/acceptance_validator_spec.rb

@@ -53,7 +53,7 @@ describe DataMapper::Validate::AcceptanceValidator do
     before(:all) do
       SkimBat.class_eval do
         validators.clear!
-        validates_is_accepted :sailyness, :accept => "true"
+        validates_is_accepted :sailyness, :accept => true
       end
       @s = SkimBat.new
     end

data/spec/integration/auto_validate_spec.rb

@@ -259,4 +259,53 @@ describe "Automatic Validation from Property Definition" do
       end
     end
   end
+
+  describe 'for custom messages' do
+    it "should have correct error message" do
+      custom_boat = Class.new do
+        include DataMapper::Resource
+        property :id,   Integer, :serial => true
+        property :name, String,  :nullable => false, :message => "This boat must have name"
+      end
+      boat = custom_boat.new
+      boat.should_not be_valid
+
+      boat.errors.on(:name).should eql(["This boat must have name"])
+    end
+
+    it "should have correct error messages" do
+      custom_boat = Class.new do
+        include DataMapper::Resource
+        property :id,   Integer, :serial => true
+        property :name, String,  :nullable => false, :length => 5..20, :format => /^[a-z]+$/,
+                 :messages => {
+                   :presence => "This boat must have name",
+                   :length => "Name must have at least 4 and at most 20 chars",
+                   :format => "Please use only small letters"
+                 }
+      end
+
+      boat = custom_boat.new
+      boat.should_not be_valid
+      boat.errors.on(:name).should include("This boat must have name")
+      boat.errors.on(:name).should include("Name must have at least 4 and at most 20 chars")
+      boat.errors.on(:name).should include("Please use only small letters")
+
+      boat.name = "%%"
+      boat.should_not be_valid
+      boat.errors.on(:name).should_not include("This boat must have name")
+      boat.errors.on(:name).should include("Name must have at least 4 and at most 20 chars")
+      boat.errors.on(:name).should include("Please use only small letters")
+
+      boat.name = "%%asd"
+      boat.should_not be_valid
+      boat.errors.on(:name).should_not include("This boat must have name")
+      boat.errors.on(:name).should_not include("Name must have at least 4 and at most 20 chars")
+      boat.errors.on(:name).should include("Please use only small letters")
+
+      boat.name = "superboat"
+      boat.should be_valid
+      boat.errors.on(:name).should be_nil
+    end
+  end
 end

data/spec/integration/confirmation_validator_spec.rb

@@ -9,20 +9,42 @@ describe DataMapper::Validate::ConfirmationValidator do
       property :id,                Integer, :serial => true
       property :name,              String
       property :name_confirmation, String
+      property :size,              Integer
 
       validates_is_confirmed :name
     end
   end
 
+  it "should only validate if the attribute is dirty" do
+    class Transformer
+      include DataMapper::Resource
+
+      property :id,                Integer, :serial => true
+      property :name,              String
+      property :assoc,             String
+
+      validates_is_confirmed :name
+
+      attr_accessor :name_confirmation
+    end
+    Transformer.auto_migrate!
+    # attribute_dirty?
+    tf = Transformer.new(:name => "Optimus Prime", :name_confirmation => "Optimus Prime", :assoc => "Autobot")
+    tf.should be_valid
+    tf.save.should == true
+    tf = Transformer.first
+    tf.update_attributes(:assoc => "Autobot!").should == true
+  end
+
   it "should validate the confirmation of a value on an instance of a resource" do
     canoe = Canoe.new
     canoe.name = 'White Water'
     canoe.name_confirmation = 'Not confirmed'
-    canoe.valid?.should_not == true
+    canoe.should_not be_valid
     canoe.errors.full_messages.first.should == 'Name does not match the confirmation'
 
     canoe.name_confirmation = 'White Water'
-    canoe.valid?.should == true
+    canoe.should be_valid
   end
 
   it "should default the name of the confirmation field to <field>_confirmation
@@ -30,11 +52,11 @@ describe DataMapper::Validate::ConfirmationValidator do
     canoe = Canoe.new
     canoe.name = 'White Water'
     canoe.name_confirmation = 'White Water'
-    canoe.valid?.should == true
+    canoe.should be_valid
   end
 
   it "should default to allowing nil values on the fields if not specified to" do
-    Canoe.new.valid?.should == true
+    Canoe.new.should be_valid
   end
 
   it "should not pass validation with a nil value when specified to" do
@@ -42,7 +64,7 @@ describe DataMapper::Validate::ConfirmationValidator do
       validators.clear!
       validates_is_confirmed :name, :allow_nil => false
     end
-    Canoe.new.valid?.should_not == true
+    Canoe.new.should_not be_valid
   end
 
   it "should allow the name of the confirmation field to be set" do
@@ -60,7 +82,21 @@ describe DataMapper::Validate::ConfirmationValidator do
     canoe = Canoe.new
     canoe.name = 'Float'
     canoe.name_check = 'Float'
-    canoe.valid?.should == true
+    canoe.should be_valid
+  end
+
+  it "should not require that the confirmation field be a property" do
+    class Raft
+      include DataMapper::Resource
+      attr_accessor :name, :name_confirmation
+
+      property :id, Integer, :serial => true
+
+      validates_is_confirmed :name
+    end
 
+    raft = Raft.new
+    raft.name = 'Lifeboat'
+    lambda { raft.should_not be_valid }.should_not raise_error
   end
 end

data/spec/integration/length_validator_spec.rb

@@ -25,6 +25,8 @@ describe DataMapper::Validate::LengthValidator do
       validates_length :snickersnack, :within => 3..40, :message => "worble warble"
     end
     wock = Jabberwock.new
+    wock.valid?.should == false
+    wock.errors.full_messages.first.should == 'worble warble'
     wock.snickersnack = "hello"
     wock.id = 1
     wock.valid?.should == true

data/spec/integration/numeric_validator_spec.rb

@@ -65,11 +65,55 @@ describe DataMapper::Validate::NumericValidator do
     describe 'Float' do
       describe 'with default precision and scale' do
         before :all do
-          class RobotFish < Fish
+          class CloudFish < Fish
             property :average_weight, Float
           end
         end
 
+        before do
+          @cloud_fish = CloudFish.new
+        end
+
+        it 'should allow up to 10 digits before the decimal' do
+          @cloud_fish.average_weight = 0
+          @cloud_fish.should be_valid
+
+          @cloud_fish.average_weight = 9_999_999_999
+          @cloud_fish.should be_valid
+
+          @cloud_fish.average_weight = 10_000_000_000
+          @cloud_fish.should_not be_valid
+        end
+
+        it 'should allow 0 digits after the decimal' do
+          @cloud_fish.average_weight = 0
+          @cloud_fish.should be_valid
+        end
+        
+        it 'should allow any digits after the decimal' do
+          @cloud_fish.average_weight = 1.2
+          @cloud_fish.should be_valid
+          
+          @cloud_fish.average_weight = 123.456
+          @cloud_fish.should be_valid
+        end
+        
+        it "should only allow up to 10 digits overall" do
+          @cloud_fish.average_weight = 1.234567890
+          @cloud_fish.should be_valid
+          
+          @cloud_fish.average_weight = 1.2345678901
+          @cloud_fish.should_not be_valid
+        end
+      end
+
+      describe 'with default precision and scaleof 0' do
+        before :all do
+          class RobotFish < Fish
+            property :average_weight, Float, :scale => 0
+          end
+        end
+
         before do
           @robot_fish = RobotFish.new
         end
@@ -112,6 +156,10 @@ describe DataMapper::Validate::NumericValidator do
         before do
           @gold_fish = GoldFish.new
         end
+        
+        it "should have scale of 2" do
+          @gold_fish.model.average_weight.scale.should == 2
+        end
 
         it 'should allow up to 2 digits before the decimal' do
           @gold_fish.average_weight = 0

data/spec/integration/validation_spec.rb

@@ -88,6 +88,26 @@ describe DataMapper::Validate do
     end
   end
 
+  describe '#create!' do
+    before do
+      Yacht.auto_migrate!
+    end
+
+    it "should save object without running validations" do
+      Yacht.create!.should be_a_kind_of(Yacht)
+    end
+  end
+
+  describe "#create" do
+    before do
+      Yacht.auto_migrate!
+    end
+
+    it "should run validations" do
+      Yacht.create.new_record?.should be_true
+    end
+  end
+
   it "should respond to validatable? (for recursing assocations)" do
     Yacht.new.should be_validatable
     Class.new.new.should_not be_validatable
@@ -336,4 +356,37 @@ describe DataMapper::Validate do
 
     invoice.all_valid?.should == true
   end
+
+  it "should retrieve private instance variables for validation" do
+    class Raft
+      include DataMapper::Resource
+      property :length, Integer, :accessor => :private
+
+      def initialize(length)
+        @length = length
+      end
+    end
+
+    Raft.new(10).validation_property_value("length").should == 10
+  end
+
+  it "should duplicate validations to STI models" do
+    class Company
+      include DataMapper::Resource
+
+      validates_present :title, :message => "Company name is a required field"
+
+      property :id,       Integer, :serial => true, :key => true
+      property :title,    String
+      property :type,     Discriminator
+    end
+
+    class ServiceCompany < Company
+    end
+
+    class ProductCompany < Company
+    end
+    company = ServiceCompany.new
+    company.should_not be_valid
+  end
 end

data/spec/spec_helper.rb

@@ -1,4 +1,5 @@
 require 'rubygems'
+require 'spec'
 require 'pathname'
 require Pathname(__FILE__).dirname.expand_path.parent + 'lib/dm-validations'
 
@@ -8,7 +9,7 @@ def load_driver(name, default_uri)
   lib = "do_#{name}"
 
   begin
-    gem lib, '=0.9.2'
+    gem lib, '=0.9.3'
     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.2
+  version: 0.9.3
 platform: ruby
 authors: 
 - Guy van den Berg
@@ -9,29 +9,48 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-06-25 00:00:00 -05:00
+date: 2008-07-24 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: dm-core
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.9.2
+        version: 0.9.3
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: hoe
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.7.0
     version: 
 description: DataMapper plugin for performing validations on data models
-email: vandenberg.guy@gmail.com
+email: 
+- vandenberg.guy@gmail.com
 executables: []
 
 extensions: []
 
 extra_rdoc_files: 
-- README
+- README.txt
 - LICENSE
 - TODO
 files: 
+- History.txt
+- LICENSE
+- Manifest.txt
+- README.txt
+- Rakefile
+- TODO
+- lib/dm-validations.rb
 - lib/dm-validations/absent_field_validator.rb
 - lib/dm-validations/acceptance_validator.rb
 - lib/dm-validations/auto_validate.rb
@@ -49,8 +68,8 @@ files:
 - lib/dm-validations/support/object.rb
 - lib/dm-validations/uniqueness_validator.rb
 - lib/dm-validations/validation_errors.rb
+- lib/dm-validations/version.rb
 - lib/dm-validations/within_validator.rb
-- lib/dm-validations.rb
 - spec/integration/absent_field_validator_spec.rb
 - spec/integration/acceptance_validator_spec.rb
 - spec/integration/auto_validate_spec.rb
@@ -68,17 +87,14 @@ files:
 - spec/integration/validation_errors_spec.rb
 - spec/integration/validation_spec.rb
 - spec/integration/within_validator_spec.rb
-- spec/spec_helper.rb
 - spec/spec.opts
-- Rakefile
-- README
-- LICENSE
-- TODO
+- spec/spec_helper.rb
 has_rdoc: true
 homepage: http://github.com/sam/dm-more/tree/master/dm-validations
 post_install_message: 
-rdoc_options: []
-
+rdoc_options: 
+- --main
+- README.txt
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -95,8 +111,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   version: 
 requirements: []
 
-rubyforge_project: 
-rubygems_version: 1.0.1
+rubyforge_project: datamapper
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
 summary: DataMapper plugin for performing validations on data models