activemodel 3.0.20 → 3.1.0.beta1

data/lib/active_model/validations/length.rb

@@ -84,7 +84,9 @@ module ActiveModel
       # * <tt>:too_short</tt> - The error message if the attribute goes under the minimum (default is: "is too short (min is %{count} characters)").
       # * <tt>:wrong_length</tt> - The error message if using the <tt>:is</tt> method and the attribute is the wrong size (default is: "is the wrong length (should be %{count} characters)").
       # * <tt>:message</tt> - The error message to use for a <tt>:minimum</tt>, <tt>:maximum</tt>, or <tt>:is</tt> violation.  An alias of the appropriate <tt>too_long</tt>/<tt>too_short</tt>/<tt>wrong_length</tt> message.
-      # * <tt>:on</tt> - Specifies when this validation is active (default is <tt>:save</tt>, other options <tt>:create</tt>, <tt>:update</tt>).
+      # * <tt>:on</tt> - Specifies when this validation is active. Runs in all
+      #   validation contexts by default (+nil+), other options are <tt>:create</tt>
+      #   and <tt>:update</tt>.
       # * <tt>:if</tt> - Specifies a method, proc or string to call to determine if the validation should
       #   occur (e.g. <tt>:if => :allow_validation</tt>, or <tt>:if => Proc.new { |user| user.signup_step > 2 }</tt>).  The
       #   method, proc or string should return or evaluate to a true or false value.

data/lib/active_model/validations/numericality.rb

@@ -24,7 +24,7 @@ module ActiveModel
       def validate_each(record, attr_name, value)
         before_type_cast = "#{attr_name}_before_type_cast"
 
-        raw_value = record.send("#{attr_name}_before_type_cast") if record.respond_to?(before_type_cast.to_sym)
+        raw_value = record.send(before_type_cast) if record.respond_to?(before_type_cast.to_sym)
         raw_value ||= value
 
         return if options[:allow_nil] && raw_value.nil?
@@ -93,7 +93,9 @@ module ActiveModel
       #
       # Configuration options:
       # * <tt>:message</tt> - A custom error message (default is: "is not a number").
-      # * <tt>:on</tt> - Specifies when this validation is active (default is <tt>:save</tt>, other options <tt>:create</tt>, <tt>:update</tt>).
+      # * <tt>:on</tt> - Specifies when this validation is active. Runs in all
+      #   validation contexts by default (+nil+), other options are <tt>:create</tt>
+      #   and <tt>:update</tt>.
       # * <tt>:only_integer</tt> - Specifies whether the value has to be an integer, e.g. an integral value (default is +false+).
       # * <tt>:allow_nil</tt> - Skip validation if attribute is +nil+ (default is +false+). Notice that for fixnum and float columns empty strings are converted to +nil+.
       # * <tt>:greater_than</tt> - Specifies the value must be greater than the supplied value.

data/lib/active_model/validations/presence.rb

@@ -26,8 +26,9 @@ module ActiveModel
       #
       # Configuration options:
       # * <tt>message</tt> - A custom error message (default is: "can't be blank").
-      # * <tt>on</tt> - Specifies when this validation is active (default is <tt>:save</tt>, other options <tt>:create</tt>,
-      #   <tt>:update</tt>).
+      # * <tt>:on</tt> - Specifies when this validation is active. Runs in all
+      #   validation contexts by default (+nil+), other options are <tt>:create</tt>
+      #   and <tt>:update</tt>.
       # * <tt>if</tt> - Specifies a method, proc or string to call to determine if the validation should
       #   occur (e.g. <tt>:if => :allow_validation</tt>, or <tt>:if => Proc.new { |user| user.signup_step > 2 }</tt>).
       #   The method, proc or string should return or evaluate to a true or false value.

data/lib/active_model/validations/validates.rb

@@ -55,14 +55,23 @@ module ActiveModel
       #     validates :name, :title => true
       #   end
       #
-      # The validators hash can also handle regular expressions, ranges and arrays:
+      # Additionally validator classes may be in another namespace and still used within any class.
+      #
+      #   validates :name, :'file/title' => true
+      #
+      # The validators hash can also handle regular expressions, ranges, 
+      # arrays and strings in shortcut form, e.g.
       #
       #   validates :email, :format => /@/
       #   validates :gender, :inclusion => %w(male female)
       #   validates :password, :length => 6..20
       #
-      # Finally, the options :if, :unless, :on, :allow_blank and :allow_nil can be given
-      # to one specific validator:
+      # When using shortcut form, ranges and arrays are passed to your
+      # validator's initializer as +options[:in]+ while other types including
+      # regular expressions and strings are passed as +options[:with]+
+      #
+      # Finally, the options +:if+, +:unless+, +:on+, +:allow_blank+ and +:allow_nil+ can be given
+      # to one specific validator, as a hash:
       #
       #   validates :password, :presence => { :if => :password_required? }, :confirmation => true
       #
@@ -72,17 +81,18 @@ module ActiveModel
       #
       def validates(*attributes)
         defaults = attributes.extract_options!
-        validations = defaults.slice!(:if, :unless, :on, :allow_blank, :allow_nil)
+        validations = defaults.slice!(*_validates_default_keys)
 
         raise ArgumentError, "You need to supply at least one attribute" if attributes.empty?
-        raise ArgumentError, "Attribute names must be symbols" if attributes.any?{ |attribute| !attribute.is_a?(Symbol) }
         raise ArgumentError, "You need to supply at least one validation" if validations.empty?
 
         defaults.merge!(:attributes => attributes)
 
         validations.each do |key, options|
+          key = "#{key.to_s.camelize}Validator"
+
           begin
-            validator = const_get("#{key.to_s.camelize}Validator")
+            validator = key.include?('::') ? key.constantize : const_get(key)
           rescue NameError
             raise ArgumentError, "Unknown validator: '#{key}'"
           end
@@ -93,18 +103,22 @@ module ActiveModel
 
     protected
 
+      # When creating custom validators, it might be useful to be able to specify
+      # additional default keys. This can be done by overwriting this method.
+      def _validates_default_keys
+        [ :if, :unless, :on, :allow_blank, :allow_nil ]
+      end
+
       def _parse_validates_options(options) #:nodoc:
         case options
         when TrueClass
           {}
         when Hash
           options
-        when Regexp
-          { :with => options }
         when Range, Array
           { :in => options }
         else
-          raise ArgumentError, "#{options.inspect} is an invalid option. Expecting true, Hash, Regexp, Range, or Array"
+          { :with => options }
         end
       end
     end

data/lib/active_model/validations/with.rb

@@ -8,6 +8,18 @@ module ActiveModel
         end
     end
 
+    class WithValidator < EachValidator
+      def validate_each(record, attr, val)
+        method_name = options[:with]
+
+        if record.method(method_name).arity == 0
+          record.send method_name
+        else
+          record.send method_name, attr
+        end
+      end
+    end
+
     module ClassMethods
       # Passes the record off to the class or classes specified and allows them
       # to add errors based on more complex conditions.
@@ -38,9 +50,9 @@ module ActiveModel
       #   end
       #
       # Configuration options:
-      # * <tt>on</tt> - Specifies when this validation is active
+      # * <tt>:on</tt> - Specifies when this validation is active
       #   (<tt>:create</tt> or <tt>:update</tt>
-      # * <tt>if</tt> - Specifies a method, proc or string to call to determine
+      # * <tt>:if</tt> - Specifies a method, proc or string to call to determine
       #   if the validation should occur (e.g. <tt>:if => :allow_validation</tt>,
       #   or <tt>:if => Proc.new { |user| user.signup_step > 2 }</tt>).
       #   The method, proc or string should return or evaluate to a true or false value.

data/lib/active_model/validator.rb

@@ -1,6 +1,7 @@
 require 'active_support/core_ext/array/wrap'
 require "active_support/core_ext/module/anonymous"
 require 'active_support/core_ext/object/blank'
+require 'active_support/core_ext/object/inclusion'
 
 module ActiveModel #:nodoc:
 
@@ -63,27 +64,27 @@ module ActiveModel #:nodoc:
   #   end
   #
   # The easiest way to add custom validators for validating individual attributes
-  # is with the convenient ActiveModel::EachValidator for example:
+  # is with the convenient <tt>ActiveModel::EachValidator</tt>. For example:
   #
   #   class TitleValidator < ActiveModel::EachValidator
   #     def validate_each(record, attribute, value)
-  #       record.errors[attribute] << 'must be Mr. Mrs. or Dr.' unless ['Mr.', 'Mrs.', 'Dr.'].include?(value)
+  #       record.errors[attribute] << 'must be Mr. Mrs. or Dr.' unless value.in?(['Mr.', 'Mrs.', 'Dr.'])
   #     end
   #   end
   #
   # This can now be used in combination with the +validates+ method
-  # (see ActiveModel::Validations::ClassMethods.validates for more on this)
+  # (see <tt>ActiveModel::Validations::ClassMethods.validates</tt> for more on this)
   #
   #   class Person
   #     include ActiveModel::Validations
   #     attr_accessor :title
   #
-  #     validates :title, :presence => true, :title => true
+  #     validates :title, :presence => true
   #   end
   #
   # Validator may also define a +setup+ instance method which will get called
-  # with the class that using that validator as it's argument. This can be
-  # useful when there are prerequisites such as an attr_accessor being present
+  # with the class that using that validator as its argument. This can be
+  # useful when there are prerequisites such as an +attr_accessor+ being present
   # for example:
   #
   #   class MyValidator < ActiveModel::Validator
@@ -98,9 +99,7 @@ module ActiveModel #:nodoc:
   class Validator
     attr_reader :options
 
-    # Returns the kind of the validator.
-    #
-    # == Examples
+    # Returns the kind of the validator. Examples:
     #
     #   PresenceValidator.kind   # => :presence
     #   UniquenessValidator.kind # => :uniqueness
@@ -122,15 +121,15 @@ module ActiveModel #:nodoc:
     # Override this method in subclasses with validation logic, adding errors
     # to the records +errors+ array where necessary.
     def validate(record)
-      raise NotImplementedError
+      raise NotImplementedError, "Subclasses must implement a validate(record) method."
     end
   end
 
-  # EachValidator is a validator which iterates through the attributes given
-  # in the options hash invoking the validate_each method passing in the
+  # +EachValidator+ is a validator which iterates through the attributes given
+  # in the options hash invoking the <tt>validate_each</tt> method passing in the
   # record, attribute and value.
   #
-  # All Active Model validations are built on top of this Validator.
+  # All Active Model validations are built on top of this validator.
   class EachValidator < Validator
     attr_reader :attributes
 
@@ -158,19 +157,18 @@ module ActiveModel #:nodoc:
     # Override this method in subclasses with the validation logic, adding
     # errors to the records +errors+ array where necessary.
     def validate_each(record, attribute, value)
-      raise NotImplementedError
+      raise NotImplementedError, "Subclasses must implement a validate_each(record, attribute, value) method"
     end
 
     # Hook method that gets called by the initializer allowing verification
     # that the arguments supplied are valid. You could for example raise an
-    # ArgumentError when invalid options are supplied.
+    # +ArgumentError+ when invalid options are supplied.
     def check_validity!
     end
   end
 
-  # BlockValidator is a special EachValidator which receives a block on initialization
-  # and call this block for each attribute being validated. +validates_each+ uses this
-  # Validator.
+  # +BlockValidator+ is a special +EachValidator+ which receives a block on initialization
+  # and call this block for each attribute being validated. +validates_each+ uses this validator.
   class BlockValidator < EachValidator
     def initialize(options, &block)
       @block = block

data/lib/active_model/version.rb

@@ -1,9 +1,9 @@
 module ActiveModel
   module VERSION #:nodoc:
     MAJOR = 3
-    MINOR = 0
-    TINY  = 20
-    PRE   = nil
+    MINOR = 1
+    TINY  = 0
+    PRE   = "beta1"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
   end

metadata

@@ -1,72 +1,77 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: activemodel
-version: !ruby/object:Gem::Version
-  version: 3.0.20
+version: !ruby/object:Gem::Version 
+  prerelease: 6
+  version: 3.1.0.beta1
 platform: ruby
-authors:
+authors: 
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-28 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2011-05-04 00:00:00 -05:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 3.0.20
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 3.0.20
-- !ruby/object:Gem::Dependency
-  name: builder
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.1.2
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        version: 3.1.0.beta1
   type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: builder
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.1.2
-- !ruby/object:Gem::Dependency
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 3.0.0
+  type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: i18n
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.5.0
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 0.6.0beta1
   type: :runtime
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: bcrypt-ruby
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.5.0
-description: A toolkit for building modeling frameworks like Active Record and Active
-  Resource. Rich support for attributes, callbacks, validations, observers, serialization,
-  internationalization, and testing.
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 2.1.4
+  type: :runtime
+  version_requirements: *id004
+description: A toolkit for building modeling frameworks like Active Record and Active Resource. Rich support for attributes, callbacks, validations, observers, serialization, internationalization, and testing.
 email: david@loudthinking.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - CHANGELOG
 - MIT-LICENSE
 - README.rdoc
 - lib/active_model/attribute_methods.rb
 - lib/active_model/callbacks.rb
 - lib/active_model/conversion.rb
-- lib/active_model/deprecated_error_methods.rb
 - lib/active_model/dirty.rb
 - lib/active_model/errors.rb
 - lib/active_model/lint.rb
@@ -75,8 +80,10 @@ files:
 - lib/active_model/mass_assignment_security/sanitizer.rb
 - lib/active_model/mass_assignment_security.rb
 - lib/active_model/naming.rb
+- lib/active_model/observer_array.rb
 - lib/active_model/observing.rb
 - lib/active_model/railtie.rb
+- lib/active_model/secure_password.rb
 - lib/active_model/serialization.rb
 - lib/active_model/serializers/json.rb
 - lib/active_model/serializers/xml.rb
@@ -97,27 +104,33 @@ files:
 - lib/active_model/validator.rb
 - lib/active_model/version.rb
 - lib/active_model.rb
+has_rdoc: true
 homepage: http://www.rubyonrails.org
 licenses: []
-metadata: {}
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
-  requirements:
+required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
+  requirements: 
   - - ">="
-    - !ruby/object:Gem::Version
+    - !ruby/object:Gem::Version 
       version: 1.8.7
-required_rubygems_version: !ruby/object:Gem::Requirement
-  requirements:
-  - - ">="
-    - !ruby/object:Gem::Version
-      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
+  requirements: 
+  - - ">"
+    - !ruby/object:Gem::Version 
+      version: 1.3.1
 requirements: []
+
 rubyforge_project: activemodel
-rubygems_version: 2.0.0.preview3.1
+rubygems_version: 1.6.2
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: A toolkit for building modeling frameworks (part of Rails).
 test_files: []
+

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 711a0c8b07ab4da81228b150f5037acf2db8e4c7
-  data.tar.gz: 9e21930d3a5461f19d059319336effef3967caa1
-SHA512:
-  metadata.gz: 79b66e256aafe01c2e911fcc2a6e1aece080387a99945de8abbf2d32ba9cd0a4ca2e393fca66b9ce03ea63c5edd405b54a96c268a772035e2a9792dc71e2f4df
-  data.tar.gz: 69b726a99060f4fd93efa39e616dc37832252a9613e12556d005f8510c00063b2bac00805dfb600c3bdee4ea361cd149eff81936a85d89c4d4861d2ecc18c8c7

data/lib/active_model/deprecated_error_methods.rb

@@ -1,33 +0,0 @@
-module ActiveModel
-  module DeprecatedErrorMethods
-    def on(attribute)
-      message = "Errors#on have been deprecated, use Errors#[] instead.\n"
-      message << "Also note that the behaviour of Errors#[] has changed. Errors#[] now always returns an Array. An empty Array is "
-      message << "returned when there are no errors on the specified attribute."
-      ActiveSupport::Deprecation.warn(message)
-
-      errors = self[attribute]
-      errors.size < 2 ? errors.first : errors
-    end
-
-    def on_base
-      ActiveSupport::Deprecation.warn "Errors#on_base have been deprecated, use Errors#[:base] instead"
-      ActiveSupport::Deprecation.silence { on(:base) }
-    end
-
-    def add_to_base(msg)
-      ActiveSupport::Deprecation.warn "Errors#add_to_base(msg) has been deprecated, use Errors#add(:base, msg) instead"
-      self[:base] << msg
-    end
-
-    def invalid?(attribute)
-      ActiveSupport::Deprecation.warn "Errors#invalid?(attribute) has been deprecated, use Errors#[attribute].any? instead"
-      self[attribute].any?
-    end
-
-    def each_full
-      ActiveSupport::Deprecation.warn "Errors#each_full has been deprecated, use Errors#to_a.each instead"
-      to_a.each { |error| yield error }
-    end
-  end
-end