rbbt-rest 1.8.132 → 1.8.133

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 464fd570357391510764587f5d9e2f95afa8710e788d17416827cdcf4c6c545a
-  data.tar.gz: 7ef1b6650b360534dd2faf6217e517c165a0c09fe609c4b3c4fca47e6c257e6a
+  metadata.gz: dbd372404c5852b1fbb2ff81458ac565c59aef590d691684e133ae25d8f4870d
+  data.tar.gz: 5d60c4e944ec6f9c5a38b46a907ae393bbcd876dca7cdef277f8caafa488c9af
 SHA512:
-  metadata.gz: 5fc9136e2be86b9cb4c4276951904f5b72b72a9403edbcfb560e3f7f45e638439ca202f1975409743a95fd14565777d81459ceacbe8ecf8a7c3b7b76dd98ab4b
-  data.tar.gz: a74fc7287fa78a6a758cdacf0814e6610a33d7bbdb3087f6bb40849746742f87c8711ea29c288b0f689e8f85da3de0830a21c482b4b8273302a0d54dc80fddbe
+  metadata.gz: 7476ccde9c44721f3d1374b9640aeffda1223ea422b6fad58f6dff36ea14cbe61b342cd3867b50a44ec699397504bc2de2ed45f11f6ae6e524d1ada1d21ce13a
+  data.tar.gz: 5ded5d4e71d4ce4e330de4d18a7485daeb65ea78b2053de9e56c88c47ce8d0cb4c15462ae354b4bee622d07bb2e2e6cd51d10f8d7d6a5a5332cb502411e2a01b

data/lib/rbbt/rest/entity.rb

@@ -69,6 +69,8 @@ module Sinatra
           entity_type = consume_parameter :entity_type
           entity = consume_parameter :entity
 
+          entity = Entity::REST.restore_element(entity)
+
           entity_type = Entity::REST.restore_element(entity_type)
 
           entity = setup_entity(entity_type, entity, @clean_params)
@@ -83,6 +85,8 @@ module Sinatra
           entity = consume_parameter :entity
           action = consume_parameter :action
 
+          entity = Entity::REST.restore_element(entity)
+
           entity_type = Entity::REST.restore_element(entity_type)
 
           entity = setup_entity(entity_type, entity, @clean_params)

data/lib/rbbt/rest/entity/rest.rb

@@ -14,11 +14,11 @@ module Entity
     #{{{ MISC
     
     def self.clean_element(elem)
-      elem.gsub('/', '-..-').gsub('%', 'o-o').gsub('[','(.-(').gsub(']',').-)')
+      elem.gsub('/', '-..-').gsub("|", '-...-').gsub('%', 'o-o').gsub('[','(.-(').gsub(']',').-)')
     end
  
     def self.restore_element(elem)
-      CGI.unescape(CGI.unescape(elem.gsub('-..-', '/').gsub('o-o', '%').gsub('(.-(','[').gsub(').-)',']')))
+      CGI.unescape(CGI.unescape(elem.gsub('-..-', '/').gsub('-...-', '|').gsub('o-o', '%').gsub('(.-(','[').gsub(').-)',']')))
     end
 
     def self.setup(mod)
@@ -84,13 +84,13 @@ module Entity
       end
 
 
-      url = File.join('/', 'entity', Entity::REST.clean_element(type.to_s), entity) 
+      url = File.join('/', 'entity', Entity::REST.clean_element(type.to_s), Entity::REST.clean_element(entity)) 
       url << "?" << Misc.hash2GET_params(params) if params.any?
       url
     end
 
     def self.entity_action_url(entity, type, action, params = {})
-      url = File.join('/', 'entity_action', Entity::REST.clean_element(type.to_s), action.to_s, entity)
+      url = File.join('/', 'entity_action', Entity::REST.clean_element(type.to_s), action.to_s, Entity::REST.clean_element(entity))
       url << "?" << Misc.hash2GET_params(params) if params.any?
       url
     end

data/share/views/tools/Rggplot.haml

@@ -0,0 +1,15 @@
+- filename = 'R-png_' << rand(10000).to_s unless defined? filename and filename
+- text = filename unless defined? text and text
+
+- size = 3 unless defined? size and size
+- width = size unless defined? width and width
+- height = size unless defined? height and height
+- plot = block.call unless (defined? plot and plot) or not defined? block
+- plot_options = {} unless defined? plot_options and plot_options
+
+- filename += '.png' unless filename =~ /\.png$/i
+- require 'rbbt/util/R'
+
+= resource filename, text, :image do |filename|
+  - R::PNG.ggplot(filename, data, plot, width, height, plot_options) 
+

data/share/views/tools/Rpng.haml

@@ -7,6 +7,7 @@
 - plot = block.call unless (defined? plot and plot) or not defined? block
 
 - filename += '.png' unless filename =~ /\.png$/i
+- require 'rbbt/util/R'
 = resource filename, text, :image do |filename|
   - TmpFile.with_file(plot) do |plot_file|
     - if defined? data

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbbt-rest
 version: !ruby/object:Gem::Version
-  version: 1.8.132
+  version: 1.8.133
 platform: ruby
 authors:
 - Miguel Vazquez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-07 00:00:00.000000000 Z
+date: 2020-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -1855,6 +1855,7 @@ files:
 - share/views/public/robots.txt
 - share/views/public/spain_logo.svg
 - share/views/tasks.haml
+- share/views/tools/Rggplot.haml
 - share/views/tools/Rpng.haml
 - share/views/tools/nvd3.haml
 - share/views/tools/nvd3/chart.haml