caboose-cms 0.4.86 → 0.4.87

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YzRjY2I0Mjc3MGE5MGRjNTZjYjdhNzczZjc3YzAxOTg0NjY5ODUyOQ==
+    NjYwYzljMjA0ZTI2ZmZhYThmZDhkMWZlMWYyOTc1MmQ2OTVhNmVjMw==
   data.tar.gz: !binary |-
-    YzcyMzBiMDU5ZTNlN2U1MDM0ODY1MWIwZWM1ZWYxOWIzZmM0NzVmOQ==
+    OTMwNDQyNzE3MjNlNGNiYzA1OGZjNDBhNzc0OWQwY2FjZjY1ZTllNw==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NmRiOGE0NGI1NjdmMThkMjJiZGZmZjg2NGVjNDU0OWMyZmNiYzdlYWJhNDQ3
-    NmQ1MjZhN2NhYTEwNTZmZWJhYTI4NmQ0ODA3YzljMzZmNTliMDE4ZDFlY2Ji
-    Njc2ZjU1ZGU4ZmU3Mjk3NTgzNmY5N2ZkNGQ4NjZjMTc1OWNjNTA=
+    YjlmYjc3NTg2OGI0YmJkYmVmYWUxZGM0NzhmOWIyMGQxNGQyZjAyNDljYzVk
+    ZDVlNGM3YWJlMWVjYzU4ZWYyZDY4YzBjNTVkZDdiNzVmNzYxMGZjNjVlOWNh
+    OTRjMTg4ZDVkYjk4OGIwZTc0MDY4NmZlMzU3NmIzNWY1ZjA2NTU=
   data.tar.gz: !binary |-
-    MTJiMTU0NTY2MTA2MTE5ZmI3YjQzNzQ3MmVkOWIzOTNhYjc3MmExNDM5MGRi
-    NTBiYmQ3YzQ1Y2EzNTJjODA2ZWNjN2ViYzA3NGQ0YzM4NDk4YWE1Yzc5YzY4
-    MGQwMWI0ZGZlNmI5NDg3NDUxMDc3ZTdkYmJjMTNjNDllYTlkM2I=
+    MWE5NDVmNWYyMDBlMGE4N2NmMmE4YWM1MjcyZDJiODk3ODkyNzQxNDcyNzY2
+    Nzc1OTY0YThlZjY5ODYxMzgyNjhhMWIxNzdlMjBhNzZmZWMyODUyMzdkZTUy
+    OWI4YjhmNjE0NzdkZWM0ZTgxMWM5MTlmOTM3MzA5OGZlNzI3MTg=

data/app/models/caboose/block.rb

@@ -208,9 +208,13 @@ class Caboose::Block < ActiveRecord::Base
     return str
   end
   
-  def block_message(block, 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")}")
+  def block_message(block, 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") : ''
+    if ex.is_a?(String)
+      Caboose.log("#{msg}#{ex}")
+    else
+      Caboose.log("#{msg}#{ex.message}\n#{ex.backtrace.join("\n")}")
+    end
     return msg
   end
 

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.4.86'
+  VERSION = '0.4.87'
 end

metadata

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