caboose-cms 0.3.90 → 0.3.91

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZTUzNGI0MTc3Mzc3Njg0ZGMyZWRmNDM1OThjOTU4YTUwMWIxZjMyOQ==
+    ZWJlYWJiMWRhNDA4MjY4ZTBhNTNkZDhjMjc4OTVmYTcxNmJhZTFmYw==
   data.tar.gz: !binary |-
-    NmJlMDY1NDE5OTg1YzlmZjRmYmJkNmFmODE2ZGQ4MDczOGRlODM3Mw==
+    NWFiYTE5NGZlYmNmZGFiZTg1Y2I0ZTUxMjI1NzI3MzVmMTI2ODcyMA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NzdiYmNlNDFhZTg2YWE2NTFhNDlmMzA0YjhmZGE0MTI0ZjVhNTBjMTU3NzY5
-    N2UyNWUxNDU1MGE1ZDViMTJkNTIyODFkNjU1ZWM2MTY3Y2RmOGZhMzAxMGVi
-    NjJlMzAyNTkyMDg5OTU0MGYyNjg1N2FmNTJhMjRlMzYyOTg5ODg=
+    MTgyNGJmMGI3ZGE2NGRmYTc4ZWZmNGU1N2E3MjYyZmQ0N2I5ODU5OTNjMzQ0
+    MWVmZmY0ZGM4NjQ0ODEzNmE2MjM5OTU4MzliY2MyNTAzNzA4OTVkMzMzZmQw
+    OTY3ZjIwNmRkMDk0NGQyZWIxODBmY2QxNjgyNTcyZjBmZWI1ZTY=
   data.tar.gz: !binary |-
-    ZGJjZGI5MmIzOWZlODAzOTAwODQ3M2JmNDNkMzY3ZjRmNTEzMDBmODE0ZjYw
-    N2YyN2RmYTY2YjU4YTA1MDMyMzNhZDUyZDA4NWIxYThkNjdhODE2NmU1Yjgz
-    ZTg0MzYyMTgzODM5NGRjYTdhZTYyZWIwMzcwYWYwMTRiMjI0YzA=
+    YmUzYThlZWFjNjc1YzQ2ZTU1ZjVjOTA1OWY4MjRiYzkzZWE2MjY3MGFkMjRk
+    ODgwZmVkZGE2MmNjN2M0MjU3YzBhNzIyYzk1YzJlYTQ2NTg0ODk5MzUwOTI3
+    NmYyMWNiZjY0YzYxOGMzZmIxYzUxN2E2NjY5YmVhNGM1NDBkZmU=

data/app/controllers/caboose/application_controller.rb

@@ -69,6 +69,7 @@ module Caboose
     # Logs a user out
     def logout_user
       cookies.delete(:caboose_user_id)
+      session["app_user"] = nil
       reset_session
     end
       

data/app/controllers/caboose/logout_controller.rb

@@ -2,7 +2,9 @@ module Caboose
   class LogoutController < ApplicationController
     # GET /logout
     def index
-      logout_user      
+      logout_user
+      elo = User.find(User::LOGGED_OUT_USER_ID)        
+      login_user(elo)      
       redirect_to "/"    
     end
   end

data/app/controllers/caboose/pages_controller.rb

@@ -19,8 +19,8 @@ module Caboose
         return
       end
 
-      user = logged_in_user      
-      if !user.is_allowed(page, 'view')
+      user = logged_in_user            
+      if !user.is_allowed(page, 'view')        
         if user.id == User::LOGGED_OUT_USER_ID	
           redirect_to "/modal/login?return_url=" + URI.encode(request.fullpath)		  		
           return

data/app/models/caboose/user.rb

@@ -22,11 +22,13 @@ class Caboose::User < ActiveRecord::Base
   end
   
   def self.logged_out_user
-    return self.where('username' => 'elo').first
+    #return self.where('username' => 'elo').first
+    return self.where(:id => self::LOGGED_OUT_USER_ID).first
   end
   
   def self.logged_out_user_id
-    return self.where('username' => 'elo').limit(1).pluck(:id)[0]
+    #return self.where('username' => 'elo').limit(1).pluck(:id)[0]
+    return self::LOGGED_OUT_USER_ID
   end
   
   def is_allowed(resource, action)

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.3.90'
+  VERSION = '0.3.91'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.3.90
+  version: 0.3.91
 platform: ruby
 authors:
 - William Barry