rbbt-rest 1.8.146 → 1.8.150

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 70de3a851bb361a775fa933d6a72992bddf25bcf6936a8b46b88afd764138337
-  data.tar.gz: dd39b1ab852febb1102fdc71b7614c5f9e610f987bb9c39e922f359f47cadb4f
+  metadata.gz: 1879b80d1d7873e206a425939bf4de751ce2d105990fb0fbf12bc8b6daf29cf2
+  data.tar.gz: 10b027be58fef0428acd946102267e6dd789d17c4df5a5af61b0ac2b2b8c0298
 SHA512:
-  metadata.gz: b826421f184bdd68b4ded24cb87c51594880ef6f189ba1d86dbe089f1a6488c298939190c124183bd8a2a9dca890dba2dd5324935057b896b131c9bfa387bb2e
-  data.tar.gz: eb7a5c2c67998fd0ea16c75f31baaa4c5976073dd01f7b78b02d43e7bf203c013280a53473dda9fc54a7b9182e31eae0f0134529f457bb702e49e7d7f763749b
+  metadata.gz: a800de9e65f448d8e4951f7e98ff4415f072732d93ee6374896166e13e05a9a2ec8c09533ffd3415603f80195f3d79a2f8fd35b96504b7f0013ccaa0ba3f8c9e
+  data.tar.gz: 5b1e2a4225567a64de9a4208c4bc1d840005e4f087ebd64e7688c807663c6adeeaa608e1f908b717d7205ba8f240a07fcc4b5305a6e1cfa03496323169613435

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/workflow.rb

@@ -292,7 +292,7 @@ module Sinatra
         job  = consume_parameter(:job)
         filename = params[:splat].first
 
-        raise Workflow::TaskNotFoundException.new workflow, task unless workflow.tasks.include? task.to_sym
+        raise Workflow::TaskNotFoundException.new workflow, task unless workflow.tasks.include?(task.to_sym)
 
         execution_type = execution_type(workflow, task)
 

data/share/views/job_files.haml

@@ -1,7 +1,7 @@
 
 - files = job.files 
 - task = job.task_name
-- workflow = job.workflow
+- workflow = job.workflow if job.workflow
 - jobname = job.name
 - files.reject!{|f| File.basename(File.dirname(f)) == ".html"}
 

data/share/views/job_result/job_control.haml

@@ -1,5 +1,8 @@
 .ui.buttons.job_control
-  %a.ui.small.basic.red.button(href="/#{[workflow.to_s, task, jobname] * "/"}?_update=clean") clean job
+  - if Open.exists?(job.info_file)
+    %a.ui.small.basic.red.button(href="/#{[workflow.to_s, task, jobname] * "/"}?_update=clean") clean job
+  - else
+    %a.ui.small.basic.red.button.disabled(href="/#{[workflow.to_s, task, jobname] * "/"}?_update=clean") clean job
   %a.ui.small.basic.blue.button(href="/#{[workflow.to_s, task, jobname, "info"] * "/"}") job info
   - if job.files.any?
     %a.ui.small.basic.blue.button(href="/#{[workflow.to_s, task, jobname, "files"] * "/"}") job files

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.146
+  version: 1.8.150
 platform: ruby
 authors:
 - Miguel Vazquez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-28 00:00:00.000000000 Z
+date: 2022-06-22 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