caboose-cms 0.1.93 → 0.1.96

data/app/controllers/caboose/application_controller.rb

@@ -57,7 +57,7 @@ module Caboose
     # Returns the currently logged in user
     def logged_in_user
       if (!logged_in?)
-        return User.where('username' => 'elo').first
+        return User.logged_out_user
       end
       #return nil if !logged_in?
       return session["app_user"]

data/app/controllers/caboose/pages_controller.rb

@@ -23,7 +23,7 @@ module Caboose
 		  
 		  user = logged_in_user
 		  if (!user.is_allowed(page, 'view'))
-		  	if (user.id == User.LOGGED_OUT_USER_ID)	
+		  	if (user.id == User.logged_out_user_id)	
 		  	  redirect_to "/login?return_url=" + URI.encode(request.fullpath)		  		
 		  		return
 		  	else

data/app/models/caboose/page.rb

@@ -155,11 +155,11 @@ class Caboose::Page < ActiveRecord::Base
 	end
 	
 	def self.is_allowed(user, page_id, action)
-		user = User.find(User.LOGGED_OUT_USER_ID) if user.nil?
+		user = User.logged_out_user if user.nil?
 
 		# Allow a user id to be sent instead of a user object
 		user = User.find(user) if user.is_a?(Integer)
-		user.role_ids = [User.LOGGED_OUT_ROLE_ID] if user.role_ids.nil?
+		user.role_ids = [Role.logged_out_role_id] if user.role_ids.nil?
 
 		t = PagePermission.table		
 		reqs = nil

data/app/models/caboose/role.rb

@@ -8,11 +8,31 @@ class Caboose::Role < ActiveRecord::Base
 
   attr_accessible :name, :description, :parent_id
   attr_accessor :children
+     
+  def self.admin_role
+    return self.where('name' => 'Admin').first
+  end
+  
+  def self.admin_role_id
+    return self.where('name' => 'Admin').limit(1).pluck(:id)[0]
+  end
+  
+  def self.logged_out_role
+    return self.where('name' => 'Everyone Logged Out').first
+  end
+  
+  def self.logged_out_role_id
+    return self.where('name' => 'Everyone Logged Out').limit(1).pluck(:id)[0]
+  end
+  
+  def self.logged_in_role
+    return self.where('name' => 'Everyone Logged In').first
+  end
+  
+  def self.logged_in_role_id
+    return self.where('name' => 'Everyone Logged In').limit(1).pluck(:id)[0]
+  end
   
-  ADMIN_ROLE_ID = 1
-  LOGGED_OUT_ROLE_ID = 2
-  LOGGED_IN_ROLE_ID = 3
-   
   def is_allowed(resource, action)
     
     # Check for the admin permission

data/app/models/caboose/user.rb

@@ -4,7 +4,13 @@ class Caboose::User < ActiveRecord::Base
   has_and_belongs_to_many :roles
   attr_accessible :email, :first_name, :last_name, :username, :token, :password
   
-  LOGGED_OUT_USER_ID = 2
+  def self.logged_out_user
+    return self.where('username' => 'elo').first
+  end
+  
+  def self.logged_out_user_id
+    return self.where('username' => 'elo').limit(1).pluck(:id)[0]
+  end
   
   def is_allowed(resource, action)
     for role in roles

data/app/views/layouts/caboose/_station.html.erb

@@ -18,7 +18,7 @@ end
 <div id='caboose_station_wrapper' class='state_<%= initial_state %>'<%= raw style %>>
 <div id='caboose_station'>
   
-  <% if (@user.nil? || @user.id == Caboose::User::LOGGED_OUT_USER_ID) %>
+  <% if (@user.nil? || @user == Caboose::User.logged_out_user) %>
     <h2>Caboose Station</h2>
     <a href='/login' class='login'>Login</a>
   <% else %>

data/app/views/layouts/caboose/_top_nav.html.erb

@@ -1,6 +1,6 @@
 
 <div id='top_nav'>
-  <% if (@user.nil? || @user.id == Caboose::User::LOGGED_OUT_USER_ID) %>
+  <% if (@user.nil? || @user == Caboose::User.logged_out_user) %>
     <%= link_to "Login", "/login?return_url=#{request.fullpath}", :id => 'caboose_login' %>
   <% else %>
     <%= link_to "Control Panel", '#', :id => 'caboose_conductor' %>

data/lib/caboose/caboose_helper.rb

@@ -120,6 +120,8 @@ class CabooseHelper
   def init_assets
     puts "Adding the layout files..."
     init_file('app/views/layouts/layout_default.html.erb')
+    puts "Adding the layout files..."
+    init_file('app/assets/stylesheets/login.css')
   end
   
   def init_tinymce

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.1.93'
+  VERSION = '0.1.96'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.1.93
+  version: 0.1.96
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-13 00:00:00.000000000 Z
+date: 2013-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -228,6 +228,7 @@ files:
 - lib/caboose/version.rb
 - lib/caboose.rb
 - lib/sample_files/layout_default.html.erb
+- lib/sample_files/login.css
 - lib/sample_files/tinymce.yml
 - lib/tasks/caboose.rake
 - MIT-LICENSE