activemodel 3.2.1 → 3.2.2.rc1

data/CHANGELOG.md

@@ -1,6 +1,6 @@
 ## Rails 3.2.1 (January 26, 2012) ##
 
-* No changes.
+*   No changes.
 
 
 ## Rails 3.2.0 (January 20, 2012) ##

data/lib/active_model/attribute_methods.rb

@@ -263,7 +263,7 @@ module ActiveModel
           unless instance_method_already_implemented?(method_name)
             generate_method = "define_method_#{matcher.method_missing_target}"
 
-            if respond_to?(generate_method)
+            if respond_to?(generate_method, true)
               send(generate_method, attr_name)
             else
               define_optimized_call generated_attribute_methods, method_name, matcher.method_missing_target, attr_name.to_s

data/lib/active_model/errors.rb

@@ -233,7 +233,7 @@ module ActiveModel
     def add(attribute, message = nil, options = {})
       message = normalize_message(attribute, message, options)
       if options[:strict]
-        raise ActiveModel::StrictValidationFailed,  message
+        raise ActiveModel::StrictValidationFailed, full_message(attribute, message)
       end
 
       self[attribute] << message

data/lib/active_model/mass_assignment_security.rb

@@ -224,12 +224,12 @@ module ActiveModel
 
   protected
 
-    def sanitize_for_mass_assignment(attributes, role = :default)
+    def sanitize_for_mass_assignment(attributes, role = nil)
       _mass_assignment_sanitizer.sanitize(attributes, mass_assignment_authorizer(role))
     end
 
-    def mass_assignment_authorizer(role = :default)
-      self.class.active_authorizer[role]
+    def mass_assignment_authorizer(role)
+      self.class.active_authorizer[role || :default]
     end
   end
 end

data/lib/active_model/validations/validates.rb

@@ -1,7 +1,6 @@
 require 'active_support/core_ext/hash/slice'
 
 module ActiveModel
-
   # == Active Model validates method
   module Validations
     module ClassMethods
@@ -59,7 +58,7 @@ module ActiveModel
       #
       #   validates :name, :'film/title' => true
       #
-      # The validators hash can also handle regular expressions, ranges, 
+      # The validators hash can also handle regular expressions, ranges,
       # arrays and strings in shortcut form, e.g.
       #
       #   validates :email, :format => /@/
@@ -70,7 +69,7 @@ module ActiveModel
       # 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+, +:allow_nil+ and +:strict+ 
+      # Finally, the options +:if+, +:unless+, +:on+, +:allow_blank+, +:allow_nil+ and +:strict+
       # can be given to one specific validator, as a hash:
       #
       #   validates :password, :presence => { :if => :password_required? }, :confirmation => true
@@ -101,11 +100,11 @@ module ActiveModel
         end
       end
 
-      # This method is used to define validation that can not be corrected by end user
-      # and is considered exceptional. 
-      # So each validator defined with bang or <tt>:strict</tt> option set to <tt>true</tt>
-      # will always raise <tt>ActiveModel::InternalValidationFailed</tt> instead of adding error
-      # when validation fails
+      # This method is used to define validation that cannot be corrected by end
+      # user and is considered exceptional. So each validator defined with bang
+      # or <tt>:strict</tt> option set to <tt>true</tt> will always raise
+      # <tt>ActiveModel::StrictValidationFailed</tt> instead of adding error
+      # when validation fails.
       # See <tt>validates</tt> for more information about validation itself.
       def validates!(*attributes)
         options = attributes.extract_options!
@@ -118,7 +117,7 @@ module ActiveModel
       # 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 , :strict]
+        [:if, :unless, :on, :allow_blank, :allow_nil , :strict]
       end
 
       def _parse_validates_options(options) #:nodoc:

data/lib/active_model/version.rb

@@ -2,8 +2,8 @@ module ActiveModel
   module VERSION #:nodoc:
     MAJOR = 3
     MINOR = 2
-    TINY  = 1
-    PRE   = nil
+    TINY  = 2
+    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: 13
-  prerelease: 
+  hash: 15424071
+  prerelease: 6
   segments: 
   - 3
   - 2
+  - 2
+  - rc
   - 1
-  version: 3.2.1
+  version: 3.2.2.rc1
 platform: ruby
 authors: 
 - David Heinemeier Hansson
@@ -15,8 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-26 00:00:00 -08:00
-default_executable: 
+date: 2012-02-22 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
@@ -26,12 +27,14 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 13
+        hash: 15424071
         segments: 
         - 3
         - 2
+        - 2
+        - rc
         - 1
-        version: 3.2.1
+        version: 3.2.2.rc1
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -62,42 +65,41 @@ files:
 - CHANGELOG.md
 - MIT-LICENSE
 - README.rdoc
+- lib/active_model/attribute_methods.rb
+- lib/active_model/callbacks.rb
+- lib/active_model/conversion.rb
+- lib/active_model/dirty.rb
+- lib/active_model/errors.rb
+- lib/active_model/lint.rb
 - lib/active_model/locale/en.yml
-- lib/active_model/mass_assignment_security/sanitizer.rb
 - lib/active_model/mass_assignment_security/permission_set.rb
-- lib/active_model/railtie.rb
-- lib/active_model/observer_array.rb
-- lib/active_model/test_case.rb
-- lib/active_model/translation.rb
-- lib/active_model/naming.rb
+- lib/active_model/mass_assignment_security/sanitizer.rb
 - lib/active_model/mass_assignment_security.rb
-- lib/active_model/secure_password.rb
-- lib/active_model/errors.rb
+- lib/active_model/naming.rb
+- lib/active_model/observer_array.rb
 - lib/active_model/observing.rb
-- lib/active_model/callbacks.rb
-- lib/active_model/validations.rb
-- lib/active_model/version.rb
-- lib/active_model/dirty.rb
-- lib/active_model/conversion.rb
-- lib/active_model/serializers/xml.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/validations/exclusion.rb
-- lib/active_model/validations/length.rb
-- lib/active_model/validations/presence.rb
+- lib/active_model/serializers/xml.rb
+- lib/active_model/test_case.rb
+- lib/active_model/translation.rb
 - lib/active_model/validations/acceptance.rb
-- lib/active_model/validations/inclusion.rb
-- lib/active_model/validations/format.rb
 - lib/active_model/validations/callbacks.rb
 - lib/active_model/validations/confirmation.rb
+- lib/active_model/validations/exclusion.rb
+- lib/active_model/validations/format.rb
+- lib/active_model/validations/inclusion.rb
+- lib/active_model/validations/length.rb
+- lib/active_model/validations/numericality.rb
+- lib/active_model/validations/presence.rb
 - lib/active_model/validations/validates.rb
 - lib/active_model/validations/with.rb
-- lib/active_model/validations/numericality.rb
-- lib/active_model/lint.rb
-- lib/active_model/attribute_methods.rb
+- lib/active_model/validations.rb
 - lib/active_model/validator.rb
-- lib/active_model/serialization.rb
+- lib/active_model/version.rb
 - lib/active_model.rb
-has_rdoc: true
 homepage: http://www.rubyonrails.org
 licenses: []
 
@@ -120,16 +122,18 @@ 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: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.16
 signing_key: 
 specification_version: 3
 summary: A toolkit for building modeling frameworks (part of Rails).