caboose-cms 0.4.78 → 0.4.79

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZTk5NmQxYjFhNzk5Mjk4MmE3MDFmMTFlNmJmMWJhNDY0ODU5Y2Q2Nw==
+    NTA4MGRjOGZhOTYzMDIxNTc5ZmFlNDFlZDdjMTczNTE1MTQ3YzM4OQ==
   data.tar.gz: !binary |-
-    YjdhYzhmNzQyNDdhOTZhNjQ5NDc4YTQ3YjhlNjlmMjAxNjU3ZTdmZQ==
+    MTlmZDk2OGUwYTYwOGU5ODFlMjFiOGY2NjEwMDhmOGI0NGE1Y2NlMQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    YzgwMzhkOGRjNzhhZDI3OGIxOWJmMmFjMWZlYWM1OTJmZjk1NzExZWE5YWY2
-    MDIwMTU2N2RjNjQ0OTAwYjJmZjhjMmRjNGY2NjI2MGU1OTA0NGRjY2ZmMDlm
-    ZWExNGNmNzNiY2E5YTlkYjU2ZTg0Y2FiZDNmNWY5ZDdhZjM5MzA=
+    YmM1ZmQwOGZhMzQ3YzdlYzlhYjM1NTI5NTdiMDBlOWQ5MzNmMjg1NjY2MTU0
+    MGY1MjA3MGU2MTBkZjU1MDhkZTllNzJiYzA5Y2Y3MGQ1Njg4MWExMDdjNjQ5
+    MjZlOGFiNmU4OWEzZDRlZWRkM2E1YzdiNTIzZjE3ZjVjMjhiNjQ=
   data.tar.gz: !binary |-
-    NTEwZjdmNWRhMDZjOGI3NmFkNjBmMmZlNjM2YzNiMDJiMTVkM2JkNjMxNDQw
-    MDQ5NDM1NGJlMjhlYTFhZjI5NTE2NjZmNWMzZTAyYWRiN2FhZDhlMDMwOGU3
-    YmJiYzZhZTVlZmYxNzg3ZjhkMTkzYWRkZjQyNmJkM2RlMzRmNjA=
+    NGQwODlkMTMzZWJmNGJkMDI1NDMxN2E2Y2Y1MzMyZmFmYmNkOTdjMDhmZjM4
+    NjVlZGQ5ZTkwMGU2NDFjZDg1ZjNkNzg3OTViZDdkNzAwY2M2YmVlYzc0ZTAw
+    MTFiN2QzMjIxNTNiZDQ1NmFlYWEwZjM1YmVhMzg5YjE0YWJjODg=

data/app/models/caboose/media_image.rb

@@ -25,7 +25,7 @@ class Caboose::MediaImage < ActiveRecord::Base
     puts "Processing #{uri}..."
     
     self.image = URI.parse(uri)
-    self.save                
+    self.save
   end
   
   def api_hash

data/lib/caboose/engine.rb

@@ -159,6 +159,9 @@ module Caboose
         'tinymce/plugins/template/plugin.js',
         'tinymce/plugins/textcolor/plugin.js',
         'tinymce/plugins/caboose/plugin.js',
+        
+        # Site JS
+        '*/js/application.js',
 
         # CSS        
         'colorbox-rails.css',
@@ -180,7 +183,10 @@ module Caboose
         'caboose/station_modal.css',
         'caboose/station_sidebar.css',
         'caboose/tinymce.css',
-        'jquery.ui.all.css'
+        'jquery.ui.all.css',
+        
+        # Site CSS
+        '*/css/application.js'
         
       ]      
     end   

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.4.78'
+  VERSION = '0.4.79'
 end

data/lib/tasks/caboose.rake

@@ -127,11 +127,52 @@ namespace :assets do
   desc "Precompile assets, upload to S3, then remove locally"
   task :purl => :environment do
   
-    Rake::Task['assets:precompile'].invoke    
+    # 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('sites', site.name, 'js')    
+      site_css    = Rails.root.join('sites', site.name, 'css')   
+      site_images = Rails.root.join('sites', site.name, 'images')
+      site_fonts  = Rails.root.join('sites', 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)
+      
+      `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
+    
+    puts "Running precompile..."
+    Rake::Task['assets:precompile'].invoke
+
+    puts "Removing assets from public/assets, but leaving manifest file..."    
     `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, 'js')
+      host_css    = Rails.root.join('app', 'assets', 'stylesheets' , site.name, 'css')
+      host_images = Rails.root.join('app', 'assets', 'images'      , site.name, 'images')
+      host_fonts  = Rails.root.join('app', 'assets', 'fonts'       , site.name, 'fonts')
+                             
+      `rm -rf #{host_js     }`
+      `rm -rf #{host_css    }`
+      `rm -rf #{host_images }` 
+      `rm -rf #{host_fonts  }`
+    end
 
   end
   

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.4.78
+  version: 0.4.79
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-11 00:00:00.000000000 Z
+date: 2014-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails