rbbt-rest 1.8.43 → 1.8.44

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 29526f96e92a2c8cbad48da652bcf714ca4ab8f9
-  data.tar.gz: f965b864cb23fbebdf0f05837126b1d758f1189c
+  metadata.gz: 60976796315c49b16fb12420e4dd05e3172431af
+  data.tar.gz: 515901d61eb491544dc75c863fe1b72ac0e3bdff
 SHA512:
-  metadata.gz: a8750d42b17e64c1e29968d64e960ca2f91a0871b00fd2bd60db6b0ffd6e6e1063328b2aded017204fd0adeff8c71d59030c4e570e3fe9f4df557b0d9c85e7b4
-  data.tar.gz: f49fa374c6561cb60ae60171abba73fcd5d1fb8129db50f27ec5a316566bdc293d1e79ef46ffc22f12402626325aab968ab2638b073accd8afef48b34d5aae7f
+  metadata.gz: 7d2d29a01a654bc06241b2df611b7df3b26a788e5925dda59436c88676e1983d81c7c1a756fe499868310541bf5c6f243eb66938ade86601662ff9aa9b49caae
+  data.tar.gz: 57a34fe10f44f56ef698bfd2b276d136f43d80fe4cc2d7531febd3318bd8d0f7c98bfb571a95008935e0ca7fac90ebe47eb658f52724f48b00b01b2bd12bbacf

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

@@ -3,6 +3,23 @@ module RbbtRESTHelpers
 
   class TemplateMissing < StandardError; end
 
+  #{{{ Common
+
+  def add_search_paths(path, resources)
+    resources.reverse.each do |resource|
+      name = Misc.snake_case(resource.to_s.gsub('/','_'))
+      path.prepend_search_path(name, resource)
+    end
+  end
+
+  def locate_server_file(template, resources, extension = nil)
+    path = Path.setup(template)
+    add_search_paths(path, resources)
+    return path.find if path.exists? and not path.directory?
+    path = path.set_extension(extension) if extension
+    return path.find if path.exists?
+  end
+
   #{{{ TEMPLATE
   
   def self.template_resources
@@ -12,24 +29,15 @@ module RbbtRESTHelpers
   def template_resources
    [Rbbt.www.views] + RbbtRESTHelpers.template_resources
   end
-  
-  def locate_template_from_resource(resource, template)
-    resource[template + '.haml']
-  end   
 
   def locate_template(template)
-    return Path.setup(template) if Open.exists?(template)
-    return Path.setup(template+'.haml') if Open.exists?(template+'.haml')
-    template_resources.each do |resource|
-      path = locate_template_from_resource(resource, template)
-      return path if path.exists?
-    end
-
-    raise TemplateMissing, "Template #{ template } not found"
+    path = locate_server_file(template, template_resources, 'haml')
+    raise TemplateMissing, "Template #{ template } not found" if path.nil?
+    path
   end
- 
-  #{{{ TEMPLATE
-  
+
+  # {{{ FILE
+
   def self.file_resources
     @file_resources ||= template_resources
   end
@@ -37,33 +45,26 @@ module RbbtRESTHelpers
   def file_resources
    [Rbbt.www.views] + RbbtRESTHelpers.file_resources
   end
-  
-  def locate_file_from_resource(resource, file)
-    resource[file]
-  end   
 
   def locate_file(file)
-    file_resources.each do |resource|
-      path = locate_file_from_resource(resource, file)
-      return path if path.exists?
-    end
-
-    raise TemplateMissing, "File #{ file } not found"
+    path = locate_server_file(file, file_resources)
+    raise TemplateMissing, "File #{ file } not found" if path.nil?
+    path
   end
 
-  def find_all_from_resource(resource, pattern)
-    resource.glob(pattern)
-  end   
-  
-  def find_all(pattern)
-    paths = []
-    file_resources.each do |resource|
-      paths.concat find_all_from_resource(resource, pattern)
-    end
+  def find_all(file)
+    path = Path.setup(file)
+    add_search_paths(path, file_resources)
+    path.find_all
+  end
 
-    paths
+  def glob_all(file)
+    path = Path.setup(file)
+    add_search_paths(path, file_resources)
+    path.glob_all
   end
 
+
   #{{{ SASS
   
   def self.add_sass_load_path(path)
@@ -78,43 +79,26 @@ module RbbtRESTHelpers
     [Rbbt.www.views.compass] + RbbtRESTHelpers.sass_resources
   end
 
-  def locate_sass_from_resource(resource, template)
-    resource[template + '.sass']
-  end
- 
   def locate_sass(template)
-    sass_resources.each do |resource|
-      path = locate_sass_from_resource(resource, template)
-      return path if path.exists?
-    end
-
-    raise TemplateMissing, "Sass template #{ template } not found"
+    path = locate_server_file(template, sass_resources, 'sass')
+    raise TemplateMissing, "Sass file #{ template } not found" if path.nil?
+    path
   end
 
   #{{{ JAVASCRIPT
 
   def self.javascript_resources
-    @javascript_resources ||= [Rbbt.share.views.public.find(:lib), Rbbt.share.views.public.js.find(:lib), Rbbt.share.views.public.plugins.find(:lib)]
+    @@javascript_resources ||= [Rbbt.share.views.public.find(:lib), Rbbt.share.views.public.js.find(:lib), Rbbt.share.views.public.plugins.find(:lib)]
   end
 
   def javascript_resources
     RbbtRESTHelpers.javascript_resources
   end
 
-
-  def locate_javascript_from_resource(resource, script)
-    path = resource[script + '.js']
-    return path if path.exists?
-    resource[script]
-  end
- 
-  def locate_javascript(script)
-    javascript_resources.each do |resource|
-      path = locate_javascript_from_resource(resource, script)
-      return path if path.exists?
-    end
-
-    raise TemplateMissing, "Script #{ script } not found"
+  def locate_javascript(template)
+    path = locate_server_file(template, javascript_resources, 'js')
+    raise TemplateMissing, "Javascript file #{ template } not found" if path.nil?
+    path
   end
 
   #{{{ CSS
@@ -127,19 +111,97 @@ module RbbtRESTHelpers
     RbbtRESTHelpers.css_resources
   end
 
-
-  def locate_css_from_resource(resource, script)
-    path = resource[script + '.css']
-    return path if path.exists?
-    resource[script]
+  def locate_css(template)
+    path = locate_server_file(template, css_resources, 'css')
+    raise TemplateMissing, "CSS file #{ template } not found" if path.nil?
+    path
   end
- 
-  def locate_css(script)
-    css_resources.each do |resource|
-      path = locate_css_from_resource(resource, script)
-      return path if path.exists?
-    end
 
-    raise TemplateMissing, "Script #{ script } not found"
-  end
+
+
+  #def locate_template_from_resource(resource, template)
+  #  resource[template + '.haml']
+  #end   
+
+  #def locate_template(template)
+  #  return Path.setup(template) if Open.exists?(template)
+  #  return Path.setup(template+'.haml') if Open.exists?(template+'.haml')
+  #  template_resources.each do |resource|
+  #    path = locate_template_from_resource(resource, template)
+  #    return path if path.exists?
+  #  end
+
+  #  raise TemplateMissing, "Template #{ template } not found"
+  #end
+
+  #{{{ FILE
+  
+  #def locate_file_from_resource(resource, file)
+  #  resource[file]
+  #end   
+
+  #def locate_file(file)
+  #  file_resources.each do |resource|
+  #    path = locate_file_from_resource(resource, file)
+  #    return path if path.exists?
+  #  end
+
+  #  raise TemplateMissing, "File #{ file } not found"
+  #end
+
+  #def find_all_from_resource(resource, pattern)
+  #  resource.glob(pattern)
+  #end   
+  #
+  #def find_all(pattern)
+  #  paths = []
+  #  file_resources.each do |resource|
+  #    paths.concat find_all_from_resource(resource, pattern)
+  #  end
+
+  #  paths
+  #end
+
+  #def locate_sass_from_resource(resource, template)
+  #  resource[template + '.sass']
+  #end
+ 
+  #def locate_sass(template)
+  #  sass_resources.each do |resource|
+  #    path = locate_sass_from_resource(resource, template)
+  #    return path if path.exists?
+  #  end
+
+  #  raise TemplateMissing, "Sass template #{ template } not found"
+  #end
+
+  #def locate_javascript_from_resource(resource, script)
+  #  path = resource[script + '.js']
+  #  return path if path.exists?
+  #  resource[script]
+  #end
+ 
+  #def locate_javascript(script)
+  #  javascript_resources.each do |resource|
+  #    path = locate_javascript_from_resource(resource, script)
+  #    return path if path.exists?
+  #  end
+
+  #  raise TemplateMissing, "Script #{ script } not found"
+  #end
+
+  #def locate_css_from_resource(resource, script)
+  #  path = resource[script + '.css']
+  #  return path if path.exists?
+  #  resource[script]
+  #end
+ 
+  #def locate_css(script)
+  #  css_resources.each do |resource|
+  #    path = locate_css_from_resource(resource, script)
+  #    return path if path.exists?
+  #  end
+
+  #  raise TemplateMissing, "Script #{ script } not found"
+  #end
 end

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

@@ -31,6 +31,22 @@ module RbbtRESTHelpers
     end
   end
 
+  def traverse(items, msg = nil, max = nil, options = {}, &block)
+    options[:msg] = msg if msg
+    options[:max] = max if max
+    msg, max = Misc.process_options options, :msg, :max
+    max = TSV.guess_max max if max.nil?
+    msg = "Processing" if msg.nil?
+    bar = @step.progress_bar(msg, :max => max)
+    TSV.traverse items, options.merge(:bar => bar), &block
+  end
+
+  def progress(msg = nil, max = nil, &block)
+    msg = "Processing" if msg.nil?
+    bar = @step.progress_bar(msg, :max => max)
+    block.call(bar)
+  end
+
   def development?
     ENV["RACK_ENV"] == "develoment"
   end

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

@@ -27,8 +27,6 @@ module EntityRESTHelpers
       return ! accept
     rescue 
       Log.exception $!
-      iii path
-      ppp code
       return true
     end
     false

data/share/views/public/js/app.js

@@ -1,5 +1,5 @@
 function fit_content(){
- var height = window.innerHeight - $('footer').outerHeight(true);
+ var height = window.innerHeight //- $('#footer').outerHeight(true);
  var top_offset = $('#content').get()[0].offsetTop
  $('#content').css('min-height', height - top_offset - 48)
  $('#top_menu dl.rbbt_menu').css('max-height', height - 100)

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

@@ -41,6 +41,20 @@ var Entity = function(data){
   if (undefined !== args) url = add_parameter(url, "args", JSON.stringify(args))
   return rbbt.insist_request({url: url})
  }
+
+ this.highlight = function(color){
+   var id = this.code
+   var links = $('.entity[id=' + id + ']')
+   forArray(links, function(link){
+     link.prepend($('span').addClass('bullet').addClass(color))
+   })
+ }
+
+ this.get_elems = function(){
+   if (undefined === this.elems && this.elem) this.elems = $([this.elem])
+   if (undefined === this.elems) this.elems = $('.entity[data-entity-id=' + this.code +']')
+   return this.elems 
+ }
 }
 
 var FavouriteEntities = function(by_type){

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

@@ -25,6 +25,12 @@ var EntityArray = function(array){
     return(result.promise)
   }
 
+  this.highlight = function(color){
+    var entities = this.get_entities().then(function(entities){
+      if (undefined === color) color = 'green'
+      rbbt.aesthetics.apply_aes({targets: entities, aes:'color', value:color})
+    })
+  }
 
   this.property = function(name, args){
     var result = m.deferred();
@@ -40,9 +46,6 @@ var EntityArray = function(array){
     return(result.promise)
   }
 
-  this.codes = function(){
-  }
-
   this.children = function(knowledgebase, database){
     var db_key = [database, knowledgebase].join("@")
     return rbbt.knowledge_base.list_children(db_key, this)
@@ -57,6 +60,7 @@ var EntityArray = function(array){
     var db_key = [database, knowledgebase].join("@")
     return rbbt.knowledge_base.list_subset(db_key, this)
   }
+
 }
 
 var EntityList = function(data){
@@ -90,7 +94,7 @@ var EntityList = function(data){
     }
   }
 
-  this.get_entities = function(func){
+  this.get_entities = function(){
     var result = m.deferred();
 
     this.get().then(function(list_data){
@@ -103,6 +107,14 @@ var EntityList = function(data){
 
     return(result.promise)
   }
+  
+  this.get_array = function(){
+    return this.get_entities().then(function(array){ return new EntityArray(array)})
+  }
+
+  this.highlight = function(color){
+    this.get_array().then(function(array){ array.highlight(color)})
+  }
 
   this.property = function(name, args){
     var url = "/entity_list_property/" + name + "/" + this.full_type() + "/" + clean_element(this.id)
@@ -128,6 +140,7 @@ var EntityList = function(data){
    var db_key = [database, knowledgebase].join("@")
    return rbbt.knowledge_base.list_subset(db_key, this)
  }
+
 }
 
 //{{{ FAVOURITES

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

@@ -94,7 +94,7 @@ fav_module.draw_favourite_menu = function(){
  var types = Object.keys(favourites)
 
  return rbbt.mview.dropdown('Entities',
-           [m('a.item',{onclick: fav_module.highlight}, 'highlight')].concat(types.map(function(type, index){ 
+           [m('.item.buttons', [m('.ui.button',{onclick: fav_module.highlight}, 'highlight'),m('.ui.button',{onclick: fav_module.clear_highlight}, 'clear')])].concat(types.map(function(type, index){ 
              var _type = favourites[type]
              var entities = Object.keys(_type)
 
@@ -120,7 +120,7 @@ fav_module.draw_favourite_list_menu = function(){
    return rbbt.mview.dropdown(type, lists.map(function(list, index){ 
      url = _type[list].url()
      var link = m('a.item', {href: url, style: 'display: inline-block'}, _type[list].name)
-     return [m('span.bullet.green', {onclick: function(){_type[list].highlight('green'); return false}},''),link,m('br')] 
+     return [m('span.bullet.green.highlight', {onclick: function(){_type[list].highlight('green'); return false}},''),link,m('br')] 
    }))
  })
 
@@ -250,14 +250,21 @@ fav_module.update_map_selects= function(){
 }
 
 fav_module.highlight = function(){
- var targets = []
+ var all_targets = []
+
  for (type in fav_module.entities.types()){
   var _type = fav_module.entities.types()[type]
+  console.log(_type)
   var n = Object.keys(_type)
-  var nt = n.map(function(e){ return _type[e].id})
-  targets = targets.concat(nt)
+  var targets = n.map(function(e){ return _type[e]})
+  all_targets = all_targets.concat(targets)
  }
- rbbt.aesthetics.apply_aesthetic({selector: targets, aes: 'color', value: 'gold'})
+
+ rbbt.aesthetics.apply_aes({targets: all_targets, aes: 'color', value: 'gold'})
+}
+
+fav_module.clear_highlight = function(){
+ rbbt.aesthetics.apply_aes({selector: '.entity', aes: 'color', value: 'remove'})
 }
 
 fav_module.new_list = function(type){

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

@@ -199,6 +199,24 @@ aes_module.add = function(rule){
   aes_module.store()
 }
 
+aes_module.apply_aes = function(info){ 
+  var elems = info.elems;
+
+  if (undefined === elems && info.targets){
+    elems = []
+    forArray(info.targets, function(target){ elems = $.merge(elems, target.get_elems()) })
+    elems = $(elems)
+  }
+
+  if (undefined === elems && info.selector){
+    elems = $(info.selector)
+  }
+
+  if (info.value == 'remove') elems.css(info.aes, '')
+  else elems.css(info.aes, info.value)
+}
+
 aes_module.apply = function(){ }
 
+
 aes_module.load()