rbbt-rest 1.1.2 → 1.1.3

data/lib/rbbt/rest/client.rb

@@ -99,6 +99,9 @@ class WorkflowRESTClient
       else
         url, params = @url, {:_cache_type => :synchronous}
       end
+
+      params[:jobname] = @name if @name
+
       case result_type
       when :string
         WorkflowRESTClient.get_raw(url, params) 
@@ -184,29 +187,29 @@ class WorkflowRESTClient
   end
 
   def tasks
-    if @tasks.nil?
-      @tasks = {}
-      exported_tasks.each do |task_name|
-        info = task_info(task_name)
-        tasks[task_name.to_sym] = Task.setup info do |*args|
-          raise "This is a remote task" 
-        end
-        tasks[task_name.to_sym].name = task_name.to_sym
+    @tasks ||= Hash.new do |hash,task_name| 
+      info = task_info(task_name)
+      task = Task.setup info do |*args|
+        raise "This is a remote task" 
       end
-      @tasks
+      task.name = task_name.to_sym
+      hash[task_name] = task
     end
-    @tasks
+  end
+
+  def load_tasks
+    exported_tasks.each{|name| tasks[name]}
+    nil
   end
 
   def task_dependencies
-    if @task_dependencies.nil?
-      @task_dependencies = {}
-      exported_tasks.each do |task|
-        task_dependencies[task] = WorkflowRESTClient.get_json(File.join(url, task.to_s, 'dependencies'))
+    @task_dependencies ||= Hash.new do |hash,task| 
+      hash[task] = if exported_tasks.include? task
+        WorkflowRESTClient.get_json(File.join(url, task.to_s, 'dependencies'))
+      else
+        []
       end
-      @task_dependencies
     end
-    @task_dependencies
   end
 
   def rec_dependencies(taskname)
@@ -275,6 +278,7 @@ class WorkflowRESTClient
       end
     else
 
+      ddd task
       if Task === task
         task_name = task.name
       else

data/lib/rbbt/rest/workflow.rb

@@ -108,7 +108,7 @@ module Sinatra
 
         job = workflow.load_id(File.join(task, job))
 
-        clean_job(workflow, job) if update == :clean
+        clean_job(workflow, job) 
 
         begin
           done = job.done?
@@ -185,7 +185,7 @@ module Sinatra
         job  = consume_parameter(:job)
         job  = workflow.load_id(File.join(task, job))
 
-        clean_job(workflow, job) if update == :clean
+        clean_job(workflow, job)
       end
     end
 

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

@@ -121,6 +121,8 @@ module WorkflowRESTHelpers
     inputs = prepare_job_inputs(workflow, task, params)
     job = workflow.job(task, jobname, inputs)
 
+    job.clean if update == :clean
+
     execution_type = execution_type(workflow, task)
     case execution_type
     when :exec

data/share/views/public/js/helpers.js

@@ -58,12 +58,16 @@ function parse_parameters(params){
 
 function require_js(url, success){
   var async = false;
+  console.log(url)
   if (undefined === success){
+    console.log('Sync')
     async = false;
   }else{
+    console.log('Async')
     async = true;
   }
-  $.ajax({url: url, dataType:'script', async:async, success: success} ).fail(function(jqxhr, settings, exception){
+
+  $.ajax({url: url, dataType:'script', async: async, success: success} ).fail(function(jqxhr, settings, exception){
     console.log('Exception loading: ' + url)
     console.log(exception)
     console.log(jqxhr)

data/share/views/tasks.haml

@@ -1,5 +1,7 @@
 .row
   .twelve.column
+    %h3= workflow.to_s
+
     %ul.tasks
       - tasks = workflow.exec_exports + workflow.synchronous_exports + workflow.asynchronous_exports
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rbbt-rest
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-20 00:00:00.000000000 Z
+date: 2013-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake