caboose-cms 0.9.228 → 0.9.229

data/app/controllers/caboose/products_controller.rb

@@ -323,7 +323,7 @@ module Caboose
         :params => params.to_json,
         :status => 'pending'
       )
-      e.delay(:queue => 'caboose_general', :priority => 8).product_process if Rails.env.production?
+      e.delay(:queue => 'general', :priority => 8).product_process if Rails.env.production?
       e.product_process if Rails.env.development?
       resp.new_id = e.id
       resp.success = true

data/app/controllers/caboose/sites_controller.rb

@@ -89,8 +89,8 @@ module Caboose
             
     # @route GET /admin/sites/:id/block-types
     def admin_edit_block_types
-      return if !user_is_allowed('sites', 'edit')
-      if (!logged_in_user.is_super_admin?)
+      return unless user_is_allowed('site_settings', 'edit') || user_is_allowed('sites', 'edit')
+      if (@site.id.to_s != params[:id] && !@site.is_master)
         @error = "You are not allowed to edit this site."
         render :file => 'caboose/extras/error' and return
       end
@@ -139,8 +139,8 @@ module Caboose
     
     # @route GET /admin/sites/:id
     def admin_edit
-      return if !user_is_allowed('sites', 'edit')
-      if (!logged_in_user.is_super_admin?)
+      return unless user_is_allowed('site_settings', 'edit') || user_is_allowed('sites', 'edit')
+      if (@site.id.to_s != params[:id] && !@site.is_master)
         @error = "You are not allowed to edit this site."
         render :file => 'caboose/extras/error' and return
       end
@@ -168,6 +168,7 @@ module Caboose
         site.description = site_name
         site.use_fonts = true
         site.use_dragdrop = true
+        site.use_caching = true
         site.theme_color = '#141414'
         site.allow_self_registration = false
         site.use_store = false
@@ -214,8 +215,11 @@ module Caboose
           when 'state' then site.state = value
           when 'zip' then site.zip = value
           when 'fax' then site.fax = value
+          when 'use_change_logs' then site.use_change_logs = value
+          when 'google_api_key' then site.google_api_key = value
           when 'contact_email' then site.contact_email = value
           when 'recaptcha_threshold' then site.recaptcha_threshold = value
+          when 'use_caching' then site.use_caching = value
           when 'head_code' then site.head_code = (value.blank? ? nil : value.gsub('<end/script>','</script>'))
           when 'body_open_code' then site.body_open_code = (value.blank? ? nil : value.gsub('<end/script>','</script>'))
           when 'body_close_code' then site.body_close_code = (value.blank? ? nil : value.gsub('<end/script>','</script>'))
@@ -299,8 +303,8 @@ module Caboose
     # @route GET /admin/sites/:field-options
     # @route GET /admin/sites/:id/:field-options    
     def options
-      return if !user_is_allowed('sites', 'view')
-      render :json => { :error => "You are not allowed to manage sites." } and return if !@site.is_master
+      return if !user_is_allowed('sites', 'edit')
+      render :json => { :error => "You are not allowed to manage sites." } and return if !logged_in_user.is_super_admin?
       case params[:field]
         when nil
           options = logged_in_user.is_super_admin? ? Site.reorder('name').all.collect { |s| { 'value' => s.id, 'text' => s.name }} : []
@@ -315,6 +319,21 @@ module Caboose
     end
 
 
+    # @route PUT /admin/sites/:id/refresh-cache
+    def admin_refresh_cache
+      return if !user_is_allowed('sites', 'edit')
+      @site.delay(:queue => 'caching', :priority => 5).refresh_all_page_caches   
+      render :json => true
+    end
+
+    # @route GET /api/generate-asset/site_:id
+    def compiled_asset
+      respond_to do |format|
+        format.css { render :layout => 'caboose/footer_css', :content_type => "text/css" }
+        format.js { render :layout => 'caboose/footer_js', :content_type => "text/javascript" }
+      end
+    end
+
     private
 
     def get_edit_site(s_id, site_id)

data/app/controllers/caboose/sns_controller.rb

@@ -22,9 +22,9 @@ module Caboose
               media_category_id = arr.shift
               original_name = arr.join('_')  
               name = Caboose::Media.upload_name(original_name)                                       
-              m = Media.where(:media_category_id => media_category_id, :original_name => original_name, :name => name).first
-              m = Media.create(:media_category_id => media_category_id, :original_name => original_name, :name => name, :processed => false) if m.nil?                
-              m.delay(:queue => 'caboose_media', :priority => 3).process
+              m = Media.where(:media_category_id => media_category_id, :original_name => original_name, :name => name, :processed => false, :deleted => false).order('id desc').first
+              m = Media.create(:media_category_id => media_category_id, :original_name => original_name, :name => name, :processed => false, :deleted => false) if m.nil?    
+              m.delay(:queue => 'general', :priority => 3).process
             end
           end                  
         end

data/app/controllers/caboose/themes_controller.rb

@@ -134,6 +134,18 @@ module Caboose
       @theme = @site.theme
     end
 
+    # @route GET /admin/theme/js
+    def admin_js
+      return if !user_is_allowed('theme', 'edit')
+      @theme = @site.theme
+    end
+
+    # @route GET /admin/theme/errors
+    def admin_error_log
+      return if !user_is_allowed('theme', 'edit')
+      @theme = @site.theme
+    end
+
     # @route PUT /admin/theme/sass
     def admin_update_sass
       return if !user_is_allowed('theme', 'edit')
@@ -146,6 +158,19 @@ module Caboose
       render :json => resp
     end
 
+    # @route PUT /admin/theme/js
+    def admin_update_js
+      return if !user_is_allowed('theme', 'edit')
+      resp = StdClass.new  
+      @theme = @site.theme
+      @theme.main_js = params['code']
+      @theme.save
+      @theme.upload_js(@site.id)
+      resp.success = true
+      resp.message = "Code has been saved!"
+      render :json => resp
+    end
+
     # @route POST /admin/themes/:id/default-banner-image
     def admin_update_default_banner_image
       return if !user_is_allowed('theme', 'edit')
@@ -166,6 +191,7 @@ module Caboose
       resp = Caboose::StdClass.new
       checked = params[:checked]
       theme_id = params[:id]
+      theme = Caboose::Theme.find(theme_id)
       file_id = params[:file_id]
       if checked && checked != false && checked != 'false'
         am = Caboose::ThemeFileMembership.where(:theme_id => theme_id, :theme_file_id => file_id).first
@@ -176,6 +202,10 @@ module Caboose
       else
         Caboose::ThemeFileMembership.delete_all(:theme_id => theme_id, :theme_file_id => file_id)
       end
+      file = Caboose::ThemeFile.find(file_id)
+      if file && file.filename.include?('.js')
+        Rails.env.production? ? theme.delay(:queue => 'general', :priority => 12).upload_js(@site.id) : theme.upload_js(@site.id)
+      end
       resp.success = "Success"
       render :json => resp
     end

data/app/controllers/caboose/users_controller.rb

@@ -26,6 +26,7 @@ module Caboose
     # @route GET /admin/users/json
     def admin_json
       return if !user_is_allowed('users', 'view')
+      where2 = @logged_in_user && @logged_in_user.is_allowed('all', 'all') ? "id is not null" : "username is null or (username != 'admin' and username != 'eli' and username != 'elo')"
       pager = PageBarGenerator.new(params, {
           'site_id'         => @site.id,
     		  'first_name_like' => '',
@@ -38,7 +39,7 @@ module Caboose
     		  'desc'			     => false,
     		  'base_url'		   => '/admin/users',
     		  'use_url_params' => false,
-          'additional_where' => [ "(site_id = #{@site.id})" ]
+          'additional_where' => [ "(site_id = #{@site.id}) AND (#{where2})" ]
     	})    	    	      
     	render :json => {
     	  :pager => pager,
@@ -114,7 +115,7 @@ module Caboose
         :params => params.to_json,
         :status => 'pending'
       )
-      e.delay(:queue => 'caboose_general', :priority => 8).user_process if Rails.env.production?
+      e.delay(:queue => 'general', :priority => 8).user_process if Rails.env.production?
       e.user_process if Rails.env.development?
       resp.new_id = e.id
       resp.success = true
@@ -126,6 +127,14 @@ module Caboose
       return if !user_is_allowed('users', 'edit')
       @edituser = get_edit_user(params[:id], @site.id)
     end
+
+    # @route GET /admin/users/:id/logs
+    def admin_change_logs
+      return unless user_is_allowed('logs', 'view')
+      @edituser = get_edit_user(params[:id], @site.id)
+      mc = "Media Category"
+      @logs = ChangeLog.where(:user_id => @edituser.id, :site_id => @site.id).where('(is_field = false and (action = ? OR action = ?)) OR (action != ? and action != ?) OR (is_field = true AND description ILIKE (?))','added','deleted','added','deleted',"%#{mc}%").order('timestamp desc, id desc').limit(500)
+    end
     
     # @route GET /admin/users/:id/password
     def admin_edit_password
@@ -212,13 +221,11 @@ module Caboose
     
     # @route POST /admin/users
     def admin_add
-      return if !user_is_allowed('users', 'add')
-      
-      resp = StdClass.new({
-          'error' => nil,
-          'redirect' => nil
-      })
-      
+      resp = StdClass.new({'error' => nil,'redirect' => nil})
+      if !user_is_allowed_to('add', 'users', true)
+        return
+      end
+    
       user = User.new()
       user.email = params[:email] ? params[:email].strip.downcase : nil
       user.site_id = @site.id
@@ -396,7 +403,7 @@ module Caboose
       token = params[:token]      
       if user.token == params[:token]
         if logged_in? || logged_in_user.id == User::LOGGED_OUT_USER_ID
-          Caboose.log(logged_in_user.id)          
+       #   Caboose.log(logged_in_user.id)          
           redirect_to "/logout?return_url=/admin/users/#{params[:id]}/su/#{user.token}"
           return
         end

data/app/controllers/caboose/variants_controller.rb

@@ -316,38 +316,38 @@ module Caboose
           when 'sale_price'
             variants.each_with_index do |v, i|              
               v.sale_price = value            
-              v.product.delay(:run_at => 3.seconds.from_now, :queue => 'caboose_store').update_on_sale if i == 0
+              v.product.delay(:run_at => 3.seconds.from_now, :queue => 'general', :priority => 15).update_on_sale if i == 0
             end
           when 'date_sale_starts'
             variants.each_with_index do |v, i|
               v.date_sale_starts = ModelBinder.update_date(v.date_sale_starts, value, @logged_in_user.timezone)
               if i == 0
-                v.product.delay(:run_at => v.date_sale_starts, :queue => 'caboose_store').update_on_sale
-                v.product.delay(:run_at => 3.seconds.from_now, :queue => 'caboose_store').update_on_sale                
+                v.product.delay(:run_at => v.date_sale_starts, :queue => 'general', :priority => 15).update_on_sale
+                v.product.delay(:run_at => 3.seconds.from_now, :queue => 'general', :priority => 15).update_on_sale                
               end                                
             end
           when 'time_sale_starts'
             variants.each_with_index do |v, i|
               v.date_sale_starts = ModelBinder.update_time(v.date_sale_starts, value, @logged_in_user.timezone)                                    
               if i == 0
-                v.product.delay(:run_at => v.date_sale_starts, :queue => 'caboose_store').update_on_sale
-                v.product.delay(:run_at => 3.seconds.from_now, :queue => 'caboose_store').update_on_sale                
+                v.product.delay(:run_at => v.date_sale_starts, :queue => 'general', :priority => 15).update_on_sale
+                v.product.delay(:run_at => 3.seconds.from_now, :queue => 'general', :priority => 15).update_on_sale                
               end
             end            
           when 'date_sale_ends'
             variants.each_with_index do |v, i|
               v.date_sale_ends = ModelBinder.update_date(v.date_sale_ends, value, @logged_in_user.timezone)            
               if i == 0
-                v.product.delay(:run_at => v.date_sale_ends  , :queue => 'caboose_store').update_on_sale
-                v.product.delay(:run_at => 3.seconds.from_now, :queue => 'caboose_store').update_on_sale                
+                v.product.delay(:run_at => v.date_sale_ends  , :queue => 'general', :priority => 15).update_on_sale
+                v.product.delay(:run_at => 3.seconds.from_now, :queue => 'general', :priority => 15).update_on_sale                
               end
             end            
           when 'time_sale_ends'
             variants.each_with_index do |v, i|
               v.date_sale_ends = ModelBinder.update_time(v.date_sale_ends, value, @logged_in_user.timezone)                                    
               if i == 0
-                v.product.delay(:run_at => v.date_sale_ends  , :queue => 'caboose_store').update_on_sale
-                v.product.delay(:run_at => 3.seconds.from_now, :queue => 'caboose_store').update_on_sale                
+                v.product.delay(:run_at => v.date_sale_ends  , :queue => 'general', :priority => 15).update_on_sale
+                v.product.delay(:run_at => 3.seconds.from_now, :queue => 'general', :priority => 15).update_on_sale                
               end
             end
             

data/app/models/caboose/block.rb

@@ -39,7 +39,11 @@ class Caboose::Block < ActiveRecord::Base
     :new_parent_id,
     :new_sort_order,
     :new_value,
-    :new_media_id
+    :new_media_id,
+    :cached_value,
+    :cached_css,
+    :cached_js,
+    :use_cache
         
   after_initialize :caste_value
   before_save :caste_value
@@ -58,6 +62,82 @@ class Caboose::Block < ActiveRecord::Base
     return self.name if parent_id.nil?
     return "#{parent.full_name}_#{self.name}"
   end
+
+  def cached_ancestor
+    begin
+      page_or_post = self.page ? self.page : self.post
+      content = page_or_post.block.child('content')
+      index_page = Caboose::Page.index_page(page_or_post.site_id)
+      footer = index_page.block.child('footer')
+      return Caboose::Block.cached_ancestor_helper(self, content.id, footer.id)
+    rescue
+     return nil
+    end
+  end
+
+  def self.cached_ancestor_helper(b, content_id, footer_id)
+    if b.block_type && b.name.nil? && !b.block_type.is_dynamic && (b.parent_id == content_id || b.parent_id == footer_id)
+      return b.id
+    elsif b.parent
+      return cached_ancestor_helper(b.parent, content_id, footer_id)
+    else
+      return nil
+    end
+  end
+
+  def has_dynamic_descendant
+    return Caboose::Block.descendant_helper(self)
+  end
+
+  def self.descendant_helper(block)
+    return true if block.block_type.nil? || block.block_type.is_dynamic
+    is_dynamic = false
+    block.children.where("name is null OR name ILIKE ?","%_column").each do |b|
+      is_dynamic = Caboose::Block.descendant_helper(b)
+      return true if is_dynamic == true
+    end
+    return is_dynamic
+  end
+
+  def update_cache
+    par = self.parent
+    hdd = self.has_dynamic_descendant
+    if par && self.block_type && self.name.blank? && !self.block_type.is_dynamic && !hdd
+      opts = {
+        :view => nil,
+        :controller_view_content => nil,
+        :modal => false,
+        :empty_text => '',
+        :editing => false,
+        :css => nil,
+        :js => nil,
+        :csrf_meta_tags => nil,
+        :csrf_meta_tags2 => nil,    
+        :logged_in_user => nil,
+        :page => self.page,
+        :post => self.post,
+        :site => self.page ? self.page.site : self.post.site,
+        :is_cache => true,
+        :protocol => "https://"
+      }
+      str = par.render(self, opts)
+      host = Rails.env.production? ? "https://#{ActionController::Base.asset_host}" : ""
+      self.cached_value = str.blank? ? '' : str.gsub('"/assets/',"\"#{host}/assets/")
+      self.use_cache = true
+    elsif self.block_type && !self.block_type.is_dynamic && self.children && self.children.count > 0 && hdd # Try caching the children
+      self.cached_value = nil
+      self.cached_css = nil
+      self.cached_js = nil
+      self.children.where(:name => nil).each do |child|
+        child.delay(:queue => 'caching', :priority => 6).update_cache
+      end
+    elsif hdd
+      self.cached_value = nil
+      self.cached_css = nil
+      self.cached_js = nil
+    end
+    self.save
+  end
   
   def child_value(name)
     b = self.child(name)
@@ -70,8 +150,6 @@ class Caboose::Block < ActiveRecord::Base
       return b.media.file if b.media
       return b.file
     end
-    #return b.image if b.block_type.field_type == 'image'
-    #return b.file  if b.block_type.field_type == 'file'
     return b.value
   end
 
@@ -153,11 +231,8 @@ class Caboose::Block < ActiveRecord::Base
     end
   end
                                             
-  def render(block, options)
-    #Caboose.log("block.full_name = #{block.full_name}")
-    #Caboose.log("block.render\nself.id = #{self.id}\nblock = #{block}\nblock.full_name = #{block.full_name}\noptions.class = #{options.class}\noptions = #{options}")                
+  def render(block, options)             
     if block && block.is_a?(String)
-      #Caboose.log("Block #{block} is a string, finding block object... self.id = #{self.id}")                                          
       b = self.child(block)        
       if b.nil?
         self.create_children
@@ -181,14 +256,14 @@ class Caboose::Block < ActiveRecord::Base
       :js => nil,
       :csrf_meta_tags => nil,
       :csrf_meta_tags2 => nil,    
-      :logged_in_user => nil
+      :logged_in_user => nil,
+      :is_cache => false
     }    
-    #defaults = { :modal => false, :empty_text => '', :editing => false, :css => nil, :js => nil, :block => block }
+
     options2 = nil
     if options.is_a?(Hash)
       options2 = defaults.merge(options)
     else
-      #options2 = { :modal => options.modal, :empty_text => options.empty_text, :editing => options.editing, :css => options.css, :js => options.js }
       options2 = {
         :view                    => options.view                    ? options.view                    : nil,
         :controller_view_content => options.controller_view_content ? options.controller_view_content : nil,
@@ -199,11 +274,15 @@ class Caboose::Block < ActiveRecord::Base
         :js                      => options.js                      ? options.js                      : nil,
         :csrf_meta_tags          => options.csrf_meta_tags          ? options.csrf_meta_tags          : nil,
         :csrf_meta_tags2         => options.csrf_meta_tags2         ? options.csrf_meta_tags2         : nil,
-        :logged_in_user          => options.logged_in_user          ? options.logged_in_user          : nil
+        :logged_in_user          => options.logged_in_user          ? options.logged_in_user          : nil,
+        :is_cache                => options.is_cache                ? options.is_cache                : nil
       }
     end
     options2[:block] = block
 
+    pop = block.page ? block.page : block.post
+    return block.cached_value if block && pop && pop.site && pop.site.use_caching && block.use_cache && !block.cached_value.blank? && block.block_type && !block.block_type.is_dynamic && !options2[:is_cache] && (options2[:editing] == false || (pop && pop.is_published))
+
     view = options2[:view]     
     view = ActionView::Base.new(ActionController::Base.view_paths) if view.nil?
 
@@ -227,7 +306,7 @@ class Caboose::Block < ActiveRecord::Base
           block.block_type.latest_error = "#{msg}#{ex.message}\n#{ex.backtrace.join("\n")}"
           block.block_type.save
         end
-      end            
+      end         
     else
       
       full_name = block.block_type.full_name
@@ -277,12 +356,9 @@ class Caboose::Block < ActiveRecord::Base
     return "<p class='note error'>Could not find block view anywhere.</p>" if i > arr.count
     begin
       str = view.render(:partial => arr[i], :locals => options)
-   #   Caboose.log("Level #{i+1} for #{full_name}: Found partial #{arr[i]}") 
-      rescue ActionView::MissingTemplate => ex        
-   #     Caboose.log("Level #{i+1} for #{full_name}: #{ex.message}")        
+      rescue ActionView::MissingTemplate => ex     
         str = render_helper(view, options, block, full_name, arr, i+1)
-      rescue Exception => ex 
-   #     Caboose.log("Level #{i+1} for #{full_name}: #{ex.message}")
+      rescue Exception => ex
         str = "<p class='note error'>#{self.block_message(block, ex)}</p>"
     end
     return str      
@@ -299,8 +375,7 @@ class Caboose::Block < ActiveRecord::Base
   end
                   
   def render_from_function(options)
-    self.create_children    
-    #locals = OpenStruct.new(:block => self, :empty_text => empty_text, :editing => editing)
+    self.create_children
     locals = OpenStruct.new(options)
     erb = ERB.new(block_type.render_function)
     return erb.result(locals.instance_eval { binding })
@@ -317,13 +392,13 @@ class Caboose::Block < ActiveRecord::Base
       :js => nil,
       :csrf_meta_tags => nil,
       :csrf_meta_tags2 => nil,    
-      :logged_in_user => nil
+      :logged_in_user => nil,
+      :is_cache => false
     }
     options2 = nil        
     if options.is_a?(Hash)
       options2 = defaults.merge(options)
     else
-      #options2 = { :modal => options.modal, :empty_text => options.empty_text, :editing => options.editing, :css => options.css, :js => options.js }
       options2 = {
         :view                    => options.view                    ? options.view                    : nil,
         :controller_view_content => options.controller_view_content ? options.controller_view_content : nil,
@@ -334,7 +409,8 @@ class Caboose::Block < ActiveRecord::Base
         :js                      => options.js                      ? options.js                      : nil,
         :csrf_meta_tags          => options.csrf_meta_tags          ? options.csrf_meta_tags          : nil,
         :csrf_meta_tags2         => options.csrf_meta_tags2         ? options.csrf_meta_tags2         : nil,
-        :logged_in_user          => options.logged_in_user          ? options.logged_in_user          : nil
+        :logged_in_user          => options.logged_in_user          ? options.logged_in_user          : nil,
+        :is_cache                => options.is_cache                ? options.is_cache                : nil
       }
     end
     options2[:block] = self