caboose-cms 0.4.56 → 0.4.57

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZDdjNGVhNmZlYTcyMjM1MzZkOTEyZjdhODE0OWYwNDIxYTg0NWQ2ZA==
+    NWZlMmY4OGUzMzNhMzRkMDNkOWVlODkxODI4ODBhYzU4YmVjNTE2MA==
   data.tar.gz: !binary |-
-    ODJmNWEwOTQzODAyODQ4Y2NmZjc3MWMzYjViMmM2NjI3ODBkZDI3NA==
+    OGVjNTdjNmZlMzE2ZDM5NzUyOTYyZWYxODM4NmVkNTJiZDJhZGYwNQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    Mjc4MjE1YTlhN2E4NTkxMWQ2OWE5MzBlNjM5ODZiOTI3MTc2Y2E1MWMzYTM0
-    NGZiOWI4YTM3MDJiYWUxMWQwZjc3M2Y3ZGU2OTQxOGEyZjg3NTAxMTg0NTNl
-    OTU3ZTE4ZTUxODY4NDA0NDYzMTQ0NmM0YjRkMzU4YzYwNzg0NmM=
+    ZDQxMzMyZWQ3MGFlZjgxZjczNjBjMTc2Y2VmZDI5Yjc3NmIxOTE0YjFjYzk5
+    ZTI1N2I0YjU1MjY4ZWE3MDQ3MDdiOTJjOWFhZDdmZWI3ZjU4YzJlZGFiNDll
+    Y2NlMjU4MzBjZWIxNTA0MzkzZjUwYjliNDkxYWM3YjY5Y2JmNWE=
   data.tar.gz: !binary |-
-    NmE5Nzg4NTQ2NzNlNWNiYTU1NmMyZWFhOGNkMTI2YTkzNWUxODk2Mjk3Njhj
-    NGEwZDEzNmI1MWU1OTJmYjlhMzE5ZTYwOWYyOWNkMDc4NDk3YTk0NzUzZDlk
-    ODJjODFkZDIyYWNlY2E3YjU0YWI4YjhkYmIzOWY5ZGY4YWUxYjA=
+    ZGEyNGM2YjFiMDc1MTEzOTg3Y2M0MzQ5ODJiNDUyOWIxNDdlMzA4MzdiMTc3
+    YTE5NjA5ZDM4YzEyOWMyNDg5ZDQ4ZTFhMjRjYmE3YzRjMWZlM2VhNjAxZTcy
+    NzgyYTBhNWRhNGRiZmFhNTAwODEyZjBhZWE5ZjRiZjAwNjBkN2U=

data/app/models/caboose/block.rb

@@ -150,7 +150,13 @@ class Caboose::Block < ActiveRecord::Base
       
       #eval("def render_my_function\n#{block.block_type.render_function}\nend\n\n, :locals => options2)
       #Caboose.log(block.id)
-      str = view.render(:partial => "caboose/blocks/render_function", :locals => options2)
+      
+      begin
+        str = view.render(:partial => "caboose/blocks/render_function", :locals => options2)
+      rescue Exception => ex
+        msg = block ? (block.block_type ? "Error with #{block.block_type.name} block (block_type_id #{block.block_type.id}, block_id #{block.id})\n" : "Error with block (block_id #{block.id})\n") : ''             
+        Caboose.log("#{msg}#{ex.message}\n#{ex.backtrace.join("\n")}")
+      end            
     else
       #view = ActionView::Base.new(ActionController::Base.view_paths, options2, )      
       #view = ActionView::Base.new(options2[:view].view_renderer, {}, options2[:view].controller)      

data/app/views/caboose/blocks/_layout_left_sidebar_content.html.erb

@@ -1,13 +1,7 @@
 <div class="content_wrapper" id='block_<%= block.id %>'>          
   <div class="content_body">    
     <% if editing %><div class='sortable'><% end %>        
-    <% block.children.each do |b| %>
-      <% 
-      msg = b ? (b.block_type ? "#{b.block_type.name} block (block_type_id #{b.block_type.id}, block_id #{b.id})\n" : "Block (block_id #{b.id})\n") : ''
-      Caboose.log(msg)
-      %>
-      <%= raw block.render(b, local_assigns) %>
-    <% end %>
+    <% block.children.each do |b| %><%= raw block.render(b, local_assigns) %><% end %>
     <% if editing %></div><% end %>
   </div>
 </div>

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.4.56'
+  VERSION = '0.4.57'
 end

metadata

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