devise 4.0.2 → 4.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 06ed02a023c4f08459f19e001b801464a1caa5aa
-  data.tar.gz: a391638c22279f189bc36990578b0831d1da2471
+  metadata.gz: 71f8722abb5f39d461f25e52897d9805d34c126e
+  data.tar.gz: b23ee1e571b673174794685aec473b60ff9cf808
 SHA512:
-  metadata.gz: e1ddaa7384069b9bfb29976a4084f70c405ceee6e337951743868de1fd466a633762477b2e74e2d487503a65f2ce009d6b3465c86af7b29033d9f14dedd6ade9
-  data.tar.gz: e32035cd04f7ef0173842173e3a2be37f060f9e44a9c5bec6b4a1e23b12b738bd8f71c9472061389218ff9a796d604d037c5c6f45b165d9db586f77e82d2d97a
+  metadata.gz: 241fcc13d6e66b9ee774be880a5a66d2cf0b0c5af0f440e80b0807b80546c8c41ed00dfbe2e287f2ed5094083d8a9f12218a431fc69f16d08b231e23252f6313
+  data.tar.gz: c93cef3ab690017d030726734c6dbbeb5182072594aa908eed750a6374feed0d0f83aa6a28c76312affe6ec30cf6af81da268573e863867133eb67e043398c7a

data/CHANGELOG.md

@@ -1,4 +1,7 @@
-### Unreleased
+### 4.0.3 - 2016-05-15
+
+* bug fixes
+  * Fix overwriting the remember_token when a valid one already exists (by @ralinchimev).
 
 ### 4.0.2 - 2016-04-25
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    devise (4.0.2)
+    devise (4.0.3)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
       railties (>= 4.1.0, < 5.1)
@@ -176,4 +176,4 @@ DEPENDENCIES
   webrat (= 0.7.3)
 
 BUNDLED WITH
-   1.11.2
+   1.12.3

data/lib/devise/models/rememberable.rb

@@ -46,7 +46,7 @@ module Devise
       end
 
       def remember_me!
-        self.remember_token = self.class.remember_token if respond_to?(:remember_token)
+        self.remember_token ||= self.class.remember_token if respond_to?(:remember_token)
         self.remember_created_at ||= Time.now.utc
         save(validate: false) if self.changed?
       end

data/lib/devise/version.rb

@@ -1,3 +1,3 @@
 module Devise
-  VERSION = "4.0.2".freeze
+  VERSION = "4.0.3".freeze
 end

data/test/models/rememberable_test.rb

@@ -16,6 +16,18 @@ class RememberableTest < ActiveSupport::TestCase
     assert user.remember_created_at
   end
 
+  test 'remember_me should not generate a new token if valid token exists' do
+    user = create_user
+    user.singleton_class.send(:attr_accessor, :remember_token)
+    User.to_adapter.expects(:find_first).returns(nil)
+
+    user.remember_me!
+    existing_token = user.remember_token
+
+    user.remember_me!
+    assert_equal existing_token, user.remember_token
+  end
+
   test 'forget_me should not clear remember token if using salt' do
     user = create_user
     user.remember_me!

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: devise
 version: !ruby/object:Gem::Version
-  version: 4.0.2
+  version: 4.0.3
 platform: ruby
 authors:
 - José Valim
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-03 00:00:00.000000000 Z
+date: 2016-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: warden