caboose-cms 0.9.229 → 1.0.1

data/app/models/caboose/block_type.rb

@@ -4,8 +4,8 @@ class Caboose::BlockType < ActiveRecord::Base
   
   belongs_to :default_child_block_type, :foreign_key => 'default_child_block_type_id', :class_name => 'Caboose::BlockType'
   belongs_to :block_type_category
-  belongs_to :parent, :foreign_key => 'parent_id', :class_name => 'Caboose::BlockType'
-  has_many :children, :foreign_key => 'parent_id', :class_name => 'Caboose::BlockType', :dependent => :destroy
+  belongs_to :parent, :foreign_key => 'parent_id', :class_name => 'Caboose::BlockType'  
+  has_many :children, -> { order(:sort_order) }, :foreign_key => 'parent_id', :class_name => 'Caboose::BlockType', :dependent => :destroy
   has_many :sites, :through => :block_type_site_memberships
   has_many :block_type_site_memberships
   attr_accessible :id,    
@@ -32,7 +32,6 @@ class Caboose::BlockType < ActiveRecord::Base
     :default_included,
     :custom_sass,
     :latest_error,
-    :is_dynamic,
     :share,      # Whether or not to share the block type in the existing block store.
     :downloaded  # Whether the full block type has been download or just the name and description.
     
@@ -76,7 +75,7 @@ class Caboose::BlockType < ActiveRecord::Base
   end
   
   def parse_api_hash(h)    
-    #Caboose.log(h)
+    Caboose.log(h)
     self.name                            = h['name']
     self.description                     = h['description']
     self.block_type_category_id          = h['block_type_category_id']

data/app/models/caboose/block_type_category.rb

@@ -2,8 +2,8 @@
 class Caboose::BlockTypeCategory < ActiveRecord::Base
   self.table_name = "block_type_categories"
 
-  belongs_to :parent, :foreign_key => 'parent_id', :class_name => 'Caboose::BlockTypeCategory'  
-  has_many :children, :foreign_key => 'parent_id', :class_name => 'Caboose::BlockTypeCategory', :dependent => :destroy, :order => :sort_order
+  belongs_to :parent, :foreign_key => 'parent_id', :class_name => 'Caboose::BlockTypeCategory'    
+  has_many :children, -> { order(:name) }, :foreign_key => 'parent_id', :class_name => 'Caboose::BlockTypeCategory', :dependent => :destroy
   has_many :block_types
   attr_accessible :id,
     :parent_id,

data/app/models/caboose/block_type_parser.rb

@@ -132,7 +132,7 @@ module Caboose
 	            cv.margin_right   = img.styles['margin-right'  ] if img.styles['margin-right'  ]
 	            cv.margin_top     = img.styles['margin-top'    ] if img.styles['margin-top'    ]
 	            
-	         #   Caboose.log(cv)
+	            Caboose.log(cv)
 
               v = StdClass.new({              
                 :name         => name,

data/app/models/caboose/block_type_source.rb

@@ -2,8 +2,8 @@ require 'httparty'
 
 class Caboose::BlockTypeSource < ActiveRecord::Base
   self.table_name = "block_type_sources"
-  
-  has_many :block_types, :class_name => 'Caboose::BlockType', :order => 'name'    
+    
+  has_many :block_types, -> { order(:name) }, :class_name => 'Caboose::BlockType'
   attr_accessible :id,
     :name, 
     :url,

data/app/models/caboose/calendar_event_group.rb

@@ -51,12 +51,12 @@ module Caboose
         while d <= self.date_end          
           (0..6).each do |i|            
             d = d + 1
-          #  Caboose.log("d = #{d}")
+            Caboose.log("d = #{d}")
             next if d < self.date_start
             break if d > self.date_end
             w = d.strftime('%w').to_i
             if (w == 0 && self.sun) || (w == 1 && self.mon) || (w == 2 && self.tue) || (w == 3 && self.wed) || (w == 4 && self.thu) || (w == 5 && self.fri) || (w == 6 && self.sat)
-          #    Caboose.log("Found a day")
+              Caboose.log("Found a day")
               if !CalendarEvent.where("calendar_event_group_id = ? and cast(begin_date as date) = ?", self.id, d).exists?
                 e.duplicate(d)
               end

data/app/models/caboose/category.rb

@@ -10,8 +10,8 @@ module Caboose
 
     belongs_to :site    
     belongs_to :parent, :class_name => 'Category', :foreign_key => 'parent_id'
-    has_many :children, :class_name => 'Category', :foreign_key => 'parent_id', :order => 'name'
-    has_many :products, :through => :category_memberships, :order => 'title'
+    has_many :children, -> { order(:name) }, :class_name => 'Category', :foreign_key => 'parent_id'
+    has_many :products, -> { order(:title) }, :through => :category_memberships
     has_many :category_memberships
     
     has_attached_file :image,    

data/app/models/caboose/comment_routes.rb

@@ -17,14 +17,14 @@ module Caboose
       end
           
       classes = {'zzz_all_domains' => []}       
-      controller_paths.each do |controller_path|                
+      controller_paths.each do |controller_path|                        
         #files = Dir.glob(Rails.root.join(controller_path, '*.rb'))        
         #files = controller ? Dir.glob(Rails.root.join(controller_path, "#{controller}_controller.rb")) : Dir.glob(Rails.root.join(controller_path, '**/*.rb'))
         #files = controller ? Dir.glob(Rails.root.join(controller_path, "#{controller}_controller.rb")) : Dir.glob(Rails.root.join(controller_path, '*.rb'))        
         #files = controller ? Dir.glob("#{controller_path}/#{controller}_controller.rb") : Dir.glob("#{controller_path}/*.rb")                          
         files = controller ? Dir.glob("#{controller_path}/**/#{controller.gsub(/(.*?)::(.*?)/, '\2')}_controller.rb") : Dir.glob("#{controller_path}/**/*_controller.rb")
         #files = Dir.glob("#{controller_path}/**/*_controller.rb")        
-        for file in files
+        for file in files          
           f2 = File.open(file, "r")
                   
           domains = []
@@ -39,15 +39,16 @@ module Caboose
           f2.each_line do |line|      
             line = line.strip        
             if line =~ /^module (.*?)$/
-              module_name = line.gsub(/^module (.*?)$/, '\1').gsub(/([A-Z])/, '_\1').downcase
-              module_name[0] = '' if module_name[0] == '_'
+              this_module_name = line.gsub(/^module (.*?)$/, '\1').gsub(/([A-Z])/, '_\1').downcase
+              this_module_name[0] = '' if this_module_name[0] == '_'              
+              module_name = module_name ? "#{module_name}/#{this_module_name}" : this_module_name              
             elsif line =~ /^(.*?)class (.*?)Controller(.*?)$/
               class_name = line.gsub(/^(.*?)class (.*?)Controller(.*?)$/, '\2').gsub(/([A-Z])/, '_\1').downcase
               class_name[0] = '' if class_name[0] == '_'
-              class_name = "#{module_name}::#{class_name}" if module_name
-            elsif line =~ /# @route_domain (.*?)$/
+              class_name = "#{module_name}/#{class_name}" if module_name
+            elsif line =~ /# @route_domain (.*?)$/              
               # Ignore if we have a domain constrainer
-              if domains.is_a?(Array)
+              if domains.is_a?(Array)                
                 domain = line.gsub(/# @route_domain (.*?)$/, '\1')
                 domains << domain if !domains.include?(domain)
               end

data/app/models/caboose/core_plugin.rb

@@ -14,10 +14,9 @@ class Caboose::CorePlugin < Caboose::CaboosePlugin
     nav << item if item['children'].count > 0
     
     item = { 'id' => 'core', 'text' => 'Settings', 'children' => [] }   
-    item['children'] << { 'id' => 'settings'      , 'icon' => 'settings',        'text' => 'Site Settings'               , 'href' => "/admin/sites/#{site.id}"              , 'modal' => false } if user.is_allowed('site_settings', 'edit')      
+    item['children'] << { 'id' => 'settings'      , 'icon' => 'settings',        'text' => 'Site Settings'               , 'href' => "/admin/sites/#{site.id}"              , 'modal' => false } if user.is_super_admin?         
     item['children'] << { 'id' => 'theme-files'             , 'icon' => 'custom', 'text' => 'Theme Files'               , 'href' => '/admin/theme-files'              , 'modal' => false } if user.is_super_admin? && site.is_master == true                  
     item['children'] << { 'id' => 'blocktypes'        , 'text' => 'Block Types'         , 'href' => '/admin/block-types'        , 'modal' => false } if user.is_allowed('blocktypes'        , 'view') && site.is_master == true
-    item['children'] << { 'id' => 'font-families'        , 'text' => 'Font Families'         , 'icon' => 'info', 'href' => '/admin/font-families'        , 'modal' => false } if user.is_allowed('fonts'        , 'view') && site.is_master == true
     item['children'] << { 'icon' => 'star', 'id' => 'fonts'             , 'text' => 'Fonts'               , 'href' => '/admin/fonts'              , 'modal' => false } if user.is_allowed('fonts'             , 'view') && site.use_fonts == true
     item['children'] << { 'id' => 'redirects'         , 'text' => 'Permanent Redirects' , 'href' => '/admin/redirects'          , 'modal' => false } if user.is_allowed('redirects'         , 'view')
     item['children'] << { 'id' => 'permissions'       , 'text' => 'Permissions'         , 'href' => '/admin/permissions'        , 'modal' => false } if user.is_allowed('permissions'       , 'view') && site.is_master == true
@@ -32,8 +31,8 @@ class Caboose::CorePlugin < Caboose::CaboosePlugin
     item['children'] << { 'id' => 'users'             , 'text' => 'Users'               , 'href' => '/admin/users'              , 'modal' => false } if user.is_allowed('users'             , 'view')
     item['children'] << { 'id' => 'code'              , 'icon' => 'stack', 'text' => 'Custom Code'         , 'href' => '/admin/code'               , 'modal' => false } if user.is_allowed('code'              , 'edit')
     item['children'] << { 'id' => 'contactinfo'      , 'icon' => 'plane', 'text' => 'Contact Information'         , 'href' => "/admin/sites/#{site.id}/contact"            , 'modal' => false } if user.is_allowed('contactinfo'              , 'edit')
-    item['children'] << { 'id' => 'theme'      , 'icon' => 'sites',        'text' => 'Theme'               , 'href' => '/admin/theme'              , 'modal' => false } if user.is_allowed('theme', 'edit') && !site.theme.nil?
-    item['children'] << { 'id' => 'logs'         , 'icon' => 'monitor', 'text' => 'Change Logs'           , 'href' => '/admin/logs'           , 'modal' => false } if user.is_allowed('logs'          , 'view')   && site.use_change_logs
+    item['children'] << { 'id' => 'theme'      , 'icon' => 'sites',        'text' => 'Theme'               , 'href' => '/admin/theme'              , 'modal' => false } if user.is_allowed('theme'             , 'view') if !site.theme.nil? && user.is_super_admin?
+   # item['children'] << { 'id' => 'variables'         , 'text' => 'Variables'           , 'href' => '/admin/settings'           , 'modal' => false } if user.is_allowed('settings'          , 'view')   
     item['children'] << { 'id' => 'my-account'             , 'text' => 'My Account'               , 'href' => '/my-account'              , 'modal' => false } 
     nav << item if item['children'].count > 0
 

data/app/models/caboose/export.rb

@@ -1,4 +1,4 @@
-require 'aws'
+#require 'aws'
 
 module Caboose
 	class Export < ActiveRecord::Base

data/app/models/caboose/font.rb

@@ -1,12 +1,7 @@
 class Caboose::Font < ActiveRecord::Base
   self.table_name = "fonts"
        
-  belongs_to :site, :class_name => 'Caboose::Site'
-
-  attr_accessible :id, :site_id, :name, :family, :variant, :url, :variant_id
-
-  def var
-  	Caboose::FontVariant.where(:id => self.variant_id).first
-  end
+  belongs_to :site, :class_name => 'Caboose::Site'        
+  attr_accessible :id, :site_id, :name, :family, :variant, :url
       
 end

data/app/models/caboose/font_variant.rb

@@ -1,17 +1,5 @@
 class Caboose::FontVariant < ActiveRecord::Base
-
   self.table_name = "font_variants"
-  
   belongs_to :font_family, :class_name => 'Caboose::FontFamily'
-
-  has_attached_file :ttf_file,
-    	:path => 'caboose_fonts/:id_ttf.:extension'
-  do_not_validate_attachment_file_type :ttf_file
-
-  has_attached_file :woff_file,
-    	:path => 'caboose_fonts/:id_woff.:extension'
-  do_not_validate_attachment_file_type :woff_file
-
   attr_accessible :id, :ttf_url, :font_family_id, :variant, :weight, :style, :sort_order
-
 end

data/app/models/caboose/invoice.rb

@@ -11,8 +11,8 @@ module Caboose
     belongs_to :customer, :class_name => 'Caboose::User'
     belongs_to :shipping_address, :class_name => 'Caboose::Address'
     belongs_to :billing_address, :class_name => 'Caboose::Address'
-    has_many :discounts    
-    has_many :line_items, :order => :id
+    has_many :discounts        
+    has_many :line_items, -> { order(:id) }
     has_many :invoice_packages, :class_name => 'Caboose::InvoicePackage'
     has_many :invoice_transactions
     
@@ -86,18 +86,18 @@ module Caboose
         
     #
     # Scopes
-    #    
-    scope :cart       , where('status = ?', 'cart')
-    scope :pending    , where('status = ?', 'pending')    
-    scope :canceled   , where('status = ?', 'canceled')
-    scope :shipped    , where('status = ?', 'shipped')
-    scope :paid       , where('status = ?', 'paid')
-    scope :test       , where('status = ?', 'testing')
-    
-    scope :authorized , where('financial_status = ?', 'authorized')
-    scope :captured   , where('financial_status = ?', 'captured')
-    scope :refunded   , where('financial_status = ?', 'refunded')
-    scope :voided     , where('financial_status = ?', 'voided')        
+    #
+    scope :cart       , -> { where('status = ?', 'cart')     }
+    scope :pending    , -> { where('status = ?', 'pending')  }  
+    scope :canceled   , -> { where('status = ?', 'canceled') }
+    scope :shipped    , -> { where('status = ?', 'shipped')  }
+    scope :paid       , -> { where('status = ?', 'paid')     }
+    scope :test       , -> { where('status = ?', 'testing')  }
+    
+    scope :authorized , -> { where('financial_status = ?', 'authorized') }
+    scope :captured   , -> { where('financial_status = ?', 'captured')   }
+    scope :refunded   , -> { where('financial_status = ?', 'refunded')   }
+    scope :voided     , -> { where('financial_status = ?', 'voided')     }
         
     after_initialize :check_nil_fields
     

data/app/models/caboose/line_item.rb

@@ -37,10 +37,10 @@ module Caboose
 
     #
     # Scopes
-    #    
-    scope :pending     , where('status = ?', 'pending')
-    scope :fulfilled   , where('status = ?', 'shipped')
-    scope :unfulfilled , where('status != ?', 'shipped')
+    #
+    scope :pending     , -> { where('status = ?' , 'pending') }
+    scope :fulfilled   , -> { where('status = ?' , 'shipped') }
+    scope :unfulfilled , -> { where('status != ?', 'shipped') }
     
     #validates :quantity, :numericality => { :greater_than_or_equal_to => 0 }    
     #validate :quantity_in_stock

data/app/models/caboose/media.rb

@@ -33,8 +33,7 @@ class Caboose::Media < ActiveRecord::Base
     :image_updated_at,
     :file_file_name,
     :file_file_size,
-    :file_updated_at,
-    :deleted
+    :file_updated_at
     
    has_attached_file :sample
    
@@ -43,11 +42,6 @@ class Caboose::Media < ActiveRecord::Base
    #  self.sample.options.merge({ :s3_headers => { "Content-Disposition" => "attachment; filename=#{self.name}" }})
    #end
 
-  # def self.delete_id(media_id)
-  #   ProductImage.where(:media_id => media_id).destroy_all
-  #   Media.where(:id => media_id).destroy_all
-  # end
-
   def process
     #return if self.processed
     
@@ -129,7 +123,7 @@ class Caboose::Media < ActiveRecord::Base
   end
   
   def download_file_from_url(url)
-    self.file = URI.parse(url)
+    self.image = URI.parse(url)
     self.processed = true
     self.save
   end
@@ -178,11 +172,6 @@ class Caboose::Media < ActiveRecord::Base
   def reprocess_image
     self.image.reprocess!
   end
-
-  def self.title_for_id(mid)
-    m = Caboose::Media.where(:id => mid).first
-    return m ? m.original_name : nil
-  end
   
   def duplicate(site_id)
     cat = Caboose::MediaCategory.top_category(site_id)
@@ -201,8 +190,8 @@ class Caboose::Media < ActiveRecord::Base
       :file_updated_at    => self.file_updated_at    ,      
       :processed          => false
     )
-    m.delay(:queue => 'general').download_image_from_url(self.image.url(:original)) if self.image
-    m.delay(:queue => 'general').download_file_from_url(self.file.url) if self.file
+    m.delay(:queue => 'caboose_media').download_image_from_url(self.image.url(:original)) if self.image
+    m.delay(:queue => 'caboose_media').download_file_from_url(self.file.url) if self.file
     return m
   end
       

data/app/models/caboose/media_category.rb

@@ -1,9 +1,9 @@
 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, :class_name => 'Caboose::Media', :order => 'sort_order'  
+  belongs_to :parent, :class_name => 'Caboose::MediaCategory'    
+  has_many :children, -> { order(:name) }, :class_name => 'Caboose::MediaCategory', :foreign_key => 'parent_id'
+  has_many :media, -> { order(:sort_order) }, :class_name => 'Caboose::Media'
   attr_accessible :id, :site_id, :parent_id, :name
   
   def self.top_category(site_id)
@@ -24,7 +24,7 @@ class Caboose::MediaCategory < ActiveRecord::Base
   end
   
   def self.tree(site_id)
-    return Caboose::MediaCategory.where(:parent_id => nil, :site_id => site_id).reorder("name").all
+    return self.where(:parent_id => nil, :site_id => site_id).reorder("name").all
   end
   
   def self.flat_tree(site_id, prefix = '-')
@@ -44,7 +44,8 @@ class Caboose::MediaCategory < ActiveRecord::Base
         :id          => cat.id,
         :parent_id   => cat.parent_id,
         :site_id     => cat.site_id,      
-        :name        => cat.name
+        :name        => cat.name,
+        :media_count => cat.media.count      
       }]
       cat.children.each do |cat2|
         arr += self.flat_tree_helper(cat2, prefix, "#{str}#{prefix}")
@@ -63,6 +64,7 @@ class Caboose::MediaCategory < ActiveRecord::Base
     return {
       :id => cat.id,
       :name => cat.name,
+      :media_count => cat.media.count,
       :children => (cat.name == 'Products' ? [] : cat.children.collect{ |kid| self.tree_hash_helper(kid) })
     }
   end

data/app/models/caboose/modification.rb

@@ -4,8 +4,8 @@ module Caboose
     self.table_name  = 'store_modifications'
     self.primary_key = 'id'
 
-    belongs_to :product, :class_name => 'Caboose::Product'
-    has_many :modification_values, :class_name => 'Caboose::ModificationValue', :order => 'sort_order'
+    belongs_to :product, :class_name => 'Caboose::Product'    
+    has_many :modification_values, -> { order(:sort_order) }, :class_name => 'Caboose::ModificationValue'
     attr_accessible :id,
       :product_id,
       :sort_order,

data/app/models/caboose/page.rb

@@ -3,11 +3,12 @@ class Caboose::Page < ActiveRecord::Base
   self.table_name = "pages"
   
   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'
-  has_many :page_tags, :class_name => 'Caboose::PageTag', :dependent => :delete_all, :order => 'tag'  
+  belongs_to :parent, :class_name => 'Caboose::Page'  
+  has_many :children, -> { order('sort_order, title') }, :class_name => 'Caboose::Page', :foreign_key => 'parent_id'
+  has_many :page_permissions    
+  has_many :blocks, -> { order(:sort_order) }  
+  has_many :page_tags, -> { order(:tag) }, :class_name => 'Caboose::PageTag', :dependent => :delete_all
+  has_one :page_cache
   has_many :page_custom_field_values
   attr_accessible :id      ,        
     :site_id               ,
@@ -19,10 +20,13 @@ class Caboose::Page < ActiveRecord::Base
     :uri                   ,
     :redirect_url          ,
     :hide                  ,
+    :content_format        ,
     :custom_css            ,
     :custom_css_files      ,
     :custom_js             ,
     :custom_js_files       ,
+    :linked_resources      ,
+    :layout                ,
     :sort_order            ,
     :custom_sort_children  ,
     :seo_title             ,
@@ -32,8 +36,11 @@ class Caboose::Page < ActiveRecord::Base
     :canonical_url         ,
     :fb_description        ,
     :gp_description        ,
-    :css_digest            ,
-    :js_digest
+    :status
+   
+  CONTENT_FORMAT_HTML  = 1 
+  CONTENT_FORMAT_TEXT  = 2
+  CONTENT_FORMAT_RUBY  = 3
 
   def order_title
     return "" + menu_title + title unless menu_title.nil? || title.nil?
@@ -45,15 +52,15 @@ class Caboose::Page < ActiveRecord::Base
   def block
     Caboose::Block.where("page_id = ? and parent_id is null", self.id).first
   end
-
-  def self.title_for_id(page_id)
-    p = Caboose::Page.where(:id => page_id).first
-    return p ? p.title : nil
-  end
   
   def top_level_blocks
     Caboose::Block.where("page_id = ? and parent_id is null", self.id).reorder(:sort_order).all
   end
+  
+  #def content
+  #  return "" if self.blocks.nil? || self.blocks.count == 0
+  #  self.blocks.collect { |b| b.render }.join("\n")     
+  #end
     
   def self.find_with_fields(page_id, fields)
     return self.where(:id => page_id).select(fields).first
@@ -67,143 +74,9 @@ class Caboose::Page < ActiveRecord::Base
     Caboose::Block.where(:page_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(page)
-    home_page = Caboose::Page.index_page(page.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
-    blocks = Caboose::Block.includes(:block_type).where("blocks.page_id = ?",self.id).where("blocks.cached_css IS NOT NULL").where("block_types.is_dynamic = false").order("blocks.id").all
-    blocks.each do |b|
-      str << b.cached_css
-    end
-
-    # Add any CSS for referenced Block Copy blocks
-    bt = Caboose::BlockType.where(:name => 'source_block_id').first
-    if bt
-      ref_ids = Caboose::Block.where("value is not null").where(:block_type_id => bt.id, :page_id => self.id).pluck(:value)
-      if ref_ids && ref_ids.count > 0
-        Caboose::Block.includes(:block_type).where("blocks.id in (?)", ref_ids).order("blocks.id").all.each do |b|
-          str << b.cached_css if !b.cached_css.blank? && !b.block_type.is_dynamic
-          b.children.where("name is null").each do |b1|
-            str << b1.cached_css if !b1.cached_css.blank? && !b1.block_type.is_dynamic
-            b1.children.where("name is null").each do |b2|
-              str << b2.cached_css if !b2.cached_css.blank? && !b2.block_type.is_dynamic
-              b2.children.where("name is null").each do |b3|
-                str << b3.cached_css if !b3.cached_css.blank? && !b3.block_type.is_dynamic
-                b3.children.where("name is null").each do |b4|
-                  str << b4.cached_css if !b4.cached_css.blank? && !b4.block_type.is_dynamic
-                end
-              end
-            end
-          end
-        end
-      end
-    end
-
-    return str.blank? ? '' : str.gsub(/<\/style>(\s*)<style>/,'')
-  end
-
-  def cached_js
-    str = ''
-    return str if self.site.nil? || !self.site.use_caching
-    blocks = Caboose::Block.includes(:block_type).where("blocks.page_id = ?",self.id).where("blocks.cached_js IS NOT NULL").where("block_types.is_dynamic = false").order("blocks.id").all
-    blocks.each do |b|
-      str << b.cached_js
-    end
-
-    # Add any JS for referenced Block Copy blocks
-    bt = Caboose::BlockType.where(:name => 'source_block_id').first
-    if bt
-      ref_ids = Caboose::Block.where("value is not null").where(:block_type_id => bt.id, :page_id => self.id).pluck(:value)
-      if ref_ids && ref_ids.count > 0
-        Caboose::Block.includes(:block_type).where("blocks.id in (?)", ref_ids).order("blocks.id").all.each do |b|
-          str << b.cached_js if !b.cached_js.blank? && !b.block_type.is_dynamic
-          b.children.where("name is null").each do |b1|
-            str << b1.cached_js if !b1.cached_js.blank? && !b1.block_type.is_dynamic
-            b1.children.where("name is null").each do |b2|
-              str << b2.cached_js if !b2.cached_js.blank? && !b2.block_type.is_dynamic
-              b2.children.where("name is null").each do |b3|
-                str << b3.cached_js if !b3.cached_js.blank? && !b3.block_type.is_dynamic
-                b3.children.where("name is null").each do |b4|
-                  str << b4.cached_js if !b4.cached_js.blank? && !b4.block_type.is_dynamic
-                end
-              end
-            end
-          end
-        end
-      end
-    end
-
-    host = Rails.env.production? ? "https://#{ActionController::Base.asset_host}" : ""
-    return str.blank? ? '' : str.gsub('"/assets/',"\"#{host}/assets/")
-  end
-
-  def publish(user_id)
+  def publish
     if !self.id.nil?
-      use_caching = self.site.use_caching
-      changed_ids = []
       Caboose::Block.where(:page_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.new_media_id.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, :page_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?
@@ -219,41 +92,16 @@ class Caboose::Page < 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(:page_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, :page_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(:page_id => self.id, :status => nil).update_all(:status => 'published')
-      if use_caching
-        index_page = Caboose::Page.index_page(self.site_id)
-        self.update_cached_blocks(changed_ids)
-        self.delay(:queue => 'caching', :priority => 7).update_css_file
-        self.delay(:queue => 'caching', :priority => 7).update_js_file
-        if index_page && self.id == index_page.id
-          self.site.delay(:queue => 'caching', :priority => 8).update_footer_css_file
-          self.site.delay(:queue => 'caching', :priority => 8).update_footer_js_file
-        end
-      end
+      self.status = 'published'
+      self.save
     end
   end
 
@@ -261,28 +109,8 @@ class Caboose::Page < ActiveRecord::Base
     if !self.id.nil?
       Caboose::Block.where(:page_id => self.id).where(:status => 'added').destroy_all
       Caboose::Block.where(:page_id => self.id).update_all("status = 'published', new_value = null, new_media_id = null, new_sort_order = sort_order, new_parent_id = null")
-    end
-  end
-
-  def refresh_css
-    begin
-      rad = rand(999)
-      dom = Rails.env.production? ? self.site.public_domain : self.site.dev_domain.domain
-      uri = URI("http://#{dom}/api/page_#{self.id}.css?#{rad}")
-      css = Net::HTTP.get(uri)
-    rescue
-      Caboose.log("Couldn't generate page CSS")
-    end
-  end
-
-  def refresh_js
-    begin
-      rad = rand(999)
-      dom = Rails.env.production? ? self.site.public_domain : self.site.dev_domain.domain
-      uri = URI("http://#{dom}/api/page_#{self.id}.js?#{rad}")
-      css = Net::HTTP.get(uri)
-    rescue
-      Caboose.log("Couldn't generate page JS")
+      self.status = 'published'
+      self.save
     end
   end
   
@@ -307,15 +135,15 @@ class Caboose::Page < ActiveRecord::Base
     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(site_id)
+    else      
+      parent_id = self.index_page(site_id).id
       page_id = self.page_with_uri_helper(parts, 0, parent_id)
     end
     
     return false if page_id.nil?
-        
+       
     page = self.find(page_id)
     
     if (!get_closest_parent) # // Look for an exact match
@@ -429,13 +257,13 @@ class Caboose::Page < ActiveRecord::Base
       user = Caboose::User.find(user)
     end
     ids = []
-    user.roles.each do |role|
-      ids << Caboose::PagePermission.where({
+    user.roles.each do |role|     
+      ids + Caboose::PagePermission.where({
           :role_id => role.id,
           :action => action
         }).pluck(:page_id)
     end
-    return ids.flatten
+    return ids.uniq
   end
   
   def self.crumb_trail(page)    
@@ -511,119 +339,6 @@ class Caboose::Page < ActiveRecord::Base
     end    
     return block
   end
-
-
-  def css_path(digest = self.css_digest)
-    return "assets/pages/page_#{self.id}_#{digest}.css"
-  end
-
-  def css_url
-    rad = rand(999)
-    old = "/api/page_#{self.id}.css?#{rad}"
-    return old if self.css_digest.blank?
-    if Rails.env.production?
-      return "https://#{Caboose::cdn_domain}/#{css_path}"
-    else
-      path = File.join(Rails.root, 'public', "#{css_path}")
-      if File.file?(path)
-        return "#{ActionController::Base.asset_host}/#{css_path}"
-      else
-        return "https://#{Caboose::cdn_domain}/#{css_path}"
-      end
-    end
-  end
-
-  def update_css_file
-    str = ""
-    css_digest = SecureRandom.urlsafe_base64.to_s
-    old_digest = self.css_digest
-    css = self.refresh_css
-    if css && !css.blank?
-      begin
-        if Rails.env.production?
-          config = YAML.load(File.read(Rails.root.join('config', 'aws.yml')))[Rails.env]
-          AWS.config(:access_key_id => config['access_key_id'], :secret_access_key => config['secret_access_key'])
-          bucket =  AWS::S3.new.buckets[config['bucket']]                         
-          bucket.objects[self.css_path(css_digest)].write(css, :acl => 'public-read', :content_type => 'text/css', :cache_control => 'public, max-age=86400')
-          if !old_digest.blank? && old_digest != 'empty'
-            key = self.css_path(old_digest)
-            obj = bucket.objects[key]
-            obj.delete
-          end
-        else
-          file_path = File.join(Rails.root, 'public', 'assets', 'pages')
-          FileUtils.mkdir_p(file_path) unless File.directory?(file_path)
-          File.open(File.join(Rails.root, 'public', self.css_path(css_digest)), 'wb+') { |f| f.write( css ) }
-          if !old_digest.blank? && old_digest != 'empty'
-            path = File.join(Rails.root, 'public', self.css_path(old_digest))
-            File.delete(path) if File.file?(path)
-          end
-        end
-        self.update_column('css_digest', css_digest)
-      rescue
-        self.update_column('css_digest', old_digest)
-      end
-    else
-      self.update_column('css_digest', 'empty')
-    end
-  end
-
-  def js_path(digest = self.js_digest)
-    return "assets/pages/page_#{self.id}_#{digest}.js"
-  end
-
-  def js_url
-    rad = rand(999)
-    old = "/api/page_#{self.id}.js?#{rad}"
-    return old if self.js_digest.blank?
-    if Rails.env.production?
-      return "https://#{Caboose::cdn_domain}/#{js_path}"
-    else
-      path = File.join(Rails.root, 'public', "#{js_path}")
-      if File.file?(path)
-        return "#{ActionController::Base.asset_host}/#{js_path}"
-      else
-        return "https://#{Caboose::cdn_domain}/#{js_path}"
-      end
-    end
-  end
-
-  def update_js_file
-    str = ""
-    js_digest = SecureRandom.urlsafe_base64.to_s
-    old_digest = self.js_digest
-    js = self.refresh_js
-    if js && !js.blank?
-      begin
-        if Rails.env.production?
-          config = YAML.load(File.read(Rails.root.join('config', 'aws.yml')))[Rails.env]
-          AWS.config(:access_key_id => config['access_key_id'], :secret_access_key => config['secret_access_key'])
-          bucket =  AWS::S3.new.buckets[config['bucket']]                         
-          bucket.objects[self.js_path(js_digest)].write(js, :acl => 'public-read', :content_type => 'text/javascript', :cache_control => 'public, max-age=86400')
-          if !old_digest.blank? && old_digest != 'empty'
-            key = self.js_path(old_digest)
-            obj = bucket.objects[key]
-            obj.delete
-          end
-        else
-          file_path = File.join(Rails.root, 'public', 'assets', 'pages')
-          FileUtils.mkdir_p(file_path) unless File.directory?(file_path)
-          File.open(File.join(Rails.root, 'public', self.js_path(js_digest)), 'wb+') { |f| f.write( js ) } 
-          if !old_digest.blank? && old_digest != 'empty'
-            path = File.join(Rails.root, 'public', self.js_path(old_digest))
-            File.delete(path) if File.file?(path)
-          end
-        end
-        self.update_column('js_digest', js_digest)
-      rescue
-       self.update_column('js_digest', old_digest)
-      end
-    else
-      self.update_column('js_digest', 'empty')
-    end
-  end
-
-
   
   def self.url(page_id)
     arr = []
@@ -677,6 +392,21 @@ class Caboose::Page < ActiveRecord::Base
   def is_child_of?(parent_id)
     return Caboose::Page.is_child(parent_id, self.id)
   end
+
+  def linked_resources_map
+    resources = { js: [], css: [] }
+    return resources if self.linked_resources.nil?
+    self.linked_resources.each_line do |r|
+      r.chomp!
+      case r
+      when /\.js$/
+        resources[:js] << r
+      when /\.css$/
+        resources[:css] << r
+      end
+    end
+    return resources
+  end
   
   def head_title
     str = ""
@@ -714,7 +444,7 @@ class Caboose::Page < ActiveRecord::Base
     end
   end
   
-  def duplicate(site_id, parent_id, duplicate_children = false, block_type_id = nil, child_block_type_id = nil, user_id = nil)
+  def duplicate(site_id, parent_id, duplicate_children = false, block_type_id = nil, child_block_type_id = nil)
     
     if parent_id.to_i == -1
       p = Caboose::Page.index_page(site_id)
@@ -729,15 +459,16 @@ class Caboose::Page < ActiveRecord::Base
       p = Caboose::Page.create(:site_id => site_id, :parent_id => parent_id)
     end
 
-    site = Caboose::Site.where(:id => site_id).first
-
     p.title                = "Copy of " + self.title                 
     p.menu_title           = self.menu_title            
     p.alias                = self.alias                               
     p.redirect_url         = self.redirect_url
-    p.hide                 = true                     
+    p.hide                 = true               
+    p.content_format       = self.content_format        
     p.custom_css           = self.custom_css            
-    p.custom_js            = self.custom_js           
+    p.custom_js            = self.custom_js             
+    p.linked_resources     = self.linked_resources      
+    p.layout               = self.layout                
     p.sort_order           = self.sort_order            
     p.custom_sort_children = self.custom_sort_children  
     p.seo_title            = self.seo_title             
@@ -757,8 +488,6 @@ class Caboose::Page < ActiveRecord::Base
     end while (Caboose::Page.where(:uri => p.uri, :site_id => site_id).count > 0 && i < 10)
 
     p.save
-
-    Caboose::ChangeLog.create(:site_id => site_id, :description => p.title, :user_id => user_id, :page_id => p.id, :timestamp => DateTime.now, :action => 'created') if site && site.use_change_logs
     
     self.page_tags.each{ |tag| Caboose::PageTag.create(:page_id => p.id, :tag => tag.tag) }
     
@@ -777,7 +506,7 @@ class Caboose::Page < ActiveRecord::Base
         
     if duplicate_children && !p.is_child_of?(self.id)
       self.children.each do |p2|
-        p2.duplicate(site_id, p.id, duplicate_children, child_block_type_id, child_block_type_id, user_id)
+        p2.duplicate(site_id, p.id, duplicate_children, child_block_type_id, child_block_type_id)
       end
     end
     return p