rbbt-rest 1.8.55 → 1.8.56

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6716eb64f85a3f3e6d72310e9d09f1a684f5721a
-  data.tar.gz: cb0a0bc5263652ac50cd0b00937184b32208b560
+  metadata.gz: 3dd743dca60e774ca984f6e9cf2a29e845f82e7b
+  data.tar.gz: 0305b01777c639f34029045ac8f5f4660acb9bd4
 SHA512:
-  metadata.gz: f0a5df5ee5734f0fb8df1c03ec7b3b957cf7fb0e317134ead50cb60950dccad225bbfba96437683c7808fc4b022c5ce981dd7463152357a8d444667eb9507cdc
-  data.tar.gz: 3f5b0455920ee70bc8000e6e124c4a65ae6def0638dd4f4dbe7619a61f9517296606a828106fe3bb0afa3a6491b87880bdcbc7c810134dc79efaf9ddd175126b
+  metadata.gz: a7465076f534758427cfeda60d7ef6356d992c139e503dabb4f9f40ce5d93774af34dfea822ec10c246e230a733bde3ca5aeb9fd9fa66389421d63091a12bb53
+  data.tar.gz: 045bb3d3fcc692f9202de5dbeecd820b5685c3b6823746bdc624d2fdbfee8f2997d0e1bfddaf03b28842c32afe3be105bde53e52de63328025c83a01bca4064a

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

@@ -247,6 +247,33 @@ module RbbtRESTHelpers
     end
   end
 
+  def json_resource(object, filename = nil, promise = true)
+    filename = File.basename(TmpFile.tmp_file) if filename.nil?
+
+    if @step
+      url = add_GET_param(remove_GET_param(@fullpath, ["_update", "_"]), "_fragment", "json_resources/#{ filename }")
+      f = @step.file(:json_resources)[filename].find
+    else
+      url = "/files/#{ filename }"
+      f = settings.file_dir[filename].find
+    end
+
+    FileUtils.mkdir_p(File.dirname(f))
+
+    Open.write(f, object.to_json)
+
+    if promise
+      "rbbt.get('#{url}')"
+    else
+      url
+    end
+  end
+
+  def sync_json_resources(objects)
+    gets = objects.collect{|object| json_resource(object) }
+    "m.sync([#{gets * ", "}])"
+  end
+
   def reveal(text, id = nil, options = nil, &block)
     id ||= "rbbt_reveal_" << (rand * 10000).to_i.to_s
 

data/share/views/layout/header.haml

@@ -69,7 +69,7 @@
 - %w(rbbt.knowledge_base).each do |file|
   - record_js "/js-find/#{ file }"
 
-- %w(rbbt.plots.basic rbbt.plots.aes rbbt.plots.graph rbbt.plots.graph.kb rbbt.plots.graph.mithril rbbt.plots.graph.adapters rbbt.plots.aesthetics rbbt.plots.list).each do |file|
+- %w(rbbt.plots.basic rbbt.plots.aes rbbt.plots.graph rbbt.plots.graph.kb rbbt.plots.graph.mithril rbbt.plots.graph.adapters rbbt.plots.graph.model rbbt.plots.aesthetics rbbt.plots.list).each do |file|
   - record_js "/js-find/rbbt.plots/#{ file }"
 
 - record_js "/js-find/app"

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

@@ -85,6 +85,24 @@ rbbt.insist_request = function(params, deferred, timeout, missing){
   return deferred.promise
 }
 
+rbbt.get = function(url, params){
+  var request_params
+  if (typeof url === 'object'){
+    request_params = url
+  }else{
+
+    if (undefined === params)  params = {}
+    if (undefined === params.url) params.url = url
+
+    request_params = {url: url, method: "GET"}
+    forHash(params, function(k,v){request_params[k] = v})
+  }
+
+  if (undefined === request_params.method) request_params.method = 'GET'
+
+  return rbbt.insist_request(request_params)
+}
+
 rbbt.post = function(url, data, params){
   var request_params
   if (typeof url === 'object'){

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

@@ -49,3 +49,8 @@ rbbt.curry = function(uncurried) {
            ));
   };
 };
+
+rbbt.default = function(val, def){
+  if (undefined === val || null === val) return def
+  else return val
+}

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

@@ -15,7 +15,7 @@ rbbt.plots.aes.map_aesthetic = function(aes, mapper, map_obj){
           aes = map_obj[aes]
         }
       }
-      return get_gradient(aes, 'red', 'green')
+      return get_gradient(aes, '#EABD5D', '#40324F')
     case 'sign-gradient':
       if (map_obj){
         if (typeof aes == 'object')
@@ -23,7 +23,7 @@ rbbt.plots.aes.map_aesthetic = function(aes, mapper, map_obj){
         else
           aes = map_obj[aes]
       }
-      return get_sign_gradient(aes, 'red', 'grey', 'green')
+      return get_sign_gradient(aes, '#EABD5D', 'grey', '#40324F')
     case 'map':
       if (typeof aes == 'object')
         return aes.map(function(value){ if (value !== undefined && value != null ) value = value.toString(); return map_obj[value] })

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

@@ -55,6 +55,8 @@ rbbt.plots.aes.complete_source_target = function(list){
    list.aes.source = list.properties.source
    list.aes.target = list.properties.target
   }
+
+  return list
 }
 
 rbbt.plots.graph.update_aes = function(graph_model){

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

@@ -0,0 +1,94 @@
+rbbt.graph_model = function(){
+  var obj = {}
+
+  obj.entities = {}
+  obj.associations = {}
+  obj.rules = []
+  obj.aes_rules = []
+  obj.edge_rules = []
+  obj.edge_aes_rules = []
+
+  var prot = {}
+  
+  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
+  }
+
+  //{{{ Add elements
+  
+  prot.set_entities = function(codes, type, info){
+    if (undefined === type) type = "Entity"
+    if (undefined === info) info = {}
+
+    this.entities[type] = {codes: codes, info: info, properties: {}, aes: {}}
+  }
+
+  prot.set_associations = function(codes, db, info){
+    if (undefined === db) db = "network"
+    if (undefined === info) info = {}
+
+    var list = {codes: codes, info: info}
+    this.associations[db] = rbbt.plots.aes.complete_source_target(list)
+  }
+
+  //{{{ Add rules
+  
+  prot.add_rule = function(rule){
+    this.rules.push(rule)
+  }
+
+  prot.add_aes_rule = function(rule){
+    this.aes_rules.push(rule)
+  }
+
+  prot.add_edge_rule = function(rule){
+    this.edge_rules.push(rule)
+  }
+
+  prot.add_edge_aes_rule = function(rule){
+    this.edge_aes_rules.push(rule)
+  }
+
+  //{{{ Add info
+
+  prot.add_property = function(values, name, type){
+    if (undefined === type) type = "Entity"
+    if (undefined === this.entities[type].properties) this.entities[type].properties = {}
+
+    this.entities[type].properties[name] = this._collect_values(values, this.entities[type].codes)
+  }
+
+  prot.add_aes = function(values, name, type){
+    if (undefined === type) type = "Entity"
+    if (undefined === this.entities[type].aes) this.entities[type].aes = {}
+
+    this.entities[type].aes[name] = this._collect_values(values, this.entities[type].codes)
+  }
+
+  prot.add_edge_property = function(values, name, db){
+    if (undefined === db) db = "network"
+    if (undefined === this.associations[db].properties) this.associations[db].properties = {}
+
+    this.associations[db].properties[name] = this._collect_values(values, this.associations[db].codes)
+  }
+
+  prot.add_edge_aes = function(values, name, db){
+    if (undefined === db) db = "network"
+    if (undefined === this.associations[db].aes) this.associations[db].aes = {}
+
+    this.associations[db].aes[name] = this._collect_values(values, this.associations[db].codes)
+  }
+
+  obj.__proto__ = prot
+
+  return obj
+}
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbbt-rest
 version: !ruby/object:Gem::Version
-  version: 1.8.55
+  version: 1.8.56
 platform: ruby
 authors:
 - Miguel Vazquez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-06 00:00:00.000000000 Z
+date: 2017-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -325,6 +325,7 @@ files:
 - share/views/public/js/rbbt.plots/rbbt.plots.graph.js
 - share/views/public/js/rbbt.plots/rbbt.plots.graph.kb.js
 - share/views/public/js/rbbt.plots/rbbt.plots.graph.mithril.js
+- share/views/public/js/rbbt.plots/rbbt.plots.graph.model.js
 - share/views/public/js/rbbt.plots/rbbt.plots.list.js
 - share/views/public/js/rbbt.views.js
 - share/views/public/js/rbbt/actions.js