caboose-cms 0.9.229 → 1.0.1

data/app/views/caboose/themes/admin_edit.html.erb

@@ -10,14 +10,10 @@ position = header.child('position') if header
 <div class="admin-theme grid-row">
   <div class="unit1of2 left">
     <section>
-      <h5>
-        Compile
-        <a href="/admin/theme/errors" style="display:inline-block;font-size:12px;margin-left:15px;text-decoration:none;color:gray;" id="error">Error Log</a>
-      </h5>
+      <h5>Compile</h5>
       <div class="buttons">
-        <a style="margin-right:3px;" href="#" id="compile-btn" class="caboose-btn">Compile Theme</a>
-        <a style="margin-right:3px;" href="/admin/theme/sass" class="caboose-btn">Edit SCSS</a>
-        <a href="/admin/theme/js" class="caboose-btn">Edit Javascript</a>
+        <a style="margin-right:5px;" href="#" id="compile-btn" class="caboose-btn">Compile Theme</a>
+        <a href="/admin/theme/sass" class="caboose-btn">Edit Custom SCSS</a>
       </div>
       
       <div style="margin-top:20px;" id='message'></div>

data/app/views/caboose/users/_admin_header.html.erb

@@ -26,10 +26,6 @@ if Caboose::Subscription.where(:site_id => @site.id).exists?
 	arr = tabs.to_a.insert(6, ['Subscriptions', "/admin/users/#{@edituser.id}/subscriptions"])
   tabs = Hash[arr]
 end
-if @site.use_change_logs && Caboose::ChangeLog.where(:user_id => @edituser.id).exists? && @logged_in_user.is_allowed('logs','view')
-  arr = tabs.to_a.insert(4, ["Change Logs","/admin/users/#{@edituser.id}/logs"])
-  tabs = Hash[arr]
-end
 tabs = Caboose.plugin_hook('admin_user_tabs', tabs, @edituser, @site)
 %>
 <% tabs.each do |text, href| %>

data/app/views/caboose/users/admin_edit_roles.html.erb

@@ -6,7 +6,6 @@
 <div id='roles'>
 <table class='data'>
 <% Caboose::Role.flat_tree(@site.id).each do |r| %>
-<% next if !@logged_in_user.is_allowed('all','all') && (r.name == 'Admin' || r.name == 'Everyone Logged Out' || r.name == '-Everyone Logged In') %>
 <% is_member = Caboose::RoleMembership.where(:role_id => r.id, :user_id => @edituser.id).exists? %>
 <tr><td><input type='checkbox' name='role<%= r.id %>' <%= is_member ? "checked='true'" : '' %> onclick="toggle_role(<%= @edituser.id %>, <%= r.id %>, $(this).prop('checked'));" /></td><td><%= r.name %></td></tr>
 <% end %>

data/app/views/caboose/variants/admin_group.html.erb

@@ -109,7 +109,7 @@
 <% end %>
 
 <% content_for :caboose_js do %>
-	<%= javascript_include_tag 'https://cdnjs.cloudflare.com/ajax/libs/underscore.js/1.9.1/underscore-min.js' %>
+	<%= javascript_include_tag 'underscore' %>
 	
 	<script>
 		window.count      = <%= @variants.count %>;

data/app/views/layouts/caboose/admin.html.erb

@@ -11,11 +11,7 @@ if request.env['HTTP_CF_VISITOR'] && request.env['HTTP_CF_VISITOR'].include?('ht
 end
 
 content_for :admin_css do
-  %><%= stylesheet_link_tag "caboose/admin", :media => "all" %>
-  <%= stylesheet_link_tag "colorbox-rails", :media => "all" %>
-  <%= stylesheet_link_tag "caboose/model_binder", :media => "all" %>
-  <%# stylesheet_link_tag "caboose/page_bar_generator", :media => "all" %>
-  <%
+  %><%= stylesheet_link_tag "caboose/admin", :media => "all" %><%
   if File.exists?("#{Rails.root}/app/assets/stylesheets/admin.css")
     %><%= stylesheet_link_tag "admin", :media => "all" %><%
   end
@@ -31,10 +27,7 @@ if protocol == 'https://'
 end
 
 content_for :admin_js do
-  %>
-  <%= javascript_include_tag "caboose/admin" %>
-  <%= javascript_include_tag "caboose/jquery.detect" %>
-  <%
+  %><%= javascript_include_tag "caboose/admin" %><%
   %><%= yield :caboose_js %><%
 end
 

data/app/views/layouts/caboose/application.html.erb

@@ -1,57 +1,41 @@
 <% if @page && @page.title != 'Access Denied' %>
-  <% content_for :js do %>
-    <%= gzip_javascript_include_tag "caboose/application" %>
-    <% if @site.theme %>
-      <script type='text/javascript' src="<%= @site.theme.js_url(@site.id) %>"></script>
-    <% else %>
-      <%= gzip_javascript_include_tag @site.name == 'application' ? 'application' : "#{@site.name}/js/application" %>
-    <% end %>
-    <% Caboose::javascripts.each do |js| %><%= javascript_include_tag(js) %><% end %>
-    <% if @site.date_js_updated %><script type='text/javascript' src="<%== @site.custom_js_url %>"></script><% end %>
-    <% if @page.custom_js_files && @page.custom_js_files.strip.length > 0 %>
-      <% @page.custom_js_files.split("\n").each do |url| %><script type='text/javascript' src="<%== url %>"></script><% end %>
-    <% end %>
-    <% if @page.custom_js && @page.custom_js.strip.length > 0 && (!@site.use_caching || @editing) %><script type='text/javascript'><%== @page.custom_js %></script><% end %>
-    <% if @site.use_caching && (!@editing || (@preview && @page.is_published)) %>
-      <% js_url = @page.js_url %>
-      <% if !js_url.include?('empty.js') && !@post %><script type='text/javascript' src="<%= js_url %>"></script><!-- page js --><% end %>
-    <% end %>
-    <% if @site.use_caching %>
-      <% footer_js_url = @site.footer_js_url %>
-      <% if !footer_js_url.include?('empty.js') && @page.parent_id != -1 %><script type='text/javascript' src="<%= footer_js_url %>"></script><!-- footer js --><% end %>
-    <% end %>
-    <% if !@site.custom_js_files.blank? && @page.parent_id != -1 %>
-      <% @site.custom_js_files.split("\n").each do |url| %><script type='text/javascript' src="<%== url %>"></script><% end %>
-    <% end %>
-    <%= yield :caboose_js %>
-  <% end %>
-  <% content_for :css do %>
-    <% if @site.theme %>
-      <link rel='stylesheet' type='text/css' media='all' href="<%= @site.theme.asset_url(@site.id) %>" />
-    <% else %>
-      <%= gzip_stylesheet_link_tag @site.name == 'application' ? 'application' : "#{@site.name}/css/application" %>
-    <% end %>
-    <% if @site.use_caching && (!@editing || (@preview && @page.is_published)) %>
-      <% css_url = @page.css_url %>
-      <% if !css_url.include?('empty.css') && !@post %><link rel='stylesheet' type='text/css' media='all' href="<%= css_url %>" /><!-- page css --><% end %>
-    <% end %>
-    <% if @site.use_caching %>
-      <% footer_css_url = @site.footer_css_url %>
-      <% if !footer_css_url.include?('empty.css') && @page.parent_id != -1 %><link rel='stylesheet' type='text/css' media='all' href="<%= footer_css_url %>" /><!-- footer css --><% end %>
-    <% end %>
-    <% if !@site.custom_css_files.blank? && @page.parent_id != -1 %>
-      <% @site.custom_css_files.split("\n").each do |url| %><link rel="stylesheet" type='text/css' href="<%== url %>" /><% end %>
-    <% end %>
-    <% Caboose::stylesheets.each do |css| %><%= gzip_stylesheet_link_tag(css) %><% end %>
-    <% if @site.date_css_updated %><link rel='stylesheet' type='text/css' href="<%== @site.custom_css_url %>" /><% end %>
-    <% if @page.custom_css_files && @page.custom_css_files.strip.length > 0 %>
-      <% @page.custom_css_files.split("\n").each do |url| %><link rel="stylesheet" type='text/css' href="<%== url %>" /><% end %>
-    <% end %>
-    <% if @page.custom_css && @page.custom_css.strip.length > 0 && (!@site.use_caching || @editing) %><style><%== @page.custom_css %></style><% end %>
-    <%= yield :caboose_css %>
-  <% end %>
+<% content_for :js do %>
+<%= gzip_javascript_include_tag "caboose/application" %>
+<% if @site.theme %>
+  <script type='text/javascript' src="<%= @site.theme.js_url %>"></script>
+<% else %>
+  <%= gzip_javascript_include_tag @site.name == 'application' ? 'application' : "#{@site.name}/js/application" %>
+<% end %>
+<script>window.loggedIn = <%= logged_in?.to_json %></script>
+<% Caboose::javascripts.each do |js| %><%= javascript_include_tag(js) %><% end %>
+<% @page.linked_resources_map[:js].each do |r| %><%= gzip_javascript_include_tag r %><% end %>
+<% if @site.date_js_updated %><script type='text/javascript' src="<%= raw @site.custom_js_url %>"></script><% end %>
+<% if @page.custom_js_files && @page.custom_js_files.strip.length > 0 %>
+  <% @page.custom_js_files.split("\n").each do |url| %><script type='text/javascript' src="<%= raw url %>"></script><% end %>
+<% end %>
+<% if @page.custom_js && @page.custom_js.strip.length > 0 %><script type='text/javascript'><%= raw @page.custom_js %></script><% end %>
+<%= yield :caboose_js %>
+<% end %>
+<% content_for :css do %>
+<%= gzip_stylesheet_link_tag 'caboose/application' %>
+<% if @site.theme %>
+  <link rel='stylesheet' type='text/css' media='all' href="<%= @site.theme.asset_url(@site.id) %>" />
+<% else %>
+  <%= gzip_stylesheet_link_tag @site.name == 'application' ? 'application' : "#{@site.name}/css/application" %>
+<% end %>
+<% Caboose::stylesheets.each do |css| %><%= gzip_stylesheet_link_tag(css) %><% end %>
+<% @page.linked_resources_map[:css].each do |r| %><%= gzip_stylesheet_link_tag r %><% end %>
+<% if @site.date_css_updated %><link rel='stylesheet' type='text/css' href="<%= raw @site.custom_css_url %>" /><% end %>
+<% if @page.custom_css_files && @page.custom_css_files.strip.length > 0 %>
+  <% @page.custom_css_files.split("\n").each do |url| %><link rel="stylesheet" type='text/css' href="<%= raw url %>" /><% end %>
+<% end %>
+<% if @page.custom_css && @page.custom_css.strip.length > 0 %><style><%= raw @page.custom_css %></style><% end %>
+<%= yield :caboose_css %>
+<% end %>
   <%  
   b = @post ? @post.block : @page.block
+  #Caboose.log(@post)
+  #Caboose.log(@page.block.inspect)
   if b.nil?
     bt = @site.default_layout
     if @post                    
@@ -63,6 +47,7 @@
     end
     b.create_children
   end
+  #b.log_helper
   options = {
     :request => @request,    
     :post => @post,    
@@ -81,19 +66,63 @@
     :ga_events => @ga_events
   }
   @block_options.each{ |k,v| options[k] = v } if @block_options  
+    
+  str = nil    
+  #if @use_page_cache
+  #  pc = Caboose::PageCache.where(:page_id => @page.id).first  
+  #  if pc # If the page is cached, send it to the user    
+  #         
+  #    require_dependency "#{Caboose.root}/app/models/caboose/block_cache.rb"
+  #    require_dependency "#{Caboose.root}/app/models/caboose/block_cache_file.rb"
+  #    require_dependency "#{Caboose.root}/app/models/caboose/block_cache_image.rb"
+  #  
+  #    @block = Marshal.load(pc.block)    
+  #    @view                    = options[:view                    ]
+  #    @controller_view_content = options[:controller_view_content ]
+  #    @modal                   = options[:modal                   ]
+  #    @empty_text              = options[:empty_text              ]
+  #    @editing                 = options[:editing                 ]
+  #    @css                     = options[:css                     ]
+  #    @js                      = options[:js                      ]
+  #    @csrf_meta_tags          = options[:csrf_meta_tags          ]
+  #    @csrf_meta_tags2         = options[:csrf_meta_tags2         ]
+  #    
+  #    str = render(:inline => pc.render_function)            
+  #  end
+  #end
+  
+  # Render the blocks if we don't have it cached    
   str = b.render(b, options) if str.nil?
-  protocol = "https://"
+        
+  protocol = request.protocol
+  #protocol = Caboose.plugin_hook('request_protocol', protocol, request)
+  
+  # See if we're using cloudflare
+  if request.env['HTTP_CF_VISITOR'] && request.env['HTTP_CF_VISITOR'].include?('https')
+    protocol = 'https://'
+    request.env['REQUEST_URI']     = "https://#{request.env['REQUEST_URI'][7..-1]}" if (request.env['REQUEST_URI'] =~ %r"http://") == 0    
+    request.env['SERVER_PORT']     = '443' if request.env['SERVER_PORT'] == '80'
+    request.env['HTTP_REFERER']    = "https://#{request.env['HTTP_REFERER'][7..-1]}" if (request.env['HTTP_REFERER'] =~ %r"http://") == 0    
+    request.env['rack.url_scheme'] = 'https'
+    request.env['HTTPS']           = 'on'
+  end
   
   css = b.partial('ga', options)
   css << yield(:css)
-  css << raw(@post ? @post.cached_css : @page.cached_css) if @post || (@site.use_caching && @editing && !@preview && (@post ? @post.is_published : @page.is_published))
-  css.gsub!("<link href=\"http://", "<link href=\"https://")
-  css.gsub!("<link href='http://" , "<link href='https://")
+  css.gsub!("<link href=\"//", "<link href=\"#{protocol}")
+  css.gsub!("<link href='//" , "<link href='#{protocol}")
+  if protocol == 'https://' 
+    css.gsub!("<link href=\"http://", "<link href=\"https://")
+    css.gsub!("<link href='http://" , "<link href='https://")
+  end
 
   js = yield(:js)
-  js << raw(@post ? @post.cached_js : @page.cached_js) if @post || (@site.use_caching && @editing && !@preview && (@post ? @post.is_published : @page.is_published))
-  js.gsub!("<script src=\"http://", "<script src=\"https://")
-  js.gsub!("<script src='http://" , "<script src='https://")
+  js.gsub!("<script src=\"//", "<script src=\"#{protocol}")
+  js.gsub!("<script src='//" , "<script src='#{protocol}")
+  if protocol == 'https://' 
+    js.gsub!("<script src=\"http://", "<script src=\"https://")
+    js.gsub!("<script src='http://" , "<script src='https://")
+  end
   if @site.use_retargeting
     js << b.partial('retargeting', options)
   end
@@ -101,7 +130,8 @@
   str.gsub!('|CABOOSE_CSS|'        , css)
   str.gsub!('|CABOOSE_PROTOCOL|'   , protocol)  
   str.gsub!('|CABOOSE_JAVASCRIPT|' , js)  
-  str.gsub!('|CABOOSE_CSRF|'       , csrf_meta_tags)
-  %>
-<%== str %>
-<% end %>
+  str.gsub!('|CABOOSE_CSRF|'       , csrf_meta_tags)  
+  
+  %><%= raw str %><%
+end
+%>

data/config/routes.rb

@@ -4,11 +4,8 @@ Caboose::Engine.routes.draw do
   #if Caboose::use_comment_routes
   #  eval(Caboose::CommentRoutes.controller_routes)      
   #end
-
-  get "/sitemap.xml" => "sites#sitemap", :format => "xml", :as => :sitemap
-  get "/robots.txt" => "sites#robots", :format => "txt", :as => :robots
   
-  match '*path' => 'pages#show'
+  get '*path' => 'pages#show'
   root :to => 'pages#show'
   
 end

data/lib/caboose/version.rb

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

data/lib/tasks/caboose.rake

@@ -67,6 +67,7 @@ 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
   
@@ -327,21 +328,31 @@ 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 => 'general', :priority => 8).reprocess_image            
+      m.delay(:queue => 'caboose_media').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 => 'general', :priority => 8).migrate_media
+      b.delay(:queue => 'caboose_media').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 => 'general', :priority => 8).migrate_media
+      b.delay(:queue => 'caboose_media').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.229
+  version: 1.0.1
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-03 00:00:00.000000000 Z
+date: 2019-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -30,42 +30,70 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.22
+        version: 4.2.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.22
+        version: 4.2.7
+- !ruby/object:Gem::Dependency
+  name: protected_attributes
+  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: 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
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.1
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.1
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: jquery-ui-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: trollop
   requirement: !ruby/object:Gem::Requirement
@@ -151,7 +179,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: prawn
+  name: prawn-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -165,7 +193,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: prawn-table
+  name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -179,7 +207,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: nokogiri
+  name: nokogiri-styles
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -193,7 +221,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: nokogiri-styles
+  name: delayed_job_active_record
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -207,7 +235,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: delayed_job_active_record
+  name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -221,33 +249,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: aws-sdk
+  name: asset_sync
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: asset_sync
+  name: fog-aws
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: unf
   requirement: !ruby/object:Gem::Requirement
@@ -361,13 +389,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec-rails
+  name: activerecord-session_store
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -375,7 +403,91 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: factory_girl_rails
+  name: left_join
+  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: sass-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: compass-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: uglifier
+  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: gibbon
+  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: braintree
+  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: launchy
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -389,7 +501,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: faker
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -403,7 +515,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: capybara
+  name: rspec-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.5.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.5.2
+- !ruby/object:Gem::Dependency
+  name: rspec-wait
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -417,7 +543,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: guard-rspec
+  name: capybara
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -431,7 +557,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: launchy
+  name: capybara-webkit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -446,7 +572,7 @@ dependencies:
         version: '0'
 description: CMS built on rails with love.
 email:
-- william@nine.is
+- william@birdbean.co
 executables:
 - caboose
 extensions: []
@@ -507,6 +633,7 @@ files:
 - app/assets/images/caboose/password_image.png
 - app/assets/images/caboose/search.png
 - app/assets/javascripts/caboose/admin.js
+- app/assets/javascripts/caboose/admin/application.js
 - app/assets/javascripts/caboose/admin_block_edit.js
 - app/assets/javascripts/caboose/admin_block_type_parser_controller.js
 - app/assets/javascripts/caboose/admin_edit_invoice.js
@@ -612,6 +739,62 @@ files:
 - app/assets/javascripts/chartjs/gulpfile.js
 - app/assets/javascripts/tinymce/plugins/caboose/plugin.js
 - app/assets/stylesheets/caboose/admin.css
+- app/assets/stylesheets/caboose/admin/_config.scss
+- app/assets/stylesheets/caboose/admin/application.css
+- app/assets/stylesheets/caboose/admin/component.css
+- app/assets/stylesheets/caboose/admin/froala.min.css
+- app/assets/stylesheets/caboose/admin/ie.scss
+- app/assets/stylesheets/caboose/admin/integrations/main.scss
+- app/assets/stylesheets/caboose/admin/integrations/shopify.scss
+- app/assets/stylesheets/caboose/admin/jquery-ui-subnav-theme.min.css
+- app/assets/stylesheets/caboose/admin/layout.scss
+- app/assets/stylesheets/caboose/admin/main.scss
+- app/assets/stylesheets/caboose/admin/modules/body.scss
+- app/assets/stylesheets/caboose/admin/modules/buttons.scss
+- app/assets/stylesheets/caboose/admin/modules/countdown.css
+- app/assets/stylesheets/caboose/admin/modules/crumbtrail.scss
+- app/assets/stylesheets/caboose/admin/modules/data_table.scss
+- app/assets/stylesheets/caboose/admin/modules/footer.scss
+- app/assets/stylesheets/caboose/admin/modules/forms.scss
+- app/assets/stylesheets/caboose/admin/modules/functions.scss
+- app/assets/stylesheets/caboose/admin/modules/grid.scss
+- app/assets/stylesheets/caboose/admin/modules/header.scss
+- app/assets/stylesheets/caboose/admin/modules/headings.scss
+- app/assets/stylesheets/caboose/admin/modules/main_nav.scss
+- app/assets/stylesheets/caboose/admin/modules/message_boxes.scss
+- app/assets/stylesheets/caboose/admin/modules/model_binder.scss
+- app/assets/stylesheets/caboose/admin/modules/navigation.scss
+- app/assets/stylesheets/caboose/admin/modules/order_bumps.scss
+- app/assets/stylesheets/caboose/admin/modules/pager.scss
+- app/assets/stylesheets/caboose/admin/modules/product_images.scss
+- app/assets/stylesheets/caboose/admin/modules/products.css
+- app/assets/stylesheets/caboose/admin/modules/search.scss
+- app/assets/stylesheets/caboose/admin/modules/selects.scss
+- app/assets/stylesheets/caboose/admin/modules/subnav_tabs.scss
+- app/assets/stylesheets/caboose/admin/modules/tabs.scss
+- app/assets/stylesheets/caboose/admin/page_edit/block_anchors.scss
+- app/assets/stylesheets/caboose/admin/page_edit/block_overlays.scss
+- app/assets/stylesheets/caboose/admin/page_edit/device_selector.scss
+- app/assets/stylesheets/caboose/admin/page_edit/froala.scss
+- app/assets/stylesheets/caboose/admin/page_edit/group_overlay.scss
+- app/assets/stylesheets/caboose/admin/page_edit/layout.scss
+- app/assets/stylesheets/caboose/admin/page_edit/main.scss
+- app/assets/stylesheets/caboose/admin/page_edit/modal.scss
+- app/assets/stylesheets/caboose/admin/page_edit/preview.scss
+- app/assets/stylesheets/caboose/admin/page_edit/publish.scss
+- app/assets/stylesheets/caboose/admin/page_edit/revisions.scss
+- app/assets/stylesheets/caboose/admin/page_edit/subnav.scss
+- app/assets/stylesheets/caboose/admin/page_edit/top_nav.scss
+- app/assets/stylesheets/caboose/admin/pages/assets_index.css
+- app/assets/stylesheets/caboose/admin/pages/block_edit_image.css.scss
+- app/assets/stylesheets/caboose/admin/pages/media_index.css.scss
+- app/assets/stylesheets/caboose/admin/pages/new_block.css
+- app/assets/stylesheets/caboose/admin/pages/page_edit.scss
+- app/assets/stylesheets/caboose/admin/pages/page_edit_content.scss
+- app/assets/stylesheets/caboose/admin/pages/pages_index.scss
+- app/assets/stylesheets/caboose/admin/pages/post_edit_content.css
+- app/assets/stylesheets/caboose/admin/print.css
+- app/assets/stylesheets/caboose/admin/slack.scss
 - app/assets/stylesheets/caboose/admin_assets_index.css
 - app/assets/stylesheets/caboose/admin_block_edit_image.css.scss
 - app/assets/stylesheets/caboose/admin_crumbtrail.css.scss
@@ -671,6 +854,7 @@ 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
@@ -680,7 +864,6 @@ 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
@@ -759,9 +942,15 @@ 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_manager.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
@@ -775,7 +964,6 @@ 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
@@ -817,6 +1005,8 @@ 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
@@ -879,6 +1069,13 @@ files:
 - app/views/caboose/ab_variants/admin_edit.html.erb
 - app/views/caboose/ab_variants/admin_index.html.erb
 - app/views/caboose/ab_variants/admin_new.html.erb
+- app/views/caboose/admin/_content.html.erb
+- app/views/caboose/admin/_fonts.html.erb
+- app/views/caboose/admin/_footer.html.erb
+- app/views/caboose/admin/_header.html.erb
+- app/views/caboose/admin/_icons.html.erb
+- app/views/caboose/admin/_mobile_navigation.html.erb
+- app/views/caboose/admin/_post.html.erb
 - app/views/caboose/admin/index.html.erb
 - app/views/caboose/application/show.html.erb
 - app/views/caboose/application/under_construction.html.erb
@@ -903,7 +1100,6 @@ 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
@@ -972,7 +1168,6 @@ 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
@@ -1014,10 +1209,7 @@ 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
@@ -1071,7 +1263,6 @@ 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
@@ -1085,11 +1276,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
@@ -1102,7 +1293,6 @@ 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
@@ -1163,8 +1353,6 @@ 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
@@ -1186,12 +1374,9 @@ 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
@@ -1221,12 +1406,8 @@ 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
@@ -1264,7 +1445,7 @@ files:
 - spec/factories/caboose_users.rb
 - spec/models/block_spec.rb
 - spec/models/user_spec.rb
-homepage: http://github.com/thenine/caboosecms
+homepage: http://github.com/williambarry007/caboose-cms
 licenses: []
 metadata: {}
 post_install_message: 
@@ -1283,7 +1464,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.8
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: CMS built on rails.