caboose-cms 0.9.167 → 0.9.168

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d0cdbb21670c498d32a302546db93e211868402b
-  data.tar.gz: 8f312dcd0e59b43826a38592adcc54cc260303c4
+  metadata.gz: fff02cf440829495affd7ac1d92ee2f744de8bb2
+  data.tar.gz: 12b891c6d08d26db212943cf01b8b5078f348544
 SHA512:
-  metadata.gz: a876de2c71a21f0e6acdffdcd803876c9b5f81960b7f319a6369c147b3b381bf386c3b797ea8861959ebc6710d7197fc06ce6beea1c6f9f1b6d778cc0f7b50e5
-  data.tar.gz: 42e189883d2042118de765e58b04ef2f2c54c5cfc70ecc7442b5f05cd7520982b3ad8329cc2cde91adbbcfd0a12fd0904cd8aa0c52730c62144a5b7a295286e1
+  metadata.gz: 0dc57142c836592143e6b769cfd0ed5af3aed66023f59deccc6e517a7253e30726f1edca0b410aca39b400f1e35806752af7fcc41f5bbfb046bf2d69a9c860cb
+  data.tar.gz: 6d707887e94cea4ff497eb11335dc69d71ea0f73ff19809fe23c2d05cec660f4e27f927812a140e8278571aaef9d0332fadfb90fcaa5291a6a3d0d073ec72f14

data/app/models/caboose/theme.rb

@@ -75,7 +75,7 @@ class Caboose::Theme < ActiveRecord::Base
   def compile(for_site_id = 0)
   	theme = self
   	theme_name = 'default'
-  	path = Rails.root.join(Caboose::site_assets_path, 'themes', "#{theme_name}.scss.erb")
+  	path = Rails.root.join('themes', "#{theme_name}.scss.erb")
   	body = ERB.new(File.read(File.join(path))).result(theme.get_binding(for_site_id))
   	tmp_themes_path = File.join(Rails.root, 'tmp', 'themes')
   	tmp_asset_name = "theme_#{self.id}_site_#{for_site_id}"
@@ -95,13 +95,15 @@ class Caboose::Theme < ActiveRecord::Base
 	      :style => :compressed
 	    }).render
 	    str = StringIO.new(compressed_body)
-	    theme.delete_asset
 	    if Rails.env.production?
 	      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.new.buckets[config['bucket']]                         
 		    bucket.objects[theme.asset_path(asset.digest, for_site_id)].write(str, :acl => 'public-read', :content_type => 'text/css')
 	    else
+	    	Caboose.log("creating themes folder if doesn't exist")
+	    	theme_path = File.join(Rails.root, 'public', 'assets', 'themes')
+				FileUtils.mkdir_p(theme_path) unless File.directory?(theme_path)
 	      File.open(File.join(Rails.root, 'public', theme.asset_path(asset.digest, for_site_id)), 'w') { |f| f.write(compressed_body) }
 	    end
 	    self.update_digest(asset.digest)
@@ -119,7 +121,7 @@ class Caboose::Theme < ActiveRecord::Base
   end
 
   def delete_asset
-  	return unless digest?
+  	Caboose.log("deleting asset")
   end
 
   def asset_path(digest = self.digest, site_id = 0)

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.9.167'
+  VERSION = '0.9.168'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.9.167
+  version: 0.9.168
 platform: ruby
 authors:
 - William Barry