defcon 1.0.4 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fe36f42ab8f13a126fb2e19b00c67e66afa673e5
-  data.tar.gz: f3931527f3b6f20a9174f338c057c117a7047a51
+  metadata.gz: cb885901605572fab3e04da2c50523cef2e39a5c
+  data.tar.gz: c92a6e9e93550503737a90929644c78216456fd6
 SHA512:
-  metadata.gz: cb4a117ec07e4bf17141986d5f4b9387836e86abfa26422422dc2b7d0cf90d6347b9b82e0c8ddfa17df500d8d7417c995ae0bcf40d321398b745939fd8840f0a
-  data.tar.gz: 77c50ce3c26b4ab71ac28c53d3c8c8d6f0731e1b639f8ce49f7031dce6dfbacb90b83c79963716f5d6adcb160b49538b4ec4f3670039dcaa9c91509a80bea972
+  metadata.gz: a383db74d4265aa4c177d1cea06c155774053eb79220067467b181f02ea19a40c4f7cdee199cd20187026d1b1e011c14cf0b9efc7da657a692f433ab24948f78
+  data.tar.gz: eda938120bb67e2b96c69e77c3b9e47c651061b3cb1b4ef0bfdc761c3432f7a31dcfedbe4fdd8d65318209a5c65c54827f78566ad1c1ca7e34b48f1137532538

data/lib/defcon.rb

@@ -13,7 +13,14 @@ module Defcon
   def self.current_admin_user(session)
     if ::Defcon.logged_in?(session)
       id = session[:admin_id]
-      return ::Defcon::AdminUser.find(id)
+      admin = ::Defcon::AdminUser.find_by_id(id)
+      if admin.nil?
+      	session[:admin_id] = nil
+      	session[:admin_username] = nil
+      	return nil
+      else
+      	return admin
+      end
     else
       return nil
     end
@@ -26,5 +33,5 @@ module Defcon
       return true
     end
   end
-  
+
 end

data/lib/defcon/version.rb

@@ -1,3 +1,3 @@
 module Defcon
-  VERSION = "1.0.4"
+  VERSION = "1.1.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: defcon
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.1.0
 platform: ruby
 authors:
 - Cleophus Robinson