caboose-cms 0.4.42 → 0.4.43

data/app/controllers/caboose/pages_controller.rb

@@ -5,14 +5,14 @@ module Caboose
     helper :application
     
     def before_action
-      @page = Page.page_with_uri('/admin')
+      @page = Page.page_with_uri(request.host_with_port, '/admin')
     end    
 
     # GET /pages/:id
     def show
       
       # Find the page with an exact URI match 
-      page = Page.page_with_uri(request.fullpath, false)
+      page = Page.page_with_uri(request.host_with_port, request.fullpath, false)
 
       if (!page)
         asset
@@ -51,7 +51,7 @@ module Caboose
       uri.chop! if uri.end_with?('/')
       uri[0] = '' if uri.starts_with?('/')
 
-      page = Page.page_with_uri(File.dirname(uri), false)
+      page = Page.page_with_uri(request.host_with_port, File.dirname(uri), false)
       if (page.nil? || !page)
         respond_to do |format|          
           format.all { render :file => "caboose/extras/error404", :layout => "caboose/error404", :formats => [:html] }
@@ -104,8 +104,9 @@ module Caboose
     
     # GET /admin/pages
     def admin_index
-      return if !user_is_allowed('pages', 'view')
-      @home_page = Page.find(1)
+      return if !user_is_allowed('pages', 'view')            
+      @domain = Domain.where(:domain => request.host_with_port).first
+      @home_page = @domain ? Page.index_page(@domain.site_id) : nil    
       render :layout => 'caboose/admin'      
     end
 
@@ -238,7 +239,7 @@ module Caboose
           'error' => nil,
           'redirect' => nil
       })
-
+            
       parent_id = params[:parent_id]
       title = params[:title]      
 
@@ -250,13 +251,20 @@ module Caboose
         resp.error = "You don't have permission to add a page there."
       end
       if (!resp.error.nil?)
-        render json: resp
+        render :json => resp
         return
       end
       	
-      parent = Caboose::Page.find(parent_id)
-      		
+      parent = Caboose::Page.find(parent_id)                  		
       page = Caboose::Page.new
+      
+      if parent.nil?
+        d = Domain.where(:domain => request.host_with_port).first.site_id
+        page.site_id = d.site_id
+      else      
+        page.site_id = parent.site_id
+      end
+      
       page.title = title
       page.parent_id = parent_id      
       page.hide = true
@@ -425,13 +433,14 @@ module Caboose
 
     # GET /admin/pages/sitemap-options
     def admin_sitemap_options
-      parent_id = params[:parent_id]
-      top_page = Page.index_page
+      parent_id = params[:parent_id]      
+      d = Domain.where(:domain => request.host_with_port).first      
+      top_page = Page.index_page(d.site_id)
       p = !parent_id.nil? ? Page.find(parent_id) : top_page
       options = []
       sitemap_helper(top_page, options)
      	  
-      render json: options 		
+      render :json => options 		
     end
 
     def sitemap_helper(page, options, prefix = '')

data/app/controllers/caboose/permissions_controller.rb

@@ -3,7 +3,7 @@ module Caboose
     layout 'caboose/admin'
     
     def before_action
-      @page = Page.page_with_uri('/admin')
+      @page = Page.page_with_uri(request.host_with_port, '/admin')
     end
     
     # GET /admin/permissions

data/app/controllers/caboose/roles_controller.rb

@@ -3,7 +3,7 @@ module Caboose
     layout 'caboose/admin'
     
     def before_action
-      @page = Page.page_with_uri('/admin')
+      @page = Page.page_with_uri(request.host_with_port, '/admin')
     end
     
     # GET /admin/roles

data/app/controllers/caboose/settings_controller.rb

@@ -3,7 +3,7 @@ module Caboose
     layout 'caboose/admin'
     
     def before_action
-      @page = Page.page_with_uri('/admin')
+      @page = Page.page_with_uri(request.host_with_port, '/admin')
     end
     
     # GET /admin/settings

data/app/controllers/caboose/sites_controller.rb

@@ -0,0 +1,156 @@
+require 'csv'
+
+module Caboose
+  class SitesController < ApplicationController
+    layout 'caboose/admin'
+      
+    def before_action
+      @page = Page.page_with_uri(request.host_with_port, '/admin')
+    end
+    
+    # GET /admin/sites
+    def admin_index
+      return if !user_is_allowed('sites', 'view')
+      
+      @pager = PageBarGenerator.new(params, {
+    		  'name_like' => '',    		  
+    		},{
+    		  'model'          => 'Caboose::Site',
+    	    'sort'			     => 'name',
+    		  'desc'			     => false,
+    		  'base_url'		   => '/admin/sites',
+    		  'use_url_params' => false
+    	})
+    	@sites = @pager.items
+    end
+    
+    # GET /admin/sites/new
+    def admin_new
+      return if !user_is_allowed('sites', 'add')
+      @site = Site.new
+    end
+    
+    # GET /admin/sites/1/edit
+    def admin_edit
+      return if !user_is_allowed('sites', 'edit')
+      @site = Site.find(params[:id])
+    end
+        
+    # POST /admin/sites
+    def admin_add
+      return if !user_is_allowed('sites', 'add')
+      
+      resp = StdClass.new      
+      site = Site.new
+      site.name = params[:name].strip
+      
+      if site.name.length == 0
+        resp.error = "Please enter a valid domain."      
+      else
+        site.save
+        resp.redirect = "/admin/sites/#{site.id}"
+      end
+      
+      render :json => resp
+    end
+    
+    # PUT /admin/sites/:id
+    def admin_update
+      return if !user_is_allowed('sites', 'edit')
+
+      resp = StdClass.new     
+      site = Site.find(params[:id])
+    
+      save = true
+      params.each do |name,value|
+        case name
+          when 'name'         then site.name          = value
+          when 'description'  then site.description   = value               		  
+    	  end
+    	end
+    	
+    	resp.success = save && site.save
+    	render :json => resp
+    end        
+      
+    # DELETE /admin/sites/1
+    def admin_delete
+      return if !user_is_allowed('sites', 'delete')
+      site = Site.find(params[:id])
+      site.destroy
+      
+      resp = StdClass.new({
+        'redirect' => '/admin/sites'
+      })
+      render :json => resp
+    end
+    
+    # POST /admin/sites/:id/members
+    def admin_add_member
+      return if !user_is_allowed('sites', 'edit')
+      sm = SiteMembership.where(:site_id => params[:id], :user_id => params[:user_id]).first
+      sm = SiteMembership.create(:site_id => params[:id], :user_id => params[:user_id]) if sm.nil?
+      sm.role = params[:role]
+      sm.save      
+      render :json => true
+    end
+    
+    # DELETE /admin/sites/:id/members/:user_id
+    def admin_remove_member
+      return if !user_is_allowed('sites', 'edit')
+      SiteMembership.where(:site_id => params[:id], :user_id => params[:user_id]).destroy_all        
+      render :json => true
+    end
+    
+    # POST /admin/sites/:id/domains
+    def admin_add_domain
+      return if !user_is_allowed('sites', 'edit')
+      
+      resp = Caboose::StdClass.new      
+      d = Domain.where(:domain => params[:domain]).first
+            
+      if d && d.site_id != params[:id]
+        resp.error = "That domain is already associated with another site."
+      elsif d && d.site_id == params[:id]
+        resp.refresh = true
+      elsif d.nil?
+        primary = Domain.where(:site_id => params[:id]).count == 0        
+        d = Domain.create(:site_id => params[:id], :domain => params[:domain], :primary => primary)
+        resp.refresh = true
+      end
+      render :json => resp
+    end
+    
+    # PUT /admin/sites/:id/domains/:domain_id/set-primary
+    def admin_set_primary_domain
+      return if !user_is_allowed('sites', 'edit')
+      
+      domain_id = params[:domain_id].to_i
+      Domain.where(:site_id => params[:id]).all.each do |d|
+        d.primary = d.id == domain_id ? true : false
+        d.save
+      end       
+      render :json => true
+    end
+    
+    # DELETE /admin/sites/:id/domains/:domain_id
+    def admin_remove_domain
+      return if !user_is_allowed('sites', 'edit')
+      Domain.find(params[:domain_id]).destroy
+      if Domain.where(:site_id => params[:id]).count == 1
+        d = Domain.where(:site_id => params[:id]).first
+        d.primary = true
+        d.save
+      end
+      render :json => { 'refresh' => true }
+    end        
+    
+    # GET /admin/sites/options
+    def options
+      return if !user_is_allowed('sites', 'view')
+      options = Site.reorder('name').all.collect { |s| { 'value' => s.id, 'text' => s.name }}
+      render :json => options
+    end
+    
+  end
+end

data/app/controllers/caboose/users_controller.rb

@@ -5,7 +5,7 @@ module Caboose
     layout 'caboose/admin'
       
     def before_action
-      @page = Page.page_with_uri('/admin')
+      @page = Page.page_with_uri(request.host_with_port, '/admin')
     end
     
     #===========================================================================

data/app/models/caboose/asset.rb

@@ -8,10 +8,10 @@ class Caboose::Asset < ActiveRecord::Base
     return str.gsub(' ', '_').downcase 
   end
   
-  def assets_with_uri(uri)
+  def assets_with_uri(host_with_port, uri)
     uri[0] = '' if uri.start_with? '/'
     
-		page = Page.page_with_uri(File.dirname(uri), false)		
+		page = Page.page_with_uri(host_with_port, File.dirname(uri), false)		
 		return false if page.nil?
 		
 		asset = Asset.where(:page_id => page.id,:filename => File.basename(uri)).first

data/app/models/caboose/core_plugin.rb

@@ -21,12 +21,13 @@ class Caboose::CorePlugin < Caboose::CaboosePlugin
       'children' => []
     }
         
-    item['children'] << { 'id' => 'users'            , 'text' => 'Users'              , 'href' => '/admin/users'              , 'modal' => false } if user.is_allowed('users'            , 'view')
-    item['children'] << { 'id' => 'roles'            , 'text' => 'Roles'              , 'href' => '/admin/roles'              , 'modal' => false } if user.is_allowed('roles'            , 'view')
-    item['children'] << { 'id' => 'permissions'      , 'text' => 'Permissions'        , 'href' => '/admin/permissions'        , 'modal' => false } if user.is_allowed('permissions'      , 'view')
-    item['children'] << { 'id' => 'blocktypes'       , 'text' => 'AB Test Variants'   , 'href' => '/admin/ab-variants'        , 'modal' => false } if user.is_allowed('abvariants'       , 'view')
-    item['children'] << { 'id' => 'variables'        , 'text' => 'Variables'          , 'href' => '/admin/settings'           , 'modal' => false } if user.is_allowed('settings'         , 'view')
-    item['children'] << { 'id' => 'blocktypes'       , 'text' => 'Block Types'        , 'href' => '/admin/block-types'        , 'modal' => false } if user.is_allowed('blocktypes'       , 'view')        
+    item['children'] << { 'id' => 'users'            , 'text' => 'Users'              , 'href' => '/admin/users'              , 'modal' => false } if user.is_allowed('users'        , 'view')
+    item['children'] << { 'id' => 'roles'            , 'text' => 'Roles'              , 'href' => '/admin/roles'              , 'modal' => false } if user.is_allowed('roles'        , 'view')
+    item['children'] << { 'id' => 'permissions'      , 'text' => 'Permissions'        , 'href' => '/admin/permissions'        , 'modal' => false } if user.is_allowed('permissions'  , 'view')
+    item['children'] << { 'id' => 'sites'            , 'text' => 'Sites'              , 'href' => '/admin/sites'              , 'modal' => false } if user.is_allowed('sites'        , 'view')
+    item['children'] << { 'id' => 'blocktypes'       , 'text' => 'AB Test Variants'   , 'href' => '/admin/ab-variants'        , 'modal' => false } if user.is_allowed('abvariants'   , 'view')
+    item['children'] << { 'id' => 'variables'        , 'text' => 'Variables'          , 'href' => '/admin/settings'           , 'modal' => false } if user.is_allowed('settings'     , 'view')
+    item['children'] << { 'id' => 'blocktypes'       , 'text' => 'Block Types'        , 'href' => '/admin/block-types'        , 'modal' => false } if user.is_allowed('blocktypes'   , 'view')    
         
     nav << item if item['children'].count > 0
     

data/app/models/caboose/domain.rb

@@ -0,0 +1,8 @@
+
+class Caboose::Domain < ActiveRecord::Base
+  self.table_name = "domains"
+       
+  belongs_to :site, :class_name => 'Caboose::Site'        
+  attr_accessible :id, :site_id, :domain, :primary
+      
+end

data/app/models/caboose/media_category.rb

@@ -0,0 +1,18 @@
+class Caboose::MediaCategory < ActiveRecord::Base
+
+  self.table_name = "media_categories"  
+  belongs_to :parent, :class_name => 'Caboose::MediaCategory'
+  has_many :children, :class_name => 'Caboose::MediaCategory', :foreign_key => 'parent_id', :order => 'name'
+  has_many :media_images, :class_name => 'Caboose::MediaImage', :order => 'name'
+  has_many :media_files, :class_name => 'Caboose::MediaFile', :order => 'name'
+  attr_accessible :id, :site_id, :parent_id, :name
+  
+  def self.top_image_category(site_id)
+    return self.where("parent_id is null and site_id = ? and name = ?", site_id, 'Images').first
+  end
+  
+  def self.top_file_category(site_id)
+    return self.where("parent_id is null and site_id = ? and name = ?", site_id, 'Files').first
+  end
+
+end

data/app/models/caboose/media_file.rb

@@ -0,0 +1,9 @@
+class Caboose::MediaFile < ActiveRecord::Base
+
+  self.table_name = "media_files"
+  belongs_to :media_category
+  has_attached_file :file, :path => 'media-files/:id.:extension'
+  do_not_validate_attachment_file_type :file  
+  attr_accessible :id, :media_category_id, :name, :description
+
+end

data/app/models/caboose/media_image.rb

@@ -0,0 +1,16 @@
+class Caboose::MediaImage < ActiveRecord::Base
+
+  self.table_name = "media_images"
+  belongs_to :media_category  
+  has_attached_file :image, 
+    :path => 'media-images/:id_:style.:extension',
+    :default_url => "#{Caboose::cdn_domain}/media-images/default_user_image.jpg",    
+    :styles => {
+      :tiny  => '150x200>',
+      :thumb => '300x400>',
+      :large => '600x800>'
+    }
+  do_not_validate_attachment_file_type :image  
+  attr_accessible :id, :media_category_id, :name, :description
+
+end

data/app/models/caboose/page.rb

@@ -2,11 +2,14 @@
 class Caboose::Page < ActiveRecord::Base
   self.table_name = "pages"
   
-  belongs_to :parent, :class_name => "Page"
-  has_many :children, :class_name => "Page", :foreign_key => 'parent_id', :order => 'sort_order, title'
+  belongs_to :site, :class_name => 'Caboose::Site'
+  belongs_to :parent, :class_name => 'Caboose::Page'
+  has_many :children, :class_name => 'Caboose::Page', :foreign_key => 'parent_id', :order => 'sort_order, title'
   has_many :page_permissions  
   has_many :blocks, :order => 'sort_order'
-  attr_accessible :parent_id, 
+  attr_accessible :id,
+    :site_id,
+    :parent_id, 
     :title, 
     :menu_title, 
     # :content, # Changed from column in pages to blocks
@@ -56,12 +59,16 @@ class Caboose::Page < ActiveRecord::Base
     return self.where(:id => page_id).select(fields).first
   end
 
-  def self.index_page
-    return self.where(:parent_id => -1).first
+  def self.index_page(site_id)
+    return self.where(:site_id => site_id, :parent_id => -1).first
   end
   
-  def self.page_with_uri(uri, get_closest_parent = true)
+  def self.page_with_uri(host_with_port, uri, get_closest_parent = true)
 
+    d = Caboose::Domain.where(:domain => host_with_port).first
+    return false if d.nil?
+    site_id = d.site_id    
+    
     uri = uri.to_s.gsub(/^(.*?)\?.*?$/, '\1')
     uri.chop! if uri.end_with?('/')
     uri[0] = '' if uri.starts_with?('/')
@@ -72,14 +79,14 @@ class Caboose::Page < ActiveRecord::Base
     parts = uri.split('/')
       
     # See where to start looking
-    page_ids = self.where(:alias => parts[0]).limit(1).pluck(:id)
+    page_ids = self.where(:site_id => site_id, :alias => parts[0]).limit(1).pluck(:id)
     page_id = !page_ids.nil? && page_ids.count > 0 ? page_ids[0] : false
     
     # Search for the page
-    if (page_id)
+    if page_id
       page_id = self.page_with_uri_helper(parts, 1, page_id)
     else
-      parent_id = self.index_page
+      parent_id = self.index_page(site_id)
       page_id = self.page_with_uri_helper(parts, 0, parent_id)
     end
     

data/app/models/caboose/schema.rb

@@ -1,6 +1,6 @@
 
 class Caboose::Schema < Caboose::Utilities::Schema
-    
+
   # Tables (in order) that were renamed in the development of the gem.
   def self.renamed_tables
     {
@@ -12,19 +12,19 @@ class Caboose::Schema < Caboose::Utilities::Schema
       :page_blocks             => :blocks
     }
   end
-  
+
   def self.renamed_columns
     {
       #Caboose::Field     => { :page_block_id        => :block_id,
-      #                        :page_block_field_id  => :field_type_id },      
+      #                        :page_block_field_id  => :field_type_id },
       #Caboose::FieldType => { :page_block_type_id   => :block_type_id },
-      Caboose::Block     => { :page_block_type_id   => :block_type_id }    
+      Caboose::Block     => { :page_block_type_id   => :block_type_id }
     }
   end
-  
+
   def self.removed_columns
     {
-      Caboose::Block => [:block_type],      
+      Caboose::Block => [:block_type],
       #Caboose::FieldType => [:model_binder_options],
       Caboose::AbValue => [:i, :text],
       Caboose::AbOption => [:text],
@@ -33,7 +33,7 @@ class Caboose::Schema < Caboose::Utilities::Schema
       Caboose::BlockType => [:layout_function]
     }
   end
-  
+
   # Any column indexes that need to exist in the database
   def self.indexes
     {
@@ -42,106 +42,54 @@ class Caboose::Schema < Caboose::Utilities::Schema
       Caboose::PostCategoryMembership => [ :post_id    , :post_category_id ]
       #Caboose::Session                => [ :session_id , :updated_at       ]
     }
-  end      
-  
+  end
+
   # The schema of the database
   # { Model => [[name, data_type, options]] }
-  def self.schema      
+  def self.schema
     {
-      Caboose::User => [  	
-        [ :first_name           , :string     ],     
-        [ :last_name            , :string     ], 
-        [ :username             , :string     ], 
-        [ :email                , :string     ],         
-        [ :address              , :string     ],
-        [ :address2             , :string     ],
-        [ :city                 , :string     ],
-        [ :state                , :string     ],
-        [ :zip                  , :string     ],
-        [ :phone                , :string     ],
-        [ :fax                  , :string     ],
-        [ :utc_offset           , :float      , { :default => -5 }],
-        #[ :timezone             , :string     , { :default => 'America/Chicago' }],
-        [ :timezone_id          , :integer    , { :defualt => 381 }], # Defaults to 'America/Chicago'        
-        [ :password             , :string     ],
-        [ :password_reset_id    , :string     ], 
-        [ :password_reset_sent  , :datetime   ], 
-        [ :token                , :string     ], 
-        [ :date_created         , :datetime   ],
-        [ :image                , :attachment ]
-      ],
-      Caboose::Role => [    
-        [ :parent_id            , :integer  ], 
-        [ :name                 , :string   ],
-        [ :description          , :string   ]
+      Caboose::AbVariant => [
+        [ :name           , :string ],
+        [ :analytics_name , :string ],
       ],
-      Caboose::Permission => [    
-        [ :resource , :string ], 
-        [ :action   , :string ]
+      Caboose::AbOption => [
+        [ :ab_variant_id , :integer ],
+        [ :value         , :string  ]
       ],
-      Caboose::RoleMembership => [    
-        [ :role_id, :integer ],
-        [ :user_id, :integer ]
+      Caboose::AbValue => [
+        [ :session_id    , :string  ],
+        [ :ab_variant_id , :integer ],
+        [ :ab_option_id  , :integer ]
       ],
-      Caboose::RolePermission => [
-	    	[ :role_id        , :integer ],
-	    	[ :permission_id  , :integer ]		
-	    ],
-	    Caboose::Asset => [
-        [ :page_id        , :integer    ],  
-        [ :user_id        , :integer    ], 
-        [ :date_uploaded  , :datetime   ], 
-        [ :name           , :string     ], 
-        [ :filename       , :string     ], 
-        [ :description    , :string     ], 
+      Caboose::Asset => [
+        [ :page_id        , :integer    ],
+        [ :user_id        , :integer    ],
+        [ :date_uploaded  , :datetime   ],
+        [ :name           , :string     ],
+        [ :filename       , :string     ],
+        [ :description    , :string     ],
         [ :extension      , :string     ]
       ],
-      Caboose::Page => [        
-        [ :parent_id             , :integer ], 
-        [ :title                 , :string  ],
-        [ :menu_title            , :string  ],
-        #[ :content               , :text    ],
-        [ :slug                  , :string  ],
-        [ :alias                 , :string  ],
-        [ :uri                   , :string  ],
-        [ :redirect_url          , :string  ],
-        [ :hide                  , :boolean , { :default => false }],
-        [ :content_format        , :integer , { :default => Caboose::Page::CONTENT_FORMAT_HTML }],
-        [ :custom_css            , :text    ],
-        [ :custom_js             , :text    ],
-        [ :linked_resources      , :text    ],
-        [ :layout                , :string  ],
-        [ :sort_order            , :integer , { :default => 0                }],
-        [ :custom_sort_children  , :boolean , { :default => false            }],
-        [ :seo_title             , :string  , { :limit => 70                 }],
-        [ :meta_description      , :string  , { :limit => 156                }],
-        [ :meta_robots           , :string  , { :default => 'index, follow'  }],
-        [ :canonical_url         , :string  ],
-        [ :fb_description        , :string  , { :limit => 156 }],
-        [ :gp_description        , :string  , { :limit => 156 }]
-      ],
-      Caboose::Block => [        
+      Caboose::Block => [
         [ :page_id               , :integer ],
         [ :parent_id             , :integer ],
         [ :block_type_id         , :integer ],
         [ :sort_order            , :integer , { :default => 0 }],
         [ :name                  , :string  ],
-        [ :value                 , :text    ],   
+        [ :value                 , :text    ],
         [ :file                  , :attachment ],
         [ :image                 , :attachment ]
       ],
-      Caboose::BlockType => [      
+      Caboose::BlockType => [
         [ :parent_id                       , :integer ],
         [ :name                            , :string  ],
         [ :description                     , :string  ],
         [ :block_type_category_id          , :integer , { :default => 2 }],
         [ :render_function                 , :text    ],
-        [ :use_render_function             , :boolean , { :default => false }],        
+        [ :use_render_function             , :boolean , { :default => false }],
         [ :use_render_function_for_layout  , :boolean , { :default => false }],
-        [ :allow_child_blocks              , :boolean , { :default => false }],        
-        
-        # Used for field values
-        [ :field_type                      , :string  ],        
+        [ :allow_child_blocks              , :boolean , { :default => false }],
+        [ :field_type                      , :string  ],
         [ :default                         , :text    ],
         [ :width                           , :integer ],
         [ :height                          , :integer ],
@@ -149,15 +97,13 @@ class Caboose::Schema < Caboose::Utilities::Schema
         [ :options                         , :text    ],
         [ :options_function                , :text    ],
         [ :options_url                     , :string  ],
-        
-        # Used for sharing block types
         [ :share                           , :boolean , { :default => true  }],
         [ :downloaded                      , :boolean , { :default => false }]
       ],
-      Caboose::BlockTypeCategory => [      
+      Caboose::BlockTypeCategory => [
         [ :parent_id  , :integer ],
-        [ :name       , :string  ]        
-      ],      
+        [ :name       , :string  ]
+      ],
       Caboose::BlockTypeSource => [
         [ :name       , :string ],
         [ :url        , :string ],
@@ -165,15 +111,74 @@ class Caboose::Schema < Caboose::Utilities::Schema
         [ :priority   , :integer, { :default => 0 }],
         [ :active     , :boolean, { :default => true }],
       ],
-      Caboose::BlockTypeSummary => [      
+      Caboose::BlockTypeSummary => [
         [ :block_type_source_id , :integer ],
         [ :name                 , :string  ],
-        [ :description          , :string  ]                
+        [ :description          , :string  ]
+      ],
+      Caboose::DatabaseSession => [
+        [ :session_id  , :string   , :null => false ],
+        [ :data        , :text                      ],
+        [ :created_at  , :datetime , :null => true  ],
+        [ :updated_at  , :datetime , :null => true  ]
+      ],
+      Caboose::Domain => [
+        [ :site_id     , :integer ],
+        [ :domain      , :string  ],
+        [ :primary     , :boolean, { :default => false }]
+      ],
+      Caboose::MediaCategory => [
+        [ :parent_id         , :integer ],
+        [ :site_id           , :integer ],
+        [ :name              , :string  ]        
+      ],
+      Caboose::MediaImage => [
+        [ :media_category_id , :integer ],
+        [ :name              , :string  ],
+        [ :description       , :text    ]
+      ],
+      Caboose::MediaFile => [
+        [ :media_category_id , :integer ],
+        [ :name              , :string  ],
+        [ :description       , :text    ]
+      ],
+      Caboose::Page => [
+        [ :site_id               , :integer ],
+        [ :parent_id             , :integer ],
+        [ :title                 , :string  ],
+        [ :menu_title            , :string  ],
+        [ :slug                  , :string  ],
+        [ :alias                 , :string  ],
+        [ :uri                   , :string  ],
+        [ :redirect_url          , :string  ],
+        [ :hide                  , :boolean , { :default => false }],
+        [ :content_format        , :integer , { :default => Caboose::Page::CONTENT_FORMAT_HTML }],
+        [ :custom_css            , :text    ],
+        [ :custom_js             , :text    ],
+        [ :linked_resources      , :text    ],
+        [ :layout                , :string  ],
+        [ :sort_order            , :integer , { :default => 0                }],
+        [ :custom_sort_children  , :boolean , { :default => false            }],
+        [ :seo_title             , :string  , { :limit => 70                 }],
+        [ :meta_description      , :string  , { :limit => 156                }],
+        [ :meta_robots           , :string  , { :default => 'index, follow'  }],
+        [ :canonical_url         , :string  ],
+        [ :fb_description        , :string  , { :limit => 156 }],
+        [ :gp_description        , :string  , { :limit => 156 }]
       ],
-      Caboose::Post => [  
-        [ :title                , :text       ],  		 	 
-        [ :body                 , :text 		   ],  	 
-        [ :hide                 , :boolean    ], 	 
+      Caboose::PagePermission => [
+        [ :role_id , :integer  ],
+        [ :page_id , :integer  ],
+        [ :action  , :string   ]
+      ],
+      Caboose::Permission => [
+        [ :resource , :string ],
+        [ :action   , :string ]
+      ],
+      Caboose::Post => [
+        [ :title                , :text       ],
+        [ :body                 , :text 		   ],
+        [ :hide                 , :boolean    ],
         [ :image_url            , :text 		   ],
         [ :published            , :boolean    ],
         [ :created_at           , :datetime   ],
@@ -182,91 +187,111 @@ class Caboose::Schema < Caboose::Utilities::Schema
       ],
       Caboose::PostCategory => [
         [ :name , :string ]
-      ],    
-      Caboose::PostCategoryMembership => [    
+      ],
+      Caboose::PostCategoryMembership => [
         [ :post_id          , :integer ],
         [ :post_category_id , :integer ]
-      ],    
-      Caboose::PagePermission => [
-        [ :role_id , :integer  ],  
-        [ :page_id , :integer  ],
-        [ :action  , :string   ]
-      ],
-      Caboose::AbVariant => [
-        [ :name           , :string ],
-        [ :analytics_name , :string ],
       ],
-      Caboose::AbOption => [        
-        [ :ab_variant_id , :integer ],
-        [ :value         , :string  ]
+      Caboose::Role => [
+        [ :parent_id            , :integer  ],
+        [ :name                 , :string   ],
+        [ :description          , :string   ]
       ],
-      Caboose::AbValue => [
-        [ :session_id    , :string  ],
-        [ :ab_variant_id , :integer ],
-        [ :ab_option_id  , :integer ]
+      Caboose::RoleMembership => [
+        [ :role_id, :integer ],
+        [ :user_id, :integer ]
       ],
-      Caboose::DatabaseSession => [
-        [ :session_id  , :string   , :null => false ],
-        [ :data        , :text                      ],
-        [ :created_at  , :datetime , :null => true  ],
-        [ :updated_at  , :datetime , :null => true  ]
-      ],    
-      Caboose::Setting => [    
+      Caboose::RolePermission => [
+	    	[ :role_id        , :integer ],
+	    	[ :permission_id  , :integer ]
+	    ],
+      Caboose::Setting => [
         [ :name  , :string ],
         [ :value , :text   ]
       ],
+      Caboose::Site => [
+        [ :name        , :string ],
+        [ :description , :text   ]
+      ],
+      Caboose::SiteMembership => [
+        [ :site_id     , :integer ],
+        [ :user_id     , :integer ],
+        [ :role        , :string  ]
+      ],
       Caboose::Timezone => [
         [ :country_code , :string ],
         [ :name         , :string ]
       ],
-      Caboose::TimezoneAbbreviation => [        
+      Caboose::TimezoneAbbreviation => [
         [ :abbreviation , :string  ],
-        [ :name         , :string  ]                
+        [ :name         , :string  ]
       ],
       Caboose::TimezoneOffset => [
         [ :timezone_id  , :integer  ],
         [ :abbreviation , :string   ],
         [ :time_start   , :integer  ],
         [ :gmt_offset   , :integer  ],
-        [ :dst          , :boolean  ]        
-      ]            
+        [ :dst          , :boolean  ]
+      ],
+      Caboose::User => [
+        [ :first_name           , :string     ],
+        [ :last_name            , :string     ],
+        [ :username             , :string     ],
+        [ :email                , :string     ],
+        [ :address              , :string     ],
+        [ :address2             , :string     ],
+        [ :city                 , :string     ],
+        [ :state                , :string     ],
+        [ :zip                  , :string     ],
+        [ :phone                , :string     ],
+        [ :fax                  , :string     ],
+        [ :utc_offset           , :float      , { :default => -5 }],
+        #[ :timezone             , :string     , { :default => 'America/Chicago' }],
+        [ :timezone_id          , :integer    , { :defualt => 381 }], # Defaults to 'America/Chicago'
+        [ :password             , :string     ],
+        [ :password_reset_id    , :string     ],
+        [ :password_reset_sent  , :datetime   ],
+        [ :token                , :string     ],
+        [ :date_created         , :datetime   ],
+        [ :image                , :attachment ]
+      ]
     }
 
   end
-  
+
   # Loads initial data into the database
   def self.load_data
 
-    c = ActiveRecord::Base.connection    
+    c = ActiveRecord::Base.connection
     #if c.column_exists?(:pages, :content)
     #  Caboose::Page.reorder(:id).all.each do |p|
-    #    Caboose::PageBlock.create( :page_id => p.id, :block_type => 'richtext', :value => p.content )        
-    #  end      
+    #    Caboose::PageBlock.create( :page_id => p.id, :block_type => 'richtext', :value => p.content )
+    #  end
     #  c.remove_column(:pages, :content)
     #end
-    
+
     admin_user = nil
     if !Caboose::User.exists?(:username => 'admin')
       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
     end
-    admin_user = Caboose::User.where(:username => 'admin').first if admin_user.nil?    
-    
+    admin_user = Caboose::User.where(:username => 'admin').first if admin_user.nil?
+
     if !Caboose::User.where(:id => Caboose::User::LOGGED_OUT_USER_ID).exists?
-      Caboose::User.create(:id => Caboose::User::LOGGED_OUT_USER_ID, :first_name => 'Logged', :last_name => 'Out', :username => 'elo', :email => 'elo@nine.is')            
-    end    
-    
+      Caboose::User.create(:id => Caboose::User::LOGGED_OUT_USER_ID, :first_name => 'Logged', :last_name => 'Out', :username => 'elo', :email => 'elo@nine.is')
+    end
+
     Caboose::Role.create(:parent_id => -1           , :name => 'Admin'               ) if !Caboose::Role.exists?(:name =>  'Admin'               )
     admin_role  = Caboose::Role.where(:name => 'Admin'               ).first
     Caboose::Role.create(:parent_id => -1           , :name => 'Everyone Logged Out' ) if !Caboose::Role.exists?(:name =>  'Everyone Logged Out' )
     elo_role    = Caboose::Role.where(:name => 'Everyone Logged Out' ).first
     Caboose::Role.create(:parent_id => elo_role.id  , :name => 'Everyone Logged In'  ) if !Caboose::Role.exists?(:name =>  'Everyone Logged In'  )
     eli_role    = Caboose::Role.where(:name => 'Everyone Logged In'  ).first
-    
+
     Caboose::User.create(:first_name => 'John', :last_name => 'Doe', :username => 'elo', :email => 'william@nine.is') if !Caboose::User.exists?(:username => 'elo')
     elo_user = Caboose::User.where(:username => 'elo').first
-     
+
     Caboose::Permission.create(:resource => 'all'         , :action => 'all'    ) if !Caboose::Permission.exists?(:resource => 'all'	       , :action => 'all'    )
     Caboose::Permission.create(:resource => 'users'	      , :action => 'view'   ) if !Caboose::Permission.exists?(:resource => 'users'	     , :action => 'view'   )
     Caboose::Permission.create(:resource => 'users'	      , :action => 'edit'   ) if !Caboose::Permission.exists?(:resource => 'users'	     , :action => 'edit'   )
@@ -280,17 +305,17 @@ class Caboose::Schema < Caboose::Utilities::Schema
     Caboose::Permission.create(:resource => 'permissions' , :action => 'edit'   ) if !Caboose::Permission.exists?(:resource => 'permissions' , :action => 'edit'   )
     Caboose::Permission.create(:resource => 'permissions' , :action => 'delete' ) if !Caboose::Permission.exists?(:resource => 'permissions' , :action => 'delete' )
     Caboose::Permission.create(:resource => 'permissions' , :action => 'add'    ) if !Caboose::Permission.exists?(:resource => 'permissions' , :action => 'add'    )
-  
+
     # Add the admin user to the admin role
     Caboose::RoleMembership.create(:user_id => admin_user.id, :role_id => admin_role.id) if !Caboose::RoleMembership.exists?(:user_id => admin_user.id, :role_id => admin_role.id)
-    
+
     # Add the elo to the elo role
     Caboose::RoleMembership.create(:user_id => elo_user.id, :role_id => elo_role.id) if !Caboose::RoleMembership.exists?(:user_id => elo_user.id, :role_id => elo_role.id)
-  
+
     # Add the all/all permission to the admin role
     admin_perm = Caboose::Permission.where(:resource => 'all', :action => 'all').first
     Caboose::RolePermission.create(:role_id => admin_role.id, :permission_id => admin_perm.id) if !Caboose::RolePermission.exists?(:role_id => admin_role.id, :permission_id => admin_perm.id)
-    
+
     # Create the necessary pages
     Caboose::Page.create(:title => 'Home'  , :parent_id => -1, :hide => 0, :layout => 'home', :uri => '') if !Caboose::Page.exists?(:title => 'Home')
     home_page = Caboose::Page.where(:title => 'Home', :parent_id => -1).first
@@ -298,25 +323,25 @@ class Caboose::Schema < Caboose::Utilities::Schema
     admin_page = Caboose::Page.where(:alias => 'admin').first
     Caboose::Page.create(:title => 'Login' , :parent_id => home_page.id, :hide => 0, :layout => 'login', :alias => 'login', :slug => 'login', :uri => 'login') if !Caboose::Page.exists?(:alias => 'login')
     login_page = Caboose::Page.where(:alias => 'login').first
-        
-    Caboose::PagePermission.create(:role_id => elo_role.id, :page_id => home_page.id  , :action => 'view') if !Caboose::PagePermission.exists?(:role_id => elo_role.id, :page_id => home_page.id  , :action => 'view') 
+
+    Caboose::PagePermission.create(:role_id => elo_role.id, :page_id => home_page.id  , :action => 'view') if !Caboose::PagePermission.exists?(: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') if !Caboose::PagePermission.exists?(:role_id => elo_role.id, :page_id => login_page.id , :action => 'view')
-    
+
     # Create a default post category
     Caboose::PostCategory.create(:name => 'General News') if !Caboose::PostCategory.exists?(:name => 'General News')
-    
+
     # Create the required settings
     Caboose::Setting.create(:name => 'version'     , :value => Caboose::VERSION        ) if !Caboose::Setting.exists?(:name => 'version'     , :value => Caboose::VERSION        )
     Caboose::Setting.create(:name => 'site_name'   , :value => 'New Caboose Site'      ) if !Caboose::Setting.exists?(:name => 'site_name'   , :value => 'New Caboose Site'      )
     Caboose::Setting.create(:name => 'site_url'    , :value => 'www.mycaboosesite.com' ) if !Caboose::Setting.exists?(:name => 'site_url'    , :value => 'www.mycaboosesite.com' )
     Caboose::Setting.create(:name => 'admin_email' , :value => 'william@nine.is'       ) if !Caboose::Setting.exists?(:name => 'admin_email' , :value => 'william@nine.is'       )
-    
+
     # Create default block type categories
     btc = Caboose::BlockTypeCategory
     layouts = btc.exists?(:name => 'Layouts') ? btc.where(:name => 'Layouts').first : btc.create(:name => 'Layouts')
     content = btc.exists?(:name => 'Content') ? btc.where(:name => 'Content').first : btc.create(:name => 'Content')
     btc.create(:name => 'Rows', :parent_id => content.id) if !btc.where(:name => 'Rows', :parent_id => content.id).exists?
-    
+
     # Create default block types
     if !Caboose::BlockType.where(:name => 'layout_basic').exists?
       bt = Caboose::BlockType.create(:name => 'layout_basic', :description => 'Basic', :block_type_category_id => layouts.id, :use_render_function_for_layout => true, :allow_child_blocks => false, :field_type => 'block')
@@ -324,7 +349,7 @@ class Caboose::Schema < Caboose::Utilities::Schema
       Caboose::BlockType.create(:name => 'content' , :description => 'Content' , :parent_id => bt.id, :field_type => 'block', :allow_child_blocks => true)
       Caboose::BlockType.create(:name => 'footer'  , :description => 'Footer'  , :parent_id => bt.id, :field_type => 'block')
     end
-    
+
     if !Caboose::BlockType.where(:name => 'layout_left_sidebar').exists?
       bt = Caboose::BlockType.create(:name => 'layout_left_sidebar', :description => 'Left Sidebar', :block_type_category_id => layouts.id, :use_render_function_for_layout => true, :allow_child_blocks => false, :field_type => 'block')
       Caboose::BlockType.create(:name => 'header'  , :description => 'Header'  , :parent_id => bt.id, :field_type => 'block')
@@ -332,7 +357,7 @@ class Caboose::Schema < Caboose::Utilities::Schema
       Caboose::BlockType.create(:name => 'content' , :description => 'Content' , :parent_id => bt.id, :field_type => 'block', :allow_child_blocks => true)
       Caboose::BlockType.create(:name => 'footer'  , :description => 'Footer'  , :parent_id => bt.id, :field_type => 'block')
     end
-    
+
     if !Caboose::BlockType.where(:name => 'layout_right_sidebar').exists?
       bt = Caboose::BlockType.create(:name => 'layout_right_sidebar', :description => 'Right Sidebar', :block_type_category_id => layouts.id, :use_render_function_for_layout => true, :allow_child_blocks => false, :field_type => 'block')
       Caboose::BlockType.create(:name => 'header'  , :description => 'Header'  , :parent_id => bt.id, :field_type => 'block')
@@ -340,22 +365,22 @@ class Caboose::Schema < Caboose::Utilities::Schema
       Caboose::BlockType.create(:name => 'content' , :description => 'Content' , :parent_id => bt.id, :field_type => 'block', :allow_child_blocks => true)
       Caboose::BlockType.create(:name => 'footer'  , :description => 'Footer'  , :parent_id => bt.id, :field_type => 'block')
     end
-    
-    if !Caboose::BlockType.where(:name => 'heading').exists?   
+
+    if !Caboose::BlockType.where(:name => 'heading').exists?
       bt = Caboose::BlockType.create(:name => 'heading', :description => 'Heading', :field_type => 'block')
       Caboose::BlockType.create(:parent_id => bt.id, :name => 'text', :description => 'Text', :field_type => 'text', :default => '', :width => 800, :fixed_placeholder => false)
       Caboose::BlockType.create(:parent_id => bt.id, :name => 'size', :description => 'Size', :field_type => 'text', :default =>  1, :width => 800, :fixed_placeholder => false, :options => "1|2|3|4|5|6")
     end
-    
+
     if !Caboose::BlockType.where(:name => 'text').exists?
-      Caboose::BlockType.create(:name => 'text', :description => 'Text', :field_type => 'text', :default => '', :width => 800, :height => 400, :fixed_placeholder => false)      
+      Caboose::BlockType.create(:name => 'text', :description => 'Text', :field_type => 'text', :default => '', :width => 800, :height => 400, :fixed_placeholder => false)
     end
-    if !Caboose::BlockType.where(:name => 'richtext').exists?      
+    if !Caboose::BlockType.where(:name => 'richtext').exists?
       Caboose::BlockType.create(:name => 'richtext', :description => 'Rich Text', :field_type => 'richtext', :default => '', :width => 800, :height => 400, :fixed_placeholder => false)
     else
       bt = Caboose::BlockType.where(:name => 'richtext').first
       bt.field_type = 'richtext'
-      bt.save      
+      bt.save
     end
     if !Caboose::BlockType.where(:name => 'image').exists?
       bt = Caboose::BlockType.create(:name => 'image', :description => 'Image', :field_type => 'block')
@@ -368,13 +393,21 @@ class Caboose::Schema < Caboose::Utilities::Schema
       Caboose::BlockType.create(:parent_id => bt.id, :name => 'margin_right'  , :description => 'Right Margin'  , :field_type => 'text'   , :default => '10'    , :width => 400, :fixed_placeholder => false)
       Caboose::BlockType.create(:parent_id => bt.id, :name => 'margin_bottom' , :description => 'Bottom Margin' , :field_type => 'text'   , :default => '10'    , :width => 400, :fixed_placeholder => false)
       Caboose::BlockType.create(:parent_id => bt.id, :name => 'margin_left'   , :description => 'Left Margin'   , :field_type => 'text'   , :default => '10'    , :width => 400, :fixed_placeholder => false)
-      Caboose::BlockType.create(:parent_id => bt.id, :name => 'align'         , :description => 'Align'         , :field_type => 'select' , :default => 'None'  , :width => 400, :fixed_placeholder => false, :options => "None\nCenter\nLeft\nRight")      
+      Caboose::BlockType.create(:parent_id => bt.id, :name => 'align'         , :description => 'Align'         , :field_type => 'select' , :default => 'None'  , :width => 400, :fixed_placeholder => false, :options => "None\nCenter\nLeft\nRight")
     end
     if !Caboose::BlockType.where(:name => 'file').exists?
       bt = Caboose::BlockType.create(:name => 'file', :description => 'File', :field_type => 'block')
       Caboose::BlockType.create(:parent_id => bt.id, :name => 'file' , :description => 'File' , :field_type => 'file', :default => ''         , :width => 400, :fixed_placeholder => false)
       Caboose::BlockType.create(:parent_id => bt.id, :name => 'text' , :description => 'Text' , :field_type => 'text', :default => 'Download' , :width => 400, :fixed_placeholder => false)
-    end    
-            
+    end
+    
+    # Make sure a top-level media category for each site exists
+    Caboose::Site.all.each do |site|
+      cat = Caboose::MediaCategory.where("parent_id is null and site_id = ? and name = ?", site.id, 'Images').first
+      Caboose::MediaCategory.create(:site_id => site.id, :name => 'Images') if cat.nil?
+      cat = Caboose::MediaCategory.where("parent_id is null and site_id = ? and name = ?", site.id, 'Files').first
+      Caboose::MediaCategory.create(:site_id => site.id, :name => 'Files') if cat.nil?
+    end
+
   end
 end