rbbt-rest 1.8.148 → 1.8.152

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 19ee6736af5384622ccdc31ef25294aa15f0fab48099f83467820341d117013b
-  data.tar.gz: 3660821decc1a11a951c8edf818964ca1068ea263ddbb2ccb24c8dfb64c8f67d
+  metadata.gz: e27cf7773d763ae330e2be0ca5f07661f18998bf86c09249b7c5d33fc233b8d5
+  data.tar.gz: 8cab349ccfb9525341d7779f208505b57890889706c211737d0a29538f887c69
 SHA512:
-  metadata.gz: 5475680967fc708f51e93a16cd3694b1fb9f664330b8cc09364af52b49af993cc5cbf8bdb786f80d00f9840744d025a59150b157883f2c632a6a9aa3bcf08aae
-  data.tar.gz: 4e4e73608d2d57f8fbbdca228430cecd1f2dd393d124ea0bcf8686137bdd9e38ffb8dc3abe21ec94cb2f6f4925ce9a3b6f2e828d8d60929245377345d417e2f8
+  metadata.gz: f3bbe0d5a8aee0611f7c780cab3b6c27fead82bef56ddd58d3c587b84e35aaeecf00cea6d722a7ea9bb8de012016779b0d2dbb52f86b904cb1f8617ed626505f
+  data.tar.gz: 23060fe4f7650865a13034ce9e84232b74b59b37cfe1a59f747728d33b5150bf4ee77b4de87761ff49129f671fe0116a2b781cf8e04d59eac735f835c908e20e

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2010-2013 Miguel Vázquez García
+Copyright (c) 2010-2022 Miguel Vázquez García
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/Rakefile

@@ -21,6 +21,7 @@ begin
     gem.add_dependency('json')
     gem.add_dependency('haml')
     gem.add_dependency('rest-client')
+    gem.add_dependency('therubyracer')
     gem.add_dependency('sinatra-authorization')
     gem.add_dependency('sinatra-cross_origin')
     gem.add_dependency('sinatra-contrib')

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

@@ -182,7 +182,6 @@ module RbbtRESTHelpers
         when "map"
           raw_tsv, tsv_options = load_tsv(fragment_file)
           raw_tsv.unnamed = true
-          Log.tsv raw_tsv
           tsv = tsv_process(raw_tsv)
 
           field = tsv.key_field

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

@@ -98,6 +98,8 @@ P-values
 P.values
 score
 scores
+weight
+weights
 ratio
 ratios
 t.value
@@ -113,7 +115,7 @@ size
 Matches
 Quality
                 EOF
-               ).split("\n")
+               ).split("\n").collect{|v| [v, v.upcase, v.downcase, Misc.humanize(v)] }.flatten
 
   def invalid?
     self == "NA" or self == "NaN"
@@ -326,10 +328,20 @@ module RbbtRESTHelpers
     end
 
     res = case options[:span]
+          when 'semicolon'
+            if Array === value
+              value.collect do |val|
+                val.split(";").collect{|v| "<span class='table_value'>#{v.to_s}</span>" } * ";"
+              end * ", "
+            else
+              value.split(";").collect{|v| "<span class='table_value'>#{v.to_s}</span>" } * ";"
+            end
           when true, "true", :true
             Array === value ? value.collect{|v| "<span class='table_value'>#{v.to_s}</span>"} * ", " : "<span class='table_value'>#{value}</span>"
           when :long, "long"
-            Array === value ? value.zip(orig_value).collect{|v,ov| "<span class='table_value long' title='#{URI.escape(ov.to_s)}'>#{v.to_s}</span>"} * " " : "<span class='table_value long' title='#{URI.escape(orig_value)}'>#{value}</span>"
+            Array === value ? value.zip(orig_value).collect{|v,ov| "<span class='table_value long' title='#{CGI.escape(ov.to_s)}'>#{v.to_s}</span>"} * " " : "<span class='table_value long' title='#{CGI.escape(orig_value)}'>#{value}</span>"
+          when :lines, "lines"
+            Array === value ? value.zip(orig_value).collect{|v,ov| "<span class='table_value long lines' title='#{CGI.escape(ov.to_s)}'>#{v.to_s}<br/></span>"} * " " : "<span class='table_value long lines' title='#{CGI.escape(orig_value)}'>#{value}</span>"
           else
             Array === value ? value.collect{|v| v.to_s} * ", " : value
           end

data/lib/rbbt/rest/helpers.rb

@@ -1,5 +1,9 @@
 module Sinatra
   module RbbtMiscHelpers
+    def job_url(job)
+      job_url = File.join("/", job.workflow.to_s, job.task_name.to_s, job.name)
+    end
+
     def param_file(name)
       name = name.to_s
       if @params[name + '__param_file']

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

@@ -143,7 +143,7 @@ module WorkflowRESTHelpers
       halt 200, job.load.to_json
     when :tsv
       content_type "text/tab-separated-values"
-      job.path ? send_file(job.path) : halt(200, job.load.to_s)
+      job.path ? send_file(job.path, :filename => (params[:filename] || File.basename(job.path))) : halt(200, job.load.to_s)
     when :literal, :raw
       path = job.path
       mime = file_mimetype path
@@ -152,7 +152,7 @@ module WorkflowRESTHelpers
         if Open.remote? job.path
           Open.open(job.path, :nocache => true)
         elsif File.exists? job.path
-          send_file(job.path)
+          send_file(job.path, :filename => (params[:filename] || File.basename(job.path)))
         else
           halt 200, job.load
         end

data/share/views/compass/app.sass

@@ -146,7 +146,7 @@ $cyan: rgba(50, 211, 255, 1)
   .status.started
     color: $cyan
   .status.dependencies
-    color: $cyan
+    color: $yellow
   .status.done
     color: $green
   .status.error, .status.aborted

data/share/views/compass/misc.sass

@@ -258,6 +258,8 @@ label[title]
 td
   &.true
     font-weight: bold
+span[title=true]
+  font-weight: bold
 
 span.choice
   padding: 0.5em

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

@@ -29,7 +29,7 @@ function contract_ellipsis(elem, max){
       var links = [];
       var head = elements.slice(0, max).removeClass('long');
       head.each(function(){ links.push(this.outerHTML)})
-      new_content = links.join(", ");
+      new_content = links.join(" ");
       elem.html(new_content);
     }
 
@@ -45,9 +45,22 @@ function restore_ellipsis(elem){
   var span = elem.find('span.ellipsis')
   if (span.length == 1){
     var html = span.attr('attr-text');
+
+    var by_lines = span.parent().find('span').first().hasClass('lines')
+
+    if (by_lines){
+      var other_tds = span.parent().parent().find('td')
+    }
+
     elem.html(unescape(html));
+
+    if (by_lines){
+      other_tds.each(function(i,x){restore_ellipsis($(x))})
+    }
+
+
+    update_rbbt();
   }
-  update_rbbt();
 }
 
 $('body').on('click', 'a.open_ellipsis', function(link){

data/share/views/public/js/rbbt/table.js

@@ -21,7 +21,6 @@ function format_page(num, size, field){
   if ( undefined !== size) parts.push(size)
   if ( undefined !== field) parts.push(field)
 
-  console.log(parts.join("~"))
   return parts.join("~")
 }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbbt-rest
 version: !ruby/object:Gem::Version
-  version: 1.8.148
+  version: 1.8.152
 platform: ruby
 authors:
 - Miguel Vazquez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-06-13 00:00:00.000000000 Z
+date: 2022-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -122,6 +122,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: therubyracer
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sinatra-authorization
   requirement: !ruby/object:Gem::Requirement