caboose-cms 0.3.47 → 0.3.48

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NmQ5YTcxMDc4ZTFhMjQxMzg0N2I2NTZkNDNiNTliYzhjZmU2ZWQ3NA==
+    NjkzNjJlOTE3YjIxMGY5OTFkMGEzYzQ5ODM2M2QxYWY2NDVjMjllNQ==
   data.tar.gz: !binary |-
-    M2EyNGQ4ZWM4MTg4Yjc5ZjUyODhjYzliOTdhMTA4NmU0MTI0ODc2NA==
+    OTM3NGFlNTQxMDQwOGQwYzNlZDI0YjY1MmYwYmUyZDFhMzc3MjI5Nw==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    OGE1MDhmMDI2MmQ5ZmI2MjJhZjg3ODU3YjVkMDZiYjhjZjQwNDA4MGZhOWMx
-    NzE0NmVhYmIwZGMwZGM0YmUxMjRkNjdiNWZlODY1MmY1YTAwMGZmMzg1MjQx
-    YjZmYmYwOTIzZTQ5ZTY0OWEzNTIxNjBkZTE0MjE2YWVkY2FkNzY=
+    MWIyZGJlMzg5YTkyNzYxM2I3MDkwNTVhMDk2M2U4ODkyNGYwNzkxNmUxOGFj
+    NGI1YmI0N2ViM2NhZTM5NmIwZTA1MmM0ODVmOGZhNjg4Mjg1YTI3Zjk0YjU2
+    ZjIwMzcwOWJlNmI5MGYwNzE3MTI3Mjc5YzU5NDhkZmQ1YzY5ODA=
   data.tar.gz: !binary |-
-    MzIyYjk3OThiNzVjYTFmYzdjNWNkZTRkODM1Njk0YjdkZGE3Zjk4NDBiZWIx
-    YWY0YzY5MWE0NjZmZWYwMjhhNTkwZDRmZmNkZTg1Y2U1Nzc4MjMwZjhmNDk2
-    ODdiMzVkM2FkZGEyMDg4YWQwYjdhNjVmMTZmNjBlNGViZmUzMTY=
+    NDEzNjEzNTE1MGJmYmI3MzI1OTNkMjE0YWEyNzMyNmQ1MGFlZjhhOGE4ZTM2
+    YThhNzI4ZTJlOWM3YjM2NmI5NmMzOWJjMTQ3Zjg5YzdiMGY2ZGVjYTczNWEw
+    MmZlNjJmOGIyZjAyNDFjMjRmNTYyNTMwNzQ3MjljOTZiYmEyYmY=

data/app/controllers/caboose/application_controller.rb

@@ -3,26 +3,30 @@ module Caboose
 
     protect_from_forgery  
     before_filter :before_before_action
+    @find_page = true
     
     def before_before_action
       
       # Modify the built-in params array with URL params if necessary 
       parse_url_params if Caboose.use_url_params
-      
-      # Try to find the page 
-      @page = Page.page_with_uri(request.fullpath)
-      
+                  
       session['use_redirect_urls'] = true if session['use_redirect_urls'].nil?
       
       # Initialize AB Testing
-      AbTesting.init(request.session_options[:id])      
+      AbTesting.init(request.session_options[:id]) if Caboose.use_ab_testing      
       
-      @crumb_trail  = Caboose::Page.crumb_trail(@page)
+      # Try to find the page 
+      @page = Page.new
+      @crumb_trail  = []
 		  @subnav       = {}
       @actions      = {}
       @tasks        = {}
       @page_tasks   = {}
-      @is_real_page = false
+      @is_real_page = false      
+      if @find_page
+        @page = Page.page_with_uri(request.fullpath)
+        @crumb_trail  = Caboose::Page.crumb_trail(@page)		    
+      end
       
       # Sets an instance variable of the logged in user
       @logged_in_user = logged_in_user      
@@ -53,6 +57,12 @@ module Caboose
     def before_action      
     end
     
+    # Logs a user out
+    def logout_user
+      cookies.delete(:caboose_user_id)
+      reset_session
+    end
+      
     # Logs in a user
     def login_user(user, remember = false)
       session["app_user"] = user
@@ -147,7 +157,7 @@ module Caboose
 
     # Redirects to login if not logged in.
     def verify_logged_in
-      if (!logged_in?)
+      if !logged_in?
         redirect_to "/modal/login?return_url=" + URI.encode(request.fullpath)
         return false
       end      

data/app/controllers/caboose/logout_controller.rb

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

data/lib/caboose.rb

@@ -30,6 +30,10 @@ module Caboose
   mattr_accessor :use_url_params
   @@use_url_params = true
   
+  # Whether or not to use AB Testing
+  mattr_accessor :use_ab_testing
+  @@use_ab_testing = true
+  
   # Website name
   mattr_accessor :website_name
   @@website_name = "Website"

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.3.47'
+  VERSION = '0.3.48'
 end

metadata

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