caboose-cms 0.9.189 → 0.9.190

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 293cf2e6ac743d9d1d145c21bf8ef8be48bd8b61
-  data.tar.gz: c14236e34426a873a50cdbefc9aea45d64e3ee6b
+  metadata.gz: 1a5083f626c310d7d091961387ba3b51011bf56d
+  data.tar.gz: 0a9e90704133f1fd2c1fb76fb502eedd5c53ba2b
 SHA512:
-  metadata.gz: 79f25b17a9b2e70ff36e43859187636cfde3460a9bfd01752c2569200c3e5e9aae2b661a1a435e47f9b6e2418a3d83ad92bedddc295776a5c5b1eb2b076308d2
-  data.tar.gz: c52d82c43c417d6ff988b0111570e415146ea01b3f3f0727885286aadfae6f8f4b0001e296505368de8038916a86f6a715bee89d1009a01d459e04b579bf97d9
+  metadata.gz: 5f1246e78cd60901e5c3a49c0afb31a20305eb0ad859213b89b16254a9cbfd9695a67b5b944bd6366099197e5cf7fed00ff0d82525f53ead85c443471e3d53fa
+  data.tar.gz: 03186636195d2125d8717a3322496c9bc31d25dae304a7bae0952ee21787283c41a012dbc90491a45b36e8454e8af095da7fd1825090a62c3f2327d5f5f98768

data/app/models/caboose/block.rb

@@ -1,3 +1,4 @@
+require 'timeout'
 
 class Caboose::Block < ActiveRecord::Base
   self.table_name = "blocks"
@@ -224,7 +225,7 @@ class Caboose::Block < ActiveRecord::Base
       rf = rf.gsub(/<% content_for :css do %>(.*?)<% end %>/m, '')
       options2[:render_function] = rf
       begin
-        str = view.render(:partial => "caboose/blocks/render_function", :locals => options2)
+        str = Timeout::timeout(3) { 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")}")

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

@@ -1,11 +1,15 @@
-<%= raw ERB.new(render_function).result(self.instance_eval { binding }) %>
+<%== ERB.new(render_function).result(self.instance_eval { binding }) %>
 
 <% if caboose_js && caboose_js.length > 1 %>
 	<% caboose_js.to_a.each_with_index do |js, ind| %>
 		<% next if ind == 0 %>
 		<% content_for :js do %>
-			<% erb = ERB.new(js).result(self.instance_eval { binding }) %>
-			<%== erb %>
+			<% begin %>
+				<% erb = ERB.new(js).result(self.instance_eval { binding }) %>
+				<%== erb %>
+			<% rescue %>
+				<% Caboose.log("JS ERROR for block #{block.id}") %>
+			<% end %>
 		<% end %>
 	<% end %>
 <% end %>
@@ -13,8 +17,12 @@
 	<% caboose_css.to_a.each_with_index do |css, ind| %>
 		<% next if ind == 0 %>
 		<% content_for :css do %>
-			<% erb = ERB.new(css).result(self.instance_eval { binding }) %>
-			<%== erb %>
+			<% begin %>
+				<% erb = ERB.new(css).result(self.instance_eval { binding }) %>
+				<%== erb %>
+			<% rescue %>
+				<% Caboose.log("CSS ERROR for block #{block.id}") %>
+			<% end %>
 		<% end %>
 	<% end %>
 <% end %>

data/app/views/caboose/inbox/admin_index.html.erb

@@ -26,7 +26,7 @@ def get_message(fs)
 		field = "field#{ind}_name".to_sym
 		value = "field#{ind}_value".to_sym
 		if fs[field] == 'message' || fs[field] == 'message_required'
-			return fs[value]
+			return fs[value].nil? ? '' : fs[value]
 			break
 		end
 	end

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.9.189'
+  VERSION = '0.9.190'
 end

metadata

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