activemodel 3.2.6 → 3.2.7.rc1

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## Rails 3.2.7 (unreleased)
+
+* `validates_inclusion_of` and `validates_exclusion_of` now accept `:within` option as alias of `:in` as documented.
+
+* Fix the the backport of the object dup with the ruby 1.9.3p194.
+
 ## Rails 3.2.6 (Jun 12, 2012)
 
 *   No changes.

data/lib/active_model/validations.rb

@@ -168,8 +168,9 @@ module ActiveModel
     # Clean the +Errors+ object if instance is duped
     def initialize_dup(other) # :nodoc:
       @errors = nil
+      super if defined?(super)
     end
-    
+
     # Backport dup from 1.9 so that #initialize_dup gets called
     unless Object.respond_to?(:initialize_dup)
       def dup # :nodoc:

data/lib/active_model/validations/exclusion.rb

@@ -5,24 +5,27 @@ module ActiveModel
   module Validations
     class ExclusionValidator < EachValidator
       ERROR_MESSAGE = "An object with the method #include? or a proc or lambda is required, " <<
-                      "and must be supplied as the :in option of the configuration hash"
+                      "and must be supplied as the :in (or :within) option of the configuration hash"
 
       def check_validity!
-        unless [:include?, :call].any? { |method| options[:in].respond_to?(method) }
+        unless [:include?, :call].any? { |method| delimiter.respond_to?(method) }
           raise ArgumentError, ERROR_MESSAGE
         end
       end
 
       def validate_each(record, attribute, value)
-        delimiter = options[:in]
         exclusions = delimiter.respond_to?(:call) ? delimiter.call(record) : delimiter
         if exclusions.send(inclusion_method(exclusions), value)
-          record.errors.add(attribute, :exclusion, options.except(:in).merge!(:value => value))
+          record.errors.add(attribute, :exclusion, options.except(:in, :within).merge!(:value => value))
         end
       end
 
     private
 
+      def delimiter
+        @delimiter ||= options[:in] || options[:within]
+      end
+
       # In Ruby 1.9 <tt>Range#include?</tt> on non-numeric ranges checks all possible
       # values in the range for equality, so it may be slow for large ranges. The new
       # <tt>Range#cover?</tt> uses the previous logic of comparing a value with the
@@ -49,6 +52,7 @@ module ActiveModel
       #   part of. This can be supplied as a proc or lambda which returns an enumerable.
       #   If the enumerable is a range the test is performed with <tt>Range#cover?</tt>
       #   (backported in Active Support for 1.8), otherwise with <tt>include?</tt>.
+      # * <tt>:within</tt> - A synonym(or alias) for <tt>:in</tt>
       # * <tt>:message</tt> - Specifies a custom error message (default is: "is reserved").
       # * <tt>:allow_nil</tt> - If set to true, skips this validation if the attribute
       #   is +nil+ (default is +false+).
@@ -65,7 +69,7 @@ module ActiveModel
       #   the validation should not occur (e.g. <tt>:unless => :skip_validation</tt>,
       #   or <tt>:unless => Proc.new { |user| user.signup_step <= 2 }</tt>). The method,
       #   proc or string should return or evaluate to a true or false value.
-      # * <tt>:strict</tt> - Specifies whether validation should be strict. 
+      # * <tt>:strict</tt> - Specifies whether validation should be strict.
       #   See <tt>ActiveModel::Validation#validates!</tt> for more information.
       def validates_exclusion_of(*attr_names)
         validates_with ExclusionValidator, _merge_attributes(attr_names)

data/lib/active_model/validations/inclusion.rb

@@ -5,24 +5,27 @@ module ActiveModel
   module Validations
     class InclusionValidator < EachValidator
       ERROR_MESSAGE = "An object with the method #include? or a proc or lambda is required, " <<
-                      "and must be supplied as the :in option of the configuration hash"
+                      "and must be supplied as the :in (or :within) option of the configuration hash"
 
       def check_validity!
-        unless [:include?, :call].any?{ |method| options[:in].respond_to?(method) }
+        unless [:include?, :call].any?{ |method| delimiter.respond_to?(method) }
           raise ArgumentError, ERROR_MESSAGE
         end
       end
 
       def validate_each(record, attribute, value)
-        delimiter = options[:in]
         exclusions = delimiter.respond_to?(:call) ? delimiter.call(record) : delimiter
         unless exclusions.send(inclusion_method(exclusions), value)
-          record.errors.add(attribute, :inclusion, options.except(:in).merge!(:value => value))
+          record.errors.add(attribute, :inclusion, options.except(:in, :within).merge!(:value => value))
         end
       end
 
     private
 
+      def delimiter
+        @delimiter ||= options[:in] || options[:within]
+      end
+
       # In Ruby 1.9 <tt>Range#include?</tt> on non-numeric ranges checks all possible
       # values in the range for equality, so it may be slow for large ranges. The new
       # <tt>Range#cover?</tt> uses the previous logic of comparing a value with the
@@ -48,6 +51,7 @@ module ActiveModel
       #   supplied as a proc or lambda which returns an enumerable. If the enumerable
       #   is a range the test is performed with <tt>Range#cover?</tt>
       #   (backported in Active Support for 1.8), otherwise with <tt>include?</tt>.
+      # * <tt>:within</tt> - A synonym(or alias) for <tt>:in</tt>
       # * <tt>:message</tt> - Specifies a custom error message (default is: "is not
       #   included in the list").
       # * <tt>:allow_nil</tt> - If set to true, skips this validation if the attribute
@@ -65,7 +69,7 @@ module ActiveModel
       #   if the validation should not occur (e.g. <tt>:unless => :skip_validation</tt>,
       #   or <tt>:unless => Proc.new { |user| user.signup_step <= 2 }</tt>). The method,
       #   proc or string should return or evaluate to a true or false value.
-      # * <tt>:strict</tt> - Specifies whether validation should be strict. 
+      # * <tt>:strict</tt> - Specifies whether validation should be strict.
       #   See <tt>ActiveModel::Validation#validates!</tt> for more information.
       def validates_inclusion_of(*attr_names)
         validates_with InclusionValidator, _merge_attributes(attr_names)

data/lib/active_model/version.rb

@@ -2,8 +2,8 @@ module ActiveModel
   module VERSION #:nodoc:
     MAJOR = 3
     MINOR = 2
-    TINY  = 6
-    PRE   = nil
+    TINY  = 7
+    PRE   = "rc1"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
   end

metadata

@@ -1,13 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: activemodel
 version: !ruby/object:Gem::Version 
-  hash: 3
-  prerelease: 
+  hash: 475645881
+  prerelease: 6
   segments: 
   - 3
   - 2
-  - 6
-  version: 3.2.6
+  - 7
+  - rc
+  - 1
+  version: 3.2.7.rc1
 platform: ruby
 authors: 
 - David Heinemeier Hansson
@@ -15,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-06-12 00:00:00 Z
+date: 2012-07-23 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
@@ -25,12 +27,14 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 475645881
         segments: 
         - 3
         - 2
-        - 6
-        version: 3.2.6
+        - 7
+        - rc
+        - 1
+        version: 3.2.7.rc1
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -118,12 +122,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: