rbbt-rest 1.3.16 → 1.3.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 62f875a6b4351919548f892321674b3ce9a22e12
-  data.tar.gz: aa633b3530d33f74724aaf4d5c4b25d8413aab3d
+  metadata.gz: b087f8339e7a65c9e44b765d5b78d656fe9e613d
+  data.tar.gz: e1eef5d17962223f05ea3e5b65aea531e1cf389c
 SHA512:
-  metadata.gz: d60256136e670dd80fa34cfd127ef1388fd4769b63a3aa5e329edcef8fba09efb3b563fdbbfad8160ce7f2e771aa1e8a5e1290fca6ed68b26acadc4afc21d7ae
-  data.tar.gz: eebc38fd2caa1ee4fddf9ae3df434619927de27294cf124f250c86d5326b88784635ff613a7f30b3993411702e52a999ed18dc9d82dc5325eef4bf7d1e19e9c9
+  metadata.gz: 2ba5c13c66439f9e9ea52535790b449cd050cf93a45b962be5266551e97928ccdcf7bb9065e5f8ccf2a5d3cf39b3d99fe6ef8cfa0a8079cdf4eaa7a57aef7422
+  data.tar.gz: 5cb298f5e8d58ef8f391a48f58e98b031200d445ca218b7f6fbe8743985e03e354ffe0362f3eaa90a4ce84d8b21404f3e413da0e4db1332bc8c5fd43e8113a44

data/lib/rbbt/rest/common/render.rb

@@ -4,9 +4,20 @@ require 'tilt'
 
 module RbbtRESTHelpers
   def error_for(job, layout = nil)
-    if @format == :json
-      halt 400, {"message" => job.messages[-2], "backtrace" => job.info[:backtrace]}.to_json
+    if ex = job.info[:exception]
+      klass = ex[:class]
+      msg = ex[:message]
+      bkt = ex[:backtrace]
     else
+      klass = "Exception"
+      msg = job.messages[-1]
+      bkt = []
+    end
+
+    case @format
+    when :json
+      halt 400, {"message" => msg, "backtrace" => bkt}.to_json
+    when :html
       layout = @layout if layout.nil?
       layout_file = (layout ? locate_template('layout') : nil)
       template_file = locate_template('error')
@@ -14,6 +25,8 @@ module RbbtRESTHelpers
       result = render template_file, {:job => job}, layout_file
 
       halt 400, result
+    else
+      halt 400, "#{klass}: " << msg << "\nBacktrace: " << btk * "\n"
     end
   end
 

data/lib/rbbt/rest/workflow/jobs.rb

@@ -176,7 +176,7 @@ module WorkflowRESTHelpers
         else
           redirect job_url
         end
-      rescue
+      rescue Exception
         Log.exception $!
         halt 500, $!.message
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbbt-rest
 version: !ruby/object:Gem::Version
-  version: 1.3.16
+  version: 1.3.17
 platform: ruby
 authors:
 - Miguel Vazquez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-12 00:00:00.000000000 Z
+date: 2014-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake