active_model-password_reset 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5b7c6e4d0caad6983ad13bfb62061b840eaa8a1c
-  data.tar.gz: cc1d6a14750cacbd6dcaf85384748d909c36e878
+  metadata.gz: 350aa28e566951412752770887f4d988bf59dad6
+  data.tar.gz: 4cbf12f0ef0fbcd628e451767b205bba26a41cd1
 SHA512:
-  metadata.gz: cbebb4528d1fc6b6e49429b04c19a506def7840b6548ff70076b96b33582b7941aeeab4bfa18603c7077bd28e682ef787864c7d76d64122eca0cc5d8b5da71f8
-  data.tar.gz: ca7fa51cb2449af82a85a320b54b227a89e6ad36614083cd44a1b7990e3770b9c822005c694a3dd37846dde01d39f215ebbb86b6ece1e5de97ef8db7c0d1b1cf
+  metadata.gz: d0b9cad3924b13892cdc82b3b3aad53928ea73118b36cf4eec3a6d278c469d92c86a355157f9e44195acb0ad423f579e435656bde364cfd144711afa040a5492
+  data.tar.gz: b8a08e8bdfc624ba262bfa716d0dec253e45b77925dd18ea2c321ea69551719b7a0df2478cb948b26ebcb14f590891a68b31e484bb1f2b9ebcad7025c3a80262

data/README.md

@@ -78,7 +78,8 @@ If you don't like the default behavior, you can always inherit the session model
     class PasswordReset < ActiveModel::PasswordReset
       EXPIRATION_TIME = 1.hour
 
-      def user
+      def email=(email)
+        @email = email
         @user = Admin.find_by(email: email)
       end
     end

data/lib/active_model/password_reset.rb

@@ -25,10 +25,12 @@ module ActiveModel
       email = user.email
       digest = Digest::MD5.digest(user.password_digest)
       expires_at = Time.now.to_i + EXPIRATION_TIME
-      MessageVerifier.generate([email, digest, expires_at])
+      token = MessageVerifier.generate([email, digest, expires_at])
+      CGI.escape(token)
     end
 
-    def self.find(token)
+    def self.find(escaped_token)
+      token = CGI.unescape(escaped_token)
       email, digest, expires_at = MessageVerifier.verify(token)
       raise TokenExpired if Time.now.to_i > expires_at.to_i
       new(email: email).tap do |password_reset|

data/lib/active_model/password_reset/version.rb

@@ -1,5 +1,5 @@
 module ActiveModel
   class PasswordReset
-    VERSION = "1.0.1"
+    VERSION = "1.0.2"
   end
 end

data/test/password_reset_test.rb

@@ -31,6 +31,7 @@ class PasswordResetTest < Test::Unit::TestCase
     @password_reset.valid?
     token = @password_reset.token
     assert token.present?
+    assert !token.include?("/")
     password_reset = ActiveModel::PasswordReset.find(token)
     assert_equal @password_reset.email, password_reset.email
     assert password_reset.user.present?
@@ -50,7 +51,7 @@ class PasswordResetTest < Test::Unit::TestCase
 
   def test_find_raises_exception_with_invalid_email
     token = ActiveModel::PasswordReset::MessageVerifier.generate(["invalid@example.com", Digest::MD5.digest("alicedigest"), Time.now.to_i + 3600])
-    assert_raises(ActiveModel::PasswordReset::EmailInvalid) { ActiveModel::PasswordReset.find(token) }
+    assert_raises(ActiveModel::PasswordReset::EmailInvalid) { ActiveModel::PasswordReset.find(CGI.escape(token)) }
   end
 
   def test_find_raises_exception_with_invalid_token
@@ -59,11 +60,11 @@ class PasswordResetTest < Test::Unit::TestCase
 
   def test_find_raises_exception_with_expired_token
     token = ActiveModel::PasswordReset::MessageVerifier.generate(["alice@example.com", Digest::MD5.digest("alicedigest"), Time.now.to_i - 3600])
-    assert_raises(ActiveModel::PasswordReset::TokenExpired) { ActiveModel::PasswordReset.find(token) }
+    assert_raises(ActiveModel::PasswordReset::TokenExpired) { ActiveModel::PasswordReset.find(CGI.escape(token)) }
   end
 
   def test_find_raises_exception_with_changed_password
     token = ActiveModel::PasswordReset::MessageVerifier.generate(["alice@example.com", Digest::MD5.digest("anotheralicedigest"), Time.now.to_i + 3600])
-    assert_raises(ActiveModel::PasswordReset::PasswordChanged) { ActiveModel::PasswordReset.find(token) }
+    assert_raises(ActiveModel::PasswordReset::PasswordChanged) { ActiveModel::PasswordReset.find(CGI.escape(token)) }
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_model-password_reset
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Kuba Kuźma
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-31 00:00:00.000000000 Z
+date: 2014-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel