rbbt-rest 1.8.147 → 1.8.151

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b76870466fef5096fbc9e2a741acc69520b02a37130ebd811d929e265663f799
-  data.tar.gz: 9048d091f9224f42b9ef15c78d53e79191496490f1357bfb8527aacdcaac53c5
+  metadata.gz: cd9278f880225799697df0bc7599a97d5463942604f3c6947e65c5450495e2ad
+  data.tar.gz: 3441f94e0dc3cbced78e4572d4d743d047d0be1dcd0728c5ebbf8c7bb0b8d74c
 SHA512:
-  metadata.gz: 59741c8b3c9faf57bfa2831702320651472b148a16ea9db5dc13fe44ecc3e1f09000098e11d8da6b43b0ae7ebb2e28e9eb794a08ad0e02673e95ce1690222444
-  data.tar.gz: 35670278102a53384f7f6bd56787c951bd4ac82d93382df72f13dd992d61e21658525be77695ccefdd0d9f992b69b25e5962db6fb4f999fe2ab405979eb4e080
+  metadata.gz: d8f1453f376b923caf6b7868462f877246614b9f051da579b55429d21ad2f2ad66ce7ad6bf99ee83dcfb20160611b983e7a6e02c477ba4501b4e0e5c112ec3b4
+  data.tar.gz: ac6c5d333a5f6b5cd41c78c014b8166d4c9f38b88297b40e89b66243bcadea5ba2896d639e5efb792b84e6562931af22498c384d14b938c36c878ad50d750f3a

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

@@ -4,6 +4,17 @@ require 'rbbt/rest/common/table'
 
 module RbbtRESTHelpers
 
+  def escape_url(url)
+    base, _sep, query = url.partition("?")
+    base = base.split("/").collect{|p| CGI.escape(p) }* "/"
+    if query && ! query.empty?
+      query = query.split("&").collect{|e| e.split("=").collect{|pe| CGI.escape(pe) } * "=" } * "&"
+      [base, query] * "?"
+    else
+      base
+    end
+  end
+
   MEMORY_CACHE = {}
 
   def old_cache(path, check)
@@ -164,15 +175,13 @@ module RbbtRESTHelpers
           list_id = "List of #{type} in table #{ @fragment }"
           list_id << " (#{ @filter })" if @filter
           Entity::List.save_list(type.to_s, list_id, list, user)
-          header "Location", Entity::REST.entity_list_url(list_id, type)
-          url = Entity::REST.entity_list_url(list_id, type)
+          url =  Entity::REST.entity_list_url(list_id, type)
           url = url + '?_layout=false' unless @layout
-          url = URI.encode(url)
+          url = escape_url(url)
           redirect to(url)
         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
@@ -189,7 +198,7 @@ module RbbtRESTHelpers
           Entity::Map.save_map(type.to_s, column, map_id, tsv, user)
           url = Entity::REST.entity_map_url(map_id, type, column)
           url = url + '?_layout=false' unless @layout
-          url = URI.encode(url)
+          url = escape_url(url)
           redirect to(url)
         when "excel"
           require 'rbbt/tsv/excel'

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,6 +328,14 @@ 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"

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/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.147
+  version: 1.8.151
 platform: ruby
 authors:
 - Miguel Vazquez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-28 00:00:00.000000000 Z
+date: 2022-07-11 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