caboose-cms 0.2.93 → 0.2.94

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NDdhODU5NjFkMDk3NmMxYWY1ZWFmMWY5MDc3ZmFjMDZhNTA2ZWRhOQ==
+    NGUwMmFkNzY5NTVlYWJkYmNlMmUyZmQzMjc4NTk2NmFhN2Q0NTZjZA==
   data.tar.gz: !binary |-
-    MWI2ODBjNjgwNWI4OGMzNWE1MWIyM2EwODlmZjI2MzJhMzUxM2FmOQ==
+    ZmNlNjg1OTgzOWMyYmZiMmFjNGNkY2I5MTllMzM4OGEyZmY3MmQwNA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MGMwZTIwNDU5NTRjOGNkODBjNDQ0NWNjYmE4ZWY5NDQxZmEwMTc5OTgwN2Zj
-    YmVkMzk4ZTMwZWM1ZjExZjU2YTJmMDZiNzkzMmU0Zjk5Yzc0NDE3M2U4ZTY3
-    MWFhOTFhNWUwNWViMTE2MjIxZGY0MzQ5NGIzZGNmOGFlMzMzMWI=
+    NThiN2FlNjM5M2Q5YzIyOGFjN2RlZGM2Y2FlZjFkMTBiYzVmZTQ5NjY3Zjdm
+    YWYwYmMxYmFiMmIzNTdmNTkwY2ZkOGQ1MTk0ZWFiOGJjOTI0MjAyOGMwODkw
+    ZjU4MWQxZTA4MjYxMzUwYzMwYmJmOWQzZDNkMDU5ZDIzMmFkNGQ=
   data.tar.gz: !binary |-
-    NjlmYjVlNzZiMWI5NTZmN2QwZjhlNGU0MDM1MmQ0ODUwMzZlZmViMzA5NTgw
-    YWQxMDJlMTIxZThmNzQyNWVlYzE0NWUzMTgwZDI0MjgyNjUzYTdkYThjMDZm
-    ZWQ3NjQzYzNhNDhlMTQxOGEwMTFkOTQ0NjcwN2M5NjA5YmE5Mzg=
+    YmY4OGNkODZkZWRhOTIzODRkZmJhNWUxOWI2NGU3NDNhYWExMDRiMDRiNTVm
+    YmJmOWVhNjRjNjUyODg5M2UwNmJhMmUxYTI4NTMwOGIxZTEwY2U4Y2IwMzRm
+    NjdjNDc0MTk0OTQ3ZGJiZTIzYWRhZDU2M2I0MmE4NWE5ZjQwMjY=

data/app/controllers/caboose/application_controller.rb

@@ -29,13 +29,17 @@ module Caboose
     end
     
     # Logs in a user
-    def login_user(user)
+    def login_user(user, remember = false)
       session["app_user"] = user
+      cookies.permanent[:caboose_user_id] = user.id if remember
+      Caboose.log("remember = #{remember}")
+      Caboose.log(cookies[:caboose_user_id])      
     end
     
     # Returns whether or not a user is logged in
     def logged_in?
       validate_token
+      validate_cookie
       return true if !session["app_user"].nil? && session["app_user"] != false && session["app_user"].id != -1    
       return false
     end
@@ -53,6 +57,16 @@ module Caboose
       return true
     end
     
+    # Checks to see if a remember me cookie value is present.    
+    def validate_cookie
+      if cookies[:caboose_user_id] && User.exists?(cookies[:caboose_user_id])
+        user = User.find(cookies[:caboose_user_id])
+        login_user(user)
+        return true
+      end
+      return false
+    end
+    
     # Returns the currently logged in user
     def logged_in_user
       if (!logged_in?)

data/app/controllers/caboose/login_controller.rb

@@ -31,7 +31,8 @@ module Caboose
           if (user.nil? || user == false)
             resp.error = "Invalid credentials"
           else
-            login_user(user)
+            remember = params[:remember] && (params[:remember] == 1 || params[:remember] == "1")
+            login_user(user, remember)
             resp.redirect = return_url
           end
         end

data/app/controllers/caboose/logout_controller.rb

@@ -2,6 +2,7 @@ module Caboose
   class LogoutController < ApplicationController
     # GET /logout
     def index
+      cookies.delete(:caboose_user_id)
       reset_session
       redirect_to "/"    
     end

data/app/views/caboose/login/index.html.erb

@@ -7,6 +7,7 @@
 <input type='hidden'    name='return_url' value='<%= @return_url %>' />
 <input type='text'      name='username' id='username' placeholder='Login or email' />
 <input type='password'  name='password' id='password' placeholder='Password' />
+<input type='checkbox'  name='remember' id='remember' value='1' checked='true' /> Remember me
 <div id='message'></div>
 <p>
   <input type='button' id='btn_cancel' value='Cancel' onclick="parent.$.fn.colorbox.close();" />

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.2.93'
+  VERSION = '0.2.94'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.2.93
+  version: 0.2.94
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-26 00:00:00.000000000 Z
+date: 2013-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails