rbbt-rest 1.8.86 → 1.8.87

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5f992a5bedb7eb7cb75080e64e7ffc3791e52ef1
-  data.tar.gz: ebd1c53873f465bb9f0946ef2cdb52c9f358fa50
+  metadata.gz: 02bd7ca8389f245e9d2bdb17c6a9a67b10269885
+  data.tar.gz: 6cfef4900c5cbecea20d709e1672842d05f3aae4
 SHA512:
-  metadata.gz: fb2e226c20511d46c3de45f68c79e391e22cd1a21038e073dd2371f3e0a4b42e427c66589758d08ffee95db35cec7c7285de7990127209f55cb8fa378163f687
-  data.tar.gz: 0f269712f47d2e2b7d190b334f83327a9e7857a34c56aa866b80fd706a362f32eb4411a73f8c644cdc2fc203c813b348d746de71bc21331f1ae444e42de60c04
+  metadata.gz: 92b890911964c494c9fa241d3957a80e9c02e67e1d4441d8541e483aa66d7f6f4d89d8446107dad3167de66550e8b376a26dcb1da3cafc3a2ed9e6924ddce4d1
+  data.tar.gz: 3ac8bb868099572754b46268a05b3b696e9c02ac0a923b7354667b25a5b6441470c14e068b9e31d3bfbeff10e1f07334c37102e39bb16226c85f0ddf71778fba

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

@@ -185,6 +185,26 @@ module RbbtRESTHelpers
           send_file excel_file, :type => 'application/vnd.ms-excel', :filename => 'table.xls'
         else
           content_type "text/html"
+
+          require 'mimemagic'
+          mime = nil
+          Open.open(fragment_file) do |io|
+            begin
+              mime = MimeMagic.by_path(io) 
+              if mime.nil?
+                io.rewind
+                mime = MimeMagic.by_magic(io) 
+              end
+              if mime.nil?
+                io.rewind
+                mime = "text/tab-separated-values" if io.gets =~ /^#/ and io.gets.include? "\t"
+              end
+            rescue Exception
+              Log.exception $!
+            end
+          end
+
+          content_type mime if mime
           send_file fragment_file
         end
       elsif Open.exists?(fragment_file + '.error') 

data/share/views/public/js/rbbt.plots/rbbt.plots.graph.adapters.js

@@ -145,7 +145,8 @@ rbbt.plots.graph.view_cytoscapejs = function(graph_model, elem, style, layout, e
 
       var cy = cytoscape(cy_params)
 
-      cy.layout(default_layout)
+      console.log(layout)
+      cy.layout(layout)
 
       cy.one('layoutready', function(){
         deferred.resolve(this)

data/share/views/public/js/rbbt.plots/rbbt.plots.graph.model.js

@@ -12,14 +12,19 @@ rbbt.graph_model = function(){
   
   prot._collect_values = function(values, codes){
     var res = [];
-    forArray(codes, function(code){
-      if (typeof values === 'function'){
-        res.push(values(code))
-      }else{
-        res.push(values[code])
-      }
-    })
-    return res
+
+    if (Array.isArray(values)){
+      return values
+    }else{
+      forArray(codes, function(code){
+        if (typeof values === 'function'){
+          res.push(values(code))
+        }else{
+          res.push(values[code])
+        }
+      })
+      return res
+    }
   }
 
   //{{{ Add elements

data/share/views/tools/Rpng.haml

@@ -7,6 +7,10 @@
 
 - filename += '.png' unless filename =~ /\.png$/i
 = resource filename, text, :image do |filename|
-  - data.R "rbbt.png_plot('#{filename}', '#{plot}', width=#{width}, height=#{height})"
+  - TmpFile.with_file(plot) do |plot_file|
+    - if defined? data
+      - data.R "rbbt.require('readr'); plot_str <- read_file('#{ plot_file }'); rbbt.png_plot('#{filename}', plot_str, width=#{width}, height=#{height})"
+    - else
+      - R.run "rbbt.require('readr'); plot_str <- read_file('#{ plot_file }'); rbbt.png_plot('#{filename}', plot_str, width=#{width}, height=#{height})"
 
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbbt-rest
 version: !ruby/object:Gem::Version
-  version: 1.8.86
+  version: 1.8.87
 platform: ruby
 authors:
 - Miguel Vazquez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-03 00:00:00.000000000 Z
+date: 2018-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake