caboose-cms 0.9.106 → 0.9.107

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b2582096246cab8ae4b3d29739b2d2235ea7902d
-  data.tar.gz: 6dbe124afb37cc6d8946ee06717ba08d295f5e43
+  metadata.gz: 12583acd997f8a6132f1387af3efa0c07a6ce6f3
+  data.tar.gz: 89fbb7eb4486e4f2acd2408c028af2dd38da3407
 SHA512:
-  metadata.gz: 16f7e167f36b59ce3667f8ed377d57d58470f0e240aff437f8062a07583b69b20a8ae3fb33cc09798d26d6543fdcb3308e22a63e11e5a39ce6d24cb3a4d385cc
-  data.tar.gz: f72a582447399cbd4f8dae7d7ae6208070bffa9792f3ebd1724b7f7d396d32dea964f78c690de28c8ad23f4af0d48202f6554568338b03422e75f217c7c33330
+  metadata.gz: 23ded9d6c59f8716eb2631bea82874d10310e021ff4149a75bd8af68dee1c069abf6824892492e102224c40e1ed0e8c61cb39aa0bb514b557bda025ab2e851c6
+  data.tar.gz: 86999fd96799a86fe721e7cf973b401ee7519582cd65ff368858f99ca9f4170090a4214fe2dd27f5c3a7ade206390fb7baaea32fe5254e84d2824ac7dc279813

data/app/assets/stylesheets/caboose/admin_edit_page_content_dragdrop.scss

@@ -33,6 +33,8 @@
         font-size: 15px;
         display: block;
         text-transform: uppercase;
+        color: #252525;
+        line-height: 16px;
       }
     }
   	li.blocktype {
@@ -48,7 +50,7 @@
       padding: 6px;
       background-color: #f9f8f6;
       span[class*=" icon-"] {
-        
+        color: #3e3e3e;
       }
   		span.bname {
         margin-top: 3px;
@@ -56,7 +58,9 @@
         font-family: 'Roboto';
         font-weight: 300;
   			font-size: 12px;
+        line-height: 14px;
         border: 0;
+        color: #252525;
   		}
       &.divider {
 

data/app/assets/stylesheets/caboose/model_binder.css

@@ -22,6 +22,7 @@ require caboose/spectrum
 .mb_container .mb_fake option,
 .mb_container option {
   font-size: 15px !important;
+  max-width: 100%;
 }
 
 .mb_container input.mb_dirty,

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.9.106'
+  VERSION = '0.9.107'
 end

data/lib/tasks/caboose.rake

@@ -529,77 +529,100 @@ end
 namespace :assets do
 
   desc "Precompile assets, upload to S3, then remove locally"
-  task :purl, [:filename] => :environment do |t, args|
-    
-    # PURL a single file
-    if args.filename
-      dest = "#{Rails.root}/tmp/#{args.filename}"
-      
-      # Compile the file
-      puts "Compiling #{args.filename}..."
-      File.write(dest, Uglifier.compile(Rails.application.assets.find_asset(args.filename).to_s))
-      
-      # Copy the file from dest to s3/assets
-      puts "Copying #{args.filename} to s3..."
-      config = YAML.load(File.read(Rails.root.join('config', 'aws.yml')))['production']    
-      AWS.config({ :access_key_id => config['access_key_id'], :secret_access_key => config['secret_access_key'] })                     
-      bucket = AWS::S3::Bucket.new(config['bucket'])
-      obj = bucket.objects["assets/#{args.filename}"]
-      obj.write(:file => dest, :acl => :public_read)
+  task :purl, [:sitename, :sitename2, :sitename3, :sitename4] => :environment do |t, args|
+
+    sitenames = []
+    sitenames << args.sitename if !args.sitename.blank?
+    sitenames << args.sitename2 if !args.sitename2.blank?
+    sitenames << args.sitename3 if !args.sitename3.blank?
+    sitenames << args.sitename4 if !args.sitename4.blank?
+    where = args.sitename.blank? ? "" : "name = '#{args.sitename}'"
+    where += " OR name = '#{args.sitename2}'" if !args.sitename2.blank?
+    where += " OR name = '#{args.sitename3}'" if !args.sitename3.blank?
+    where += " OR name = '#{args.sitename4}'" if !args.sitename4.blank?
+
+    `mv #{Rails.root.join('public', 'assets', 'manifest.yml')} #{Rails.root.join('public', 'manifest1.yml')}`
+  
+    puts "Copying site assets into host assets..."
+    Caboose::Site.where(where).all.each do |site|
+      site_js     = Rails.root.join(Caboose::site_assets_path, site.name, 'js')    
+      site_css    = Rails.root.join(Caboose::site_assets_path, site.name, 'css')   
+      site_images = Rails.root.join(Caboose::site_assets_path, site.name, 'images')
+      site_fonts  = Rails.root.join(Caboose::site_assets_path, site.name, 'fonts') 
+          
+      host_js     = Rails.root.join('app', 'assets', 'javascripts' , site.name)
+      host_css    = Rails.root.join('app', 'assets', 'stylesheets' , site.name)
+      host_images = Rails.root.join('app', 'assets', 'images'      , site.name)
+      host_fonts  = Rails.root.join('app', 'assets', 'fonts'       , site.name)
       
-      # Remove the temp file
-      puts "Cleaning up..."
-      `rm -rf #{dest}`      
-    
-    else # Otherwise do a full PURL
-    
-      # Copy any site assets into the host app assets directory first
-      puts "Copying site assets into host assets..."
-      Caboose::Site.all.each do |site|
-        site_js     = Rails.root.join(Caboose::site_assets_path, site.name, 'js')    
-        site_css    = Rails.root.join(Caboose::site_assets_path, site.name, 'css')   
-        site_images = Rails.root.join(Caboose::site_assets_path, site.name, 'images')
-        site_fonts  = Rails.root.join(Caboose::site_assets_path, site.name, 'fonts') 
+      `mkdir -p #{host_js     }` if File.directory?(site_js) 
+      `mkdir -p #{host_css    }` if File.directory?(site_css) 
+      `mkdir -p #{host_images }` if File.directory?(site_images) 
+      `mkdir -p #{host_fonts  }` if File.directory?(site_fonts)
+                             
+      `cp -R #{site_js     } #{host_js     }` if File.directory?(site_js) 
+      `cp -R #{site_css    } #{host_css    }` if File.directory?(site_css) 
+      `cp -R #{site_images } #{host_images }` if File.directory?(site_images) 
+      `cp -R #{site_fonts  } #{host_fonts  }` if File.directory?(site_fonts) 
+    end
             
-        host_js     = Rails.root.join('app', 'assets', 'javascripts' , site.name)
-        host_css    = Rails.root.join('app', 'assets', 'stylesheets' , site.name)
-        host_images = Rails.root.join('app', 'assets', 'images'      , site.name)
-        host_fonts  = Rails.root.join('app', 'assets', 'fonts'       , site.name)
-        
-        `mkdir -p #{host_js     }` if File.directory?(site_js) 
-        `mkdir -p #{host_css    }` if File.directory?(site_css) 
-        `mkdir -p #{host_images }` if File.directory?(site_images) 
-        `mkdir -p #{host_fonts  }` if File.directory?(site_fonts)
-                               
-        `cp -R #{site_js     } #{host_js     }` if File.directory?(site_js) 
-        `cp -R #{site_css    } #{host_css    }` if File.directory?(site_css) 
-        `cp -R #{site_images } #{host_images }` if File.directory?(site_images) 
-        `cp -R #{site_fonts  } #{host_fonts  }` if File.directory?(site_fonts) 
+    puts "Running precompile..."
+    Rake::Task['assets:precompile'].invoke
+
+    if !sitenames.blank?
+
+      puts "Moving manifest.yml to public > manifest2.yml"
+      `mv #{Rails.root.join('public', 'assets', 'manifest.yml')} #{Rails.root.join('public', 'manifest2.yml')}`
+
+      new_string = ""
+
+      prefixes = sitenames.map{ |sn| sn + "/"}
+
+      File.readlines("#{Rails.root.join('public', 'manifest1.yml')}").each do |line|
+        if !line.starts_with?(*prefixes)
+          new_string += (line)
+        end
       end
-              
-      puts "Running precompile..."
-      Rake::Task['assets:precompile'].invoke
-      
-      puts "Removing assets from public/assets, but leaving manifest file..."    
+
+      File.readlines("#{Rails.root.join('public', 'manifest2.yml')}").each do |line|
+        if line.starts_with?(*prefixes)
+          new_string += (line)
+        end
+      end
+
+      puts "Writing to public > manifest3.yml"
+      `touch #{Rails.root.join('public', 'manifest3.yml')}`
+      File.open("#{Rails.root.join('public', 'manifest3.yml')}", "w") { |f| f.write(new_string)}
+
+      puts "Removing assets from public/assets, but leaving manifest file..."  
+      `rm -rf #{Rails.root.join('public', 'assets')}`
+      `rm #{Rails.root.join('public', 'manifest1.yml')}`
+      `rm #{Rails.root.join('public', 'manifest2.yml')}`
+      `mkdir #{Rails.root.join('public', 'assets')}`     
+      `mv #{Rails.root.join('public', 'manifest3.yml')} #{Rails.root.join('public', 'assets', 'manifest.yml')}`
+
+    else
+      puts "Removing assets from public/assets, but leaving manifest file..."
+      `rm #{Rails.root.join('public', 'manifest1.yml')}`
       `mv #{Rails.root.join('public', 'assets', 'manifest.yml')} #{Rails.root.join('public', 'manifest.yml')}`
       `rm -rf #{Rails.root.join('public', 'assets')}`
       `mkdir #{Rails.root.join('public', 'assets')}`     
       `mv #{Rails.root.join('public', 'manifest.yml')} #{Rails.root.join('public', 'assets', 'manifest.yml')}`
-                  
-      # Clean up
-      puts "Removing site assets from host assets..."
-      Caboose::Site.all.each do |site|      
-        host_js     = Rails.root.join('app', 'assets', 'javascripts' , site.name)
-        host_css    = Rails.root.join('app', 'assets', 'stylesheets' , site.name)
-        host_images = Rails.root.join('app', 'assets', 'images'      , site.name)
-        host_fonts  = Rails.root.join('app', 'assets', 'fonts'       , site.name)
-                               
-        `rm -rf #{host_js     }`
-        `rm -rf #{host_css    }`
-        `rm -rf #{host_images }` 
-        `rm -rf #{host_fonts  }`
-      end
     end
+                
+    puts "Removing site assets from host assets..."
+    Caboose::Site.where(where).all.each do |site|      
+      host_js     = Rails.root.join('app', 'assets', 'javascripts' , site.name)
+      host_css    = Rails.root.join('app', 'assets', 'stylesheets' , site.name)
+      host_images = Rails.root.join('app', 'assets', 'images'      , site.name)
+      host_fonts  = Rails.root.join('app', 'assets', 'fonts'       , site.name)
+                      
+      `rm -rf #{host_js     }`
+      `rm -rf #{host_css    }`
+      `rm -rf #{host_images }` 
+      `rm -rf #{host_fonts  }`
+    end
+
   end
    
   desc "Create .gz versions of assets"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.9.106
+  version: 0.9.107
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-16 00:00:00.000000000 Z
+date: 2018-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg