activemodel 4.0.0.rc1 → 4.0.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 250ef70b10d4ec2e30333cfffc80da63aed87895
-  data.tar.gz: 69c232cc5ed875faedbb29a0f0d6c1a01bcf5d19
+  metadata.gz: 6aa2aecf4bda96a7e235db9ea86b18694f38eb1f
+  data.tar.gz: 151da99081ef1acbec2e9a36b9714f152a96f381
 SHA512:
-  metadata.gz: 0be6ba150a3151982443cf95e5c2a04da6af1b807282767e5ca44a4367830b070cbaa631dffaf3d65494a9e8cafe72f6ba19dcdb71d504c01009902a09865964
-  data.tar.gz: 836ccca90ace183c3e7944cbefb229a369db445f34fe68289d9af0444e29058f6834b9495b5554d95180c8777517977009eb94ad5de1d4880bdbc0125616bbaa
+  metadata.gz: 3be8435d14cfcd59406f8690f8e870bed760dbf9040d1876debbb6312d25fcf5a776543edf41d864c22df17697656d60821bae0518223a6224c8e3c6634038be
+  data.tar.gz: 694318bbec36b0d99869b78f3e0c232ac17606b26821e3f2e40011750089054c40deb8c6f6e9a57c4bda2169f4f84e61d0d3d57a16dfc3a7789dccebbb449e60

data/CHANGELOG.md

@@ -1,4 +1,11 @@
-## Rails 4.0.0 (unreleased) ##
+## Rails 4.0.0.rc2 (June 11, 2013) ##
+
+*   Fix regression in has_secure_password. When a password is set, but a
+    confirmation is an empty string, it would incorrectly save.
+
+    *Steve Klabnik* and *Phillip Calvin*
+
+## Rails 4.0.0.rc1 (April 29, 2013) ##
 
 *   Add `ActiveModel::Errors#full_messages_for`, to return all the error messages
     for a given attribute.

data/lib/active_model/lint.rb

@@ -98,7 +98,7 @@ module ActiveModel
 
       private
         def model
-          assert @model.respond_to?(:to_model), "The object should respond_to to_model"
+          assert @model.respond_to?(:to_model), "The object should respond to to_model"
           @model.to_model
         end
 

data/lib/active_model/secure_password.rb

@@ -56,8 +56,9 @@ module ActiveModel
         include InstanceMethodsOnActivation
 
         if options.fetch(:validations, true)
-          validates_confirmation_of :password
+          validates_confirmation_of :password, if: lambda { |m| m.password.present? }
           validates_presence_of     :password, :on => :create
+          validates_presence_of     :password_confirmation, if: lambda { |m| m.password.present? }
 
           before_create { raise "Password digest missing on new record" if password_digest.blank? }
         end
@@ -106,9 +107,7 @@ module ActiveModel
       end
 
       def password_confirmation=(unencrypted_password)
-        unless unencrypted_password.blank?
-          @password_confirmation = unencrypted_password
-        end
+        @password_confirmation = unencrypted_password
       end
     end
   end

data/lib/active_model/version.rb

@@ -1,7 +1,7 @@
 module ActiveModel
   # Returns the version of the currently loaded ActiveModel as a Gem::Version
   def self.version
-    Gem::Version.new "4.0.0.rc1"
+    Gem::Version.new "4.0.0.rc2"
   end
 
   module VERSION #:nodoc:

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activemodel
 version: !ruby/object:Gem::Version
-  version: 4.0.0.rc1
+  version: 4.0.0.rc2
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-29 00:00:00.000000000 Z
+date: 2013-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.0.0.rc1
+        version: 4.0.0.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.0.0.rc1
+        version: 4.0.0.rc2
 - !ruby/object:Gem::Dependency
   name: builder
   requirement: !ruby/object:Gem::Requirement
@@ -104,7 +104,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.0.2
 signing_key: 
 specification_version: 4
 summary: A toolkit for building modeling frameworks (part of Rails).