encrypted_cookie_store-instructure 1.0.4 → 1.0.5

data/encrypted_cookie_store-instructure.gemspec

@@ -1,9 +1,9 @@
 Gem::Specification.new do |s|
   s.name = %q{encrypted_cookie_store-instructure}
-  s.version = "1.0.4"
+  s.version = "1.0.5"
 
-  s.authors = ["Cody Cutrer", "Jacob Fugal"]
-  s.date = %q{2013-05-02}
+  s.authors = ["Cody Cutrer", "Jacob Fugal", "James Williams"]
+  s.date = %q{2013-12-20}
   s.extra_rdoc_files = [
     "LICENSE.txt"
   ]

data/lib/encrypted_cookie_store.rb

@@ -4,6 +4,8 @@ require 'zlib'
 class EncryptedCookieStore < ActionController::Session::CookieStore
   OpenSSLCipherError = OpenSSL::Cipher.const_defined?(:CipherError) ? OpenSSL::Cipher::CipherError : OpenSSL::CipherError
 
+  EXPIRE_AFTER_KEY = "encrypted_cookie_store.session_expire_after"
+
   class << self
     attr_accessor :data_cipher_type
   end
@@ -23,6 +25,7 @@ class EncryptedCookieStore < ActionController::Session::CookieStore
   end
 
   def call(env)
+    @options[:expire_after] = env[EXPIRE_AFTER_KEY] || @options[:expire_after]
     prepare!(env)
 
     old_session_data, raw_old_session_data, old_timestamp = all_unpacked_cookie_data(env)
@@ -36,7 +39,8 @@ class EncryptedCookieStore < ActionController::Session::CookieStore
     options = env[ENV_SESSION_OPTIONS_KEY]
     request = ActionController::Request.new(env)
 
-    @options[:expire_after] = options[:expire_after] || @options[:expire_after]
+    @options[:expire_after] = env[EXPIRE_AFTER_KEY] || options[:expire_after] || @options[:expire_after]
+    options[:expire_after] = @options[:expire_after]
 
     if !(options[:secure] && !request.ssl?) && (!session_data.is_a?(ActionController::Session::AbstractStore::SessionHash) || session_data.loaded? || options[:expire_after])
       session_data.send(:load!) if session_data.is_a?(ActionController::Session::AbstractStore::SessionHash) && !session_data.loaded?

metadata

@@ -1,16 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: encrypted_cookie_store-instructure
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
   prerelease: 
 platform: ruby
 authors:
 - Cody Cutrer
 - Jacob Fugal
+- James Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-02 00:00:00.000000000 Z
+date: 2013-12-20 00:00:00.000000000 Z
 dependencies: []
 description: A secure version of Rails' built in CookieStore
 email: