authie 1.2.2 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 721f8e38c433954e5ba8db0482bd99a1d22bc5be
-  data.tar.gz: bce1c42caec7d276d0a54a4aae9a447e92ad8dd4
+  metadata.gz: a0750005f312781bb6b816fd972796ef8a0ddd98
+  data.tar.gz: f7350c0b084ed528cf5d4228bb940dc63b3faf75
 SHA512:
-  metadata.gz: de1b61f6d168f52317cc248cafac501364af37cff355e3ca258cb33c70b1565b8093a5a2b89c81435920167e15be7e81ac1e7aa54a37ebf26539ec99cd092c0e
-  data.tar.gz: 427175384881e617289b231c63f629710cd3c7c53a54f9c3d971e3f4ec2ed2bb2640c03c614ba46948ca1f4e363ce7c4d2686e82b1c918d1d8e3ac7c6817812e
+  metadata.gz: 9dc85c037deb3ec2c05b83a1e4d456503ad7866b7f4fd5a98926a32298f4503a35c23a7371181d448b3ea8785e34a6a88e61aa70aed9c9432b9727abdde437fc
+  data.tar.gz: bc3089c0de810207c1f091d02389f194bbdc214ab8e363a7bd6e3fe9e3d4af6707c3421888061855394c2c17921ff1ed87eac9ce35c61765623bf6ff32d8db26

data/lib/authie/session.rb

@@ -68,18 +68,31 @@ module Authie
           raise InactiveSession, "Session is no longer active"
         end
 
-        if self.expires_at && self.expires_at < Time.now
+        if self.expired?
           invalidate!
           raise ExpiredSession, "Persistent session has expired"
         end
 
-        if self.expires_at.nil? && self.last_activity_at && self.last_activity_at < Authie.config.session_inactivity_timeout.ago
+        if self.inactive?
           invalidate!
           raise InactiveSession, "Non-persistent session has expired"
         end
       end
     end
 
+    # Has this persistent session expired?
+    def expired?
+      self.expires_at &&
+      self.expires_at < Time.now
+    end
+
+    # Has a non-persistent session become inactive?
+    def inactive?
+      self.expires_at.nil? &&
+      self.last_activity_at &&
+      self.last_activity_at < Authie.config.session_inactivity_timeout.ago
+    end
+
     # Allow this session to persist rather than expiring at the end of the
     # current browser session
     def persist!

data/lib/authie/version.rb

@@ -1,3 +1,3 @@
 module Authie
-  VERSION = '1.2.2'
+  VERSION = '1.2.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: authie
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
 platform: ruby
 authors:
 - Adam Cooke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-16 00:00:00.000000000 Z
+date: 2015-07-22 00:00:00.000000000 Z
 dependencies: []
 description: A Rails library for storing user sessions in a backend database
 email: