caboose-cms 0.5.41 → 0.5.42

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MjUyMzA2NmM2MDFkZDAyY2ViZjc4NjAwOWQwZTFjYjQ2MWJhNGVmNQ==
+    Y2NmZDM4ZmQ0NDdjOTZlOTVhYWU3OTM5YjkyMTQwNTBlMGFjNDc2ZQ==
   data.tar.gz: !binary |-
-    MjIwYjE1MmFiNTJkYmIxZmU1NWEyM2JhM2YwYjViNjM0NGYxYWVkNQ==
+    ZmZiNmI2MzI3MjUxZjUwMDIyZTJiN2Q5MDk2OTVlYjYzOTgxMDc5Mw==
 SHA512:
   metadata.gz: !binary |-
-    ZTZiZGY1NWY2ZDliZTVjMzA1NmMyOWFmOTQ4M2RjZTAzNzhmZmY0Y2Q2OGJj
-    ODMzMjEzMGU1YjZhMjkzNDNjYTI2MmJhMWQwM2I5ZGQ5ZGYzZTg1ZGU3ZDkz
-    Y2FjMGFkNGZhNjQ4ODc5ZmU2MjMzMWQ5MGY4NzA2OWI4YmU3ODA=
+    ODEwMjA4YzQxMzliM2M4NjdmZTk5NjE3NDlkMzQ5NTU4YzMwZjRhZThjZDlh
+    MTRiZWMzMDliM2U3MDkxNWI0YThjOTJkN2I0MTBlZWMzOWI4NGQzNjRlOTdk
+    MzYyYmE1ZjIxZTAxNzdkYzY1ZmM0ZmY5NjU0MzBhYTBkZjNlM2Y=
   data.tar.gz: !binary |-
-    MGVlNTQwYWE5YmFhOWUwYmM1ZjgyYWU5MWFjM2MyNmIzNDBhNGIxMDQ3NGYw
-    NDQxMjA2YTdjYjg1NzkwMTI3ODVmOGEyNzdiODNkNGJjZDk2MWM5OWM5YTNl
-    YmExN2Y0ZmJiYmNhODE4ZjRiYTZkYzdkOTk2NDk2YTk3ZGVkOTg=
+    YzcwYTExZDdmMjBmMTgyMjExNWFlOWJkMWFhMzcwOGViNDQ1OWUxNTU5ZGE0
+    OWQ3ZmVkZDk5YzQxNDBiODgyYWI5OGRmMTJmZGVjMDg3YTJlZWU2MDM5MWQ1
+    NThhM2MyYTI0OTljZmY2MjU2OWE2ZjY2OGZmNzM0NjQyZmVhYWY=

data/app/models/caboose/page_cacher.rb

@@ -8,7 +8,7 @@ module Caboose
       end
       
       # Make sure all pages are cached
-      query = ["select id from pages where id not in (select distinct(page_id) from page_cache"]
+      query = ["select id from pages where id not in (select distinct(page_id) from page_cache)"]
       rows = ActiveRecord::Base.connection.execute(ActiveRecord::Base.send(:sanitize_sql_array, query))
       if rows
         rows.each{ |row| self.delay.cache(row['id']) }
@@ -97,7 +97,7 @@ module Caboose
           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 = File.read(f)
+          f = (f && f.to_s.strip.length > 0 ? File.read(f) : '')
         end
         f.gsub!(/block\.partial\((.*?),(.*?)\)/ , 'render :partial => \1')
         f.gsub!(/block\.render\((.*?),(.*?)\)/  , 'render_block_type(block, \1, page, view, controller_view_content, modal, empty_text, editing, css, js, csrf_meta_tags, csrf_meta_tags2, logged_in_user, site)')        

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.5.41'
+  VERSION = '0.5.42'
 end

metadata

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