caboose-cms 0.9.229 → 1.0.1

data/app/models/caboose/page_bar_generator.rb

@@ -21,15 +21,13 @@ module Caboose
     #		itemsPerPage:	Number of items you want to show per page. Defaults to 10 if not present.
     #		page: Current page number.  Defaults to 0 if not present.
     #
-    attr_accessor :original_params, :params, :options, :custom_url_vars, :post_get, :use_game, :game_id
+    attr_accessor :original_params, :params, :options, :custom_url_vars, :post_get    
   	
     #def initialize(post_get, params = nil, options = nil, &custom_url_vars = nil)
   	def initialize(post_get, params = nil, options = nil)
   	  
   	  params  = {} if params.nil?
   	  options = {} if options.nil?
-      @use_game = false
-      @game_id = 0
   	  
   		# Note: a few keys are required:
   		# base_url, page, itemCount, itemsPerPage
@@ -53,22 +51,19 @@ module Caboose
   			                         #   search_field_2 => [association_name, join_table, column_name]
   			                         # }  			
   		}      
-
   		params.each do |key, val|
   		  @original_params[key] = val
   		  @params[key] = val 
   		end
-
-      if @post_get['game_id'] && !@post_get['game_id'].blank?
-        @use_game = true
-        @game_id = @post_get['game_id']
-      end
-
   		options.each { |key, val| @options[key] = val }
   		
+  		#@params.each  { |key, val|  		  
+  		#  k = @options['abbreviations'].include?(key) ? @options['abbreviations'][key] : nil  		  
+  		#  @params[key] = post_get[key].nil? ? (k && !post_get[k].nil? ? post_get[k] : val) : post_get[key]  		          
+  		#}
+  		
   		new_params = {}
   		keys_to_delete = []
-
   		@params.each  { |key, val|
   		  next if !@options['abbreviations'].has_key?(key)  		  
   		  long_key = @options['abbreviations'][key]  		  
@@ -77,11 +72,9 @@ module Caboose
   		}  	
   		keys_to_delete.each { |k| @params.delete(k) }
   		new_params.each { |k,v| @params[k] = v }  		
-  		@original_params.each { |k,v| @original_params[k] = post_get[k] ? post_get[k] : v } 
-
+  		@original_params.each { |k,v| @original_params[k] = post_get[k] ? post_get[k] : v }  		
   		@params.each  { |k,v| @params[k]  = post_get[k] ? post_get[k] : v }  		
-  		@options.each { |k,v| @options[k] = ok(post_get[k]) ? post_get[k] : v } 
-
+  		@options.each { |k,v| @options[k] = ok(post_get[k]) ? post_get[k] : v }  		  		
   		#@custom_url_vars = custom_url_vars if !custom_url_vars.nil?
   		@use_url_params = @options['use_url_params'].nil? ? Caboose.use_url_params : @options['use_url_params']
       
@@ -248,9 +241,9 @@ module Caboose
   	  if !@custom_url_vars.nil?
   	    return @custom_url_vars.call @options['base_url'], @params
   	  end
-  	 
+  	    	  
   	  vars = []
-  	  @original_params.each do |k,v|
+  	  @original_params.each do |k,v|          	    
   	    next if @options['skip'].include?(k)
   	    k = @options['abbreviations'].include?(k) ? @options['abbreviations'][k] : k  	      	    
   	    if v.kind_of?(Array)
@@ -270,9 +263,6 @@ module Caboose
   	      end  	        
   	    end  	      	    
   	  end
-      if @use_game
-        vars.push("game_id=#{@game_id}")
-      end
   	  if @use_url_params
   	    vars.push("sort/#{@options['sort']}")
   		  vars.push("desc/#{@options['desc']}")  		

data/app/models/caboose/page_cache.rb

@@ -0,0 +1,12 @@
+module Caboose
+  class PageCache < ActiveRecord::Base
+    self.table_name = "page_cache"
+    
+    belongs_to :page
+    attr_accessible :id,
+      :page_id,
+      :render_function,
+      :block      
+        
+  end
+end

data/app/models/caboose/page_cacher.rb

@@ -0,0 +1,137 @@
+
+module Caboose
+  class PageCacher
+    
+    def self.refresh
+      PageCache.where(:refresh => true).all.each do |pc|
+ #       self.delay(:queue => 'caboose_cache').cache(pc.page_id)
+      end
+      
+      # Make sure all pages are cached
+      query = ["select id from pages where id not in (select distinct(page_id) from page_cache)"]
+      rows = ActiveRecord::Base.connection.execute(ActiveRecord::Base.send(:sanitize_sql_array, query))
+      if rows
+#        rows.each{ |row| self.delay(:queue => 'caboose_cache').cache(row['id'].to_i) }
+      end
+    end
+    
+    def self.cache_all
+      query = ["select id from pages order by id"]
+      rows = ActiveRecord::Base.connection.execute(ActiveRecord::Base.send(:sanitize_sql_array, query))
+      if rows
+  #      rows.each{ |row| self.delay(:queue => 'caboose_cache').cache(row['id'].to_i) }
+      end            
+    end
+      
+    def self.cache(page_id)    
+      p = (page_id.is_a?(Integer) ? Page.where(:id => page_id).first : page_id)
+      return if p.nil?
+      return if p.site_id.nil?
+      return if p.site.nil?
+      return if p.block.nil?
+            
+      @render_functions = {} if @render_functions.nil?
+      @page_render_functions = {} if @page_render_functions.nil?      
+      @page_render_functions[p.id] = []
+      @dups = {}
+                  
+      self.cache_helper(p.site, p, p.block)
+
+      arr = @page_render_functions[p.id].collect do |bt_id|                        
+        "<% def render_block_type_#{bt_id}(block, page, view, controller_view_content, modal, empty_text, editing, css, js, csrf_meta_tags, csrf_meta_tags2, logged_in_user, site) %>#{@render_functions[bt_id]}<% end %>"         
+      end                  
+      
+      dups = []
+      @dups.each{ |bt_id, arr| dups << "#{bt_id} => [#{arr.join(',')}]" }
+      dups = dups.join(', ')
+        
+      str = arr.join("\n\n")      
+      str << "<%\n"      
+      str << "def dup_id(bt_id)\n"
+      str << "  dups = {#{dups}}\n"
+      str << "  dups.each do |bt_id2, arr|\n"
+      str << "    return bt_id2 if arr.include?(bt_id)\n"
+      str << "  end\n"
+      str << "  return bt_id\n"
+      str << "end\n"            
+      str << "def render_block_type(block, child_block, page, view, controller_view_content, modal, empty_text, editing, css, js, csrf_meta_tags, csrf_meta_tags2, logged_in_user, site)\n"
+      str << "  b = child_block && child_block.is_a?(String) ? block.child(child_block) : child_block\n"      
+      str << "  send(\"render_block_type_\#\{dup_id(b.block_type_id)\}\", b, page, view, controller_view_content, modal, empty_text, editing, css, js, csrf_meta_tags, csrf_meta_tags2, logged_in_user, site)\n"
+      str << "end\n\n"            
+      str << "render_block_type_#{p.block.block_type_id}(@block, @page, @view, @controller_view_content, @modal, @empty_text, @editing, @css, @js, @csrf_meta_tags, @csrf_meta_tags2, @logged_in_user, @site)\n"      
+      str << "%>\n"      
+            
+      pc = PageCache.where(:page_id => p.id).first
+      pc = PageCache.new(:page_id => p.id) if pc.nil?
+      pc.render_function = str
+      pc.block = Marshal.dump(BlockCache.new(p.block))
+      pc.refresh = false
+      pc.save              
+    end
+    
+    def self.cache_helper(site, p, block)
+      return if block.nil?
+      self.cache_helper2(site, p, block.block_type)            
+      block.children.each{ |b2| self.cache_helper(site, p, b2) }
+    end
+    
+    def self.cache_helper2(site, p, bt)
+      return if bt.nil?      
+      self.add_block_type(site, p, bt)
+      bt.children.each{ |bt2| self.cache_helper2(site, p, bt2) }
+    end
+            
+    def self.add_block_type(site, p, bt)
+      return if bt.nil?
+      if !@render_functions.has_key?(bt.id)
+        f = ''        
+        if bt.use_render_function && bt.render_function
+          f = bt.render_function          
+        else
+          full_name = bt.full_name
+          full_name = "lksdjflskfjslkfjlskdfjlkjsdf" if full_name.nil? || full_name.length == 0
+          #if    File.file?(Rails.root.join("sites/#{site.name}/blocks/_#{full_name}.html.erb"     )) then f = Rails.root.join("sites/#{site.name}/blocks/_#{full_name}.html.erb")
+          #elsif File.file?(Rails.root.join("sites/#{site.name}/blocks/_#{bt.name}.html.erb"       )) then f = Rails.root.join("sites/#{site.name}/blocks/_#{bt.name}.html.erb")
+          #elsif File.file?(Rails.root.join("sites/#{site.name}/blocks/_#{bt.field_type}.html.erb" )) then f = Rails.root.join("sites/#{site.name}/blocks/_#{bt.field_type}.html.erb")
+          if    File.file?(Rails.root.join("app/views/caboose/blocks/#{site.name}/_#{full_name}.html.erb"     )) then f = Rails.root.join("app/views/caboose/blocks/#{site.name}/_#{full_name}.html.erb")
+          elsif File.file?(Rails.root.join("app/views/caboose/blocks/#{site.name}/_#{bt.name}.html.erb"       )) then f = Rails.root.join("app/views/caboose/blocks/#{site.name}/_#{bt.name}.html.erb")
+          elsif File.file?(Rails.root.join("app/views/caboose/blocks/#{site.name}/_#{bt.field_type}.html.erb" )) then f = Rails.root.join("app/views/caboose/blocks/#{site.name}/_#{bt.field_type}.html.erb")            
+          elsif File.file?(Rails.root.join("app/views/caboose/blocks/_#{full_name}.html.erb"                  )) then f = Rails.root.join("app/views/caboose/blocks/_#{full_name}.html.erb")
+          elsif File.file?(Rails.root.join("app/views/caboose/blocks/_#{bt.name}.html.erb"                    )) then f = Rails.root.join("app/views/caboose/blocks/_#{bt.name}.html.erb")
+          elsif File.file?(Rails.root.join("app/views/caboose/blocks/_#{bt.field_type}.html.erb"              )) then f = Rails.root.join("app/views/caboose/blocks/_#{bt.field_type}.html.erb")
+          elsif File.file?("#{Caboose.root}/app/views/caboose/blocks/_#{full_name}.html.erb"                   ) then f = "#{Caboose.root}/app/views/caboose/blocks/_#{full_name}.html.erb"
+          elsif File.file?("#{Caboose.root}/app/views/caboose/blocks/_#{bt.name}.html.erb"                     ) then f = "#{Caboose.root}/app/views/caboose/blocks/_#{bt.name}.html.erb"
+          elsif File.file?("#{Caboose.root}/app/views/caboose/blocks/_#{bt.field_type}.html.erb"               ) then f = "#{Caboose.root}/app/views/caboose/blocks/_#{bt.field_type}.html.erb"
+          end
+          f = (f && f.to_s.strip.length > 0 ? File.read(f) : '')
+        end
+        f.gsub!(/block\.partial\((.*?),(.*?)\)/ , 'render :partial => \1')
+        f.gsub!(/block\.render\((.*?),(.*?)\)/  , 'render_block_type(block, \1, page, view, controller_view_content, modal, empty_text, editing, css, js, csrf_meta_tags, csrf_meta_tags2, logged_in_user, site)')        
+        f.gsub!(/\=\s*render_block_type\(/      , 'render_block_type(')
+        f.gsub!(/\=\s*raw render_block_type\(/  , 'render_block_type(')
+        f.gsub!(/block.children.where\(([^\)]*?)\)\.all/, 'block.children_where(\1)')                
+                
+        #@render_functions[bt.id] = "<% def render_block_type_#{bt.id}(block, page, view, controller_view_content, modal, empty_text, editing, css, js, csrf_meta_tags, csrf_meta_tags2, logged_in_user, site) %>#{f}<% end %>"
+          
+        @render_functions[bt.id] = f
+      end
+      
+      is_dup = false
+      f = @render_functions[bt.id]
+      @render_functions.each do |bt_id, f2|
+        if f == f2 && @page_render_functions[p.id].include?(bt_id)
+          @dups[bt_id] = [] if !@dups.has_key?(bt_id)
+          @dups[bt_id] << bt.id if !@dups[bt_id].include?(bt.id)
+          is_dup = true
+          break
+        end
+      end
+      
+      if !is_dup        
+        @page_render_functions[p.id] = [] if !@page_render_functions.has_key?(p.id)
+        @page_render_functions[p.id] << bt.id if !@page_render_functions[p.id].include?(bt.id)
+      end
+    end
+    
+  end
+end

data/app/models/caboose/post.rb

@@ -18,7 +18,8 @@ class Caboose::Post < ActiveRecord::Base
     :image_url   ,
     :published   ,
     :created_at  ,
-    :updated_at  
+    :updated_at  ,
+    :status
     
   has_attached_file :image, 
     :path => ':caboose_prefixposts/:id_:style.:extension',
@@ -48,96 +49,9 @@ class Caboose::Post < ActiveRecord::Base
     Caboose::Block.where(:post_id => self.id).where('status != ?','published').count == 0 if !self.id.nil?
   end
 
-  # Returns an array of block IDs for all descendant blocks of the homepage footer
-  def self.home_page_footer_block_ids(post)
-    home_page = Caboose::Page.index_page(post.site_id)
-    home_footer = home_page ? home_page.block.child('footer') : nil
-    if home_footer
-      footer_ids = [home_footer.id]
-      home_footer.children.where("name is null").each do |f1|
-        footer_ids << f1.id
-        f1.children.where("name is null").each do |f2|
-          footer_ids << f2.id
-          f2.children.where("name is null").each do |f3|
-            footer_ids << f3.id
-            f3.children.where("name is null").each do |f4|
-              footer_ids << f4.id
-              f4.children.where("name is null").each do |f5|
-                footer_ids << f5.id
-              end
-            end
-          end
-        end
-      end
-      return footer_ids
-    else
-      return [0]
-    end
-  end
-
-  def update_cached_blocks(block_ids)
-    blocks = block_ids && block_ids.count > 0 ? Caboose::Block.where("id in (?)", block_ids).order(:id).all : []
-    blocks.each do |b|
-      b.use_cache = false
-      b.save
-      b.delay(:queue => 'caching', :priority => 6).update_cache
-    end
-  end
-
-  def cached_css
-    str = ''
-    return str if self.site.nil? || !self.site.use_caching
-    footer_ids = Caboose::Post.home_page_footer_block_ids(self)
-    blocks = Caboose::Block.includes(:block_type).where("blocks.post_id = ? OR blocks.parent_id in (?)",self.id,footer_ids).where("blocks.cached_css IS NOT NULL").where("block_types.is_dynamic = false").all
-    blocks.each do |b|
-      str << b.cached_css
-    end
-    return str.blank? ? '' : str.gsub(/<\/style>(\s*)<style>/,'')
-  end
-
-  def cached_js
-    str = ''
-    return str if self.site.nil? || !self.site.use_caching
-    footer_ids = Caboose::Post.home_page_footer_block_ids(self)
-    blocks = Caboose::Block.includes(:block_type).where("blocks.post_id = ? OR blocks.parent_id in (?)",self.id,footer_ids).where("blocks.cached_js IS NOT NULL").where("block_types.is_dynamic = false").all
-    blocks.each do |b|
-      str << b.cached_js
-    end
-    return str
-  end
-
-  def publish(user_id)
+  def publish
     if !self.id.nil?
-      use_caching = self.site.use_caching
-      changed_ids = []
       Caboose::Block.where(:post_id => self.id).where('status = ? OR status = ?','edited','added').all.each do |b|
-        if self.site && self.site.use_change_logs
-          if b.new_parent_id.blank? && b.new_value.blank? && b.sort_order == b.new_sort_order && b.status == 'edited'
-            # This one just got moved because something else was added
-          else
-            cl = Caboose::ChangeLog.create(:site_id => self.site_id, :user_id => user_id, :post_id => self.id, :block_id => b.id, :block_parent_id => b.parent_id, :timestamp => DateTime.now, :action => b.status)
-            desc = ""
-            desc += b.parent.parent.block_type.description + " -> " if b.parent && b.parent.parent && b.parent.parent.block_type && b.parent.parent.block_type.description != "Content" && !b.parent.parent.block_type.name.include?('layout')
-            pos = b.parent && b.parent.block_type && b.parent.block_type.name == 'flex_grid_unit' ? b.parent.sort_order + 1 : nil
-            desc += b.parent.block_type.description + " #{pos} -> " if b.parent && b.parent.block_type && b.parent.block_type.description != "Content" && !b.parent.block_type.name.include?('layout')
-            desc += b.block_type.description if b.block_type
-            cl.description = desc
-            cl.is_field = true if !b.name.blank?
-            ov = ['page','page_id'].include?(b.name) ? Caboose::Page.title_for_id(b.value) : b.value
-            nv = ['page','page_id'].include?(b.name) ? Caboose::Page.title_for_id(b.new_value) : b.new_value
-            if b.new_value.blank? && !b.new_media_id.blank?
-              ov = Caboose::Media.title_for_id(b.media_id)
-              nv = Caboose::Media.title_for_id(b.new_media_id)
-            end
-            cl.old_value = ov
-            cl.new_value = nv
-            cl.old_sort_order = b.sort_order
-            cl.new_sort_order = b.new_sort_order
-            cl.old_parent_id = b.parent_id
-            cl.new_parent_id = b.new_parent_id
-            cl.save
-          end
-        end
         if b.new_value == 'EMPTY'
           b.value = nil
         elsif !b.new_value.blank?
@@ -153,32 +67,16 @@ class Caboose::Post < ActiveRecord::Base
         b.status = 'published'
         b.new_value = nil
         b.new_media_id = nil
-        b.new_sort_order = b.sort_order
+        b.new_sort_order = nil
         b.new_parent_id = nil
         b.save
-        # Update cached value for the closest cached ancestor of this block
-        changed_ids << b.cached_ancestor if use_caching
-      end
-      if use_caching # Catch published blocks that have never been cached before
-        content = self.block.child('content')
-        Caboose::Block.includes(:block_type).where(:parent_id => content.id, :status => 'published', :cached_value => nil, :name => nil).where("block_types.is_dynamic = false").all.each do |b|
-          changed_ids << b.cached_ancestor
-        end
       end
       deleted_blocks = Caboose::Block.where(:post_id => self.id, :status => 'deleted').pluck(:id)
       dids = deleted_blocks.blank? ? 0 : deleted_blocks
-      if self.site && self.site.use_change_logs
-        Caboose::Block.where("id in (?)",dids).all.each do |b|
-          cl = Caboose::ChangeLog.create(:site_id => self.site_id, :user_id => user_id, :post_id => self.id, :block_id => b.id, :block_parent_id => b.parent_id, :timestamp => DateTime.now, :action => 'deleted')
-          cl.old_value = b.new_value.blank? ? b.value : b.new_value
-          cl.description = b.block_type.description if b.block_type
-          cl.is_field = true if !b.name.blank?
-          cl.save
-        end
-      end
       Caboose::Block.where("id in (?) or parent_id in (?)",dids,dids).destroy_all
       Caboose::Block.where(:post_id => self.id, :status => nil).update_all(:status => 'published')
-      self.update_cached_blocks(changed_ids) if use_caching
+      self.status = 'published'
+      self.save
     end
   end
 
@@ -186,6 +84,8 @@ class Caboose::Post < ActiveRecord::Base
     if !self.id.nil?
       Caboose::Block.where(:post_id => self.id).where(:status => 'added').destroy_all
       Caboose::Block.where(:post_id => self.id).update_all("status = 'published', new_value = null, new_media_id = null, new_sort_order = sort_order, new_parent_id = null")
+      self.status = 'published'
+      self.save
     end
   end
   

data/app/models/caboose/product.rb

@@ -10,11 +10,11 @@ module Caboose
     has_many :customizations, :class_name => 'Caboose::Product', :through => :customization_memberships
     has_many :customization_memberships, :class_name => 'Caboose::CustomizationMembership'
     has_many :categories, :class_name => 'Caboose::Category', :through => :category_memberships
-    has_many :category_memberships, :class_name => 'Caboose::CategoryMembership'
-    has_many :variants, :class_name => 'Caboose::Variant', :order => 'option1_sort_order, option2_sort_order, option3_sort_order'
+    has_many :category_memberships, :class_name => 'Caboose::CategoryMembership'    
+    has_many :variants, -> { order('option1_sort_order, option2_sort_order, option3_sort_order') }, :class_name => 'Caboose::Variant'
     has_many :product_images, :class_name => 'Caboose::ProductImage'
-    has_many :product_inputs, :class_name => 'Caboose::ProductInput'
-    has_many :modifications, :class_name => 'Caboose::Modification', :order => 'sort_order'
+    has_many :product_inputs, :class_name => 'Caboose::ProductInput'    
+    has_many :modifications, -> { order(:sort_order) }, :class_name => 'Caboose::Modification'
     has_many :reviews, :class_name => 'Caboose::Review'
     has_many :product_category_sorts, :class_name => 'Caboose::ProductCategorySort'
     
@@ -218,7 +218,7 @@ module Caboose
     
     def Product.update_on_sale            
       Product.reorder(:id).all.each do |p|
-        p.delay(:queue => 'general', :priority => 15).update_on_sale 
+        p.delay(:queue => 'caboose_store').update_on_sale 
       end
     end
 

data/app/models/caboose/product_image.rb

@@ -35,7 +35,7 @@ module Caboose
     do_not_validate_attachment_file_type :image
     #validates_attachment_content_type :image, :content_type => ["image/jpg", "image/jpeg", "image/png"]
     
-    default_scope order('position ASC')
+    default_scope { order('position ASC') }
             
     def process
       config = AssetSync.config

data/app/models/caboose/role.rb

@@ -43,10 +43,10 @@ class Caboose::Role < ActiveRecord::Base
   
   def is_allowed(resource, action)    
     # Check for the admin permission
-    exc = ["theme","site_settings"] # Excluded resources for ALL permission - must be specifically designated
     for perm in permissions
-      return true if (perm.resource == "all" && perm.action == "all" && !exc.include?(resource))
+      return true if (perm.resource == "all" && perm.action == "all")
     end
+        
     if (resource.is_a?(Caboose::Page))      
       for perm in page_permissions
         return true if (perm.page_id == resource.id && perm.action == action)

data/app/models/caboose/schema.rb

@@ -6,6 +6,8 @@ class Caboose::Schema < Caboose::Utilities::Schema
     {
       :roles_users              => :role_memberships,
       :permissions_roles        => :role_permissions,
+      #:page_block_field_values => :fields,
+      #:page_block_fields       => :field_types,
       :page_block_types         => :block_types,
       :page_blocks              => :blocks,      
       :store_order_discounts    => :store_invoice_discounts,
@@ -88,9 +90,8 @@ class Caboose::Schema < Caboose::Utilities::Schema
         :decremented           ,
         :user_subscription_id
       ],        
+      #Caboose::PageCache => [:block],
       #Caboose::RetargetingConfig => [:fb_pixels_function],
-      Caboose::Page => [:content_format, :linked_resources, :layout, :status],
-      Caboose::Post => [:hide, :image_url, :status],  
       Caboose::ShippingPackage => [:price, :carrier, :service_code, :service_name, :shipping_method_id, :length, :width, :height],
       Caboose::Site => [:shipping_cost_function],
       Caboose::StoreConfig => [:use_usps, :allowed_shipping_codes, :default_shipping_code, :pp_relay_url, :pp_response_url],
@@ -145,6 +146,15 @@ class Caboose::Schema < Caboose::Utilities::Schema
         [ :country       , :string  ],
         [ :country_code  , :string  ],
         [ :phone         , :string  ]
+      ],      
+      Caboose::Asset => [
+        [ :page_id        , :integer    ],
+        [ :user_id        , :integer    ],
+        [ :date_uploaded  , :datetime   ],
+        [ :name           , :string     ],
+        [ :filename       , :string     ],
+        [ :description    , :string     ],
+        [ :extension      , :string     ]
       ],
       Caboose::Block => [
         [ :page_id               , :integer    ],
@@ -165,11 +175,7 @@ class Caboose::Schema < Caboose::Utilities::Schema
         [ :new_parent_id, :integer ],
         [ :new_sort_order, :integer ],
         [ :new_value, :text ],
-        [ :new_media_id              , :integer    ],
-        [ :cached_value, :text ],
-        [ :cached_css, :text ],
-        [ :cached_js, :text ],
-        [ :use_cache, :boolean     , { :default => false }]
+        [ :new_media_id              , :integer    ]
       ],
       Caboose::BlockType => [        
         [ :parent_id                       , :integer ],
@@ -198,8 +204,7 @@ class Caboose::Schema < Caboose::Utilities::Schema
         [ :default_included                , :boolean , { :default => false }],
         [ :default_full_width              , :boolean , { :default => false }],
         [ :share                           , :boolean , { :default => true  }],
-        [ :downloaded                      , :boolean , { :default => false }],
-        [ :is_dynamic, :boolean     , { :default => false }]
+        [ :downloaded                      , :boolean , { :default => false }]
       ],
       Caboose::BlockTypeSiteMembership => [
         [ :site_id        , :integer ],
@@ -283,25 +288,6 @@ class Caboose::Schema < Caboose::Utilities::Schema
         [ :product_id            , :integer ],
         [ :sort_order            , :integer  , { :default => 0 }]
       ],
-      Caboose::ChangeLog => [
-        [ :site_id, :integer ],
-        [ :page_id, :integer ],
-        [ :post_id, :integer ],
-        [ :block_id, :integer ],
-        [ :media_id, :integer ],
-        [ :user_id, :integer ],
-        [ :description, :string ],
-        [ :action, :string ],
-        [ :timestamp, :datetime ],
-        [ :old_value, :text ],
-        [ :new_value, :text ],
-        [ :old_parent_id, :integer ],
-        [ :new_parent_id, :integer ],
-        [ :old_sort_order, :integer ],
-        [ :new_sort_order, :integer ],
-        [ :is_field, :boolean   , { :default => false }],
-        [ :block_parent_id, :integer ]
-      ],
       Caboose::CustomizationMembership => [
         [ :product_id       , :integer ],
         [ :customization_id , :integer ]
@@ -339,8 +325,7 @@ class Caboose::Schema < Caboose::Utilities::Schema
         [ :name               , :string  ],
         [ :family             , :string  ],
         [ :variant            , :string  ],
-        [ :url                , :string  ],
-        [ :variant_id         , :integer ]
+        [ :url                , :string  ]
       ],
       Caboose::FontFamily => [
         [ :name               , :string  ]
@@ -351,9 +336,7 @@ class Caboose::Schema < Caboose::Utilities::Schema
         [ :ttf_url            , :string  ],
         [ :weight             , :string  ],
         [ :style              , :string  ],
-        [ :sort_order         , :integer ],
-        [ :ttf_file         , :attachment ],
-        [ :woff_file         , :attachment ]
+        [ :sort_order         , :integer ]
       ],
       Caboose::FormSubmission => [
         [ :site_id, :integer ],
@@ -495,8 +478,7 @@ class Caboose::Schema < Caboose::Utilities::Schema
         [ :original_name     , :string     ],
         [ :image             , :attachment ],
         [ :file              , :attachment ],
-        [ :processed         , :boolean     , { :default => false }],
-        [ :deleted         , :boolean     , { :default => false }]
+        [ :processed         , :boolean     , { :default => false }]
       ],      
       Caboose::Modification => [      
         [ :product_id               , :integer ],
@@ -587,6 +569,24 @@ class Caboose::Schema < Caboose::Utilities::Schema
         [ :gift_message          , :text     ],
         [ :include_receipt       , :boolean  , { :default => true }],
         [ :instore_pickup        , :boolean  , { :default => false }]
+                
+        #[ :email                 , :string   ],
+        #[ :invoice_number        , :string   ],
+        #[ :payment_id            , :integer  ],
+        #[ :gateway_id            , :integer  ],
+        #[ :date_authorized       , :datetime ],
+        #[ :date_captured         , :datetime ],
+        #[ :date_cancelled        , :datetime ],                
+        #[ :shipping_carrier      , :string   ],
+        #[ :shipping_service_code , :string   ],
+        #[ :shipping_service_name , :string   ],        
+        #[ :transaction_id        , :string   ],
+        #[ :transaction_id        , :string   ],
+        #[ :transaction_service   , :string   ],
+        #[ :amount_discounted     , :numeric  ],
+        #[ :auth_code             , :string   ],                
+        #[ :date_shipped          , :datetime ],                        
+        #[ :decremented           , :boolean  ]
       ],      
       Caboose::Page => [
         [ :site_id               , :integer ],
@@ -598,10 +598,13 @@ class Caboose::Schema < Caboose::Utilities::Schema
         [ :uri                   , :string  ],
         [ :redirect_url          , :string  ],
         [ :hide                  , :boolean , { :default => false }],
+        [ :content_format        , :integer , { :default => Caboose::Page::CONTENT_FORMAT_HTML }],
         [ :custom_css            , :text    ],
         [ :custom_css_files      , :text    ],
         [ :custom_js             , :text    ],
         [ :custom_js_files       , :text    ],
+        [ :linked_resources      , :text    ],
+        [ :layout                , :string  ],
         [ :sort_order            , :integer , { :default => 0                }],
         [ :custom_sort_children  , :boolean , { :default => false            }],
         [ :seo_title             , :string  , { :limit => 200                 }],
@@ -611,9 +614,14 @@ class Caboose::Schema < Caboose::Utilities::Schema
         [ :canonical_url         , :string  ],
         [ :fb_description        , :string  , { :limit => 300 }],
         [ :gp_description        , :string  , { :limit => 300 }],
-        [ :css_digest            , :string  ],
-        [ :js_digest            , :string  ]
-      ],  
+        [ :status,                :string  ]
+      ],
+      Caboose::PageCache => [
+        [ :page_id               , :integer ],
+        [ :render_function       , :text    ],
+        [ :block                 , :binary  ],
+        [ :refresh               , :boolean , { :default => false }]        
+      ],
       Caboose::PageCustomField => [
         [ :site_id           , :integer ],
         [ :key               , :string  ],
@@ -675,12 +683,15 @@ class Caboose::Schema < Caboose::Utilities::Schema
         [ :author               , :text       ],
         [ :body                 , :text 		  ],
         [ :preview              , :text       ],
+        [ :hide                 , :boolean    ],
+        [ :image_url            , :text 		  ],
         [ :published            , :boolean    ],
         [ :created_at           , :datetime   ],
         [ :updated_at           , :datetime   ],
         [ :image                , :attachment ],
         [ :slug                 , :string     ],        
-        [ :uri                  , :string     ]
+        [ :uri                  , :string     ],
+        [ :status               , :string     ]
       ],      
       Caboose::PostCategory => [
         [ :site_id  , :integer ],
@@ -892,14 +903,7 @@ class Caboose::Schema < Caboose::Utilities::Schema
         [ :head_code, :text ],
         [ :body_open_code, :text ],
         [ :body_close_code, :text ],
-        [ :recaptcha_threshold, :float, { :default => 0.05 } ],
-        [ :use_change_logs, :boolean     , { :default => false }],
-        [ :google_api_key, :string ],
-        [ :use_caching, :boolean     , { :default => false }],
-        [ :footer_css_digest, :string ],
-        [ :footer_js_digest, :string ],
-        [ :custom_css_files      , :text    ],
-        [ :custom_js_files      , :text    ]
+        [ :recaptcha_threshold, :float, { :default => 0.05 } ]
       ],
       Caboose::SiteMembership => [
         [ :site_id     , :integer ],
@@ -1098,12 +1102,7 @@ class Caboose::Schema < Caboose::Utilities::Schema
         [ :mobile_logo_height, :string ],
         [ :mobile_logo_top_padding, :string ],
         [ :constrain_footer, :string ],
-        [ :heading_base_font_size, :string ],
-        [ :sass_error, :text ],
-        [ :main_js, :text ],
-        [ :js_digest, :string ],
-        [ :default_page_padding, :string ],
-        [ :default_page_constrain, :string ]
+        [ :heading_base_font_size, :string ]
       ],
       Caboose::ThemeFile => [
         [ :filename, :string ],
@@ -1363,28 +1362,28 @@ class Caboose::Schema < Caboose::Utilities::Schema
     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')
-    #   Caboose::BlockType.create(:name => 'header'  , :description => 'Header'  , :parent_id => bt.id, :field_type => 'block')
-    #   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_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')
+      Caboose::BlockType.create(:name => 'header'  , :description => 'Header'  , :parent_id => bt.id, :field_type => 'block')
+      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')
-    #   Caboose::BlockType.create(:name => 'sidebar' , :description => 'Sidebar' , :parent_id => bt.id, :field_type => 'block', :allow_child_blocks => true)
-    #   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')
+      Caboose::BlockType.create(:name => 'sidebar' , :description => 'Sidebar' , :parent_id => bt.id, :field_type => 'block', :allow_child_blocks => true)
+      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')
-    #   Caboose::BlockType.create(:name => 'sidebar' , :description => 'Sidebar' , :parent_id => bt.id, :field_type => 'block', :allow_child_blocks => true)
-    #   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')
+      Caboose::BlockType.create(:name => 'sidebar' , :description => 'Sidebar' , :parent_id => bt.id, :field_type => 'block', :allow_child_blocks => true)
+      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?
       bt = Caboose::BlockType.create(:name => 'heading', :description => 'Heading', :field_type => 'block')