caboose-cms 0.9.228 → 0.9.229

data/app/views/layouts/caboose/footer_css.css.erb

@@ -0,0 +1,41 @@
+<%
+css = ''
+css << raw(@site.cached_footer_css) if @site.use_caching
+if !css.blank?
+  css = css.gsub('<style>','')
+  css = css.gsub('</style>','')
+  links = css.scan(/@import(\s)*url\(('|")(http(s)?:)?(\/\/[A-z 0-9?=@._\-\/]*)('|")\);/).flatten
+  links2 = css.scan(/<link href=('|")(http(s)?:)?(\/\/[A-z 0-9?=@._\-\/]*)('|")([A-z 0-9?@="'\/]*)\/>/).flatten
+  css_files = []
+  if links && links.length > 0
+    links.to_a.each do |link|
+      if !link.blank? && link.include?('.css') && !link.include?('@import')
+        if !css_files.include?(link)
+          css_files << link
+        end
+      end
+    end
+  end
+  if links2 && links2.length > 0
+    links2.to_a.each do |link|
+      if !link.blank? && link.include?('.css') && !link.include?('media')
+        if !css_files.include?(link)
+          css_files << link
+        end
+      end
+    end
+  end
+  str = @site.custom_css_files.blank? ? '' : @site.custom_css_files
+  css_files.each do |csf|
+    str += "\n" if !str.blank? && !str.include?(csf)
+    str += "#{csf}" if !str.include?(csf)
+  end
+  @site.custom_css_files = str
+  @site.save
+  if !css.blank?
+    css = css.gsub(/@import(\s)*url\(('|")(http(s)?:)?(\/\/[A-z 0-9?=@._\-\/]*)('|")\);/,'')
+    css = css.gsub(/<link href=('|")(http(s)?:)?(\/\/[A-z 0-9?=@._\-\/]*)('|")([A-z 0-9@?="'\/]*)\/>/,'')
+  end
+%>
+<%== css %>
+<% end %>

data/app/views/layouts/caboose/footer_js.js.erb

@@ -0,0 +1,31 @@
+<%
+js = ''
+js << raw(@site.cached_footer_js) if @site.use_caching
+if !js.blank?
+  links = js.scan(/<script src=('|")(http(s)?:)?(\/{1,2}[A-z 0-9?=@._\-\/]*)('|")([A-z 0-9@?="'\/]*)\><\/script>/).flatten
+  js_files = []
+  if links && links.length > 0
+    links.to_a.each do |link|
+      if !link.blank? && link.include?('.js')
+        if !js_files.include?(link)
+          js_files << link
+        end
+      end
+    end
+  end
+  str = @site.custom_js_files.blank? ? '' : @site.custom_js_files
+  js_files.each do |csf|
+    str += "\n" if !str.blank? && !str.include?(csf)
+    str += "#{csf}" if !str.include?(csf)
+  end
+  @site.custom_js_files = str
+  @site.save
+  if !js.blank?
+    js = js.gsub(/<script src=('|")(http(s)?:)?(\/{1,2}[A-z 0-9?=@._\-\/]*)('|")([A-z 0-9@?="'\/]*)\><\/script>/,'')
+    js = js.gsub(/<script src=('|")(http(s)?:)?(\/{1,2}[A-z 0-9?=@._\-\/]*)('|")([A-z 0-9@?="'\/]*)\>/,'')
+    js = js.gsub('<script>','')
+    js = js.gsub('</script>','')
+  end
+%>
+<%== js %>
+<% end %>

data/app/views/layouts/caboose/js.js.erb

@@ -0,0 +1,34 @@
+<% if @page.custom_js && !@page.custom_js.blank? %>
+<%== @page.custom_js %>
+<% end %>
+<%
+js = ''
+js << raw(@post ? @post.cached_js : @page.cached_js) if @site.use_caching
+if !js.blank?
+  links = js.scan(/<script src=('|")(http(s)?:)?(\/{1,2}[A-z 0-9?=@._\-\/]*)('|")([A-z 0-9@?="'\/]*)\><\/script>/).flatten
+  js_files = []
+  if links && links.length > 0
+    links.to_a.each do |link|
+      if !link.blank? && link.include?('.js')
+        if !js_files.include?(link)
+          js_files << link
+        end
+      end
+    end
+  end
+  str = @page.custom_js_files.blank? ? '' : @page.custom_js_files
+  js_files.each do |csf|
+    str += "\n" if !str.blank? && !str.include?(csf)
+    str += "#{csf}" if !str.include?(csf)
+  end
+  @page.custom_js_files = str
+  @page.save
+  if !js.blank?
+    js = js.gsub(/<script src=('|")(http(s)?:)?(\/{1,2}[A-z 0-9?=@._\-\/]*)('|")([A-z 0-9@?="'\/]*)\><\/script>/,'')
+    js = js.gsub(/<script src=('|")(http(s)?:)?(\/{1,2}[A-z 0-9?=@._\-\/]*)('|")([A-z 0-9@?="'\/]*)\>/,'')
+    js = js.gsub('<script>','')
+    js = js.gsub('</script>','')
+  end
+%>
+<%== js %>
+<% end %>

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.9.228'
+  VERSION = '0.9.229'
 end

data/lib/tasks/caboose.rake

@@ -67,7 +67,6 @@ namespace :caboose do
     puts Rails.application.assets.file_digest(temp_file)    
     #puts Rails.application.config.assets.digests['benttree/images/icons/loading.gif']
     
-    #resp = Caboose::AssetManifest.save_asset('assets/william/test1.js', 'var x = 32;')
     #puts resp
   end
   
@@ -328,31 +327,21 @@ namespace :caboose do
   desc "Reprocess media images"
   task :reprocess_media_images => :environment do    
     Caboose::Media.where("image_file_name is not null").reorder(:id).all.each do |m|
-      m.delay(:queue => 'caboose_media').reprocess_image            
+      m.delay(:queue => 'general', :priority => 8).reprocess_image            
     end
   end
   
   desc "Migrate block images and files to media"
   task :migrate_block_assets_to_media => :environment do
     Caboose::Block.where("image_file_name is not null and media_id is null").reorder(:id).all.each do |b|                
-      b.delay(:queue => 'caboose_media').migrate_media
+      b.delay(:queue => 'general', :priority => 8).migrate_media
     end  
     Caboose::Block.where("file_file_name is not null and media_id is null").reorder(:id).all.each do |b|
-      b.delay(:queue => 'caboose_media').migrate_media
+      b.delay(:queue => 'general', :priority => 8).migrate_media
     end
     Caboose::BlockType.where(:id => 19).update_all('name' => 'image2')    
     Caboose::Block.where(:block_type_id => 19).update_all('name' => 'image2')
   end
-        
-  desc "Update expired caches and cache pages that aren't cached"
-  task :cache_pages => :environment do    
- #   Caboose::PageCacher.delay(:queue => 'caboose_cache').refresh    
-  end
-  
-  desc "Cache all pages"
-  task :cache_all_pages => :environment do    
-#    Caboose::PageCacher.delay(:queue => 'caboose_cache').cache_all    
-  end
   
   desc "Run rspec tests on Caboose"
   task :test => :environment do    

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.9.228
+  version: 0.9.229
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-12 00:00:00.000000000 Z
+date: 2019-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -38,20 +38,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.2.22
-- !ruby/object:Gem::Dependency
-  name: underscore-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
@@ -685,7 +671,6 @@ files:
 - app/controllers/caboose/ab_variants_controller.rb
 - app/controllers/caboose/admin_controller.rb
 - app/controllers/caboose/application_controller.rb
-- app/controllers/caboose/assets_controller.rb
 - app/controllers/caboose/billing_addresses_controller.rb
 - app/controllers/caboose/block_type_categories_controller.rb
 - app/controllers/caboose/block_type_sources_controller.rb
@@ -695,6 +680,7 @@ files:
 - app/controllers/caboose/calendars_controller.rb
 - app/controllers/caboose/cart_controller.rb
 - app/controllers/caboose/categories_controller.rb
+- app/controllers/caboose/change_logs_controller.rb
 - app/controllers/caboose/checkout_controller.rb
 - app/controllers/caboose/checkout_controller_bak.rb
 - app/controllers/caboose/domains_controller.rb
@@ -773,14 +759,9 @@ files:
 - app/models/caboose/ab_variant.rb
 - app/models/caboose/address.rb
 - app/models/caboose/approval_request.rb
-- app/models/caboose/asset.rb
-- app/models/caboose/asset_manifest.rb
 - app/models/caboose/authenticator.rb
 - app/models/caboose/authnet.rb
 - app/models/caboose/block.rb
-- app/models/caboose/block_cache.rb
-- app/models/caboose/block_cache_file.rb
-- app/models/caboose/block_cache_image.rb
 - app/models/caboose/block_type.rb
 - app/models/caboose/block_type_category.rb
 - app/models/caboose/block_type_icons.rb
@@ -794,6 +775,7 @@ files:
 - app/models/caboose/calendar_event_group.rb
 - app/models/caboose/category.rb
 - app/models/caboose/category_membership.rb
+- app/models/caboose/change_log.rb
 - app/models/caboose/comment_routes.rb
 - app/models/caboose/core_plugin.rb
 - app/models/caboose/crumbtrail.rb
@@ -835,8 +817,6 @@ files:
 - app/models/caboose/modification_value_input_field.rb
 - app/models/caboose/page.rb
 - app/models/caboose/page_bar_generator.rb
-- app/models/caboose/page_cache.rb
-- app/models/caboose/page_cacher.rb
 - app/models/caboose/page_custom_field.rb
 - app/models/caboose/page_custom_field_value.rb
 - app/models/caboose/page_permission.rb
@@ -923,6 +903,7 @@ files:
 - app/views/caboose/block_types/admin_new.html.erb
 - app/views/caboose/block_types/admin_parse_form.html.erb
 - app/views/caboose/blocks/_block.html.erb
+- app/views/caboose/blocks/_cached_block.html.erb
 - app/views/caboose/blocks/_checkbox.html.erb
 - app/views/caboose/blocks/_controller_view_content.html.erb
 - app/views/caboose/blocks/_file.html.erb
@@ -991,6 +972,7 @@ files:
 - app/views/caboose/categories/admin_index.html.erb
 - app/views/caboose/categories/admin_new.html.erb
 - app/views/caboose/categories/admin_sort_children.html.erb
+- app/views/caboose/change_logs/admin_index.html.erb
 - app/views/caboose/checkout/_address_form.html.erb
 - app/views/caboose/checkout/_billing_form.html.erb
 - app/views/caboose/checkout/_cart.html.erb
@@ -1032,7 +1014,10 @@ files:
 - app/views/caboose/extras/error.html.erb
 - app/views/caboose/extras/error404.html.erb
 - app/views/caboose/extras/error_invalid_site.html.erb
+- app/views/caboose/fonts/admin_family_edit.html.erb
+- app/views/caboose/fonts/admin_family_index.html.erb
 - app/views/caboose/fonts/admin_index.html.erb
+- app/views/caboose/fonts/admin_variant_edit.html.erb
 - app/views/caboose/gift_cards/admin_edit.html.erb
 - app/views/caboose/gift_cards/admin_index.html.erb
 - app/views/caboose/inbox/admin_index.html.erb
@@ -1086,6 +1071,7 @@ files:
 - app/views/caboose/pages/_admin_header.html.erb
 - app/views/caboose/pages/_content.html.erb
 - app/views/caboose/pages/_new_block_header.html.erb
+- app/views/caboose/pages/admin_change_logs.html.erb
 - app/views/caboose/pages/admin_delete_form.html.erb
 - app/views/caboose/pages/admin_duplicate_form.html.erb
 - app/views/caboose/pages/admin_edit_child_sort_order.html.erb
@@ -1099,11 +1085,11 @@ files:
 - app/views/caboose/pages/admin_edit_seo.html.erb
 - app/views/caboose/pages/admin_index.html.erb
 - app/views/caboose/pages/admin_new.html.erb
-- app/views/caboose/pages/admin_new_old.html.erb
 - app/views/caboose/pages/admin_sitemap.html.erb
+- app/views/caboose/pages/compiled_asset.css.erb
+- app/views/caboose/pages/compiled_asset.js.erb
 - app/views/caboose/pages/preview.html.erb
 - app/views/caboose/pages/show.html.erb
-- app/views/caboose/pages/test.html.erb
 - app/views/caboose/pages/update_pic.html.erb
 - app/views/caboose/pages/update_resume.html.erb
 - app/views/caboose/permissions/edit.html.erb
@@ -1116,6 +1102,7 @@ files:
 - app/views/caboose/post_custom_fields/admin_index.html.erb
 - app/views/caboose/posts/_admin_footer.html.erb
 - app/views/caboose/posts/_admin_header.html.erb
+- app/views/caboose/posts/admin_change_logs.html.erb
 - app/views/caboose/posts/admin_delete_form.html.erb
 - app/views/caboose/posts/admin_edit_categories.html.erb
 - app/views/caboose/posts/admin_edit_content.html.erb
@@ -1176,6 +1163,8 @@ files:
 - app/views/caboose/sites/admin_edit_js.html.erb
 - app/views/caboose/sites/admin_index.html.erb
 - app/views/caboose/sites/admin_new.html.erb
+- app/views/caboose/sites/compiled_asset.css.erb
+- app/views/caboose/sites/compiled_asset.js.erb
 - app/views/caboose/sites/robots.text.erb
 - app/views/caboose/sites/sitemap.xml.erb
 - app/views/caboose/smtp/admin_edit.html.erb
@@ -1197,9 +1186,12 @@ files:
 - app/views/caboose/theme_files/admin_edit.html.erb
 - app/views/caboose/theme_files/admin_index.html.erb
 - app/views/caboose/themes/admin_edit.html.erb
+- app/views/caboose/themes/admin_error_log.html.erb
+- app/views/caboose/themes/admin_js.html.erb
 - app/views/caboose/themes/admin_sass.html.erb
 - app/views/caboose/users/_admin_footer.html.erb
 - app/views/caboose/users/_admin_header.html.erb
+- app/views/caboose/users/admin_change_logs.html.erb
 - app/views/caboose/users/admin_delete_form.html.erb
 - app/views/caboose/users/admin_edit.html.erb
 - app/views/caboose/users/admin_edit_password.html.erb
@@ -1229,8 +1221,12 @@ files:
 - app/views/layouts/caboose/admin.html.erb
 - app/views/layouts/caboose/admin_empty.html.erb
 - app/views/layouts/caboose/application.html.erb
+- app/views/layouts/caboose/css.css.erb
 - app/views/layouts/caboose/empty.html.erb
 - app/views/layouts/caboose/error404.html.erb
+- app/views/layouts/caboose/footer_css.css.erb
+- app/views/layouts/caboose/footer_js.js.erb
+- app/views/layouts/caboose/js.js.erb
 - app/views/layouts/caboose/modal.html.erb
 - app/views/layouts/caboose/no_layout.html.erb
 - app/views/layouts/caboose/store/_banner.html.erb
@@ -1268,7 +1264,7 @@ files:
 - spec/factories/caboose_users.rb
 - spec/models/block_spec.rb
 - spec/models/user_spec.rb
-homepage: http://github.com/williambarry007/caboose-cms
+homepage: http://github.com/thenine/caboosecms
 licenses: []
 metadata: {}
 post_install_message: 

data/app/controllers/caboose/assets_controller.rb

@@ -1,65 +0,0 @@
-module Caboose
-  class AssetsController < Caboose::ApplicationController
-    layout 'caboose/admin'
-    
-    ## @route GET /admin/assets/ace
-    #def admin_ace
-    #  return if !user_is_allowed('assets', 'edit')      
-    #end
-    #        
-    ## @route GET /admin/assets
-    #def admin_index
-    #  return if !user_is_allowed('assets', 'edit')
-    #  config = YAML.load(File.read(Rails.root.join('config', 'aws.yml')))[Rails.env]          
-    #  bucket = config['bucket']
-    #  @assets_path = "http://#{bucket}.s3.amazonaws.com/assets"
-    #end
-    #
-    ## @route GET /admin/assets/manifest
-    #def admin_manifest
-    #  return if !user_is_allowed('assets', 'edit')
-    #  
-    #  config = YAML.load(File.read(Rails.root.join('config', 'aws.yml')))[Rails.env]          
-    #  bucket = config['bucket']
-    #  resp = HTTParty.get("http://#{bucket}.s3.amazonaws.com/assets/manifest.yml")      
-    #  str = resp.body             
-    #  manifest = self.parse_manifest(str, true)
-    #  
-    #  render :json => manifest            
-    #end
-    #
-    #def parse_manifest(str, exclude_images = true)
-    #  lines = str.split("\n")
-    #  h = {}
-    #  lines.each_with_index do |line, i|
-    #    next if i == 0
-    #    path = line.split(": ").first.split('/')
-    #    
-    #    if exclude_images
-    #      ext = line.split('.')
-    #      next if ext.count > 0 && ['png','jpg','gif','ico'].include?(ext.last.downcase)
-    #    end
-    #    self.verify_path_exists(path, h)
-    #  end
-    #  return h
-    #end
-    #
-    #def verify_path_exists(path, h, i = 0)
-    #  return if i >= path.count
-    #  h[path[i]] = i == (path.count - 1) ? true : {} if h[path[i]].nil?
-    #  self.verify_path_exists(path, h[path[i]], i+1)
-    #end
-    #
-    ## @route PUT /admin/assets
-    #def admin_update
-    #  return if !user_is_allowed('assets', 'edit')
-    #              
-    #  path = params[:path]
-    #  value = params[:value]
-    #  
-    #  resp = AssetManifest.save_asset(path, value)                  
-    #  render :json => resp      
-    #end
-
-  end
-end

data/app/models/caboose/asset.rb

@@ -1,23 +0,0 @@
-
-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_manifest.rb

@@ -1,91 +0,0 @@
-module Caboose
-  class AssetManifest
-    
-    #@@bucket = nil
-    #
-    #def AssetManifest.bucket
-    #  if @@bucket.nil?        
-    #    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::Bucket.new(config['bucket'])
-    #  end
-    #  return @@bucket
-    #end
-    #    
-    #def AssetManifest.save_asset(path, str, reset = true)
-    #
-    #  file = self.bucket.objects[path]      
-    #  return { :error => "Can't find file." } if file.nil?
-    #                        
-    #  # Save the contents into the source file
-    #  return { :error => "Can't write to file." } if !file.write(str)
-    #  
-    #  # Compile the file
-    #  str_compiled = ''
-    #  begin
-    #    str_compiled = Uglifier.compile(str)
-    #  rescue Exception => e
-    #    return { :error => e.message }
-    #  end
-    #  
-    #  # Compute the digest for the compiled file
-    #  # Note: digest must be generated with environment set to 'production' (sprockets changes digests per environment) 
-    #  digest = Rails.application.assets.file_digest('/Users/william/Sites/caboosecms.com/sites/benttree/images/icons/loading.gif')
-    #  digest = Rails.application.assets.digest.hexdigest(str_compiled)      
-    #  digest = Digest::SHA2.hexdigest(str_compiled)
-    #  
-    #  # See if the digest file for the compiled file exists
-    #  digest_path = self.path_with_digest(path, digest)
-    #  if self.bucket.objects[digest_path].exists?
-    #    digest_file = bucket.objects[digest_path]
-    #    digest_file.write(str_compiled)
-    #  end
-    #  
-    #  # See if the digest is in the manifest
-    #  manifest = self.bucket.objects['assets/manifest.yml']
-    #  exists = false
-    #  changed = false      
-    #  new_lines = []
-    #  manifest.read.split("\n").each do|line|
-    #    if line.starts_with?("#{path}: ")
-    #      exists = true
-    #      changed = true if line != "#{path}: #{digest_path}"            
-    #      new_lines << "#{path}: #{digest_path}"
-    #    else
-    #      new_lines << line
-    #    end
-    #  end
-    #  if !exists
-    #    new_lines << "#{path}: #{digest_path}"
-    #    changed = true
-    #  end
-    #
-    #  # If the digest has changed, update the manifest and set the app asset digests
-    #  if changed
-    #    manifest.write(new_lines.join("\n"))        
-    #    self.reset_asset_digests(new_lines) if reset
-    #  end
-    #  
-    #  return { :sucess => true }
-    #end
-    #
-    #def AssetManifest.reset_asset_digests(lines = nil)
-    #  lines = self.bucket.objects['assets/manifest.yml'].read.split("\n") if lines.nil?       
-    #  lines.each do|line|                  
-    #    arr = line.split(": ")                    
-    #    Rails.application.config.assets.digests[arr[0]] = arr[1]                
-    #  end            
-    #end
-    #
-    #def AssetManifest.path_with_digest(path, digest)
-    #  arr = path.split('/')
-    #  filename = arr.pop
-    #  filename = filename.split('.')
-    #  ext = filename.pop
-    #  filename = "#{filename.join('.')}-#{digest}.#{ext}"
-    #  return filename if arr.count == 0
-    #  return "#{arr.join('/')}/#{filename}"
-    #end
-
-  end
-end