rbbt-rest 1.8.57 → 1.8.58

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 670376b8fffcf1f42a9349e4d1c68b1c50a4ed99
-  data.tar.gz: c318aef5f05444056d9931be33c573f266c46b45
+  metadata.gz: 114a1a6d890aa4e7fe21cb1559197c259dfbd0e9
+  data.tar.gz: 9702d3726a39dc13a1ca94bfc4c0c70a8ce5fa5d
 SHA512:
-  metadata.gz: a6a1f1f47c9a9ad952d47da514b6a542b716990093b39c386c9a98d629dd8521fb05a9bed4fd0f70b17ee47b154f04acfa6a92762daba08e0ca0eab8c4924870
-  data.tar.gz: 20e6265e6555d27f0922185c287666a10dce67495f9016e51ca6bb9ee9ff2076227acbc90e4b9b49ab519833808dce2ee5aa56575410b10662d2538fbed32e1f
+  metadata.gz: 2e7067cc90ae02fb314db91c478442a8c5623aef250509828419e5b03ab6e9440fdeded8bcb9a7784ad103cd9511e7ba956bc73930d4a5e8c63a470679234360
+  data.tar.gz: 3617a5fd71a8418d89e1f2340fe7405d1fb06954b23d3832f3b90e9b36f16b3d448255229cc467086d050a7b080a6e19ea2d7e086c9f53d31294684bbbbcbbc1

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

@@ -101,6 +101,32 @@ module RbbtRESTHelpers
       fragment_file = step.file(@fragment)
       if File.exists?(fragment_file)
         case @format.to_s
+        when "query-entity"
+          tsv, table_options = load_tsv(fragment_file, true)
+          begin
+            res = tsv[@entity].to_json
+            content_type "application/json" 
+          rescue
+            res = nil.to_json
+          end
+          halt 200, res 
+        when "query-entity-field"
+          tsv, table_options = load_tsv(fragment_file, true)
+          begin
+            res = tsv[@entity]
+            res = [res] if tsv.type == :single or tsv.type == :flat
+          rescue
+            res = nil.to_json
+          end
+
+          fields = tsv.fields
+          content_type "application/json" 
+          hash = {}
+          fields.each_with_index do |f,i|
+            hash[f] = res.nil? ? nil : res[i]
+          end
+
+          halt 200, hash.to_json 
         when "table"
           halt 200, tsv2html(fragment_file)
         when "json"

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

@@ -109,6 +109,9 @@ module RbbtRESTHelpers
     @filter = consume_parameter :_filter
     @column = consume_parameter :_column
 
+    # TSV table query
+    @entity = consume_parameter :_entity
+
     # Fix boolean inputs sumbitted using checkboxes
     params.keys.each do |param|
       if param =~ /(.*)_checkbox_false$/

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

@@ -356,10 +356,12 @@ module RbbtRESTHelpers
     RbbtRESTHelpers.save_tsv(file)
   end
 
-
-
-  def self.load_tsv(file)
-    tsv = TSV.open(Open.open(file))
+  def self.load_tsv(file, persist = false)
+    if persist
+      tsv = TSV.open(Open.open(file), :persist => true, :persist_file => file + '.persist')
+    else
+      tsv = TSV.open(Open.open(file))
+    end
 
     table_options = File.exists?(file + '.table_options') ? YAML.load_file(file + '.table_options') : {}
     tsv.entity_options = table_options[:tsv_entity_options]
@@ -369,8 +371,8 @@ module RbbtRESTHelpers
     [tsv, table_options]
   end
 
-  def load_tsv(file)
-    RbbtRESTHelpers.load_tsv(file)
+  def load_tsv(*args)
+    RbbtRESTHelpers.load_tsv(*args)
   end
 
   def table(options = {})

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

@@ -120,9 +120,6 @@ module EntityRESTHelpers
 
     render(template_file, locals, layout_file, "Action #{ action } for map: #{ id }")
   end
-
-
-
 end
 
 

data/share/views/public/js/rbbt.basic.js

@@ -1,5 +1,6 @@
 rbbt.mlog = function(data){
   console.log(data)
+  return data
 }
 
 // AJAX

data/share/views/public/js/rbbt.plots/rbbt.plots.aes.js

@@ -23,7 +23,7 @@ rbbt.plots.aes.map_aesthetic = function(aes, mapper, map_obj){
         else
           aes = map_obj[aes]
       }
-      return get_sign_gradient(aes, '#EABD5D', 'grey', '#40324F')
+      return get_sign_gradient(aes, '#EABD5D', '#DDD', '#40324F')
     case 'map':
       if (typeof aes == 'object')
         return aes.map(function(value){ if (value !== undefined && value != null ) value = value.toString(); return map_obj[value] })
@@ -94,6 +94,35 @@ rbbt.plots.aes.get_properties = function(list, rules, type, namespace){
       }
     }
 
+    if (rule.query){
+      var fragment = rule.query
+      var field = rule.field
+      if (undefined === name && ! undefined === field){ name = field }
+      if (undefined === name){ name = fragment }
+
+      var url = main_url
+      url = add_parameter(url, '_fragment', fragment)
+
+      if (field){
+        url = add_parameter(url, '_format', 'query-entity-field')
+        url = add_parameter(url, '_field', field)
+      }else{
+        url = add_parameter(url, '_format', 'query-entity')
+      }
+
+      var ajax_promises = list.codes.map(function(code){ 
+        var deferred = m.deferred()
+        rbbt.ajax({url: add_parameter(url, '_entity', code)}).then(deferred.resolve)
+        return deferred.promise
+      })
+
+      promise = m.sync(ajax_promises)
+
+      if ('string' === typeof field ){
+        promise = promise.then(function(values){ return values.map(function(v){ if (null === v){ return null }else{ return v[field] } }) })
+      }
+    }
+
     if (rule.subset){
       var deferred = m.deferred()
       var inclusion = list.codes.map(function(code){ if (rule.subset.indexOf(code) < 0){ return "false"} else { return "true" } })

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

@@ -249,7 +249,7 @@ rbbt.plots.graph.view_d3js_graph = function(graph_model, elem, node_obj){
 }
 
 rbbt.plots.graph.view_mithril = function(graph_model, elem, container_obj, produce_obj){
-  rbbt.plots.graph.update(graph_model).then(function(updated_model){
+  return rbbt.plots.graph.update(graph_model).then(function(updated_model){
     var obj = $(elem)[0]
     var component = {view: rbbt.curry(rbbt.plots.mithril, graph_model, container_obj, produce_obj)}
     rbbt.mount(obj, component)

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

@@ -11,5 +11,7 @@ rbbt.plots.mithril = function(graph_model, container_obj, produce_obj){
     obj_by_type[type] = objs
   })
 
-  return container_obj(graph_model, obj_by_type)
+  var container = m('.mitrhil', {config: function(){ update_dom() }}, container_obj(graph_model, obj_by_type))
+
+  return container
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbbt-rest
 version: !ruby/object:Gem::Version
-  version: 1.8.57
+  version: 1.8.58
 platform: ruby
 authors:
 - Miguel Vazquez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-15 00:00:00.000000000 Z
+date: 2017-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake