Merge remote-tracking branch 'upstream/pull/5374'

[rails.git] / lib / session_persistence.rb

diff --git a/lib/session_persistence.rb b/lib/session_persistence.rb
index 7d45d1fc4e59af2c067aca4049f2f7d56808861f..0a9f1d2f1de13f75a8ebae1fd96d10b5951a7fb5 100644 (file)
--- a/lib/session_persistence.rb
+++ b/lib/session_persistence.rb
@@ -20,13 +20,18 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 module SessionPersistence
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 module SessionPersistence

-  private
+  class << self
+    private

 
 

-  # Install filter when we are included
-  def self.included(controller)
-    controller.after_filter :persist_session
+    # Install filter when we are included
+    def included(controller)
+      super
+      controller.after_action :persist_session
+    end

   end
 
   end
 

+  private
+

   # Override this method if you don't want to use session[:_remember_for].
   def session_persistence_key
     :_remember_for
   # Override this method if you don't want to use session[:_remember_for].
   def session_persistence_key
     :_remember_for


@@ -37,7 +42,7 @@ module SessionPersistence
   #   session_expires_after 1.hour
   #   session_expires_after 2.weeks
   def session_expires_after(seconds)
   #   session_expires_after 1.hour
   #   session_expires_after 2.weeks
   def session_expires_after(seconds)

-    session[session_persistence_key] = seconds 
+    session[session_persistence_key] = seconds.to_i

   end
 
   # Expire the session.
   end
 
   # Expire the session.


@@ -48,8 +53,8 @@ module SessionPersistence
 
   # Filter callback
   def persist_session
 
   # Filter callback
   def persist_session

-    if session[session_persistence_key]
-      request.session_options[:expire_after] = session[session_persistence_key]
-    end
+    request.session_options[:expire_after] = session[session_persistence_key] if session[session_persistence_key]
+  rescue StandardError
+    reset_session

   end
 end
   end
 end