rbbt-rest 1.8.136 → 1.8.137

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8291911f0473d9d30956ea5989996c626736f5406bc4e6a09478c2a7ada771fb
-  data.tar.gz: 9ca33ac6c0b51b927b3d6041aced32a732646414772ba6aa46df8a48190ad7ae
+  metadata.gz: 260f3dfac0e66e1895ed7aea67d5a07e91b4e3b47f009278b36eee79e419107e
+  data.tar.gz: 74d2cb800b8c8f72a2fcfccb5e16386c051e1474029de057d2f81a817f009518
 SHA512:
-  metadata.gz: 2ae762c95a7d407c3c90c5e242ae3370f2c2083fc90181bbe63bc5e80159e68196beba7d128c1e6c415a87287efbba132f3d0b452c5f0564019fea4a4660cced
-  data.tar.gz: 2625b47931d49c18711718846760db4c62c5f5ab0c451a459ddbca96960ddbccd0345605a4994752a7d81af9ee0769c3ea6343593fb58902e18e9c649d57ad1b
+  metadata.gz: 987251d8d2d028fabdd77337bb25c34219361f77087b0d60b6210fbbd2b9c7c7ec724fd377d7a5baf887b1f2512f5138314718df72419e2986df5975e0381940
+  data.tar.gz: e18031687205f914cc169b42472edbf9c237b9e3d0747bb8517027584ca2d26e41f4ec6203ec96c5a62b5483f16e2c81415a22648bfd2eeee76af6fa0fadaf2d

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

@@ -223,7 +223,8 @@ data = NULL
 
           if mime.nil?
             txt = Open.read(fragment_file)
-            if txt =~ /<([^> ]+)[^>]*>.*<\/\1>/sm
+
+            if txt =~ /<([^> ]+)[^>]*>.*?<\/\1>/m
               mime = "text/html"
             else
               begin

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

@@ -59,8 +59,13 @@ module RbbtRESTHelpers
     @ajax = request.xhr?
     @ajax_url = headers["AJAX-URL"]
 
-    @fullpath = request.fullpath
     @uri = request.env["REQUEST_URI"]
+    @path = request.env["PATH_INFO"]
+    @query = request.env["QUERY_STRING"]
+
+    #@fullpath = request.fullpath
+    @fullpath = (@query && ! @query.empty?) ? @path + "?" + @query : @path
+    @fullpath = remove_GET_param(@fullpath, ["_update", "_"])
 
     @layout = consume_parameter(:_layout)
 

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

@@ -166,9 +166,10 @@ module RbbtRESTHelpers
         }
         Open.write(pid_file, pid.to_s)
 
-        url = @uri
+        url = @fullpath 
         url = remove_GET_param(url, "_update")
         url = remove_GET_param(url, "_")
+
         fragment_url = add_GET_param(url, "_fragment", fragment_code)
         if link.nil?
           html_tag('a', "", :href => fragment_url, :class => 'fragment', "data-text" => text)
@@ -226,7 +227,7 @@ module RbbtRESTHelpers
     filename = Misc.sanitize_filename(Misc.name2basename(filename))
 
     if @step
-      url = add_GET_param(remove_GET_param(@uri, ["_update", "_"]), "_fragment", "html_resources/#{ filename }")
+      url = add_GET_param(remove_GET_param(@fullpath, ["_update", "_"]), "_fragment", "html_resources/#{ filename }")
       f = @step.file(:html_resources)[filename].find
     else
       url = "/files/#{ filename }"

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

@@ -402,7 +402,7 @@ module RbbtRESTHelpers
     if @step
       table_file = @step.file(table_code) if @step
 
-      url = add_GET_param(@uri, "_fragment", File.basename(table_file))
+      url = add_GET_param(@fullpath, "_fragment", File.basename(table_file))
       url = remove_GET_param(url, "_update")
       url = remove_GET_param(url, "_layout")
       url = remove_GET_param(url, "_")

data/share/views/compass/misc.sass

@@ -278,3 +278,16 @@ ul.tasks
 
 .table > .table_url
   display: none
+
+dl.flex_dl
+  display: flex
+  flex-flow: row wrap
+  & > dt
+    flex-basis: 20%
+    text-align: right
+    padding-right: 2em
+  & > dd
+    flex-basis: 80%
+    flex-grow: 1
+    margin: 0
+

data/share/views/entity_partials/entity_map_card.haml

@@ -21,7 +21,7 @@
               %input(type='submit')
 
           - if (%w(pvalue p.value p-value pvalues p.values p-values qvalue q.value q-value qvalues q.values q-values) & map.fields.first.downcase.split(/\s+/)).any? and map.fields.first.downcase !~ /score$/
-            - url = add_GET_param(@uri, '_format', 'pvalue_score')
+            - url = add_GET_param(@fullpath, '_format', 'pvalue_score')
             %a.ui.small.button(href=url) Pvalue score
 
             = reveal "QQ-plot", nil, :class => 'ui small button plot' do
@@ -56,16 +56,16 @@
 
           - if Gene == Entity.formats[map.key_field]
             - if map.key_field != "Ensembl Gene ID"
-              - url = add_GET_param(@uri, '_format', 'ensembl')
+              - url = add_GET_param(@fullpath, '_format', 'ensembl')
               %a.ensembl.ui.small.button(href=url) Ensembl
             - if map.key_field != "Associated Gene Name"
-              - url = add_GET_param(@uri, '_format', 'name')
+              - url = add_GET_param(@fullpath, '_format', 'name')
               %a.name.ui.small.button(href=url) Name
           - if "Rank" == map.fields.first
-            - url = add_GET_param(@uri, '_format', 'invert_ranks')
+            - url = add_GET_param(@fullpath, '_format', 'invert_ranks')
             %a.invert_ranks.ui.small.button(href=url) Invert ranks
           - else
-            - url = add_GET_param(@uri, '_format', 'ranks')
+            - url = add_GET_param(@fullpath, '_format', 'ranks')
             %a.ranks.ui.small.button(href=url) Ranks
           - if NumericValue == Entity.formats[map.fields.first] or (map.entity_templates[map.fields.first] and map.entity_templates[map.fields.first].annotation_types.include? NumericValue)
             - $page_entity_base_type = page_entity_base_type 

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

@@ -6,7 +6,7 @@
 
 - extra = "" unless defined? extra
 
-- url = @uri
+- url = @fullpath
 
 %svg(id=id)
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbbt-rest
 version: !ruby/object:Gem::Version
-  version: 1.8.136
+  version: 1.8.137
 platform: ruby
 authors:
 - Miguel Vazquez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-07 00:00:00.000000000 Z
+date: 2020-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake