caboose-cms 0.2.23 → 0.2.24

data/app/views/caboose/pages/edit_settings.html.erb

@@ -1,10 +1,11 @@
 
 <h1>Page Settings</h1>
 <div class='top_right_controls'>
-<input type='button' value='General' disabled='true' onclick="window.location='/pages/<%= @page.id %>/edit-settings';" />
-<input type='button' value='CSS'     onclick="window.location='/pages/<%= @page.id %>/edit-css';" />
-<input type='button' value='JS'      onclick="window.location='/pages/<%= @page.id %>/edit-js';" />
-<input type='button' value='SEO'     onclick="window.location='/pages/<%= @page.id %>/edit-seo';" />
+<input type='button' value='General'   onclick="window.location='/pages/<%= @page.id %>/edit-settings';" disabled='true' />
+<input type='button' value='CSS'       onclick="window.location='/pages/<%= @page.id %>/edit-css';" />
+<input type='button' value='JS'        onclick="window.location='/pages/<%= @page.id %>/edit-js';" />
+<input type='button' value='SEO'       onclick="window.location='/pages/<%= @page.id %>/edit-seo';" />
+<input type='button' value='Resources' onclick="window.location='/pages/<%= @page.id %>/edit-resources';" />
 </div>
 <div style='float: left; width: 310px;'>
   <p><div id='page_<%= @page.id %>_parent_id'             ></div></p>
@@ -30,6 +31,7 @@ $(document).ready(function() {
     name: 'Page',
     id: <%= @page.id %>,
     update_url: '/pages/<%= @page.id %>',
+    authenticity_token: '<%= form_authenticity_token %>',
     attributes: [
       { name: 'parent_id'             , nice_name: 'Parent'                   , type: 'select'     , value: <%= @page.parent_id %>                       , width: 270, text: <%= raw (@page.parent_id == -1 ? "[No Parent]" : @page.parent.title).to_json %>, options_url: '/pages/sitemap-options' },
       { name: 'menu_title'            , nice_name: 'Menu title'               , type: 'text'       , value: <%= raw Caboose.json(@page.menu_title   ) %> , width: 270 },     

data/app/views/caboose/pages/edit_title.html.erb

@@ -10,6 +10,7 @@ $(document).ready(function() {
     name: 'Page',
     id: <%= @page.id %>,
     update_url: '/pages/<%= @page.id %>',
+    authenticity_token: '<%= form_authenticity_token %>',
     attributes: [{ 
       name: 'title',
       nice_name: 'Title',

data/app/views/caboose/pages/show.html.erb

@@ -1,2 +1,17 @@
+
+<% content_for :caboose_css do %>
+  <% @resources[:css].each do |r| %>
+    <!--link type='text/css' rel='stylesheet' href="<%= r %>" /-->
+    <%= stylesheet_link_tag r %>
+  <% end %>
+<% end %>
+
+<% content_for :caboose_js do %>
+  <% @resources[:js].each do |r| %>
+    <!--script type='text/javascript' src="<%= r %>" ></script-->
+    <%= javascript_include_tag r %>
+  <% end %>
+<% end %>
+
 <% content_for :page_title   do %><%= raw @page.title   %><% end %>
 <% content_for :page_content do %><%= raw @page.content %><% end %>

data/app/views/caboose/pages/sitemap.html.erb

@@ -6,7 +6,7 @@
 <h1>Page Sitemap</h1>
 
 <ul>
-<% @options.each do |opt| %>
-<li><a href='<%= opt.title
-this->addPageItems($p);
-</ul>\n";
+<% @options.each do |option| %>
+  <li><%= link_to option['text'], pages_path + '/' + option['value'].to_s %></li>
+<% end %>
+</ul>

data/app/views/caboose/roles/edit.html.erb

@@ -3,15 +3,17 @@
 <div id='role_<%= @role.id %>_container'></div>
 
 <% content_for :caboose_js do %>
+<%= javascript_include_tag "caboose/model/all" %>
 <script type="text/javascript">
 
 $(document).ready(function() {
-  var user = new Model({
+  new ModelBinder({
     name: 'Role',
     id: <%= @role.id %>,
     listing_url: 'get /admin/roles',
     update_url: 'put /admin/roles/<%= @role.id %>',
     delete_url: 'delete /admin/roles/<%= @role.id %>',
+    authenticity_token: '<%= form_authenticity_token %>',
     attributes: [
       { 
         name: 'parent_id',
@@ -23,8 +25,47 @@ $(document).ready(function() {
         loading_message: 'Getting roles...',
         options_url: '/admin/roles/options' 
       },    
-      { name: 'name'          , type: 'text'  , value: "<%= @role.name %>" },
-      { name: 'description'   , type: 'text'  , value: "<%= @role.description %>" },
+      { name: 'name'        , nice_name: 'Name'        , type: 'text' , value: "<%= @role.name %>" },
+      { name: 'description' , nice_name: 'Description' , type: 'text' , value: "<%= @role.description %>" },
+      { 
+        name: 'members',
+        type: 'checkbox-multiple',
+        value: <%= @role.users.collect{|u| u.id}.to_json %>,
+        text: "<%= raw @role.users.order('last_name, first_name').collect{|u| "#{u.first_name} #{u.last_name}"}.join('<br />') %>",
+        loading_message: 'Getting users...',
+        options_url: '/admin/users/options',
+      },
+      { 
+        name: 'permissions',
+        type: 'checkbox-multiple',
+        value: <%= @role.permissions.collect{|p| p.id}.to_json %>,
+        text: "<%= raw @role.permissions.order('resource, action').collect{|p| "#{p.resource}_#{p.action}"}.join('<br />') %>",
+        loading_message: 'Getting permissions...',
+        options_url: '/admin/permissions/options',
+      }
+    ],
+    on_load: function() { modal.autosize(); }
+  });  
+
+  /*var user = new Model({
+    name: 'Role',
+    id: <%= @role.id %>,
+    listing_url: 'get /admin/roles',
+    update_url: 'put /admin/roles/<%= @role.id %>',
+    delete_url: 'delete /admin/roles/<%= @role.id %>',
+    attributes: [
+      { 
+        name: 'parent_id',
+        nice_name: 'Parent',
+        type: 'select',
+        value: <%= @role.parent_id %>,
+        text: "<%= @role.parent.nil? ? '[No parent]' : @role.parent.name %>",
+        show_controls: true,
+        loading_message: 'Getting roles...',
+        options_url: '/admin/roles/options' 
+      },    
+      { name: 'name'        , type: 'text' , value: "<%= @role.name %>" },
+      { name: 'description' , type: 'text' , value: "<%= @role.description %>" },
       { 
         name: 'members',
         type: 'checkbox-multiple',
@@ -42,7 +83,7 @@ $(document).ready(function() {
         options_url: '/admin/permissions/options',
       }
     ]
-  });
+  });*/
 });
 
 </script>

data/config/routes.rb

@@ -49,11 +49,13 @@ Caboose::Engine.routes.draw do
   get     "pages/robots-options"          => "pages#robots_options"
   get     "pages/format-options"          => "pages#content_format_options"
   get     "pages/new"                     => "pages#new"
+  get     "pages/:id/sitemap"             => "pages#sitemap"
   get     "pages/:id/redirect"            => "pages#redirect"
   get     "pages/:id/edit-settings"       => "pages#edit_settings"
   get     "pages/:id/edit-css"            => "pages#edit_css"
   get     "pages/:id/edit-js"             => "pages#edit_js"
   get     "pages/:id/edit-seo"            => "pages#edit_seo"
+  get     "pages/:id/edit-resources"      => "pages#edit_resources"
   get     "pages/:id/edit-content"        => "pages#edit_content"
   get     "pages/:id/edit-title"          => "pages#edit_title"
   get     "pages/:id/edit"                => "pages#edit"

data/config/tinymce.yml

@@ -0,0 +1,11 @@
+
+caboose:
+  theme_advanced_toolbar_location: top
+  theme_advanced_toolbar_align: left
+  theme_advanced_statusbar_location: bottom
+  theme_advanced_buttons3_add:
+    - tablecontrols
+    - fullscreen
+  plugins:
+    - table
+    - fullscreen

data/lib/caboose/caboose_helper.rb

@@ -21,7 +21,7 @@ class CabooseHelper
     gem_root = Gem::Specification.find_by_name('caboose-cms').gem_dir
     filename = File.join(@app_path, filename)  
     copy_from = File.join(gem_root,'lib','sample_files', Pathname.new(filename).basename)
-    
+
     if (!File.exists?(filename) || @force)
       FileUtils.cp(copy_from, filename)
     end  

data/lib/caboose/migration_version.rb

@@ -0,0 +1,47 @@
+module Caboose
+
+  class Version
+    include Comparable
+    attr_accessor :str, :migrations
+
+    def initialize(str, migration_range)
+      @str = str
+      @migrations = []
+
+      if !migration_range.nil?
+
+        directory = File.join(File.expand_path('../../..', __FILE__), 'db/migrate')
+        files = Dir.entries(directory).select{ |f| !File.directory?(f) && /[0-9]{3}_[^\n\r\.]+\.rb$/ =~ f && migration_range.include?(f[0..2].to_i) }
+        files.sort.each do |f|
+          require File.join(directory, f)
+          /[0-9]{3}_(?<clazz_name>[^\n\r\.]+)\.rb$/ =~ f
+          @migrations += [clazz_name.classify.constantize.new]
+        end
+      end
+
+    end
+
+    def to_s
+      return @str
+    end
+
+    def self.compare_version_strings(a, b)
+      a = a.split('.').map{|s| s.to_i}
+      b = b.split('.').map{|s| s.to_i}
+      return a <=> b
+    end
+
+    def <=>(other)
+      return Version.compare_version_strings(@str, other.to_s)
+    end
+
+    def up(c)
+      @migrations.each{|m| m.up(c)}
+    end
+
+    def down(c)
+      @migrations.reverse_each{|m| m.down(c)}
+    end
+  end
+
+end

data/lib/caboose/migrations.rb

@@ -0,0 +1,7 @@
+require 'caboose/migration_version.rb'
+
+module Caboose
+  VERSIONS = [
+    Caboose::Version.new('0.2.19', 000..000),
+  ]
+end

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.2.23'
+  VERSION = '0.2.24'
 end

data/lib/tasks/caboose.rake

@@ -1,4 +1,5 @@
 require "caboose/version"
+require "caboose/migrations"
 
 namespace :caboose do
 
@@ -8,20 +9,37 @@ namespace :caboose do
     create_tables
     load_data
   end
+
   desc "Drops all caboose tables"
   task :drop_tables => :environment do drop_tables end
+
   desc "Creates all caboose tables"
   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
+
+  desc "Performs caboose migrations to transition from the first to the second version. (Unsafe.)"
+  task :migrate_between, [:from_version, :to_version] => :environment do |t, args|
+    args.with_defaults(from_version: nil, to_version: nil)
+    migrate_tables(args[:from_version], args[:to_version])
+  end
+ 
+  desc "Performs caboose migrations to transition from the current version to the given version"
+  task :migrate_to, [:to_version] => :migrate_between
  
+  desc "Performs caboose migrations to transition from the current version to the latest installed version"
+  task :migrate => :migrate_between
+
   #=============================================================================
   
   def drop_tables
     puts "Dropping any existing caboose tables..."
     c = ActiveRecord::Base.connection  
+<<<<<<< HEAD
     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')
@@ -29,9 +47,22 @@ namespace :caboose do
     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 :posts                if c.table_exists?('posts')
     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')
+=======
+    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')
+>>>>>>> 91fad24b37b250731136ae37abdd655f03b008e3
   end
 
   def create_tables  
@@ -99,6 +130,7 @@ namespace :caboose do
       t.integer :content_format, :default => Caboose::Page::CONTENT_FORMAT_HTML
       t.text    :custom_css
       t.text    :custom_js
+      t.text    :linked_resources
       t.string  :layout
       t.integer :sort_order, :default => 0
       t.boolean :custom_sort_children, :default => false
@@ -109,6 +141,13 @@ namespace :caboose do
       t.string  :fb_description, :limit => 156
       t.string  :gp_description, :limit => 156
     end
+    create_table :posts do |t|
+	  	t.text 		 	 :title
+	  	t.text 		 	 :body
+	  	t.boolean  	 :hide
+	  	t.text 		 	 :image_url 
+	  	t.timestamps
+	  end
     c.create_table :page_permissions do |t|
       t.references  :role
       t.references  :page
@@ -144,18 +183,18 @@ namespace :caboose do
     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')
+    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)
@@ -189,4 +228,28 @@ namespace :caboose do
     admin_user.password = Digest::SHA1.hexdigest(Caboose::salt + 'caboose')
     admin_user.save
   end
+
+  def migrate_tables(from_version, to_version)
+    version_setting = Caboose::Setting.where(name: 'version').first
+    versions = Caboose::VERSIONS
+
+    from_version = version_setting.value if from_version.nil?
+    to_version = Caboose::VERSION if to_version.nil?
+    version_regex = /[0-9]+(\.[0-9]+)*/
+
+    raise "from_version '#{from_version}' was invalid" if not version_regex.match(from_version)
+    raise "to_version '#{to_version}' was invalid" if not version_regex.match(to_version)
+
+    c = ActiveRecord::Base.connection
+    from_to_compare = Caboose::Version.compare_version_strings(from_version, to_version)
+
+    if from_to_compare < 0
+      versions.select{ |v| v > from_version && v <= to_version }.each{ |v| v.up(c) }
+    elsif from_to_compare > 0
+      versions.select{ |v| v > to_version && v <= from_version }.reverse_each{ |v| v.down(c) }
+    end
+
+    version_setting.value = to_version
+    version_setting.save
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.2.23
+  version: 0.2.24
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-09 00:00:00.000000000 Z
+date: 2013-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -201,6 +201,7 @@ files:
 - app/views/caboose/pages/edit_content.html.erb
 - app/views/caboose/pages/edit_css.html.erb
 - app/views/caboose/pages/edit_js.html.erb
+- app/views/caboose/pages/edit_resources.html.erb
 - app/views/caboose/pages/edit_seo.html.erb
 - app/views/caboose/pages/edit_settings.html.erb
 - app/views/caboose/pages/edit_title.html.erb
@@ -238,8 +239,11 @@ files:
 - app/views/layouts/caboose/modal.html.erb
 - bin/caboose
 - config/routes.rb
+- config/tinymce.yml
 - lib/caboose/caboose_helper.rb
 - lib/caboose/engine.rb
+- lib/caboose/migration_version.rb
+- lib/caboose/migrations.rb
 - lib/caboose/version.rb
 - lib/caboose.rb
 - lib/sample_files/layout_default.html.erb