caboose-cms 0.3.100 → 0.3.101

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NWIyNGU5OTMwOGFjNDcwMmRlMWE1ZWRiMDZhMzg4ZmYxZTExMmQ1MA==
+    N2NlYzU4ZDY3MmRkNDQ1NmE0ZDFlYmNmNmY4ODU3YzEzYTEwYWFhMQ==
   data.tar.gz: !binary |-
-    OGQxMGIzNjdmYjRmMzU5ZDRhMzA0MDVlMjQ0MmQ2ZGE1ZmVlMmRkNg==
+    NzE1MjhlNmNhY2I4OGVhZTQxNThmZDdkZDVlNzZhNGYzNTA4NWU2ZQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MjNlZTc2NDRhNjY2ZTk4MmQ3Njc3ZTliMGI3ZGE1NDM0MTcwNDQyNWJmYzVi
-    NDY1NzFkZmVkMzkxOTc4MzMyNTA2Nzc0Njc5MzZjZTU3ZmU1MzM4MjFmMTEx
-    ZTAwMDYyNWMzOGU0M2JlNWZkNGU2ZmM1ODNiMGVkYWRhNmRiZmI=
+    YjRhZTAzYTQxNzA2ZTc2ZjU0YTI1MTMxMDBlNjhmMTBiYzc4ZGFkOTQ2MGI0
+    ZWRkY2M4NTE1NmY2NGUwZjM0ZWVhMzc5YjczZjAyNGMxMWJkM2Y5MWZjYmI2
+    ZTQ5ZGE5ZjI2Y2JhMWUzNzc5ZGIyNDE3MGNkOWJkMzFiZmNiOTY=
   data.tar.gz: !binary |-
-    NDM2YzJjOGMyY2ZhYmYyOTdmMTNmZGI0OTUxZDUxOTk0MmFjMDk2MjBhNjJh
-    ZmJiZmIzMmM4ZWQxYmU1ZTFkZmQwODNmZWUxODc4MWRjYmNiODMyYjgzMTFi
-    OTMyMjEwNGI1Nzk0NzgzN2E1MjBmOGRmZTM2MjI4ZWFiODk3MTM=
+    NDgyMWZmNTA0YmVmYzM2ODMxMTFmZmYxMzE3M2FjZmJkNDBhMGU2YTE2OTQz
+    ODgzZTAzYzE3OTZlMmU2ZTZlODNiYzkwZDkzNTkzY2E3OGRlNjNmMTVlODcw
+    YzRkOGQwZGI4ZDhhYzc0ZjdlOTc1YTVlZGQ4ZjgyMTI3MzBhZjY=

data/app/controllers/caboose/application_controller.rb

@@ -134,6 +134,7 @@ module Caboose
       @user = logged_in_user
       if (!@user.is_allowed(resource, action))
         @error = "You don't have permission to " + action + " " + resource
+        @return_url = request.fullpath
         render :template => "caboose/extras/error"
         return false
       end
@@ -159,6 +160,7 @@ module Caboose
       @user = logged_in_user
       unless @user.is_allowed(resource, action)
         @error = "You don't have permission to #{action} #{resource}"
+        @return_url = request.fullpath
         render :template => "caboose/extras/error"
         return false
       end

data/app/controllers/caboose/login_controller.rb

@@ -4,26 +4,30 @@ module Caboose
     
     # GET /login
     def index
+      if params[:logout]
+        logout_user
+        elo = User.find(User::LOGGED_OUT_USER_ID)        
+        login_user(elo)
+      end      
       @return_url = params[:return_url].nil? ? "/" : params[:return_url]
       @modal = params[:modal].nil? ? false : params[:modal]
       redirect_to @return_url and return if logged_in?
     end
     
     # POST /login
-    def login
+    def login      
       resp = StdClass.new('error' => '', 'redirect' => '')
       return_url = params[:return_url].nil? ? "/" : params[:return_url]
       
-      if (logged_in?)
+      if logged_in?
         resp.redirect = return_url
       else
         username = params[:username].downcase
         password = params[:password]
                            
-        if (username.nil? || password.nil? || password.strip.length == 0)
+        if username.nil? || password.nil? || password.strip.length == 0
           resp.error = "Invalid credentials"
-        else
-          
+        else          
           bouncer_class = Caboose::authenticator_class.constantize
           bouncer = bouncer_class.new
           login_resp = bouncer.authenticate(username, password)
@@ -37,8 +41,8 @@ module Caboose
             Caboose.plugin_hook('login_success')            
           end
         end
-      end            
-      render :json => resp
+      end
+      render :json => resp      
     end
     
     # GET /login/forgot-password

data/app/views/caboose/extras/error.html.erb

@@ -1,2 +1,3 @@
 <h1>Error</h1>
 <p class='note error'><%= @error %></p>
+<p><a href="/modal/login?logout=1&return_url=<%= @return_url %>">Login as a different user</a></p>

data/config/routes.rb

@@ -13,7 +13,7 @@ Caboose::Engine.routes.draw do
   get     "login/reset-password/:reset_id"  => "login#reset_password_form"
   post    "login/reset-password"            => "login#reset_password"  
   get     "login"                           => "login#index"
-  post    "login"                           => "login#login"
+  post    "login"                           => "login#login"  
   get     "logout"                          => "logout#index"
   get     "register"                        => "register#index"
   post    "register"                        => "register#register"

data/lib/caboose.rb

@@ -57,6 +57,10 @@ module Caboose
   
   # API key for timezonedb.com/api
   mattr_accessor :timezonedb_api_key
-  @@timezonedb_api_key = ''  
+  @@timezonedb_api_key = ''
+
+  # Session length (in hours)
+  mattr_accessor :session_length
+  @@session_length = 24  
   
 end

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.3.100'
+  VERSION = '0.3.101'
 end

data/lib/tasks/caboose.rake

@@ -53,6 +53,11 @@ namespace :caboose do
     `pg_restore --verbose --clean --no-acl --no-owner -h #{ddb['host']} -U #{ddb['username']} -d #{ddb['database']} #{dump_file}`
     
   end
+               
+  desc "Clears sessions older than the length specified in the caboose config from the sessions table"
+  task :clear_old_sessions => :environment do
+    ActiveRecord::SessionStore::Session.delete_all(["updated_at < ?", Caboose::session_length.hours.ago])        
+  end
   
   desc "Loads and refreshes the timezones from timezonedb.com"
   task :load_timezones => :environment do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.3.100
+  version: 0.3.101
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-19 00:00:00.000000000 Z
+date: 2014-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails