rbbt-rest 1.8.16 → 1.8.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3925a1799d7cfb43aaef03e8afd5488cdde75f83
-  data.tar.gz: 9b822534f5f313b5c60b1e75d3e67df48384d95a
+  metadata.gz: 8d7939b36f5199993fc0868411b191b6e2bb7ff8
+  data.tar.gz: a62f033b721ccfaae48b8335510342c02bb0c9fb
 SHA512:
-  metadata.gz: c03edea3f5e962cc14c2ef466940deae11c91b2f1cdc7b2658208e13c8104d91ac21f94cadbbff0f38f1db0a02ff12acd63c21f8c471a0732b940937aad4ac6e
-  data.tar.gz: eb9c35081adf97c66fdea21f66231a5a14352eafc3dd4a03800c12d5d8e067eb2423c4f362751dd14b7fd031d3502cb3b9900233660d20c40210e4593c7ed35d
+  metadata.gz: 89a7f8fa74695df8ae48dcfd05ceb1d98964546b3c98d6f2620d7714df613d05c7c0e4840a273377cc5d2fba652af2f4a61a6d8fe41af55064b81eb734494c6e
+  data.tar.gz: 57bd18efbbfe63ec02fe0cfefce0eac2dbd6731a14294b8e11cdf8d439f550c7e963c1826fe7fb7fbc9eb920c969accb6c563ef3f0fcde161b9480ad4f35617c

data/lib/rbbt/rest/main.rb

@@ -132,6 +132,10 @@ module Sinatra
 
         add_sass_load_path Rbbt.views.compass.find
 
+        get '/robots.txt' do
+          send_file locate_file('public/robots.txt')
+        end
+
         get '/files/:filename' do
           cache_control :public, :max_age => 360000 if production?
           file = settings.file_dir[params[:filename]].find

data/lib/rbbt/rest/workflow.rb

@@ -110,6 +110,8 @@ module Sinatra
         raise Workflow::TaskNotFoundException.new workflow, task unless workflow.tasks.include? task.to_sym
 
         task_parameters = consume_task_parameters(workflow, task, params)
+        
+        task_parameters[:jobname] = jobname
 
         if complete_input_set(workflow, task, task_parameters) or format != :html 
           issue_job(workflow, task, jobname, task_parameters)

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

@@ -174,6 +174,8 @@ module WorkflowRESTHelpers
     inputs = prepare_job_inputs(workflow, task, params)
     job = workflow.job(task, jobname, inputs)
 
+    job.clean if job.aborted?
+
     clean_job(workflow, job) and clean = true if update.to_s == "clean"
     recursive_clean_job(workflow, job) and clean = true if update.to_s == "recursive_clean"
 

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

@@ -249,23 +249,23 @@ class StreamWorkflowTask
         out_stream = TSV.get_stream job
 
         begin
-          Log.low "Write response #{Misc.fingerprint tcp_io} "
+          Log.high "Write response #{Misc.fingerprint tcp_io} "
           tcp_io.write "HTTP/1.1 200\r\n"
           tcp_io.write "Connection: close\r\n"
           tcp_io.write "RBBT-STREAMING-JOB-URL: #{ job_url }\r\n"
           tcp_io.write "\r\n"
-          Log.low "Comsuming response #{Misc.fingerprint tcp_io}"
+          Log.high "Comsuming response #{Misc.fingerprint tcp_io}"
           Misc.consume_stream(out_stream, false, tcp_io)
-          Log.low "Comsumed response #{Misc.fingerprint tcp_io}"
+          Log.high "Comsumed response #{Misc.fingerprint tcp_io}"
         rescue Exception
           Log.exception $!
         end if out_stream
 
         tcp_io.close unless tcp_io.closed?
-        Log.low "Closed io #{tcp_io}"
+        Log.high "Closed io #{tcp_io}"
 
         [-1, {}, []]
-      rescue
+      rescue Exception
         Log.exception $!
         tcp_io.write "HTTP/1.1 515\r\n"
         tcp_io.write "Connection: close\r\n"

data/share/views/compass/app.sass

@@ -57,7 +57,10 @@ table > caption
   margin-top: 2em
 
 .link.button
-  padding: 0px
+  padding: 0px !important
   & > a
     padding: 11px 21px
     display: inline-block
+  &.small > a
+    padding: .78571429em !important
+    display: inline-block

data/share/views/form.haml

@@ -16,7 +16,7 @@
 
   .form.action_parameters.ui.segment
     = partial_render('partials/form', :id => id, :action => action, :method => 'post', 
-      :enctype => "multipart/form-data", :info => task_info, :klass => 'workflow_task')
+      :enctype => "multipart/form-data", :info => task_info, :klass => 'workflow_task', :locals => locals)
 
   - if workflow.libdir.examples[task.to_s].exists?
     .examples

data/share/views/partials/form.haml

@@ -4,6 +4,7 @@
 - method  = 'post' unless defined? method
 - enctype = 'multipart/form-data' unless defined? enctype
 - info    = {} unless defined? info
+- locals  = {} unless defined? locals
 
 - klass = "#{klass} custom"
 
@@ -27,13 +28,13 @@
     %div(class="field #{types[input]} #{input} #{hide ? 'hide' : ''}")
       - input_options = options[input]
       - input_options = input_options.dup unless input_options.nil?
-      !~ form_input(input, types[input], defaults[input], values[input], descriptions[input], input_id, input_options)
+      !~ form_input(input, types[input], defaults[input], values[input] || locals[input], descriptions[input], input_id, input_options)
 
 
   .input.field.submit
     %input.ui.submit.button(type="submit")
     - if klass =~ /workflow_task/
-      %input.jobname(type='text' name='jobname' placeholder='optional job name')
+      %input.jobname(type='text' name='jobname' placeholder='optional job name' value="#{locals[:jobname]}")
       %select.format(name="_format")
         - [:html, :json, :raw, :binary].each do |format|
           %option(value=format)= format.to_s

data/share/views/public/robots.txt

@@ -0,0 +1,5 @@
+User-agent: *
+Disallow: /entity/
+Disallow: /entity_list/
+Disallow: /entity_action/
+Disallow: /entity_list_action/

data/share/views/tools/nvd3/scatter.haml

@@ -7,7 +7,7 @@
 - y ||= "y"
 
 - data_values = []
-- data.each do |key,values|
+- data.through do |key,values|
   - label = key.respond_to?(:name)? key.name || key : key
   - data_values << {:label => label, :x => values[x], :y => values[y], :size => values[size]}
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbbt-rest
 version: !ruby/object:Gem::Version
-  version: 1.8.16
+  version: 1.8.17
 platform: ruby
 authors:
 - Miguel Vazquez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-20 00:00:00.000000000 Z
+date: 2016-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -1844,6 +1844,7 @@ files:
 - share/views/public/plugins/springy/springyui.js
 - share/views/public/plugins/svg-pan-zoom/js/svg-pan-zoom.js
 - share/views/public/plugins/underscore/js/underscore.js
+- share/views/public/robots.txt
 - share/views/tasks.haml
 - share/views/tools/nvd3.haml
 - share/views/tools/nvd3/chart.haml