mongoid_sessions 1.0.1 → 1.1.0

data/VERSION

@@ -1 +1 @@
-1.0.1
+1.1.0

data/lib/action_dispatch/session/mongoid_session_store.rb

@@ -3,6 +3,9 @@ require 'action_dispatch/middleware/session/abstract_store'
 module ActionDispatch
   module Session
 
+    class SessionExpiredException < Exception
+    end
+
     class MongoidSessionStore < ActionDispatch::Session::AbstractStore
 
       SESSION_RECORD_KEY = 'rack.session.record'
@@ -15,10 +18,7 @@ module ActionDispatch
       end
 
       def get_session(env, sid)
-        unless sid and session = session_class.find_by_session_id(sid)
-          sid = generate_sid
-          session = session_class.new(:session_id => sid, :data => {})
-        end
+        return nil unless sid and session = session_class.find_by_session_id(sid)
         env[SESSION_RECORD_KEY] = session
         [sid, session.data]
       end

data/lib/mongoid/session_store/session.rb

@@ -9,22 +9,47 @@ module Mongoid
 
       field :session_id
       field :raw_data
+      field :expires_at, :type => DateTime
+
+      DEFAULT_SESSION_EXPIRY = 60
 
       store_in :collection => :sessions, :database => 'mongoid_session_store'
 
+      before_update :set_expires_at
+
       def self.find_by_session_id(session_id)
         where(:session_id => session_id).last
       end
 
+      def self.session_expiry
+        ENV['SESSION_TIMEOUT'].to_i.minutes || DEFAULT_SESSION_EXPIRY.minutes
+      end
+
       def data
-        self.raw_data.present? && Marshal.load(Base64.decode64(self.raw_data)) || {}
+        self.raw_data.present? && Marshal.load(Base64.decode64(self.raw_data)).merge(:expires_at => self.expires_at) || {}
       end
 
-      def data=(raw)
-        raw ||= {}
+      def data=(raw={})
         self.raw_data = Base64.encode64(Marshal.dump(raw))
       end
 
+      def set_expires_at
+        if current?
+          self.expires_at = Time.now + Session.session_expiry
+        else
+          self.expires_at = nil
+        end
+      end
+
+      def current?
+        return true unless self.expires_at.present?
+        self.expires_at.in_time_zone > Time.now.in_time_zone
+      end
+
+      def expired?
+        ! current?
+      end
+
       def loaded?
         self.raw_data.present?
       end

data/lib/mongoid_sessions/version.rb

@@ -1,3 +1,3 @@
 module MongoidSessions
-  VERSION = "1.0.1"
+  VERSION = "1.1.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid_sessions
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-31 00:00:00.000000000 Z
+date: 2013-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongo