caboose-cms 0.1.35 → 0.1.78

data/README.md

@@ -1,4 +1,113 @@
-Caboose
-=======
+<h1>Caboose CMS</h1>
+<p>Caboose is a simple yet flexible and powerful content management system that runs 
+on top of ruby on rails.  It handles users, roles, permissions, and the login process.
+In addition, it handles content pages and their URLs.  It has a layout system that 
+allows a developer to easily customize the look and feel of each page.</p>
 
-Ruby on rails content management system
+<ul>
+<li><a href='#installation'>Installation</a></li>
+<li><a href='#layouts'>Layouts</a></li>
+<li><a href='#plugins'>Plugins</a></li>
+</ul>
+
+<a name='installation'></a><h2>Installation</h2>
+<p>Install the caboose-cms gem:</p>
+<pre>
+$ gem install caboose-cms
+</pre>
+<p>Create a new rails app configured to use Caboose:</p>
+<pre>
+$ caboose new my_caboose_app
+</pre>
+<p>Now go create a local MySQL database called <code>my_caboose_app_development</code>. Then let Caboose install the database:</p>
+<pre>
+$ cd my_caboose_app
+$ rake caboose:db
+</pre>
+<p>That's it! To test it out, start your rails server:</p>
+<pre>
+$ rails server
+</pre>
+<p>And go check out http://localhost:3000</p>
+
+<a name='layouts'></a><h2>Layouts</h2>
+<p>Caboose already handles the page editing process, but you need to be able to 
+control the layout for each of those pages.  You do that with layouts.  Caboose 
+has a simple layout system.  You control which layout each page uses.  There are three options:
+<dl>
+  <dt>Default layout:</dt>
+  <dd><p>The layout that any page by default will use if any other layout options are not set.  This layout resides in the <code>layout_default.html.erb</code> file.</p></dd>
+  <dt>Per page layout:</dt>
+  <dd>
+    <p>Just create a new layout called <code>layout_&lt;page_id&gt;.html.erb</code>.</p>
+    <p>Example: <code>layout_37.html.erb</code></p>
+  </dd>
+  <dt>Per type layout:</dt>
+  <dd>
+    <p>If you need multiple pages to use a common layout, just create a layout with a name.</p>
+    <p>Examples: <code>layout_about.html.erb</code>, <code>layout_listing.html.erb</code></p>
+  </dd>
+</dl>
+<p>For each layout, a few things must exist in the layout for it to work properly with Caboose.
+You must include the following:</p>
+<ul>
+  <li>
+    <p>CSS and CSRF in the head:</p>
+<pre>
+&lt;%= yield :css %&gt;
+&lt;%= csrf_meta_tags %&gt;
+</pre>
+  </li>
+  <li>
+    <p>The top nav login/control panel link:</p>
+<pre>
+&lt;%= render :partial => 'layouts/caboose/top_nav' %&gt;
+</pre>
+  </li>
+  <li>
+    <p>The top nav login/control panel link:</p>
+<pre>
+&lt;%= render :partial => 'layouts/caboose/top_nav' %&gt;
+</pre>
+  </li>
+  <li>
+    <p>The station and javascript in the footer:</p>
+<pre>
+&lt;%= render :partial => 'layouts/caboose/station' %&gt;
+&lt;%= yield :js %&gt;
+</pre>
+  </li>
+</ul>
+<p>You have access to the <code>@page</code> object in the layout.  Here's a bare-bones example of all the elements:
+
+<pre>
+&lt;!DOCTYPE html&gt;
+&lt;html&gt;
+&lt;head&gt;
+&lt;title&gt;My App&lt;/title&gt;
+&lt;%= yield :css %&gt;
+&lt;%= csrf_meta_tags %&gt;
+&lt;/head&gt;
+&lt;body;&gt;
+&lt;%= render :partial =&gt; 'layouts/caboose/top_nav' %&gt;
+
+&lt;h1&gt;&lt;%= raw @page.title %&gt;&lt;/h1&gt;
+&lt;%= raw @page.content %&gt;  
+
+&lt;%= render :partial =&gt; 'layouts/caboose/station' %&gt;
+&lt;%= yield :js %&gt;
+&lt;/body&gt;
+&lt;/html&gt;
+</pre>
+
+<a name='plugins'><h2>Plugins</h2>
+<p>To add new functionality to the Caboose station, extend the Caboose::CaboosePlugin
+object and override the methods you'd like to implement.  The existing hooks
+are the following:</p>
+
+<dl>
+  <dt><code>String page_content(String str)</code></dt>
+  <dd>Manipulate the page content before it's shown on the screen.</dd>  
+  <dt><code>Array admin_nav(Array arr)</code></dt>
+  <dd>Add items to the navigation that appears in the Caboose station.</dd>
+</dl>

data/app/assets/javascripts/caboose/application.js

@@ -10,7 +10,6 @@
 // WARNING: THE FIRST BLANK LINE MARKS THE END OF WHAT'S TO BE PROCESSED, ANY BLANK LINE SHOULD
 // GO AFTER THE REQUIRES BELOW.
 //
-//= require caboose_before
 //= require jquery
 //= require jquery_ujs
 //= require jquery.ui.all
@@ -32,7 +31,8 @@
 //= require attribute/select
 //= require attribute/texarea
 //= require attribute/textjs
+//= require attribute/h1
 //= require attribute/time
 //= require attribute/video
 //= require caboose/station
-//= require caboose_after
+//= require application

data/app/assets/javascripts/caboose/station.js

@@ -5,27 +5,32 @@ CabooseStation = Class.extend({
     conductor: false,
     state: 'min', // left, right, or min
     open_tabs: [], // Currently open tabs
+    wrapper_width: 0,
     
     init: function()
     {       
+      this.wrapper_width = $('#caboose_station_wrapper').width();
       this.attach_dom();
+      $('body').css('overflow', 'scroll-y'); 
       //alert(this.open_tabs);
 
-      if ($('#caboose_station').hasClass('state_left'))
+      if ($('#caboose_station_wrapper').hasClass('state_left'))
       {
-        $('#caboose_station').css('left', 0);
-        $('#caboose_station').show();
+        $('#caboose_station_wrapper').css('left', 0);
+        $('#caboose_station_wrapper').show();
         this.state = 'left';
       }
-      else if ($('#caboose_station').hasClass('state_right'))
+      else if ($('#caboose_station_wrapper').hasClass('state_right'))
       {
-        $('#caboose_station').css('right', 0);
-        $('#caboose_station').show();
+        $('#caboose_station_wrapper').css('right', 0);
+        $('#caboose_station_wrapper').show();
         this.state = 'right';
       }
       else
       {
-        $('#caboose_station').hide();
+        $('#caboose_station_wrapper').css('right', 0);
+        $('#caboose_station_wrapper').css('width', 0);
+        $('#caboose_station_wrapper').show();
         this.state = 'min';
       }
     },
@@ -38,7 +43,7 @@ CabooseStation = Class.extend({
         this2.open_tabs[this2.open_tabs.length] = id;
       });
       
-      $('#caboose_conductor').click(function() { this2.open(); });  
+      $('#caboose_conductor').click(function() { this2.right(); });  
       $('#caboose_station ul.hidden').hide();
       $('#caboose_station li a.top_level').click(function() {
         ul = $(this).parent().children("ul.hidden:first");
@@ -75,19 +80,16 @@ CabooseStation = Class.extend({
       });
     },
     
-    min: function()
+    min: function(func_after)
     {
       if (this.state == 'min')
         return;
-      if (this.state == 'right')
-      {
-        $('#caboose_station').hide('slide', { direction: 'right' }, 300);
-      }
-      else if (this.state == 'left')
-      {
-        var w = $(window).width();
-        $('#caboose_station').animate({ left: '+=' + w }, 300);
-      }
+      if (!func_after)
+        func_after = function() {};
+      
+      // Assume you never go from left to min
+      $('#caboose_station_wrapper').removeClass('state_left state_right').addClass('state_min');
+      $('#caboose_station_wrapper').animate({ width: 0 }, 300);
       this.state = 'min';
     },
     
@@ -96,17 +98,11 @@ CabooseStation = Class.extend({
       if (this.state == 'left')
         return;
       if (!func_after)
-        func_after = function() {};      
-      if (this.state == 'right')
-      {
-        var w = $(window).width() - $('#caboose_station').width();
-        $('#caboose_station').animate({ left: '-=' + w }, 300, func_after);
-      }
-      else if (this.state == 'min')
-      {
-        var w = $(window).width();
-        $('#caboose_station').animate({ left: '+=' + w }, 300, func_after);
-      }
+        func_after = function() {};
+
+      // Assume you never go from min to left
+      $('#caboose_station_wrapper').removeClass('state_min state_right').addClass('state_left');      
+      $('#caboose_station_wrapper').animate({ left: 0 }, 300, func_after);
       this.state = 'left'; 
     },
     
@@ -116,36 +112,19 @@ CabooseStation = Class.extend({
         return;
       if (!func_after)
         func_after = function() {};
+      
+      $('#caboose_station_wrapper').removeClass('state_min state_left').addClass('state_right');
       if (this.state == 'left')
       {
-        var w = $(window).width() - $('#caboose_station').width();
-        $('#caboose_station').animate({ left: '+=' + w }, 300, func_after);
+        $('#caboose_station_wrapper').animate({ right: 0 }, 300, func_after);
       }
       else if (this.state == 'min')
-      {
-        $('#caboose_station').show('slide', { direction: 'right' }, 300, func_after);        
+      {        
+        $('#caboose_station_wrapper').animate({ width: this.wrapper_width }, 300, func_after);
       }
       this.state = 'right'; 
     },
     
-    open: function() 
-    {
-      if (this.state == 'min')
-        this.right();
-      else if (this.state == 'right')
-        this.left();
-    },
-    
-    close: function() 
-    {
-      if (this.state == 'min')
-        return;
-      if (this.state == 'left')
-        this.right();
-      else if (this.state == 'right');
-        this.min();      
-    },
-    
     open_url: function(url)
     {      
       // Send the station settings first
@@ -168,26 +147,20 @@ CabooseStation = Class.extend({
           var w = $(window).width() - $('#caboose_station').width();
           var h = $(window).height();
           
-          $('#caboose_station').after(
+          $('#caboose_station_wrapper').after(
             $('<div/>')
               .attr('id', 'caboose_white')
               .css({
                 position: 'absolute',
-                right: -1,
+                right: 0,
                 top: 0,
-                width: 1,
+                width: 0,
                 height: h,
                 background: 'url(/assets/loading.gif) 40px 40px no-repeat #fff'
               })
             );
-          $('#caboose_station').removeClass('state_right').addClass('state_left');
-          $('#caboose_station').animate({ left: '-=' + w }, 300, function() {
-            //$.ajax({
-            //  url: url,
-            //  success: function(html) { window.location = url; }
-            //});
-            window.location = url; 
-          });
+          $('#caboose_station_wrapper').removeClass('state_right').addClass('state_left');
+          $('#caboose_station_wrapper').animate({ left: 0 }, 300, function() { window.location = url; });
           $('#caboose_white').animate({ width: '+=' + w }, 300);
         }
       });
@@ -207,9 +180,9 @@ CabooseStation = Class.extend({
         },
         success: function() {
           var w = $(window).width() - $('#caboose_station').width();
-          $('#caboose_station').removeClass('state_left').addClass('state_right');
+          $('#caboose_station_wrapper').removeClass('state_left').addClass('state_right');
           $('#content_wrapper').animate({ marginLeft: '+=' + w }, 300);
-          $('#caboose_station').animate({ left: '+=' + w }, 300, function() { window.location = url; })
+          $('#caboose_station_wrapper').animate({ left: w }, 300, function() { window.location = url; })
         }
       }); 
     }

data/app/assets/stylesheets/caboose/admin.css

@@ -22,6 +22,7 @@ body {
 }
 
 #content_wrapper {
+  position: relative;
   margin-left: 208px;
 }
 
@@ -50,7 +51,7 @@ body {
 p.current_page_editing {
   position: absolute;
   top: 84px;
-  left: 212px;
+  left: 4px;
   
   margin: 0;
   padding: 10px 10px 10px 30px;

data/app/assets/stylesheets/caboose/application.css

@@ -8,8 +8,7 @@
  * You're free to add application-wide styles to this file and they'll appear at the top of the
  * compiled file, but it's generally better to create a new file per style scope.
  *
- *= require caboose_before
  *= require modeljs
  *= require caboose/caboose
- *= require caboose_after
+ *= require application
  */

data/app/assets/stylesheets/caboose/caboose.css

@@ -4,7 +4,8 @@ body {
 }
 
 #wrapper {
-  width: 960px; 
+  width: 960px;
+  position: relative;
 }
 
 .page_links {
@@ -41,11 +42,22 @@ body {
   text-decoration: none;
 }
 
-#caboose_station {
+#caboose_white {
+  z-index: 99;
+}
+                
+#caboose_station_wrapper {
   display: none;
   position: absolute;
   top: 0;
   right: 0;
+  z-index: 100;
+  width: 210px;
+  height: 100%;
+  overflow: hidden;
+}
+
+#caboose_station {
   width: 208px;
   height: 100%;
   background: #e1e1e1;
@@ -172,8 +184,9 @@ body {
 #caboose_station ul.admin li#nav_item_pages       a.top_level:active { background-position: -424px -275px; }
 #caboose_station ul.admin li#nav_item_settings    a.top_level:active { background-position: -424px -328px; }
 
-#caboose_station.state_left a.close, 
-#caboose_station.state_right a.close {
+#caboose_station_wrapper.state_min a.close,
+#caboose_station_wrapper.state_left a.close, 
+#caboose_station_wrapper.state_right a.close {
   display: block;
   background-image: url('/assets/caboose/caboose_nav.png');
   background-repeat: no-repeat;
@@ -187,9 +200,12 @@ body {
   overflow: hidden;
 }
 
-#caboose_station.state_left  a.close        { background-position:    0px -422px; } /* Back  */
-#caboose_station.state_right a.close        { background-position:    0px -380px; } /* Close */
-#caboose_station.state_left  a.close:hover  { background-position: -212px -422px; } /* Back  */
-#caboose_station.state_right a.close:hover  { background-position: -212px -380px; } /* Close */
-#caboose_station.state_left  a.close:active { background-position: -424px -422px; } /* Back  */
-#caboose_station.state_right a.close:active { background-position: -424px -380px; } /* Close */
+#caboose_station_wrapper.state_left  a.close        { background-position:    0px -422px; }
+#caboose_station_wrapper.state_right a.close        { background-position:    0px -380px; }
+#caboose_station_wrapper.state_min   a.close        { background-position:    0px -380px; }
+#caboose_station_wrapper.state_left  a.close:hover  { background-position: -212px -422px; }
+#caboose_station_wrapper.state_right a.close:hover  { background-position: -212px -380px; }
+#caboose_station_wrapper.state_min   a.close:hover  { background-position: -212px -380px; }
+#caboose_station_wrapper.state_left  a.close:active { background-position: -424px -422px; }
+#caboose_station_wrapper.state_right a.close:active { background-position: -424px -380px; }
+#caboose_station_wrapper.state_min   a.close:active { background-position: -424px -380px; }

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

@@ -15,7 +15,8 @@ elsif (initial_state == 'right')
 end
 
 %>
-<div id='caboose_station' class='state_<%= initial_state %>'<%= raw style %>>
+<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) %>
     <h2>Caboose Station</h2>
@@ -48,5 +49,5 @@ end
     </ul>
     <a href='<%= return_url %>' class='close'>Close</a>
   <% end %>
-  
 </div>
+</div>

data/bin/caboose

@@ -5,49 +5,63 @@ require 'caboose'
 require 'caboose/engine'
 require 'caboose/version'
 require 'caboose/caboose_helper'
+require 'trollop'
 
-action = false
-action = ARGV[0] if ARGV.count > 0
-
-path = Dir.pwd
-path = ARGV[1] if ARGV.count > 1
-helper = CabooseHelper.new(path)
-
-case action
+#puts "Usage:"
+#puts "Create a new caboose app:"
+#puts "  caboose new <app_path>"
+#puts "Initialize an existing rails app as a new caboose app:"
+#puts "  caboose init [<app_path>]\n\n"
+#exit
   
-when 'v', 'version'
-  puts "Caboose CMS Version #{Caboose::VERSION}\n\n"
-  exit
+global_opts = Trollop::options do
+  banner <<-EOS
+--------------------------------------------------------------------------------  
+Caboose CMS
+A content management system built on top of Ruby on Rails.
+--------------------------------------------------------------------------------
+Usage:
+caboose new <path>
+caboose init [--force] [<path>]
+--------------------------------------------------------------------------------
+EOS
+  version "Caboose CMS Version #{Caboose::VERSION}\n\n"
+  stop_on ['version', 'new', 'init']
+end
 
-when 'help'
-  puts "Usage:"
-  puts "Create a new caboose app:"
-  puts "  caboose new <app_path>"
-  puts "Initialize an existing rails app as a new caboose app:"
-  puts "  caboose init [<app_path>]\n\n"
-  exit
+cmd = ARGV.shift
+case cmd
 
 when 'new'
   
-  if (ARGV.count != 2)
-    puts "Usage: caboose new <app_path>\n\n"
+  path = ARGV.shift
+  if (path.nil?)
+    puts "Error: path for new app is required.\n\n"
+    global_opts.help
     exit
   end
+  
   puts "Creating the new rails app..."
   `rails new #{path} -d=mysql`  
+  helper = CabooseHelper.new(path)  
   helper.init_all
   
 when 'init'
   
-  is_rails_app = File.exists(File.join(path, 'config', 'environment.rb'))  
+  opts = Trollop::options do
+    opt :force, 'Force re-installation of all caboose files.', :default => false
+  end
+  
+  path = ARGV.shift
+  path = Dir.pwd if path.nil?  
+  is_rails_app = File.exists?(File.join(path, 'config', 'environment.rb'))  
   if (!is_rails_app)
-    if (ARGV.count == 1)
-      puts "Error: You don't seem to be in a rails app.\n\n"
-    else
-      puts "Error: The supplied path (#{path}) doesn't seem to be a rails app.\n\n"
-    end
-    exit 
+    puts "Error: Not a rails app.\n\n"
+    global_opts.help
+    exit
   end
+  
+  helper = CabooseHelper.new(path, opts.force)
   helper.init_all
   
 else

data/lib/caboose/caboose_helper.rb

@@ -1,8 +1,9 @@
 
 class CabooseHelper
   
-  def initialize(app_path)
+  def initialize(app_path, force = false)
     @app_path = app_path
+    @force = force
   end
   
   def init_all
@@ -21,7 +22,7 @@ class CabooseHelper
     filename = File.join(@app_path, filename)  
     copy_from = File.join(gem_root,'lib','sample_files', Pathname.new(filename).basename)
     
-    if (!File.exists?(filename))
+    if (!File.exists?(filename) || @force)
       FileUtils.cp(copy_from, filename)
     end  
   end
@@ -30,7 +31,8 @@ class CabooseHelper
   def init_gem
     puts "Adding the caboose gem to the Gemfile... "
     filename = File.join(@app_path,'Gemfile')
-    return if !File.exists?(filename)
+    return if !File.exists?(filename)    
+    return if !@force
     
     file = File.open(filename, 'rb')
     str = file.read
@@ -78,14 +80,14 @@ class CabooseHelper
     puts "Adding the caboose initializer file..."
     
     filename = File.join(@app_path,'config','initializers','caboose.rb')
-    return if File.exists?(filename)
+    return if File.exists?(filename) && !@force
     
     Caboose::salt = Digest::SHA1.hexdigest(DateTime.now.to_s)
     str = ""
     str << "# Salt to ensure passwords are encrypted securely\n"
     str << "Caboose::salt = '#{Caboose::salt}'\n\n"
     str << "# Where page asset files will be uploaded\n"
-    str << "Caboose::assets_path = File.join(@app_path,'app', 'assets', 'caboose')\n\n"
+    str << "Caboose::assets_path = Rails.root.join('app', 'assets', 'caboose')\n\n"
     str << "# Register any caboose plugins\n"
     str << "#Caboose::plugins + ['MyCaboosePlugin']\n\n"
     
@@ -98,6 +100,7 @@ class CabooseHelper
     
     filename = File.join(@app_path,'config','routes.rb')
     return if !File.exists?(filename)
+    return if !@force
     
     str = "" 
     str << "\t# Catch everything with caboose\n"  
@@ -115,14 +118,6 @@ class CabooseHelper
   end
   
   def init_assets
-    puts "Adding the javascript files..."
-    init_file('app/assets/javascripts/caboose_before.js')
-    init_file('app/assets/javascripts/caboose_after.js')
-    
-    puts "Adding the stylesheet files..."
-    init_file('app/assets/stylesheets/caboose_before.css')
-    init_file('app/assets/stylesheets/caboose_after.css')
-    
     puts "Adding the layout files..."
     init_file('app/views/layouts/layout_default.html.erb')
   end
@@ -146,174 +141,4 @@ class CabooseHelper
     str = lines.join("\n")
     File.open(File.join(@app_path,'config','initializers','session_store.rb'), 'w') {|file| file.write(str) }
   end
-  
-  def init_schema
-    drop_tables
-    create_tables
-  end
-  
-  def drop_tables
-    puts "Dropping any existing caboose tables..."
-    c = ActiveRecord::Base.connection  
-    c.drop_table :users                if c.table_exists?('users')
-    c.drop_table :roles                if c.table_exists?('roles')
-    c.drop_table :permissions          if c.table_exists?('permissions')
-    c.drop_table :roles_users          if c.table_exists?('roles_users')
-    c.drop_table :permissions_roles    if c.table_exists?('permissions_roles')
-    c.drop_table :assets               if c.table_exists?('assets')
-    c.drop_table :pages                if c.table_exists?('pages')
-    c.drop_table :page_permissions     if c.table_exists?('page_permissions')
-    c.drop_table :sessions             if c.table_exists?('sessions')
-    c.drop_table :settings             if c.table_exists?('settings')
-  end
-
-  def create_tables  
-    puts "Creating required caboose tables..."
-    
-    c = ActiveRecord::Base.connection
-    
-    # User/Role/Permissions    
-  	c.create_table :users do |t|
-      t.string :first_name
-      t.string :last_name
-      t.string :username
-      t.string :email
-      t.string :password
-      t.string :password_reset_id
-      t.datetime :password_reset_sent
-      t.string :token     
-    end
-    c.create_table :roles do |t|
-      t.integer :parent_id
-      t.string :name
-      t.string :description
-    end
-    c.create_table :permissions do |t|
-      t.string :resource
-      t.string :action
-    end
-    
-    # Role membership
-    c.create_table :roles_users do |t|
-      t.references :role
-      t.references :user
-    end
-    c.add_index :roles_users, :role_id
-    c.add_index :roles_users, :user_id
-    
-    # Role permissions    
-    c.create_table :permissions_roles do |t|
-			t.references :role
-			t.references :permission
-		end
-		c.add_index :permissions_roles, :role_id
-		c.add_index :permissions_roles, :permission_id
-    
-    # Pages and Assets
-    c.create_table :assets do |t|
-      t.references  :page
-      t.references  :user
-      t.datetime    :date_uploaded
-      t.string      :name
-      t.string      :filename
-      t.string      :description
-      t.string      :extension      
-    end
-    c.create_table :pages do |t|
-      t.integer :parent_id
-      t.string  :title
-      t.string  :menu_title
-      t.text    :content
-      t.string  :slug
-      t.string  :alias
-      t.string  :uri
-      t.string  :redirect_url
-      t.boolean :hide, :default => false
-      t.integer :content_format, :default => Caboose::Page::CONTENT_FORMAT_HTML
-      t.text    :custom_css
-      t.text    :custom_js
-      t.string  :layout
-      t.integer :sort_order, :default => 0
-      t.boolean :custom_sort_children, :default => false
-      t.string  :seo_title, :limit => 70
-      t.string  :meta_description, :limit => 156
-      t.string  :meta_robots, :default => 'index, follow' # Multi-select options: none, noindex, nofollow, nosnippet, noodp, noarchive
-      t.string  :canonical_url
-      t.string  :fb_description, :limit => 156
-      t.string  :gp_description, :limit => 156
-    end
-    c.create_table :page_permissions do |t|
-      t.references  :role
-      t.references  :page
-      t.string      :action
-    end
-    c.create_table :sessions do |t|
-      t.string :session_id, :null => false
-      t.text :data
-      t.timestamps
-    end
-    c.add_index :sessions, :session_id
-    c.add_index :sessions, :updated_at
-    c.change_column :sessions, :created_at, :datetime, :null => true
-    c.change_column :sessions, :updated_at, :datetime, :null => true
-    c.create_table :settings do |t|
-      t.string    :name
-      t.text      :value
-    end
-		
-  end
-  
-  def init_data
-    puts "Loading data into caboose tables..."
-    
-    admin_user = Caboose::User.create(first_name: 'Admin', last_name: 'User', username: 'admin', email: 'william@nine.is')
-    admin_user.password = Digest::SHA1.hexdigest(Caboose::salt + 'caboose')
-    admin_user.save
-    
-    admin_role  = Caboose::Role.create(parent_id: -1, name: 'Admin')
-    elo_role    = Caboose::Role.create(parent_id: -1, name: 'Everyone Logged Out')
-    eli_role    = Caboose::Role.create(parent_id: elo_role.id, name: 'Everyone Logged In')
-    
-    elo_user = Caboose::User.create(first_name: 'John', last_name: 'Doe', username: 'elo', email: 'william@nine.is')
-    
-    admin_perm = Caboose::Permission.create(resource: 'all', action: 'all')
-    Caboose::Permission.create(resource: 'users'	      , action: 'view')
-    Caboose::Permission.create(resource: 'users'	      , action: 'edit')
-    Caboose::Permission.create(resource: 'users'	      , action: 'delete')
-    Caboose::Permission.create(resource: 'users'	      , action: 'add')
-    Caboose::Permission.create(resource: 'roles'	      , action: 'view')
-    Caboose::Permission.create(resource: 'roles'	      , action: 'edit')
-    Caboose::Permission.create(resource: 'roles'	      , action: 'delete')
-    Caboose::Permission.create(resource: 'roles'	      , action: 'add')
-    Caboose::Permission.create(resource: 'permissions'	, action: 'view')
-    Caboose::Permission.create(resource: 'permissions'	, action: 'edit')
-    Caboose::Permission.create(resource: 'permissions'	, action: 'delete')
-    Caboose::Permission.create(resource: 'permissions'	, action: 'add')
-
-    # Add the admin user to the admin role
-    admin_user.roles.push(admin_role)
-    admin_user.save
-    
-    # Add the elo to the elo role
-    elo_user.roles.push(elo_role)
-    elo_user.save
-
-    # Add the all/all permission to the admin role
-    admin_role.permissions.push(admin_perm)
-    admin_role.save
-    
-    # Create the home page
-    home_page  = Caboose::Page.create(title: 'Home'  , parent_id: -1, hide: 0, layout: 'home'   , uri: '')
-    admin_page = Caboose::Page.create(title: 'Admin' , parent_id: home_page.id, hide: 0, layout: 'admin', alias: 'admin', slug: 'admin', uri: 'admin')
-    login_page = Caboose::Page.create(title: 'Login' , parent_id: home_page.id, hide: 0, layout: 'login', alias: 'login', slug: 'login', uri: 'login')
-    Caboose::PagePermission.create(role_id: elo_role.id, page_id: home_page.id, action: 'view') 
-    Caboose::PagePermission.create(role_id: elo_role.id, page_id: login_page.id, action: 'view')
-    
-    # Create the required settings
-    Caboose::Setting.create(name: 'version'     , value: Caboose::VERSION)
-    Caboose::Setting.create(name: 'site_name'   , value: 'New Caboose Site')
-    Caboose::Setting.create(name: 'site_url'    , value: 'www.mycaboosesite.com')
-    Caboose::Setting.create(name: 'admin_email' , value: 'william@nine.is')
-    
-  end
 end

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.1.35'
+  VERSION = '0.1.78'
 end

data/lib/tasks/caboose.rake

@@ -14,6 +14,8 @@ namespace :caboose do
   task :create_tables => :environment do create_tables end
   desc "Loads data into caboose tables"
   task :load_data => :environment do load_data end
+  desc "Resets the admin password to 'caboose'"
+  task :reset_admin_pass => :environment do reset_admin_pass end
  
   #=============================================================================
   
@@ -128,7 +130,7 @@ namespace :caboose do
 		
   end
   
-  def init_data
+  def load_data
     puts "Loading data into caboose tables..."
     
     admin_user = Caboose::User.create(first_name: 'Admin', last_name: 'User', username: 'admin', email: 'william@nine.is')
@@ -181,4 +183,10 @@ namespace :caboose do
     Caboose::Setting.create(name: 'admin_email' , value: 'william@nine.is')
     
   end
+  
+  def reset_admin_pass
+    admin_user = Caboose::User.where(username: 'admin').first
+    admin_user.password = Digest::SHA1.hexdigest(Caboose::salt + 'caboose')
+    admin_user.save
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.1.35
+  version: 0.1.78
   prerelease: 
 platform: ruby
 authors:
@@ -123,6 +123,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: trollop
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: CMS built on rails with love.
 email:
 - william@nine.is
@@ -207,12 +223,6 @@ files:
 - lib/caboose/engine.rb
 - lib/caboose/version.rb
 - lib/caboose.rb
-- lib/sample_files/caboose.rb
-- lib/sample_files/caboose_after.css
-- lib/sample_files/caboose_after.js
-- lib/sample_files/caboose_before.css
-- lib/sample_files/caboose_before.js
-- lib/sample_files/caboose_station.html.erb
 - lib/sample_files/layout_default.html.erb
 - lib/sample_files/tinymce.yml
 - lib/tasks/caboose.rake

data/lib/sample_files/caboose.rb

@@ -1,12 +0,0 @@
-#
-# Caboose CMS Settings
-#
-
-# Salt to ensure passwords are encrypted securely
-Caboose::salt = 'CHANGE THIS TO A UNIQUE STRING!!!'
-
-# Where page asset files will be uploaded
-Caboose::assets_path = Rails.root.join('app', 'assets', 'caboose')
-
-# Register any caboose plugins
-#Caboose::plugins + ['MyCaboosePlugin']

data/lib/sample_files/caboose_station.html.erb

@@ -1,19 +0,0 @@
-
-<div id='caboose_station'>
-<h2>Station</h2>
-<ul>        
-  <li><%= link_to 'My Account', "/users/#{@user.id}/edit" %></li>
-  <li><%= link_to 'Logout', "/logout" %></li>
-  <% if (@user.is_allowed('admin', 'view')) %> 
-    <li><li><%= link_to 'Admin', "/admin" %></li></li>
-  <% end %>
-  <%
-  uru = session['use_redirect_urls'].nil? ? true : session['use_redirect_urls']
-  %>
-  <li><a href="javascript:caboose_set_redirect_url(<%= uru ? '0' : '1' %>, this);"><%= uru ? 'Disable' : 'Enable' %> Redirect Urls</a></li>
-  <% if (!@page_tasks.nil?) %>
-    <% @page_tasks.each do |href, task| %>
-      <li><%= link_to task, href %></li>
-    <% end %>
-  <% end %>
-</ul>