dm-validations 0.10.0 → 0.10.1

data/History.rdoc

@@ -1,4 +1,12 @@
-=== 0.10.0 / 2009-10-15
+=== 0.10.1 / 2009-09-30
+
+* 2 minor enhancements:
+
+  * Always pass the base options into the validation methods so that
+    :allow_nil => true is always in effect in auto-validations
+  * Improved active_model compatibility
+
+=== 0.10.0 / 2009-09-15
 
 * 3 major enhancements:
 

data/lib/dm-validations/auto_validate.rb

@@ -89,7 +89,7 @@ module DataMapper
         # validation when the value is nil
         opts = { :allow_nil => true }
 
-        if property.options.has_key?(:validates)
+        if property.options.key?(:validates)
           opts[:context] = property.options[:validates]
         end
 
@@ -98,7 +98,7 @@ module DataMapper
         infer_format_validation_for(property, opts.dup)
         infer_uniqueness_validation_for(property, opts.dup)
         infer_within_validation_for(property, opts.dup)
-        infer_numeric_validation_for(property, opts.dup)
+        infer_type_validation_for(property, opts.dup)
       end # auto_generate_validations
 
       # Checks whether auto validations are currently
@@ -121,50 +121,56 @@ module DataMapper
       # @return [TrueClass, FalseClass]
       #   true for properties with :auto_validation option that has positive value
       def skip_auto_validation_for?(property)
-        property.options.has_key?(:auto_validation) && !property.options[:auto_validation]
+        property.options.key?(:auto_validation) && !property.options[:auto_validation]
       end
 
       def infer_presence_validation_for(property, options)
-        unless allow_nil?(property)
-          # validates_present property.name, opts
-          validates_present property.name, options_with_message(options, property, :presence)
-        end
+        return if allow_nil?(property)
+
+        validates_present property.name, options_with_message(options, property, :presence)
       end
 
       def infer_length_validation_for(property, options)
-        if [ String, DataMapper::Types::Text ].include?(property.type)
-          case length = property.options.fetch(:length, DataMapper::Property::DEFAULT_LENGTH)
-            when Range then options[:within]  = length
-            else            options[:maximum] = length
-          end
+        return unless [ String, DataMapper::Types::Text ].include?(property.type)
 
-          validates_length property.name, options_with_message(options, property, :length)
+        case length = property.options.fetch(:length, DataMapper::Property::DEFAULT_LENGTH)
+          when Range then options[:within]  = length
+          else            options[:maximum] = length
         end
+
+        validates_length property.name, options_with_message(options, property, :length)
       end
 
       def infer_format_validation_for(property, options)
-        if property.options.has_key?(:format)
-          options[:with] = property.options[:format]
-          validates_format property.name, options_with_message(options, property, :format)
-        end
+        return unless property.options.key?(:format)
+
+        options[:with] = property.options[:format]
+
+        validates_format property.name, options_with_message(options, property, :format)
       end
 
       def infer_uniqueness_validation_for(property, options)
-        if property.options.has_key?(:unique)
-          value = property.options[:unique]
-          if value.is_a?(Array) || value.is_a?(Symbol)
-            validates_is_unique property.name, options_with_message({:scope => Array(value)}, property, :is_unique)
-          elsif value.is_a?(TrueClass)
-            validates_is_unique property.name, options_with_message({}, property, :is_unique)
-          end
+        return unless property.options.key?(:unique)
+
+        case value = property.options[:unique]
+          when Array, Symbol
+            options[:scope] = Array(value)
+
+            validates_is_unique property.name, options_with_message(options, property, :is_unique)
+          when TrueClass
+            validates_is_unique property.name, options_with_message(options, property, :is_unique)
         end
       end
 
       def infer_within_validation_for(property, options)
-        validates_within property.name, options_with_message({:set => property.options[:set]}, property, :within) if property.options.has_key?(:set)
+        return unless property.options.key?(:set)
+
+        options[:set] = property.options[:set]
+
+        validates_within property.name, options_with_message(options, property, :within)
       end
 
-      def infer_numeric_validation_for(property, options)
+      def infer_type_validation_for(property, options)
         options[:gte] = property.min if property.min
         options[:lte] = property.max if property.max
 
@@ -177,11 +183,11 @@ module DataMapper
           options[:scale]     = property.scale
 
           validates_is_number property.name, options_with_message(options, property, :is_number)
-        else
+        elsif !property.custom?
           # We only need this in the case we don't already
           # have a numeric validator, because otherwise
           # it will cause duplicate validation errors
-          validates_is_primitive property.name, options_with_message(options, property, :is_primitive) unless property.custom?
+          validates_is_primitive property.name, options_with_message(options, property, :is_primitive)
         end
       end
 

data/lib/dm-validations/validation_errors.rb

@@ -84,6 +84,17 @@ module DataMapper
         end
       end
 
+      # Return validation errors for a particular field name or an empty array
+      #
+      # This method is a necessary requirement for active_model compatibility.
+      #
+      # @param [Symbol] field_name the name of the field you want an error for
+      # @return [Array<Array<String>>]
+      #   array of validation errors or empty array, if there are no errors on given field
+      def [](field_name)
+        errors[field_name] ||= []
+      end
+
       # Return validation errors for a particular field_name.
       #
       # @param [Symbol] field_name the name of the field you want an error for

data/lib/dm-validations/version.rb

@@ -1,5 +1,5 @@
 module DataMapper
   module Validations
-    VERSION = '0.10.0'.freeze
+    VERSION = '0.10.1'.freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dm-validations
 version: !ruby/object:Gem::Version 
-  version: 0.10.0
+  version: 0.10.1
 platform: ruby
 authors: 
 - Guy van den Berg, DataMapper development team
@@ -9,10 +9,19 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-16 00:00:00 -07:00
+date: 2009-09-30 00:00:00 -07:00
 default_executable: 
-dependencies: []
-
+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.10.1
+    version: 
 description: Library for performing validations on DM models and pure Ruby object
 email: 
 - vandenberg.guy [a] gmail [d] com