rbbt-rest 1.3.7 → 1.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2a1e8ea5906421691ba0ed838b8636c39cf94835
-  data.tar.gz: 74c068a5b593a8443bc2a03c1eca0f27028319f2
+  metadata.gz: af2d0738024e2f1576ee464174c75e69bff9e565
+  data.tar.gz: f8b5daa03aad2d4f9f0686fb0dc77864a691d173
 SHA512:
-  metadata.gz: 895f70b43a2e15cf3b2ed3f41f66261ae7b2811aded4db5d88613ef9e9cd851b12c669cb9e61b25a6631a653e978b71a7cc073dae45ff4d5ae9ae15c3e2f24d7
-  data.tar.gz: 4c74347a06c8e6d57da78ad2ed49820ee4518555bc4dc7c76afdc54a2f4eae041b3b30759cee59d2ee7b3bf03d84acf4ba828dbe0240a151b8847704e04c78d0
+  metadata.gz: 80f04a7411ff1e2d08f77c5edb4c966615409ba6c66f0a793cb766efaebeb313478f4954dacda49869a2ea0ecae465e4af55773780a58a570fcdb0997aae1849
+  data.tar.gz: c874aceb9421927804e172ffd46d2e6ab7e1f8e60a31aeb51d1d6cb4db268e3416bd61fe0bfc75b540892331e85b561e6638b9ce015797f20a3993d7c1ad034b

data/lib/rbbt/rest/client/get.rb

@@ -2,11 +2,19 @@ class WorkflowRESTClient
   def self.fix_hash(hash, fix_values = false)
     fixed = {}
     hash.each do |key, value|
-      fixed[key.to_sym] = case
-                          when Hash === value 
+      fixed[key.to_sym] = case value
+                          when TrueClass
+                            value
+                          when FalseClass
+                            value
+                          when Hash 
                             fix_hash(value)  
-                          when (fix_values and String === value)
+                          when (fix_values and String )
                             value.to_sym
+                          when IO
+                            value.read
+                          when TSV::Dumper
+                            value.stream.read
                           else
                             value
                           end

data/lib/rbbt/rest/client/step.rb

@@ -49,7 +49,7 @@ class WorkflowRESTClient
     #{{{ MANAGEMENT
     
     def init_job(cache_type = :asynchronous)
-      @name = WorkflowRESTClient.post_jobname(File.join(base_url, task.to_s), inputs.merge(:jobname => @name, :_cache_type => cache_type))
+      @name ||= WorkflowRESTClient.post_jobname(File.join(base_url, task.to_s), inputs.merge(:jobname => @name, :_cache_type => cache_type))
       @url = File.join(base_url, task.to_s, @name)
       nil
     end
@@ -108,11 +108,11 @@ class WorkflowRESTClient
 
     def run(noload = false)
       return exec_job if @is_exec
-      init_job(:synchronous)
+      init_job(:synchronous) 
       noload ? @name : self.load
     end
 
-    def exec
+    def exec(*args)
       exec_job
     end
 
@@ -122,18 +122,18 @@ class WorkflowRESTClient
     end
 
     def recursive_clean
-      init_job unless url
       begin
-        WorkflowRESTClient.get_raw(url, :_update => :recursive_clean) unless @is_exec
+        inputs[:_update] = :recursive_clean
       rescue Exception
       end
       self
     end
 
     def clean
-      init_job unless url
       begin
-        WorkflowRESTClient.get_raw(url, :_update => :clean) unless @is_exec
+        ddd inputs
+        inputs[:_update] = :clean
+        ddd inputs
       rescue Exception
       end
       self

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

@@ -140,6 +140,13 @@ module RbbtRESTHelpers
         text.split(/\r?\n/).collect{|l| l.strip}
       when text =~ /\|/
         text.split(/\|/).collect{|l| l.strip}
+      when Hash
+        io = text[:tempfile].open
+        class << io
+          attr_accessor :filename
+        end
+        io.filename = text[:filename]
+        io
       else
         text.split(/,/).collect{|l| l.strip}
       end

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

@@ -89,6 +89,8 @@ module WorkflowRESTHelpers
     when :binary
       content_type "application/octet-stream"
       halt 200, result.to_s
+    when :jobname
+      halt 200, nil
     else
       raise "Unsupported format: #{ format }"
     end
@@ -156,21 +158,33 @@ module WorkflowRESTHelpers
     when :synchronous, :sync
       job.clean if update == :reload
       begin
-        job.run(false) unless File.exists? job.info_file
+        job.run unless File.exists? job.info_file
         job_url = to(File.join("/", workflow.to_s, task, job.name)) 
         job_url += "?_format=#{@format}" if @format
-        halt 200, job.name if format === :jobname
+        halt 200, job.name if format == :jobname
         redirect job_url
       rescue
+        Log.exception $!
         halt 500, $!.message
       end
     when :asynchronous, :async, nil
       job.clean if update == :reload
-      job.fork unless File.exists? job.info_file
-      job_url = to(File.join("/", workflow.to_s, task, job.name)) 
-      job_url += "?_format=#{@format}" if @format
-      halt 200, job.name if format === :jobname
-      redirect job_url
+
+      begin
+        job.fork unless File.exists? job.info_file
+
+        job_url = to(File.join("/", workflow.to_s, task, job.name)) 
+        job_url += "?_format=#{@format}" if @format
+        #halt 200, job.name if format == :jobname
+        if format == :jobname
+          content_type :text
+          job.name
+        else
+          redirect job_url
+        end
+      rescue Exception
+        Log.exception $!
+      end
     else
       raise "Unsupported execution_type: #{ execution_type }"
     end

data/share/views/job_result/job_control.haml

@@ -3,11 +3,11 @@
   %dd.job_control
     %ul
       %li
-        %a(href="/#{[workflow, task, jobname] * "/"}?_update=clean") clean
+        %a(href="/#{[workflow.to_s, task, jobname] * "/"}?_update=clean") clean
       %li
-        %a(href="/#{[workflow, task, jobname, "info"] * "/"}") info
+        %a(href="/#{[workflow.to_s, task, jobname, "info"] * "/"}") info
       %li
-        %a(href="/#{[workflow, task, jobname] * "/"}?_format=raw") raw
+        %a(href="/#{[workflow.to_s, task, jobname] * "/"}?_format=raw") raw
 
   - if job.files.any?
     %dt Files
@@ -15,4 +15,4 @@
       %ul
         - job.files.each do |file|
           %li
-            %a(href="/#{[workflow, task, jobname, "file", file] * "/"}")= file
+            %a(href="/#{[workflow.to_s, task, jobname, "file", file] * "/"}")= file

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbbt-rest
 version: !ruby/object:Gem::Version
-  version: 1.3.7
+  version: 1.3.8
 platform: ruby
 authors:
 - Miguel Vazquez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-25 00:00:00.000000000 Z
+date: 2014-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake