caboose-cms 0.9.229 → 1.0.1

data/app/controllers/caboose/posts_controller.rb

@@ -73,38 +73,12 @@ module Caboose
       render :layout => 'caboose/admin'
     end
 
-    # @route GET /admin/posts/:id/logs
-    def admin_change_logs
-      return unless user_is_allowed('logs', 'view')
-      @post = Post.find(params[:id])  
-      if @post.site_id != @logged_in_user.site_id && !@logged_in_user.is_super_admin?
-        redirect_to '/admin/posts'
-      else
-        @logs = ChangeLog.where(:post_id => @post.id).where('(is_field is false and (action = ? OR action = ?)) OR (action != ? and action != ?)','added','deleted','added','deleted').order('timestamp desc, id desc').limit(500)
-        render :layout => 'caboose/admin'
-      end
-    end
-
-    # @route PUT /admin/posts/:id/publish
+    # @route GET /admin/posts/:id/publish
     def admin_publish
-      resp = Caboose::StdClass.new
-      resp.success = false
-      render :json => resp and return unless user_is_allowed('posts', 'edit')
-      post = get_edit_post(params[:id], @site.id)
-      resp.success = true
-      post.delay(:queue => 'caching', :priority => 5).publish(logged_in_user.id)
-      render :json => resp
-    end
-
-    # @route GET /admin/posts/:id/status
-    def admin_status
-      resp = Caboose::StdClass.new
-      resp.status = 'pending'
+      return unless user_is_allowed('posts', 'edit')
       post = get_edit_post(params[:id], @site.id)
-      if post && post.is_published
-        resp.status = 'published'
-      end
-      render :json => resp
+      post.publish
+      redirect_to "/admin/posts/#{post.id}/content"
     end
 
     # @route GET /admin/posts/:id/revert
@@ -196,9 +170,7 @@ module Caboose
       resp = Caboose::StdClass.new({'attributes' => {}})
       post = get_edit_post(params[:id], @site.id)
       save = true
-      user = logged_in_user
-      params.each do |name, value|
-        old_value = post[name]
+      params.each do |name, value|    
         case name                      
           when 'site_id'    then post.site_id    = value.to_i
           when 'slug'       then post.set_slug_and_uri(value)                        
@@ -213,13 +185,6 @@ module Caboose
           when 'created_at' then post.created_at = DateTime.strptime(value,'%m/%d/%Y')
           when 'updated_at' then post.updated_at = DateTime.parse(value)
         end
-        if @site.use_change_logs && !['id','action','controller'].include?(name)
-          ov = old_value
-          nv = value
-          ov = ['published'].include?(name) ? (ov ? 'yes' : 'no') : ov
-          nv = ['published'].include?(name) ? ( ['1',1,true,'true'].include?(nv) ? 'yes' : 'no') : nv
-          cl = Caboose::ChangeLog.create(:site_id => @site.id, :description => "Post #{name.titleize}", :user_id => user.id, :post_id => post.id, :timestamp => DateTime.now, :action => 'edited', :old_value => ov, :new_value => nv)
-        end
       end
       resp.success = save && post.save      
       render :json => resp
@@ -227,25 +192,20 @@ module Caboose
     
     # @route POST /admin/posts/:id/image
     def admin_update_image
-      return if !user_is_allowed('posts', 'edit')
-      user = logged_in_user
+      return if !user_is_allowed('posts', 'edit')  
       resp = Caboose::StdClass.new
       post = get_edit_post(params[:id], @site.id)
-      ov = post.image_file_name
       post.image = params[:image]            
       resp.success = post.save
       resp.attributes = { 'image' => { 'value' => post.image.url(:thumb) }}
-      Caboose::ChangeLog.create(:site_id => @site.id, :description => "Post Image", :user_id => user.id, :post_id => post.id, :timestamp => DateTime.now, :action => 'edited', :old_value => ov, :new_value => post.image_file_name) if @site.use_change_logs
       render :text => resp.to_json
     end
 
     # @route POST /admin/posts/:id/remove-image
     def admin_remove_image
       return unless user_is_allowed("posts", 'edit')
-      resp = Caboose::StdClass.new
-      user = logged_in_user
+      resp = Caboose::StdClass.new   
       b = Post.find(params[:id])
-      Caboose::ChangeLog.create(:site_id => @site.id, :description => "Post Image", :user_id => user.id, :post_id => b.id, :timestamp => DateTime.now, :action => 'edited', :old_value => b.image_file_name, :new_value => 'None') if @site.use_change_logs
       b.image_file_name = nil
       b.image_file_size = nil
       b.image_content_type = nil
@@ -281,7 +241,6 @@ module Caboose
         bt = BlockType.where(:id => @site.default_layout_id).first
         Block.create(:post_id => post.id, :block_type_id => bt.id, :name => bt.name) if post && bt
         resp.redirect = "/admin/posts/#{post.id}"
-        Caboose::ChangeLog.create(:site_id => @site.id, :description => post.title, :user_id => logged_in_user.id, :post_id => post.id, :timestamp => DateTime.now, :action => 'created') if @site.use_change_logs
       end
       render :json => resp
     end
@@ -291,10 +250,8 @@ module Caboose
       return if !user_is_allowed('posts', 'edit')
       post = get_edit_post(params[:id], @site.id)
       cat_id = params[:post_category_id]
-      cat = PostCategory.where(:id => cat_id).first
       if post && !PostCategoryMembership.exists?(:post_id => post.id, :post_category_id => cat_id)
         PostCategoryMembership.create(:post_id => post.id, :post_category_id => cat_id)
-        Caboose::ChangeLog.create(:site_id => @site.id, :description => "Post Category", :user_id => logged_in_user.id, :post_id => post.id, :timestamp => DateTime.now, :action => "added", :new_value => (cat ? cat.name : nil)) if @site.use_change_logs
       end
       render :json => true      
     end
@@ -304,10 +261,8 @@ module Caboose
       return if !user_is_allowed('posts', 'edit')
       post = get_edit_post(params[:id], @site.id)
       cat_id = params[:post_category_id]
-      cat = PostCategory.where(:id => cat_id).first
       if post && PostCategoryMembership.exists?(:post_id => post.id, :post_category_id => cat_id)
         PostCategoryMembership.where(:post_id => post.id, :post_category_id => cat_id).destroy_all
-        Caboose::ChangeLog.create(:site_id => @site.id, :description => "Post Category", :user_id => logged_in_user.id, :post_id => post.id, :timestamp => DateTime.now, :action => "deleted", :old_value => (cat ? cat.name : nil)) if @site.use_change_logs
       end
       render :json => true      
     end
@@ -317,7 +272,6 @@ module Caboose
       return if !user_is_allowed('posts', 'edit')
       post = get_edit_post(params[:id], @site.id)
       PostCategoryMembership.where(:post_id => post.id).destroy_all if post
-      Caboose::ChangeLog.create(:site_id => @site.id, :description => post.title, :user_id => logged_in_user.id, :post_id => post.id, :timestamp => DateTime.now, :action => 'deleted') if post && @site.use_change_logs
       Post.where(:id => post.id).destroy_all if post
       render :json => { 'redirect' => '/admin/posts' }      
     end

data/app/controllers/caboose/products_controller.rb

@@ -323,7 +323,7 @@ module Caboose
         :params => params.to_json,
         :status => 'pending'
       )
-      e.delay(:queue => 'general', :priority => 8).product_process if Rails.env.production?
+      e.delay(:queue => 'caboose_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 unless user_is_allowed('site_settings', 'edit') || user_is_allowed('sites', 'edit')
-      if (@site.id.to_s != params[:id] && !@site.is_master)
+      return if !user_is_allowed('sites', 'edit')
+      if (!logged_in_user.is_super_admin?)
         @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 unless user_is_allowed('site_settings', 'edit') || user_is_allowed('sites', 'edit')
-      if (@site.id.to_s != params[:id] && !@site.is_master)
+      return if !user_is_allowed('sites', 'edit')
+      if (!logged_in_user.is_super_admin?)
         @error = "You are not allowed to edit this site."
         render :file => 'caboose/extras/error' and return
       end
@@ -168,7 +168,6 @@ 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
@@ -215,11 +214,8 @@ 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>'))
@@ -303,8 +299,8 @@ module Caboose
     # @route GET /admin/sites/:field-options
     # @route GET /admin/sites/:id/:field-options    
     def options
-      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?
+      return if !user_is_allowed('sites', 'view')
+      render :json => { :error => "You are not allowed to manage sites." } and return if !@site.is_master
       case params[:field]
         when nil
           options = logged_in_user.is_super_admin? ? Site.reorder('name').all.collect { |s| { 'value' => s.id, 'text' => s.name }} : []
@@ -319,21 +315,6 @@ 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, :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
+              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
             end
           end                  
         end

data/app/controllers/caboose/themes_controller.rb

@@ -134,18 +134,6 @@ 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')
@@ -158,19 +146,6 @@ 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')
@@ -191,7 +166,6 @@ 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
@@ -202,10 +176,6 @@ 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,7 +26,6 @@ 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' => '',
@@ -39,7 +38,7 @@ module Caboose
     		  'desc'			     => false,
     		  'base_url'		   => '/admin/users',
     		  'use_url_params' => false,
-          'additional_where' => [ "(site_id = #{@site.id}) AND (#{where2})" ]
+          'additional_where' => [ "(site_id = #{@site.id})" ]
     	})    	    	      
     	render :json => {
     	  :pager => pager,
@@ -115,7 +114,7 @@ module Caboose
         :params => params.to_json,
         :status => 'pending'
       )
-      e.delay(:queue => 'general', :priority => 8).user_process if Rails.env.production?
+      e.delay(:queue => 'caboose_general', :priority => 8).user_process if Rails.env.production?
       e.user_process if Rails.env.development?
       resp.new_id = e.id
       resp.success = true
@@ -127,14 +126,6 @@ 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
@@ -221,11 +212,13 @@ module Caboose
     
     # @route POST /admin/users
     def admin_add
-      resp = StdClass.new({'error' => nil,'redirect' => nil})
-      if !user_is_allowed_to('add', 'users', true)
-        return
-      end
-    
+      return if !user_is_allowed('users', 'add')
+      
+      resp = StdClass.new({
+          'error' => nil,
+          'redirect' => nil
+      })
+      
       user = User.new()
       user.email = params[:email] ? params[:email].strip.downcase : nil
       user.site_id = @site.id
@@ -403,7 +396,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 => 'general', :priority => 15).update_on_sale if i == 0
+              v.product.delay(:run_at => 3.seconds.from_now, :queue => 'caboose_store').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 => 'general', :priority => 15).update_on_sale
-                v.product.delay(:run_at => 3.seconds.from_now, :queue => 'general', :priority => 15).update_on_sale                
+                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                
               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 => 'general', :priority => 15).update_on_sale
-                v.product.delay(:run_at => 3.seconds.from_now, :queue => 'general', :priority => 15).update_on_sale                
+                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                
               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 => 'general', :priority => 15).update_on_sale
-                v.product.delay(:run_at => 3.seconds.from_now, :queue => 'general', :priority => 15).update_on_sale                
+                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                
               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 => 'general', :priority => 15).update_on_sale
-                v.product.delay(:run_at => 3.seconds.from_now, :queue => 'general', :priority => 15).update_on_sale                
+                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                
               end
             end
             

data/app/models/caboose/ab_variant.rb

@@ -5,7 +5,7 @@
 class Caboose::AbVariant < ActiveRecord::Base
   self.table_name = "ab_variants"
   
-  has_many :ab_options, :order => 'id', :dependent => :destroy
+  has_many :ab_options, -> { order(:id) }, :dependent => :destroy
   has_many :ab_values, :dependent => :destroy
   attr_accessible :name, :analytics_name
   

data/app/models/caboose/asset.rb

@@ -0,0 +1,23 @@
+
+class Caboose::Asset < ActiveRecord::Base
+  self.table_name = "assets"
+  belongs_to :page
+  attr_accessible :page_id, :uploaded_by_id, :date_uploaded, :name, :filename, :description, :extension
+
+  def sanitize_name(str)
+    return str.gsub(' ', '_').downcase 
+  end
+  
+  def assets_with_uri(host_with_port, uri)
+    uri[0] = '' if uri.start_with? '/'
+    
+		page = Page.page_with_uri(host_with_port, File.dirname(uri), false)		
+		return false if page.nil?
+		
+		asset = Asset.where(:page_id => page.id,:filename => File.basename(uri)).first
+		return false if asset.nil?
+		
+		return asset
+	end
+
+end

data/app/models/caboose/asset_manager.rb

@@ -0,0 +1,92 @@
+module Caboose
+  class AssetManager
+    def AssetManager.referenced_assets_in_views
+      
+      files = []
+
+      # Stylesheets
+      str = `grep -Rh stylesheet_link_tag #{Rails.root}/app/views`
+      str << `grep -Rh stylesheet_link_tag #{Rails.root}/sites/*/views`
+      str.strip.split("\n").each do |line|
+        file = self.replace_css_line(line)
+        files << (file.ends_with?('.css') ? "#{file}" : "#{file}.css") if file
+      end
+
+      # Javascript
+      str = `grep -Rh javascript_include_tag #{Rails.root}/app/views`      
+      str << `grep -Rh javascript_include_tag #{Rails.root}/sites/*/views`
+      str.strip.split("\n").each do |line|
+        file = self.replace_js_line(line)
+        files << (file.ends_with?('.js') ? "#{file}" : "#{file}.js") if file
+      end
+      
+      return files.uniq
+      
+    end
+    
+    def AssetManager.referenced_assets_in_caboose_views
+      
+      # Get anything that was referenced in the views
+      spec = Gem::Specification.find_by_name('caboose-cms')            
+      files = []
+      
+      # Stylesheets
+      str = `grep -Rh stylesheet_link_tag #{spec.gem_dir}/app/views`      
+      str.strip.split("\n").each do |line|
+        file = self.replace_css_line(line)
+        files << (file.ends_with?('.css') ? "#{file}" : "#{file}.css") if file                
+      end
+
+      # Javascript
+      str = `grep -Rh javascript_include_tag #{spec.gem_dir}/app/views`      
+      str.strip.split("\n").each do |line|
+        file = self.replace_js_line(line)        
+        files << (file.ends_with?('.js') ? "#{file}" : "#{file}.js") if file
+      end
+      
+      #puts "--------------------------------------------------------------------"
+      #puts files.uniq
+      #puts "--------------------------------------------------------------------"      
+      #return files.uniq
+            
+    end        
+    
+    def AssetManager.replace_css_line(str)
+      return nil if str.include?('#{') || str.include?('@') || str.include?(".each do")      
+      str = str
+        .gsub('<%=','')
+        .gsub('%>','')
+        .gsub('gzip_stylesheet_link_tag','')
+        .gsub('stylesheet_link_tag','')
+        .gsub('(','')
+        .gsub(')','')
+        .gsub('"','')
+        .gsub("'",'')
+        .gsub(',','')
+        .gsub(':media => "all"','')
+        .strip.split(' ').first.strip
+      return nil if str.length == 0 || str.starts_with?('#') || str.starts_with?('http') || str.starts_with?('//')
+      return str
+    end
+    
+    def AssetManager.replace_js_line(str)
+      return nil if str.include?('#{') || str.include?('@') || str.include?(".each do")
+      str = str
+        .gsub('<%=','')
+        .gsub('<%','')
+        .gsub('%>','')
+        .gsub('gzip_javascript_include_tag','')
+        .gsub('javascript_include_tag','')
+        .gsub('(','')
+        .gsub(')','')
+        .gsub('"','')
+        .gsub("'",'')
+        .gsub(",",'')
+        .strip.split(' ').first.strip              
+      return nil if str.length == 0 || str.starts_with?('#') || str.starts_with?('http') || str.starts_with?('//')
+      return str      
+    end
+      
+  end
+end
+