rbbt-rest 1.8.81 → 1.8.82

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9765df9f3ec0cdf45ee797dc69d9c7f8096c7de8
-  data.tar.gz: 67e007aa33fc7bad853512ef7ea3fac9c89a5fcc
+  metadata.gz: b3d6daab394cc889b85fd28c4f11e172c16adcae
+  data.tar.gz: 31b215ce0d07e16301dafd5d8b4a4141ef80efb7
 SHA512:
-  metadata.gz: 75815aaabbc80dd82a1d3dc53d595b0f6e1400555d6e4cd29c32e619e0b6b388ad2b149dcfcc97d522626386eeb5625269b11423f4617dd43ee037c9f9a89620
-  data.tar.gz: bfaf28d0c4b5931064f0c081bd78a62972e7447467cebf6af3411b31a4c3f7131caade70f73896c889114a84e59123bfe08d35bc2ee85677f9a39534acd377a1
+  metadata.gz: cdcb2fec4ca4dce492fedec59c84d58fe813d1a432800220581b70b7f82267322b4751204b31e19864b7028bd7a5b49822769844f8a14acd1b4b11beb0413f1d
+  data.tar.gz: b87429a8396917a46752f90a5a6b6b9f58260e6dc41dbbcd344f27fc3233dcfeba2c9f865bdda88769acc203dde4716d5bd8fdf83b00b8658bd40720231d8b16

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

@@ -6,10 +6,15 @@ Tilt::SYMBOL_ARRAY_SORTABLE = false
 
 module RbbtRESTHelpers
   def error_for(job, layout = nil)
+    iii [job.status, job.dirty?]
     if ex = job.info[:exception]
       klass = ex[:class]
       msg = ex[:message]
       bkt = ex[:backtrace]
+    elsif job.dirty?
+      klass = "Exception"
+      msg = "Job dirty"
+      bkt = []
     else
       klass = "Exception"
       msg = job.messages[-1]

data/lib/rbbt/rest/workflow.rb

@@ -147,6 +147,8 @@ module Sinatra
 
         job = workflow.load_id(File.join(task, job))
 
+        halt 404, "Job not found: #{job.path} (#{job.status})" if job.status == :noinfo and not job.done?
+
         abort_job(workflow, job) and halt 200 if update.to_s == "abort"
         clean_job(workflow, job) and halt 200 if update.to_s == "clean"
         recursive_clean_job(workflow, job) and halt 200 if update.to_s == "recursive_clean"
@@ -157,17 +159,23 @@ module Sinatra
           started = job.started?
           waiting = job.waiting?
 
-          done = job.done?
+          done = job.done? 
+          error = job.error? || job.aborted? 
+
+          dirty = (done || status == :done) && job.dirty?
 
-          error = job.error? || job.aborted? || (job.done? && job.dirty?)
           started = started || done || error
 
+          done = false if dirty
+
           if done
             show_result job, workflow, task, params
           else
             if started || waiting
               exec_type = execution_type(workflow, task) 
               case
+              when dirty
+                error_for job
               when error
                 error_for job
               when (exec_type == :asynchronous or exec_type == :async)
@@ -200,17 +208,21 @@ module Sinatra
 
         job = workflow.load_id(File.join(task, job))
 
-        raise RbbtException.new "Job not found: #{job.path} (#{job.status})" unless job.started? or job.waiting? or job.error? or job.aborted?
+        not_started = true unless job.started? or job.waiting? or job.error? or job.aborted?
+        dirty = true  if (job.done? || job.status == :done) && job.dirty?
 
         begin
-          check_step job unless job.done?
+          check_step job unless job.done? or not_started
         rescue Aborted
         end
 
+        halt 404, "Job not found: #{job.path} (#{job.status})" if job.status == :noinfo and not job.done?
+
         case format
         when :html
           workflow_render('job_info', workflow, task, :job => job, :info => job.info)
         when :json
+          halt 200, {}.to_json if not_started
           content_type "application/json"
           info_json = {}
           job.info.each do |k,v|
@@ -223,6 +235,7 @@ module Sinatra
                              v
                            end
           end
+          info_json[:status] = :error if dirty
           halt 200, info_json.to_json
         else
           raise "Unsupported format specified: #{ format }"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbbt-rest
 version: !ruby/object:Gem::Version
-  version: 1.8.81
+  version: 1.8.82
 platform: ruby
 authors:
 - Miguel Vazquez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-23 00:00:00.000000000 Z
+date: 2017-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -1866,7 +1866,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Rbbt Web and REST interfaces