caboose-cms 0.8.89 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 13c65f79a43427d49eec81dcedba73190ad7f4ad
-  data.tar.gz: 1fd9cdacff471b16104521d1f13687b6bc45f5fb
+  metadata.gz: 68fa060ae238f851781562c6bbdc67c99b757e2c
+  data.tar.gz: 62c2fbbbfbab125e25ad71e33fa810e8f85f2de6
 SHA512:
-  metadata.gz: 2f704db76b8c8ac7542923548a9c07ed05cfa3e0fc1ffbb7fdb47c26ffb9a711012b43bac46df0a209dfa2755715a596bbf0e55ebf9d2dfaed12d37b4c9ccb09
-  data.tar.gz: b82f85dd53e864c54b1377456d9288d388a26b2e1d6bbb3ca186d548e8380e494ffa7b7b719d67e07546367d84992d833a0b7697f41d8cb1808e0dde49bfb0c4
+  metadata.gz: 816f4317a6e8717c1bcfd40b3be784a0b6248f0fe52f173fadc883cbe85646eeb59a4b4eb7d7f2908e76192c5972724a67362427a4cc823d4d8d4233fd7c8ee4
+  data.tar.gz: 71c13b3af1b80ac04da17eadc10e75f271a8cd7d2ddee6e7fee07afb2fe3377c7d37ca6e80789554c590aebd9dec8fbd7f77c139c991544ef800abab2e0a4900

data/app/models/caboose/block.rb

@@ -226,9 +226,19 @@ class Caboose::Block < ActiveRecord::Base
       #end
       
       arr = [
-        "../../sites/#{site.name}/blocks/#{full_name}",
-        "../../sites/#{site.name}/blocks/#{block.block_type.name}",
-        "../../sites/#{site.name}/blocks/#{block.block_type.field_type}",
+        #"../../sites/#{site.name}/blocks/#{full_name}",
+        #"../../sites/#{site.name}/blocks/#{block.block_type.name}",
+        #"../../sites/#{site.name}/blocks/#{block.block_type.field_type}",
+        #"../../app/views/caboose/blocks/#{full_name}",
+        #"../../app/views/caboose/blocks/#{block.block_type.name}",
+        #"../../app/views/caboose/blocks/#{block.block_type.field_type}",
+        #"caboose/blocks/#{full_name}",                
+        #"caboose/blocks/#{block.block_type.name}",                
+        #"caboose/blocks/#{block.block_type.field_type}"
+        
+        "../../app/views/caboose/blocks/#{site.name}/#{full_name}",
+        "../../app/views/caboose/blocks/#{site.name}/#{block.block_type.name}",
+        "../../app/views/caboose/blocks/#{site.name}/#{block.block_type.field_type}",
         "../../app/views/caboose/blocks/#{full_name}",
         "../../app/views/caboose/blocks/#{block.block_type.name}",
         "../../app/views/caboose/blocks/#{block.block_type.field_type}",
@@ -314,7 +324,8 @@ class Caboose::Block < ActiveRecord::Base
     site = options[:site]
     
     begin
-      str = view.render(:partial => "../../sites/#{site.name}/blocks/#{name}", :locals => options2)
+      #str = view.render(:partial => "../../sites/#{site.name}/blocks/#{name}", :locals => options2)
+      str = view.render(:partial => "../../app/views/caboose/blocks/#{site.name}/#{name}", :locals => options2)
     rescue ActionView::MissingTemplate => ex      
       begin
         str = view.render(:partial => "caboose/blocks/#{name}", :locals => options2)      

data/app/models/caboose/page_cacher.rb

@@ -90,15 +90,18 @@ module Caboose
         else
           full_name = bt.full_name
           full_name = "lksdjflskfjslkfjlskdfjlkjsdf" if full_name.nil? || full_name.length == 0
-          if    File.file?(Rails.root.join("sites/#{site.name}/blocks/_#{full_name}.html.erb"     )) then f = Rails.root.join("sites/#{site.name}/blocks/_#{full_name}.html.erb")
-          elsif File.file?(Rails.root.join("sites/#{site.name}/blocks/_#{bt.name}.html.erb"       )) then f = Rails.root.join("sites/#{site.name}/blocks/_#{bt.name}.html.erb")
-          elsif File.file?(Rails.root.join("sites/#{site.name}/blocks/_#{bt.field_type}.html.erb" )) then f = Rails.root.join("sites/#{site.name}/blocks/_#{bt.field_type}.html.erb")
-          elsif File.file?(Rails.root.join("app/views/caboose/blocks/_#{full_name}.html.erb"      )) then f = Rails.root.join("app/views/caboose/blocks/_#{full_name}.html.erb")
-          elsif File.file?(Rails.root.join("app/views/caboose/blocks/_#{bt.name}.html.erb"        )) then f = Rails.root.join("app/views/caboose/blocks/_#{bt.name}.html.erb")
-          elsif File.file?(Rails.root.join("app/views/caboose/blocks/_#{bt.field_type}.html.erb"  )) then f = Rails.root.join("app/views/caboose/blocks/_#{bt.field_type}.html.erb")
-          elsif File.file?("#{Caboose.root}/app/views/caboose/blocks/_#{full_name}.html.erb"       ) then f = "#{Caboose.root}/app/views/caboose/blocks/_#{full_name}.html.erb"
-          elsif File.file?("#{Caboose.root}/app/views/caboose/blocks/_#{bt.name}.html.erb"         ) then f = "#{Caboose.root}/app/views/caboose/blocks/_#{bt.name}.html.erb"
-          elsif File.file?("#{Caboose.root}/app/views/caboose/blocks/_#{bt.field_type}.html.erb"   ) then f = "#{Caboose.root}/app/views/caboose/blocks/_#{bt.field_type}.html.erb"
+          #if    File.file?(Rails.root.join("sites/#{site.name}/blocks/_#{full_name}.html.erb"     )) then f = Rails.root.join("sites/#{site.name}/blocks/_#{full_name}.html.erb")
+          #elsif File.file?(Rails.root.join("sites/#{site.name}/blocks/_#{bt.name}.html.erb"       )) then f = Rails.root.join("sites/#{site.name}/blocks/_#{bt.name}.html.erb")
+          #elsif File.file?(Rails.root.join("sites/#{site.name}/blocks/_#{bt.field_type}.html.erb" )) then f = Rails.root.join("sites/#{site.name}/blocks/_#{bt.field_type}.html.erb")
+          if    File.file?(Rails.root.join("app/views/caboose/blocks/#{site.name}/_#{full_name}.html.erb"     )) then f = Rails.root.join("app/views/caboose/blocks/#{site.name}/_#{full_name}.html.erb")
+          elsif File.file?(Rails.root.join("app/views/caboose/blocks/#{site.name}/_#{bt.name}.html.erb"       )) then f = Rails.root.join("app/views/caboose/blocks/#{site.name}/_#{bt.name}.html.erb")
+          elsif File.file?(Rails.root.join("app/views/caboose/blocks/#{site.name}/_#{bt.field_type}.html.erb" )) then f = Rails.root.join("app/views/caboose/blocks/#{site.name}/_#{bt.field_type}.html.erb")            
+          elsif File.file?(Rails.root.join("app/views/caboose/blocks/_#{full_name}.html.erb"                  )) then f = Rails.root.join("app/views/caboose/blocks/_#{full_name}.html.erb")
+          elsif File.file?(Rails.root.join("app/views/caboose/blocks/_#{bt.name}.html.erb"                    )) then f = Rails.root.join("app/views/caboose/blocks/_#{bt.name}.html.erb")
+          elsif File.file?(Rails.root.join("app/views/caboose/blocks/_#{bt.field_type}.html.erb"              )) then f = Rails.root.join("app/views/caboose/blocks/_#{bt.field_type}.html.erb")
+          elsif File.file?("#{Caboose.root}/app/views/caboose/blocks/_#{full_name}.html.erb"                   ) then f = "#{Caboose.root}/app/views/caboose/blocks/_#{full_name}.html.erb"
+          elsif File.file?("#{Caboose.root}/app/views/caboose/blocks/_#{bt.name}.html.erb"                     ) then f = "#{Caboose.root}/app/views/caboose/blocks/_#{bt.name}.html.erb"
+          elsif File.file?("#{Caboose.root}/app/views/caboose/blocks/_#{bt.field_type}.html.erb"               ) then f = "#{Caboose.root}/app/views/caboose/blocks/_#{bt.field_type}.html.erb"
           end
           f = (f && f.to_s.strip.length > 0 ? File.read(f) : '')
         end

data/lib/caboose.rb

@@ -136,6 +136,9 @@ module Caboose
   mattr_accessor :use_comment_routes
   @@use_comment_routes = true
   
+  mattr_accessor :site_assets_path
+  @@site_assets_path = "sites"
+  
 end
 
 # These are used so that both local filestorage and S3 can work without having to change paperclip paths in models

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.8.89'
-end
+  VERSION = '0.9.1'
+end

data/lib/tasks/caboose.rake

@@ -2,6 +2,34 @@ require "caboose/version"
 require 'aws-sdk'
 
 namespace :caboose do
+            
+  task :move_site_blocks => :environment do
+    
+    #Dir["sites/*/blocks"].each do |file|
+    #  arr = file.split('/')
+    #  site_name = arr[1]                  
+    #  next if site_name.nil? || site_name.strip.length == 0      
+    #  `mv sites/#{site_name}/blocks app/views/caboose/blocks/#{site_name}` if !File.exist?("app/views/caboose/blocks/#{site_name}")
+    #end
+    
+    Dir["app/views/caboose/blocks/*/*"].each do |file|
+      arr = file.split('/')
+      site_name = arr[4]
+      partial_name = arr[5]      
+      next if site_name.nil? || site_name.strip.length == 0 || partial_name.nil? || partial_name.strip.length == 0
+            
+      #puts "site_name = #{site_name}, partial_name = #{partial_name}"
+      
+      str = File.read(file)
+      str2 = str.gsub("../../sites/#{site_name}/blocks", "caboose/blocks/#{site_name}")
+      if str != str2
+        puts file
+        File.open(file, 'w') { |the_file| the_file.write(str2) }
+      end
+            
+    end
+
+  end
     
   task :subscription_migration => :environment do
     Caboose::Subscription.migrate_from_user_subscriptions
@@ -519,10 +547,10 @@ namespace :assets do
       # 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') 
+        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)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.8.89
+  version: 0.9.1
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-21 00:00:00.000000000 Z
+date: 2016-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg