rbbt-rest 1.6.28 → 1.7.0

data/share/views/layout/top_menu.haml

@@ -10,6 +10,7 @@
       %form.collapse(action='/find' method="POST")
         %input(type="search" name="term" placeholder='Search')
 
+  #aesthetics.item
   - if defined? Sinatra::RbbtRESTWorkflow and Sinatra::RbbtRESTWorkflow::WORKFLOWS
     - expoted_workflows = Sinatra::RbbtRESTWorkflow::WORKFLOWS.collect do |workflow|
       - next if workflow.asynchronous_exports.empty? and workflow.synchronous_exports.empty? and workflow.exec_exports.empty?

data/share/views/partials/table.haml

@@ -49,7 +49,13 @@
           - list_id = "#{ Misc.humanize(table_id) }: #{header[i]} for #{row.first}" if list_links and table_id and header and AnnotatedArray === value
           - field = header ? header[i] : nil
           - val = table_value(value, field, :list_id => list_id, :unnamed => unnamed, :entity_options => entity_options, :span => span)
-          %td= Float === val ? "%.5g" % val : val.to_s
+          - case val.to_s
+          - when 'true'
+            %td.true= val.to_s
+          - when 'false'
+            %td.false= val.to_s
+          - else
+            %td= Float === val ? "%.5g" % val : val.to_s
 
 
   -#{{{ TFOOT

data/share/views/public/js/_ajax_replace.js

@@ -98,6 +98,8 @@ function replace_object(object, href, embedd, complete){
   if (embedd === undefined){ embedd = false; }
   var clean_href = remove_parameter(remove_parameter(href,'_'), '_update')
 
+  object.find('.mithril-mount').map(function(i,obj){ m.mount(obj, null) });
+
   object.addClass("embedded").attr('target-href', href)
 
   $.ajax({

data/share/views/public/js/defer.js

@@ -14,6 +14,7 @@ function defer(deps, func){
 
 function start_deferred(){
   var tmp = $.unique(deferred_execution);
+  deferred_execution = [];
   $(tmp).each(function(pos,func){
     if (typeof(func) == 'object'){
       require_js(func[0], func[1]);
@@ -21,7 +22,6 @@ function start_deferred(){
       rbbt.try(func).call()
     }
   })
-  deferred_execution = [];
   return(false)
 }
 

data/share/views/public/js/helpers.js

@@ -96,32 +96,41 @@ function remove_from_array(array, elem){
  });
 }
 
+function merge_hash(destination, source){
+  for (var property in source) {
+    if (source.hasOwnProperty(property)) {
+      destination[property] = source[property];
+    }
+  }
+  return destination;
+}
+
 function array_values(hash){
- var tmp_arr = [], key = '';
- for (key in hash) {
-  tmp_arr[tmp_arr.length] = hash[key];
- }
+  var tmp_arr = [], key = '';
+  for (key in hash) {
+    tmp_arr[tmp_arr.length] = hash[key];
+  }
 
- return tmp_arr;
+  return tmp_arr;
 }
 
 function clean_attr(text){
- return encodeURIComponent(text)
+  return encodeURIComponent(text)
 }
 
 function uniq(ary) {
- var seen = {};
- return ary.filter(function(elem) {
-  var k = elem;
-  return (seen[k] === 1) ? 0 : seen[k] = 1;
- })
+  var seen = {};
+  return ary.filter(function(elem) {
+    var k = elem;
+    return (seen[k] === 1) ? 0 : seen[k] = 1;
+  })
 }
 function uniqBy(ary, key) {
- var seen = {};
- return ary.filter(function(elem) {
-  var k = key(elem);
-  return (seen[k] === 1) ? 0 : seen[k] = 1;
- })
+  var seen = {};
+  return ary.filter(function(elem) {
+    var k = key(elem);
+    return (seen[k] === 1) ? 0 : seen[k] = 1;
+  })
 }
 
 
@@ -129,8 +138,8 @@ function unique(arrayName) {
   var newArray=new Array();
   label:for(var i=0; i<arrayName.length;i++ ){  
     for(var j=0; j<newArray.length;j++ ){ 
-    if(newArray[j]==arrayName[i]) 
-      continue label;
+      if(newArray[j]==arrayName[i]) 
+        continue label;
     }
     newArray[newArray.length] = arrayName[i];
   }
@@ -166,3 +175,65 @@ function forArray(obj, fn, thisObj){
   }
   return forArray;
 }
+
+function contains(a, obj) {
+  for (var i = 0; i < a.length; i++) {
+    if (a[i] === obj) {
+      return true;
+    }
+  }
+  return false;
+}
+
+function return_same(obj){ return obj }
+
+function pvalue_score(pvalue){ if (undefined === pvalue || null == pvalue || pvalue == ""){ return pvalue }; if (pvalue < 0){ return 10 * Math.log10(-pvalue)}else{ return -10 * Math.log10(pvalue) }}
+
+function get_gradient(values, color1, color2){
+  var Color = net.brehaut.Color;
+  var color1 = Color(color1)
+  var color2 = Color(color2)
+  var steps = values.length
+  var clean_values = []
+  forArray(values,function(v){ if (typeof v == 'number' && ! isNaN(v)) clean_values.push(v) })
+  var max = Math.max.apply(null,clean_values)
+  var min = Math.min.apply(null,clean_values)
+  var diff = max - min
+  var colors = []
+  forArray(values, function(value){
+    if (typeof value == 'number'){
+      var a = (value - min)/diff
+      colors.push(color1.blend(color2, a).toString())
+    }else{
+      colors.push(undefined)
+    }
+  })
+  return colors
+}
+
+function get_sign_gradient(values, color1, color0, color2){
+  var Color = net.brehaut.Color;
+  var color1 = Color(color1)
+  var color0 = Color(color0)
+  var color2 = Color(color2)
+  var steps = values.length
+  var clean_values = []
+  forArray(values,function(v){ if (typeof v == 'number' && ! isNaN(v)) clean_values.push(v) })
+  var max = Math.max.apply(null,clean_values)
+  var min = Math.min.apply(null,clean_values)
+  var colors = []
+  forArray(values, function(value){
+    if (typeof value == 'number'){
+      if (value > 0){
+        var a = value/max
+        colors.push(color0.blend(color1, a).toString())
+      }else{
+        var a = value/min
+        colors.push(color0.blend(color2, a).toString())
+      }
+    }else{
+      colors.push(undefined)
+    }
+  })
+  return colors
+}

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

@@ -3,54 +3,165 @@ rbbt.aesthetics = {LS_key: "rbbt.aesthetics"}
 var aes_module = rbbt.aesthetics 
 
 aes_module.load = function(){
- this.aesthetics = rbbt.LS.load(this.LS_key)
- if (undefined === this.aesthetics)
-  this.aesthetics = []
-}
+  this.aesthetics = rbbt.LS.load(this.LS_key)
+  if (undefined === this.aesthetics)
+    this.aesthetics = []
+}.bind(aes_module)
 
 aes_module.store = function(){
  rbbt.LS.store(this.LS_key, this.aesthetics)
-}
+}.bind(aes_module)
 
-aes_module.add = function(selector, aes, value){
-  var mod = this
-  if (typeof selector == 'function'){ 
-    return selector.then(function(_selector){
-      mod.aesthetics.push({selector: _selector, aes: aes, value: value})
-    })
-  }else{
-    this.aesthetics.push({selector: selector, aes: aes, value: value})
+aes_module.map_aesthetic = function(aes, mapper, map_obj){
+  switch(mapper){
+    case false:
+    case undefined:
+    case null:
+    case 'direct':
+      return aes;
+    case 'gradient':
+      return get_gradient(aes, 'green', 'red')
+    case 'sign-gradient':
+      return get_sign_gradient(aes, 'green', 'white', 'red')
+    case 'map':
+      return aes.map(function(value){ map_obj[value] })
   }
 }
 
-aes_module.clear_aesthetic = function(aes){
-  var data_key = 'data-aes-' + aesthetic.aes
+aes_module.get_list_aesthetics = function(list, rules) {
+  var result = {}
+  var promises = []
+  var deferred = m.deferred()
+  var mappers = {}
 
-  $('[' + data_key + ']').attr(data_key, 'none')
-}
+  if (undefined === rules) rules = this.aesthetics
+  forArray(rules, function(rule){
+    var aes = rule.aes
+    result[aes] = m.prop()
+    mappers[aes] = rule.mapper
+
+    var args = rule.args
+    var extract = rule.extract
+
+    var promise
+
+    if (rule.property){
+      promise = list.property(rule.property, args)
 
-aes_module.apply_aesthetic = function(aesthetic){
+      if (undefined === extract){
+        promises.push(promise.then(result[aes]))
+      }else{
+        promises.push(promise.then(function(v){return v.map(extract)}).then(result[aes]))
+      }
+    }
 
- if (typeof aesthetic.selector == "string"){
-  targets = $(aesthetic.selector)
- }else{
-  var items = aesthetic.selector
-  if (typeof items[0] == 'object') items = $.map(items, function(i){return i.id})
-  targets = $('.entity').filter(function(index){ 
-   var id = $(this).attr('data-entity-id')
-   return items.indexOf(id) >= 0
+    if (rule.workflow){
+      promise = rbbt.job(rule.workflow, rule.task, args,true)
+      if (undefined === extract){
+        promises.push(promise.then(result[aes]))
+      }else{
+        promises.push(m.sync([list.get(), promise]).then(function(res){
+          list_info = res[0]
+          data = res[1]
+          return list_info.entities.map(function(e){ return extract.call(null, data, e) })
+        }).then(result[aes]))
+      }
+    }
+
+    if (rule.knowledge_base){
+      if (rule.parents)
+        promise = rbbt.knowledge_base.list_parents([rule.parents, rule.knowledge_base].join("@"), list)
+      if (rule.children)
+        promise = rbbt.knowledge_base.list_children([rule.children, rule.knowledge_base].join("@"), list)
+      
+      promise = promise.then(function(data){
+        var matches = {}
+        forHash(data, function(key, values){
+          var source = values[0]
+          var target = values[1]
+          if (matches[source] === undefined) matches[source] = {}
+          matches[source][target] = values.slice(2) 
+        })
+        return matches
+      })
+
+      if (undefined === extract){
+        promises.push(m.sync([list.get(), promise]).then(function(res){
+          list_info = res[0]
+          data = res[1]
+          return list_info.entities.map(function(e){ return data[e] })
+        }).then(result[aes]))
+      }else{
+        promises.push(m.sync([list.get(), promise]).then(function(res){
+          list_info = res[0]
+          data = res[1]
+          return list_info.entities.map(function(e){ return extract.call(null, data, e) })
+        }).then(result[aes]))
+      }
+    }
   })
- }
 
- var data_key = 'data-aes-' + aesthetic.aes
- targets.attr(data_key, aesthetic.value)
+  var mapped_result = {}
+  m.sync(promises).then(function(){
+    forHash(result, function(aes, values){
+      var mapper = mappers[aes]
+      mapped_result[aes] = rbbt.aesthetics.map_aesthetic(values(), mapper)
+    })
+    return mapped_result
+  }).then(function(){ deferred.resolve(mapped_result) })
+
+  return deferred.promise
 }
 
-aes_module.apply = function(aesthetic){
- if (undefined === aesthetic)
-  aes_module.aesthetics.map(aes_module.apply_aesthetic)
- else
-  aes_module.apply_aesthetic(aesthetic)
+aes_module.add = function(rule){
+  aes_module.aesthetics.push(rule)
+  aes_module.aesthetics = unique(aes_module.aesthetics)
+  aes_module.store()
 }
 
+aes_module.apply = function(){
+}
+
+//aes_module.add = function(selector, aes, value){
+//  var mod = this
+//  if (typeof selector == 'function'){ 
+//    return selector.then(function(_selector){
+//      mod.aesthetics.push({selector: _selector, aes: aes, value: value})
+//    })
+//  }else{
+//    this.aesthetics.push({selector: selector, aes: aes, value: value})
+//  }
+//}
+//
+//aes_module.clear_aesthetic = function(aes){
+//  var data_key = 'data-aes-' + aesthetic.aes
+//
+//  $('[' + data_key + ']').attr(data_key, 'none')
+//}
+//
+//aes_module.apply_aesthetic = function(aesthetic){
+//
+// if (typeof aesthetic.selector == "string"){
+//  targets = $(aesthetic.selector)
+// }else{
+//  var items = aesthetic.selector
+//  if (typeof items[0] == 'object') items = $.map(items, function(i){return i.id})
+//  targets = $('.entity').filter(function(index){ 
+//   var id = $(this).attr('data-entity-id')
+//   return items.indexOf(id) >= 0
+//  })
+// }
+//
+// var data_key = 'data-aes-' + aesthetic.aes
+// targets.attr(data_key, aesthetic.value)
+//}
+//
+//aes_module.apply = function(aesthetic){
+// if (undefined === aesthetic)
+//  aes_module.aesthetics.map(aes_module.apply_aesthetic)
+// else
+//  aes_module.apply_aesthetic(aesthetic)
+//}
+//
+
 aes_module.load()

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

@@ -3,11 +3,31 @@ rbbt.mlog = function(data){
   console.log(data)
 }
 
+// AJAX
+
 rbbt.ajax = function(params){
   params.config = function(xhr, options){ xhr.setRequestHeader( "X-Requested-With", "XMLHttpRequest"); return xhr; }
+  if (undefined === params.method) params.method = "GET"
   return m.request(params)
 }
 
+rbbt.post = function(url, data, params){
+  var formData = new FormData()
+
+  if (undefined === params)  params = {}
+  if (undefined === params.method) params.method = 'POST'
+  if (undefined === params.url) params.url = url
+  if (undefined === params.serialize) params.serialize = function(formData) {return formData}
+
+
+  forHash(data, function(key,value){
+    formData.append(key, value)
+  })
+
+  var request_params = {url: url, method: "POST", data: formData, serialize: function(formData){return formData} }
+  return rbbt.ajax(request_params)
+}
+
 rbbt.insist_request = function(params, deferred, timeout, missing){
   if (undefined === deferred) deferred = m.deferred()
   if (undefined === timeout) timeout = 1000

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

@@ -1,5 +1,4 @@
 var Entity = function(data){
- this.id = data.id
  this.code = data.code
 
  if (data.name !== undefined)
@@ -9,7 +8,11 @@ var Entity = function(data){
 
  this.type = data.type
  this.format = data.format
- this.info = data.info
+ if (undefined === data.info)
+   this.info = {}
+ else
+   this.info = data.info 
+ this.info = {}
  if (this.format === undefined && this.info !== undefined) this.format = this.info['format']
 
  this.full_type = function(){
@@ -30,6 +33,13 @@ var Entity = function(data){
   url = add_parameters(url, this.link_info())
   return url
  }
+
+ this.property = function(name, args){
+  var url = "/entity_property/" + name + "/" + this.full_type() + "/" + this.code
+  url = add_parameters(url, this.link_info())
+  if (undefined !== args) url = add_parameter(url, "args", JSON.stringify(args))
+  return rbbt.insist_request({url: url})
+ }
 }
 
 var FavouriteEntities = function(by_type){

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

@@ -16,14 +16,60 @@ var EntityList = function(data){
  this.get = function(){ 
   var url = this.url()
   url = add_parameter(url, '_format', 'json')
-  return m.request({url: url, method: 'GET'})
+  if (undefined === this.entities && ! this.loading){
+    list = this
+    this.loading = m.request({url: url, method: 'GET'}).then(this.entities).then(function(x){ list.loading = undefined; return x})
+    return this.loading
+  }else{
+    var deferred = m.deferred()
+    if (this.loading)
+      this.loading.then(function(x){ deferred.resolve(x)})
+    else
+      deferred.resolve(this.entities)
+    return deferred.promise
+  }
  }
 
- this.highlight = function(color){
-  this.get().then(function(list){
-   rbbt.aesthetics.apply_aesthetic({selector: list.entities, aes: 'color', value: color})
-  })
+ this.get_entities = function(func){
+   var result = m.deferred();
+
+   this.get().then(function(list_data){
+     var item_values = []
+     forArray(list_data.entities, function(entity_code){
+       item_values.push(new Entity({code: entity_code, info: list_data.info}))
+     })
+     result.resolve(item_values)
+   })
+
+   return(result.promise)
+ }
+
+ this.property = function(name, args){
+  var url = "/entity_list_property/" + name + "/" + this.full_type() + "/" + clean_element(this.id)
+  if (undefined !== args) 
+    if ('string' === typeof args)
+      url = add_parameter(url, "args", args)
+    else
+      url = add_parameter(url, "args", JSON.stringify(args))
+  return rbbt.insist_request({url: url})
+ }
+
+ this.children = function(knowledgebase, database){
+   var db_key = [database, knowledgebase].join("@")
+   return rbbt.knowledge_base.list_children(db_key, this)
  }
+
+ this.parents = function(knowledgebase, database){
+   var db_key = [database, knowledgebase].join("@")
+   return rbbt.knowledge_base.list_parents(db_key, this)
+ }
+
+ this.subset = function(knowledgebase, database){
+   var db_key = [database, knowledgebase].join("@")
+   return rbbt.knowledge_base.list_subset(db_key, this)
+ }
+
+
 }
 
 var FavouriteLists = function(by_type){