rbbt-rest 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f2b2a924290d2d90b77317f8ff443e515accbef3
-  data.tar.gz: 11ffdc8e6988331b88dfe7e7698b2a3f5cf69a69
+  metadata.gz: 2e55cf49281298b1246307255c0a12b1d21ed9c7
+  data.tar.gz: f1c82dbd4fbcfa7aa7319a062572d7e2668a372e
 SHA512:
-  metadata.gz: 4c7f7b942ad71effd216ad6789de00717c72f7475ed702b767154f5fd2e91758b03bc6517a0e879e481a2adde98fe3f2b7abf5e10a5d70213e7757750fa88914
-  data.tar.gz: acf5284071e5d43349268ff6c5b883e1111a303ba215439ca93aaabca011f8a7ca2e8eb44bd20be61ce2b6137174da4c723f2f614e84d1249fe69ca016d1db75
+  metadata.gz: 6a115419189c4329aa8a21583470a30aabf4b6df83496ba0c4458b4c82abd69c52735d960dd593e8daf8ff4edb50aa3bd98104c5543e4e8f4e659301d6e30e7a
+  data.tar.gz: df4116e66c81deda238babf66b90a660b66dd20cd09a61b80a00ad2714a62204fa69752c12e4418e1cdd68569dafe9142af9248487ffdc40ac3b4a63ed98411a

data/lib/rbbt/rest/client.rb

@@ -252,19 +252,23 @@ class WorkflowRESTClient
   end
 
   def rec_input_defaults(taskname)
-    [taskname].concat(rec_dependencies(taskname)).inject({}){|acc, tn| acc.merge tasks[tn.to_sym].input_defaults}
+    [taskname].concat(rec_dependencies(taskname)).inject({}){|acc, tn| acc.merge tasks[tn.to_sym].input_defaults}.
+      tap{|h| IndiferentHash.setup(h) }
   end
 
   def rec_input_types(taskname)
-    [taskname].concat(rec_dependencies(taskname)).inject({}){|acc, tn| acc.merge tasks[tn.to_sym].input_types}
+    [taskname].concat(rec_dependencies(taskname)).inject({}){|acc, tn| acc.merge tasks[tn.to_sym].input_types}.
+      tap{|h| IndiferentHash.setup(h) }
   end
 
   def rec_input_descriptions(taskname)
-    [taskname].concat(rec_dependencies(taskname)).inject({}){|acc, tn| acc.merge tasks[tn.to_sym].input_descriptions}
+    [taskname].concat(rec_dependencies(taskname)).inject({}){|acc, tn| acc.merge tasks[tn.to_sym].input_descriptions}.
+      tap{|h| IndiferentHash.setup(h) }
   end
 
   def rec_input_options(taskname)
-    [taskname].concat(rec_dependencies(taskname)).inject({}){|acc, tn| acc.merge tasks[tn.to_sym].input_options}
+    [taskname].concat(rec_dependencies(taskname)).inject({}){|acc, tn| acc.merge tasks[tn.to_sym].input_options}.
+      tap{|h| IndiferentHash.setup(h) }
   end
 
   def init_remote_tasks

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

@@ -15,9 +15,11 @@ module RbbtRESTHelpers
     html_tag('label', text, {:id => label_id, :for => id, :title => description}.merge(options))
   end
 
-  def file_or_text_area(id, name, value)
+  def file_or_text_area(id, name, value, tsv = false)
+    text_area_string = tsv ? "or use the text area bellow (you may use ',' intead of tabs)" : "or use the text area bellow"
+
     html_tag("input", nil, :type => "file", :id => (id.nil? ? nil : id +  "__" + "param_file"), :name => name.to_s + "__" + "param_file") + 
-    html_tag("span", "or use the text area bellow", :class => "file_or_text_area") + 
+    html_tag("span", text_area_string, :class => "file_or_text_area") + 
     html_tag("textarea", value || "" , :name => name, :id => id )
   end
 
@@ -101,7 +103,7 @@ module RbbtRESTHelpers
           html_tag("textarea", value || "" , :name => name, :id => id )
       else
         input_label(id, name, description, default, extra) +
-          file_or_text_area(id, name, value)
+          file_or_text_area(id, name, value, type == :tsv)
       end
 
     when :select

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

@@ -148,7 +148,7 @@ module RbbtRESTHelpers
       if param_file and (value.nil? or (String === value and value.empty?))
         TSV.open(param_file[:tempfile].open)
       else
-        TSV.open(StringIO.new(value))
+        TSV.open(StringIO.new(value), :sep=>/\t|,/)
       end
     end
   end

data/lib/rbbt/rest/entity/favourites.rb

@@ -87,8 +87,6 @@ module EntityRESTHelpers
 
     if (file = dir[entity_type]).exists?
       lists = Open.read(file).split("\n")
-      ddd lists
-      ddd list
       lists -= [list]
       if lists.any?
         Open.write(file, lists * "\n")

data/share/views/compass/rbbt/form.sass

@@ -86,3 +86,10 @@
     margin-bottom: 3px
     display: inline-block
     font-color: $color_action_parameter_label
+
+  input.jobname
+    float: right
+    width: auto
+  select.format
+    float: right
+    width: auto

data/share/views/form.haml

@@ -7,6 +7,10 @@
     %h3 
       %span.workflow= workflow
       %span.task= Misc.humanize task
+  - if task_info[:description]
+    .description
+      :markdown
+        #{task_info[:description]}
   .form
     = partial_render('partials/form', :id => id, :action => action, :method => 'post', 
       :enctype => "multipart/form-data", :info => task_info, :klass => 'workflow_task')

data/share/views/partials/form.haml

@@ -32,5 +32,8 @@
 
   .input.submit
     - if klass =~ /workflow_task/
-      != form_input('_format', :select , :html, nil, "result format", "_format", {:select_options =>[:html, :json, :raw, :binary]})
+      %input.jobname(type='text' name='jobname' placeholder='optional job name')
+      %select.format(name="_format")
+        - [:html, :json, :raw, :binary].each do |format|
+          %option(value=format)= format.to_s
     %input(type="submit")

data/share/views/tasks.haml

@@ -16,5 +16,5 @@
       %a(href="#{File.join("/", workflow.to_s, task.to_s)}")= task
       - info = workflow.task_info(task)
       - if info[:description]
-        %p= info[:description]
+        %p= info[:description].split(/\n\s*\n/).first
 

metadata

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