rbbt-rest 1.8.44 → 1.8.45

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 60976796315c49b16fb12420e4dd05e3172431af
-  data.tar.gz: 515901d61eb491544dc75c863fe1b72ac0e3bdff
+  metadata.gz: 40e90eddb36c53c25372a680f163a3a1e7c06b09
+  data.tar.gz: 809f9e0ee244cad3c4afff02bfde90ce21e313a0
 SHA512:
-  metadata.gz: 7d2d29a01a654bc06241b2df611b7df3b26a788e5925dda59436c88676e1983d81c7c1a756fe499868310541bf5c6f243eb66938ade86601662ff9aa9b49caae
-  data.tar.gz: 57a34fe10f44f56ef698bfd2b276d136f43d80fe4cc2d7531febd3318bd8d0f7c98bfb571a95008935e0ca7fac90ebe47eb658f52724f48b00b01b2bd12bbacf
+  metadata.gz: df5b716ef38910f33193ca6f719a03dbad2ab054b3d2d3c5c03f03b5539f06f6f12ae089c89c04f2fcdbee0e01dcc0f7fa567425900420b4eb3b1063a2a3eabd
+  data.tar.gz: e59d885e8cabc4b0f9a231a16bfd794e057d586c2ec8a778960cac69b54a59dea0e209bcbe84ee5210b604e04be7523b6cce969dff1d62f75744523b4e875fbd

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

@@ -92,6 +92,7 @@ module RbbtRESTHelpers
         step.fork
         step.soft_grace
       end
+      step.set_info :template_file, params[:_template_file]
     end
 
     # Return fragment
@@ -113,8 +114,9 @@ module RbbtRESTHelpers
           content_type "application/json" 
           halt 200, list.compact.to_json
         when "entities"
-          orig_tsv = load_tsv(fragment_file).first
-          tsv = tsv_process(orig_tsv)
+          raw_tsv, tsv_options = load_tsv(fragment_file)
+          tsv = tsv_process(raw_tsv)
+
           list = tsv.values.flatten
           tsv.prepare_entity(list, tsv.fields.first, tsv.entity_options)
           type = list.annotation_types.last
@@ -126,9 +128,20 @@ module RbbtRESTHelpers
           url = url + '?_layout=false' unless @layout
           redirect to(url)
         when "map"
-          tsv = tsv_process(load_tsv(fragment_file).first)
-          type = tsv.keys.annotation_types.last
+          raw_tsv, tsv_options = load_tsv(fragment_file)
+          raw_tsv.unnamed = true
+          Log.tsv raw_tsv
+          tsv = tsv_process(raw_tsv)
+
+          field = tsv.key_field
           column = tsv.fields.first
+
+          if tsv.entity_templates[field] 
+            type = tsv.entity_templates[field].annotation_types.first
+          else
+            type = [Entity.formats[field]].compact.first || field
+          end
+
           map_id = "Map #{type}-#{column} in #{ @fragment }"
           map_id << " (#{ @filter.gsub(';','|') })" if @filter
           Entity::Map.save_map(type.to_s, column, map_id, tsv, user)
@@ -137,7 +150,7 @@ module RbbtRESTHelpers
           redirect to(url)
         when "excel"
           require 'rbbt/tsv/excel'
-          tsv = load_tsv(fragment_file).first
+          tsv, tsv_options = load_tsv(fragment_file)
           content_type "text/html"
           data = nil
           excel_file = TmpFile.tmp_file

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

@@ -1,7 +1,9 @@
+
+class TemplateMissing < StandardError; end
+
 module RbbtRESTHelpers
   attr_accessor :template_resources, :sass_resources, :javascript_resources, :plugin_resources
 
-  class TemplateMissing < StandardError; end
 
   #{{{ Common
 
@@ -20,6 +22,18 @@ module RbbtRESTHelpers
     return path.find if path.exists?
   end
 
+  def glob_all_server_files(file, resources)
+    path = Path.setup(file)
+    add_search_paths(path, resources)
+    path.glob_all
+  end
+
+  def find_all_server_files(file, resource)
+    path = Path.setup(file)
+    add_search_paths(path, resources)
+    path.find_all
+  end
+
   #{{{ TEMPLATE
   
   def self.template_resources
@@ -53,18 +67,13 @@ module RbbtRESTHelpers
   end
 
   def find_all(file)
-    path = Path.setup(file)
-    add_search_paths(path, file_resources)
-    path.find_all
+    find_all_server_files(file, file_resources)
   end
 
   def glob_all(file)
-    path = Path.setup(file)
-    add_search_paths(path, file_resources)
-    path.glob_all
+    glob_all_server_files(file, file_resources)
   end
 
-
   #{{{ SASS
   
   def self.add_sass_load_path(path)

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

@@ -0,0 +1,43 @@
+
+module RbbtRESTHelpers
+  class Tabs
+    attr_accessor :headers, :codes, :content, :classes, :tab_classes
+    def initialize(page)
+      @page = page
+    end
+
+    def add(header = nil, code = nil, &block)
+      
+      @headers ||= []
+      @codes ||= {}
+      @content ||= {}
+
+      if block_given? 
+        html = @page.capture_haml &block
+      else
+        html = nil
+      end
+
+      @headers << header
+      @codes[header] = code.to_s if code
+      @content[header] = html
+    end
+
+    def active(header=nil)
+      @active ||= header.nil? ? false : header 
+    end
+  end
+  
+  def tabs(&block)
+    tab = Tabs.new(self)
+    block.call(tab)
+
+    tab.headers.each do |header|
+      code = tab.codes[header] || Misc.digest(header)
+      content = tab.content[header]
+    end
+
+    partial_render('partials/tabs', :headers => tab.headers, :codes => tab.codes, :content => tab.content, :active => tab.active)
+  end
+
+end

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

@@ -1,3 +1,4 @@
+require 'rbbt/util/misc/annotated_module'
 
 module EntityRESTHelpers
 
@@ -28,7 +29,7 @@ module EntityRESTHelpers
 
   def action_parameters(values = nil, action_options = {}, form_options = {}, &block)
     o = Object.new
-    o.extend AnnotatedModule
+    o.extend InputModule
 
     if values.nil?
       values = @clean_params
@@ -38,7 +39,7 @@ module EntityRESTHelpers
 
     o.instance_eval &block
 
-    description = o.description
+    #description = o.description
 
     inputs = o.inputs || []
     input_types = o.input_types
@@ -60,7 +61,7 @@ module EntityRESTHelpers
     locals[:action] = @ajax_url
     locals[:klass] = 'action_parameter_form'
     locals[:info] = info
-    locals[:description] = description
+    #locals[:description] = description
     locals[:method] = 'GET'
     locals = locals.merge(form_options)
 

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

@@ -7,10 +7,16 @@ module EntityRESTHelpers
   def entity_resources
     [Rbbt.share.views.find(:lib)] +  EntityRESTHelpers.entity_resources
   end
+
+  def resources_for_entity(entity)
+    resources = entity_resources
+    resources.unshift entity.dir.www.views if entity.respond_to? :dir and Path === entity.dir
+    resources
+  end
  
   #{{{ CHECKS
 
-  def reject_template(path,binding)
+  def reject_template(path, binding)
     check_file = path.sub(/\.haml$/, '.check')
 
     if Path === path
@@ -34,114 +40,137 @@ module EntityRESTHelpers
 
   #{{{ ENTITY
 
-  def locate_entity_template_from_resource(resource, entity)
-    if entity == "Default" 
-      path = resource.entity["Default.haml"]
-      if path.exists?
-        return path
-      else
-        return nil
-      end
-    end
+  #def locate_entity_template_from_resource(resource, entity)
+  #  if entity == "Default" 
+  #    path = resource.entity["Default.haml"]
+  #    if path.exists?
+  #      return path
+  #    else
+  #      return nil
+  #    end
+  #  end
 
-    entity.annotation_types.each do |annotation|
-      path = resource.entity[annotation.to_s + ".haml"]
-      return path if path.exists?
-    end
+  #  entity.annotation_types.each do |annotation|
+  #    path = resource.entity[annotation.to_s + ".haml"]
+  #    return path if path.exists?
+  #  end
 
-    nil
-  end   
+  #  nil
+  #end   
 
-  def locate_entity_template(entity)
+  #def locate_entity_template(entity)
 
-    if entity.respond_to? :dir and Path === entity.dir
-      entity_views = entity.dir.www.views
+  #  if entity.respond_to? :dir and Path === entity.dir
+  #    entity_views = entity.dir.www.views
 
-      entity.annotation_types.each do |annotation|
-        path = entity_views.entity[annotation.to_s + ".haml"]
-        return path if path.exists?
-      end
-    end
+  #    entity.annotation_types.each do |annotation|
+  #      path = entity_views.entity[annotation.to_s + ".haml"]
+  #      return path if path.exists?
+  #    end
+  #  end
 
-    entity_resources.each do |resource|
-      path = locate_entity_template_from_resource(resource, entity)
-      return path if path and path.exists?
-    end
+  #  entity_resources.each do |resource|
+  #    path = locate_entity_template_from_resource(resource, entity)
+  #    return path if path and path.exists?
+  #  end
 
-    entity_resources.each do |resource|
-      path = locate_entity_template_from_resource(resource, "Default")
-      return path if path and path.exists?
-    end
+  #  entity_resources.each do |resource|
+  #    path = locate_entity_template_from_resource(resource, "Default")
+  #    return path if path and path.exists?
+  #  end
 
-    raise "Template not found for entity: #{ entity } (#{entity.annotation_types * ", "})"
-  end
+  #  raise "Template not found for entity: #{ entity } (#{entity.annotation_types * ", "})"
+  #end
 
-  #{{{ ENTITY ACTION
+ 
+  def locate_entity_template(entity)
+    resources = resources_for_entity(entity)
 
-  def locate_entity_action_template_from_resource(resource, entity, action)
-    if entity == "Default" 
-      path = resource.entity["Default"][action.to_s + ".haml"]
-      raise "This action was rejected: #{ action }" if path and reject_template(path,binding)
-      if path.exists?
-        return path
-      else
-        return nil
-      end
-    end
+    types = entity.annotation_types.collect{|e| e.to_s}
+    types << "Default"
 
-    entity.annotation_types.each do |annotation|
-      path = resource.entity[annotation][action.to_s + ".haml"]
-      raise "This action was rejected: #{ action }" if path and reject_template(path,binding)
-      return path if path.exists?
+    path = nil
+    types.each do |type|
+      path ||= locate_server_file(["entity", type]*"/", resources, 'haml')
     end
 
-    nil
-  end   
+    raise TemplateMissing, "Template not found for entity: #{ entity } (#{entity.annotation_types * ", "})" if path.nil?
 
-  def locate_entity_action_template(entity, action)
+    path
+  end
 
-    if entity.respond_to? :dir and Path === entity.dir
-      path = locate_entity_action_template_from_resource(entity.dir.www.views, entity, action)
-      return path if path and path.exists?
-    end
 
-    entity_resources.each do |resource|
-      path = locate_entity_action_template_from_resource(resource, entity, action)
-      return path if path and path.exists?
-    end
+  #{{{ ENTITY ACTION
+
+  #def locate_entity_action_template_from_resource(resource, entity, action)
+  #  if entity == "Default" 
+  #    path = resource.entity["Default"][action.to_s + ".haml"]
+  #    raise "This action was rejected: #{ action }" if path and reject_template(path,binding)
+  #    if path.exists?
+  #      return path
+  #    else
+  #      return nil
+  #    end
+  #  end
+
+  #  entity.annotation_types.each do |annotation|
+  #    path = resource.entity[annotation][action.to_s + ".haml"]
+  #    raise "This action was rejected: #{ action }" if path and reject_template(path,binding)
+  #    return path if path.exists?
+  #  end
+
+  #  nil
+  #end   
+
+  #def locate_entity_action_template(entity, action)
+
+  #  if entity.respond_to? :dir and Path === entity.dir
+  #    path = locate_entity_action_template_from_resource(entity.dir.www.views, entity, action)
+  #    return path if path and path.exists?
+  #  end
+
+  #  entity_resources.each do |resource|
+  #    path = locate_entity_action_template_from_resource(resource, entity, action)
+  #    return path if path and path.exists?
+  #  end
+
+  #  entity_resources.each do |resource|
+  #    path = locate_entity_action_template_from_resource(resource, "Default", action)
+  #    raise "This action was rejected: #{ action }" if reject_template(path,binding)
+  #    return path if path and path.exists?
+  #  end
+
+  #  raise "Template not found for action #{action}: #{ entity } (#{entity.annotation_types * ", "})"
+  #end
 
-    entity_resources.each do |resource|
-      path = locate_entity_action_template_from_resource(resource, "Default", action)
+  def locate_entity_action_template(entity, action)
+    resources = resources_for_entity(entity)
+
+    types = entity.annotation_types.collect{|e| e.to_s}
+    types << "Default"
+
+    path = nil
+    types.each do |type|
+      next if path
+      path = locate_server_file(["entity", type, action]*"/", resources, 'haml')
       raise "This action was rejected: #{ action }" if reject_template(path,binding)
-      return path if path and path.exists?
     end
 
-    raise "Template not found for action #{action}: #{ entity } (#{entity.annotation_types * ", "})"
-  end
+    raise TemplateMissing, "Template not found for entity action #{action}: #{ entity } (#{entity.annotation_types * ", "})" if path.nil?
 
-  def find_all_entity_action_templates_from_resource(resource, entity)
-    if entity == "Default" 
-      resource.entity["Default"].glob("*.haml").sort
-    else
-      entity.annotation_types.collect do |annotation|
-        resource.entity[annotation].glob('*.haml')
-      end.compact.flatten.sort
-    end
-  end   
+    path
+  end
 
   def find_all_entity_action_templates(entity, check = false)
-    paths = []
+    resources = resources_for_entity(entity)
 
-    if entity.respond_to? :dir and Path === entity.dir
-      paths.concat find_all_entity_action_templates_from_resource(entity.dir.www.views, entity)
-    end
+    types = entity.annotation_types.collect{|e| e.to_s}
+    types << "Default"
 
-    entity_resources.each do |resource|
-      paths.concat find_all_entity_action_templates_from_resource(resource, entity)
-    end
-
-    entity_resources.each do |resource|
-      paths.concat find_all_entity_action_templates_from_resource(resource, "Default")
+    paths = types.inject([]) do |acc,type|
+      acc += glob_all_server_files(["entity", type, "*.haml"]*"/", resources).reject{|path|
+        reject_template(path,binding)
+      }
     end
 
     if check
@@ -162,118 +191,228 @@ module EntityRESTHelpers
     
     actions
   end
+
+  #def find_all_entity_action_templates_from_resource(resource, entity)
+  #  if entity == "Default" 
+  #    resource.entity["Default"].glob("*.haml").sort
+  #  else
+  #    entity.annotation_types.collect do |annotation|
+  #      resource.entity[annotation].glob('*.haml')
+  #    end.compact.flatten.sort
+  #  end
+  #end   
+
+  #def find_all_entity_action_templates(entity, check = false)
+  #  paths = []
+
+  #  if entity.respond_to? :dir and Path === entity.dir
+  #    paths.concat find_all_entity_action_templates_from_resource(entity.dir.www.views, entity)
+  #  end
+
+  #  entity_resources.each do |resource|
+  #    paths.concat find_all_entity_action_templates_from_resource(resource, entity)
+  #  end
+
+  #  entity_resources.each do |resource|
+  #    paths.concat find_all_entity_action_templates_from_resource(resource, "Default")
+  #  end
+
+  #  if check
+  #    paths = paths.reject do |path|
+  #      (path.basename == "edit.haml" or path.basename == 'new.haml') 
+  #    end
+  #  end
+
+  #  actions = paths.collect{|file| file.basename.sub('.haml', '') }.uniq
+
+  #  actions.select! do |action|
+  #    begin
+  #      locate_entity_action_template(entity, action)
+  #    rescue Exception
+  #      false
+  #    end
+  #  end if check
+  #  
+  #  actions
+  #end
   #{{{ ENTITY LIST
 
-  def locate_entity_list_template_from_resource(resource, list)
-    if list == "Default" 
-      path = resource.entity_list["Default.haml"]
-      if path.exists?
-        return path
-      else
-        return nil
-      end
-    end
+  #def locate_entity_list_template_from_resource(resource, list)
+  #  if list == "Default" 
+  #    path = resource.entity_list["Default.haml"]
+  #    if path.exists?
+  #      return path
+  #    else
+  #      return nil
+  #    end
+  #  end
 
-    list.annotation_types.each do |annotation|
-      path = resource.entity_list[annotation.to_s + ".haml"]
-      return path if path.exists?
-    end
+  #  list.annotation_types.each do |annotation|
+  #    path = resource.entity_list[annotation.to_s + ".haml"]
+  #    return path if path.exists?
+  #  end
 
-    nil
-  end   
+  #  nil
+  #end   
 
-  def locate_entity_list_template(list)
+  #def locate_entity_list_template(list)
 
-    if list.respond_to? :dir and Path === list.dir
-      list_views = list.dir.www.views
+  #  if list.respond_to? :dir and Path === list.dir
+  #    list_views = list.dir.www.views
 
-      list.annotation_types.each do |annotation|
-        path = list_views.entity_list[annotation.to_s + ".haml"]
-        return path if path.exists?
-      end
-    end
+  #    list.annotation_types.each do |annotation|
+  #      path = list_views.entity_list[annotation.to_s + ".haml"]
+  #      return path if path.exists?
+  #    end
+  #  end
 
-    entity_resources.each do |resource|
-      path = locate_entity_list_template_from_resource(resource, list)
-      return path if path and path.exists?
-    end
+  #  entity_resources.each do |resource|
+  #    path = locate_entity_list_template_from_resource(resource, list)
+  #    return path if path and path.exists?
+  #  end
+
+  #  entity_resources.each do |resource|
+  #    path = locate_entity_list_template_from_resource(resource, "Default")
+  #    return path if path and path.exists?
+  #  end
+
+  #  raise "Template not found for list (#{list.annotation_types * ", "})"
+  #end
+
+  def locate_entity_list_template(list)
+    resources = resources_for_entity(list)
 
-    entity_resources.each do |resource|
-      path = locate_entity_list_template_from_resource(resource, "Default")
-      return path if path and path.exists?
+    types = list.annotation_types.collect{|e| e.to_s}
+    types << "Default"
+
+    path = nil
+    types.each do |type|
+      path ||= locate_server_file(["entity_list", type]*"/", resources, 'haml')
     end
 
-    raise "Template not found for list (#{list.annotation_types * ", "})"
+    raise TemplateMissing, "Template not found for list (#{list.annotation_types * ", "})" if path.nil?
+
+    path
   end
 
 
+
   #{{{ ENTITY LIST ACTION
  
  
-  def locate_entity_list_action_template_from_resource(resource, list, action)
-    if list == "Default" 
-      path = resource.entity_list["Default"][action.to_s + ".haml"]
-      raise "This action was rejected: #{ action }" if path and reject_template(path,binding)
-      if path.exists?
-        return path
-      else
-        return nil
-      end
-    end
-
-    list.annotation_types.each do |annotation|
-      path = resource.entity_list[annotation][action.to_s + ".haml"]
-      raise "This action was rejected: #{ action }" if path and reject_template(path,binding)
-      return path if path.exists?
-    end
-
-    nil
-  end   
+  #def locate_entity_list_action_template_from_resource(resource, list, action)
+  #  if list == "Default" 
+  #    path = resource.entity_list["Default"][action.to_s + ".haml"]
+  #    raise "This action was rejected: #{ action }" if path and reject_template(path,binding)
+  #    if path.exists?
+  #      return path
+  #    else
+  #      return nil
+  #    end
+  #  end
+
+  #  list.annotation_types.each do |annotation|
+  #    path = resource.entity_list[annotation][action.to_s + ".haml"]
+  #    raise "This action was rejected: #{ action }" if path and reject_template(path,binding)
+  #    return path if path.exists?
+  #  end
+
+  #  nil
+  #end   
+
+  #def locate_entity_list_action_template(list, action)
+
+  #  if list.respond_to? :dir and Path === list.dir
+  #    path = locate_entity_list_action_template_from_resource(list.dir.www.views, list, action)
+  #    return path if path and path.exists?
+  #  end
+
+  #  entity_resources.each do |resource|
+  #    path = locate_entity_list_action_template_from_resource(resource, list, action)
+  #    return path if path and path.exists?
+  #  end
+
+  #  entity_resources.each do |resource|
+  #    path = locate_entity_list_action_template_from_resource(resource, "Default", action)
+  #    return path if path and path.exists?
+  #  end
+
+  #  raise "Template not found for list #{ action } (#{list.annotation_types * ", "})"
+  #end
+
+  #def find_all_entity_list_action_templates_from_resource(resource, entity)
+
+  #  if entity == "Default" 
+  #    resource.entity_list["Default"].glob("*.haml").sort
+  #  else
+  #    entity.annotation_types.collect do |annotation|
+  #      resource.entity_list[annotation].glob('*.haml')
+  #    end.compact.flatten.sort
+  #  end
+  #end   
+
+  #def find_all_entity_list_action_templates(list, check = false)
+  #  paths = []
+
+  #  if list.respond_to? :dir and Path === list.dir
+  #    paths.concat find_all_entity_list_action_templates_from_resource(list.dir.www.views, list)
+  #  end
+
+  #  entity_resources.each do |resource|
+  #    paths.concat find_all_entity_list_action_templates_from_resource(resource, list)
+  #  end
+
+  #  entity_resources.each do |resource|
+  #    paths.concat find_all_entity_list_action_templates_from_resource(resource, "Default")
+  #  end
+
+  #  if check
+  #    paths = paths.reject do |path|
+  #      (path.basename == "edit.haml" or path.basename == 'new.haml') 
+  #    end
+  #  end
+
+  #  actions = paths.collect{|file| file.basename.sub('.haml', '') }.uniq
+
+  #  actions.select! do |action|
+  #    begin
+  #      locate_entity_list_action_template(list, action)
+  #    rescue Exception
+  #      false
+  #    end
+  #  end if check
+  #  
+  #  actions
+  #end
 
   def locate_entity_list_action_template(list, action)
+    resources = resources_for_entity(list)
 
-    if list.respond_to? :dir and Path === list.dir
-      path = locate_entity_list_action_template_from_resource(list.dir.www.views, list, action)
-      return path if path and path.exists?
-    end
+    types = list.annotation_types.collect{|e| e.to_s}
+    types << "Default"
 
-    entity_resources.each do |resource|
-      path = locate_entity_list_action_template_from_resource(resource, list, action)
-      return path if path and path.exists?
+    path = nil
+    types.each do |type|
+      next if path
+      path = locate_server_file(["entity_list", type, action]*"/", resources, 'haml')
+      raise "This action was rejected: #{ action }" if reject_template(path,binding)
     end
 
-    entity_resources.each do |resource|
-      path = locate_entity_list_action_template_from_resource(resource, "Default", action)
-      return path if path and path.exists?
-    end
+    raise TemplateMissing, "Template not found for entity list action #{action} (#{list.annotation_types * ", "})" if path.nil?
 
-    raise "Template not found for list #{ action } (#{list.annotation_types * ", "})"
+    path
   end
 
-  def find_all_entity_list_action_templates_from_resource(resource, entity)
-
-    if entity == "Default" 
-      resource.entity_list["Default"].glob("*.haml").sort
-    else
-      entity.annotation_types.collect do |annotation|
-        resource.entity_list[annotation].glob('*.haml')
-      end.compact.flatten.sort
-    end
-  end   
-
   def find_all_entity_list_action_templates(list, check = false)
-    paths = []
+    resources = resources_for_entity(list)
 
-    if list.respond_to? :dir and Path === list.dir
-      paths.concat find_all_entity_list_action_templates_from_resource(list.dir.www.views, list)
-    end
+    types = list.annotation_types.collect{|e| e.to_s}
+    types << "Default"
 
-    entity_resources.each do |resource|
-      paths.concat find_all_entity_list_action_templates_from_resource(resource, list)
-    end
-
-    entity_resources.each do |resource|
-      paths.concat find_all_entity_list_action_templates_from_resource(resource, "Default")
+    paths = types.inject([]) do |acc,type|
+      acc += glob_all_server_files(["entity_list", type, "*.haml"]*"/", resources).reject{|path|
+        reject_template(path,binding)
+      }
     end
 
     if check
@@ -297,95 +436,173 @@ module EntityRESTHelpers
 
   #{{{ ENTITY MAP
 
-  def locate_entity_map_template_from_resource(resource, type)
-    if type == "Default" 
-      path = resource.entity_map["Default.haml"]
-      if path.exists?
-        return path
-      else
-        return nil
-      end
-    end
+  #def locate_entity_map_template_from_resource(resource, type)
+  #  if type == "Default" 
+  #    path = resource.entity_map["Default.haml"]
+  #    if path.exists?
+  #      return path
+  #    else
+  #      return nil
+  #    end
+  #  end
 
-    path = resource.entity_map[type.to_s + ".haml"]
-    return path if path.exists?
+  #  path = resource.entity_map[type.to_s + ".haml"]
+  #  return path if path.exists?
 
-    nil
-  end   
+  #  nil
+  #end   
 
-  def locate_entity_map_template(type, column)
-    entity_resources.each do |resource|
-      path = locate_entity_map_template_from_resource(resource, type)
-      return path if path and path.exists?
-    end
+  #def locate_entity_map_template(type, column)
+  #  entity_resources.each do |resource|
+  #    path = locate_entity_map_template_from_resource(resource, type)
+  #    return path if path and path.exists?
+  #  end
+
+  #  entity_resources.each do |resource|
+  #    path = locate_entity_map_template_from_resource(resource, "Default")
+  #    return path if path and path.exists?
+  #  end
 
-    entity_resources.each do |resource|
-      path = locate_entity_map_template_from_resource(resource, "Default")
-      return path if path and path.exists?
+  #  raise "Template not found for list (#{type}--#{column})"
+  #end
+
+
+  def locate_entity_map_template(type, column = nil)
+    resources = entity_resources
+
+    types = [type.to_s]
+    types << "Default"
+
+    path = nil
+    types.each do |t|
+      path ||= locate_server_file(["entity_map", t]*"/", resources, 'haml')
     end
 
-    raise "Template not found for list (#{type}--#{column})"
+    raise TemplateMissing, "Template not found for map (#{type}--#{column})" if path.nil?
+
+    path
   end
 
 
   #{{{ ENTITY MAP ACTION
  
-  def locate_entity_map_action_template_from_resource(resource, map, action)
+  #def locate_entity_map_action_template_from_resource(resource, map, action)
+  #  field = map.key_field
+
+  #  if map.entity_templates[field] 
+  #    annotation_types = map.entity_templates[field].annotation_types
+  #  else
+  #    annotation_types = [Entity.formats[field]].compact
+  #  end
+
+  #  annotation_types += ["Default"]
+
+  #  annotation_types.each do |annotation|
+  #    path = resource.entity_map[annotation][action.to_s + ".haml"]
+  #    raise "This action was rejected: #{ action }" if path and reject_template(path,binding)
+  #    return path if path.exists?
+  #  end
+
+  #  nil
+  #end   
+
+  #def locate_entity_map_action_template(map, action)
+
+  #  entity_resources.each do |resource|
+  #    path = locate_entity_map_action_template_from_resource(resource, map, action)
+  #    return path if path and path.exists?
+  #  end
+
+  #  raise "Template not found for map #{ action } (#{map.key_field * ", "})"
+  #end
+
+  #def find_all_entity_map_action_templates_from_resource(resource, map)
+  #  field = map.key_field
+
+  #  if map.entity_templates[field] 
+  #    annotation_types = map.entity_templates[field].annotation_types
+  #  else
+  #    annotation_types = [Entity.formats[field]].compact
+  #  end
+
+  #  annotation_types += ["Default"]
+
+  #  annotation_types.collect do |annotation|
+  #    resource.entity_map[annotation].glob('*.haml')
+  #  end.compact.flatten
+  #end   
+
+  #def find_all_entity_map_action_templates(map, check = false)
+  #  paths = []
+
+  #  entity_resources.each do |resource|
+  #    paths.concat find_all_entity_map_action_templates_from_resource(resource, map)
+  #  end
+
+  #  if check
+  #    paths = paths.reject do |path|
+  #      (path.basename == "edit.haml" or path.basename == 'new.haml')
+  #    end
+  #  end
+
+  #  actions = paths.collect{|file| file.basename.sub('.haml', '') }.uniq
+
+  #  actions.select! do |action|
+  #    begin
+  #      locate_entity_map_action_template(map, action)
+  #    rescue Exception
+  #      false
+  #    end
+  #  end if check
+  #  
+  #  actions
+  #end
+   
+  def locate_entity_map_action_template(map, action)
+    resources = entity_resources
+
     field = map.key_field
 
     if map.entity_templates[field] 
-      annotation_types = map.entity_templates[field].annotation_types
+      types = map.entity_templates[field].annotation_types
     else
-      annotation_types = [Entity.formats[field]].compact
+      types = [Entity.formats[field]].compact
     end
+    types += ["Default"]
 
-    annotation_types += ["Default"]
-
-    annotation_types.each do |annotation|
-      path = resource.entity_map[annotation][action.to_s + ".haml"]
-      raise "This action was rejected: #{ action }" if path and reject_template(path,binding)
-      return path if path.exists?
+    path = nil
+    types.each do |type|
+      next if path
+      path = locate_server_file(["entity_map", type, action]*"/", resources, 'haml')
+      raise "This action was rejected: #{ action }" if reject_template(path, binding)
     end
 
-    nil
-  end   
+    raise TemplateMissing, "Template not found for entity map action #{action} (#{field}--#{map.fields.first})" if path.nil?
 
-  def locate_entity_map_action_template(map, action)
-
-    entity_resources.each do |resource|
-      path = locate_entity_map_action_template_from_resource(resource, map, action)
-      return path if path and path.exists?
-    end
-
-    raise "Template not found for map #{ action } (#{map.key_field * ", "})"
+    path
   end
 
-  def find_all_entity_map_action_templates_from_resource(resource, map)
+  def find_all_entity_map_action_templates(map, check = false)
+    resources = entity_resources
+
     field = map.key_field
 
     if map.entity_templates[field] 
-      annotation_types = map.entity_templates[field].annotation_types
+      types = map.entity_templates[field].annotation_types
     else
-      annotation_types = [Entity.formats[field]].compact
+      types = [Entity.formats[field]].compact
     end
+    types += ["Default"]
 
-    annotation_types += ["Default"]
-
-    annotation_types.collect do |annotation|
-      resource.entity_map[annotation].glob('*.haml')
-    end.compact.flatten
-  end   
-
-  def find_all_entity_map_action_templates(map, check = false)
-    paths = []
-
-    entity_resources.each do |resource|
-      paths.concat find_all_entity_map_action_templates_from_resource(resource, map)
+    paths = types.inject([]) do |acc,type|
+      acc += glob_all_server_files(["entity_map", type, "*.haml"]*"/", resources).reject{|path|
+        reject_template(path,binding)
+      }
     end
 
     if check
       paths = paths.reject do |path|
-        (path.basename == "edit.haml" or path.basename == 'new.haml')
+        (path.basename == "edit.haml" or path.basename == 'new.haml') 
       end
     end
 
@@ -393,7 +610,7 @@ module EntityRESTHelpers
 
     actions.select! do |action|
       begin
-        locate_entity_map_action_template(map, action)
+        locate_entity_map_action_template(list, action)
       rescue Exception
         false
       end
@@ -401,6 +618,4 @@ module EntityRESTHelpers
     
     actions
   end
-
- 
 end

data/lib/rbbt/rest/main.rb

@@ -204,7 +204,7 @@ module Sinatra
           end
         end
 
-        error RbbtRESTHelpers::TemplateMissing do |e|
+        error TemplateMissing do |e|
           halt 404, e.message
         end
 

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

@@ -9,33 +9,53 @@ module WorkflowRESTHelpers
     [Rbbt.www.views.find(:lib)] + WorkflowRESTHelpers.workflow_resources
   end
 
-  def locate_workflow_template_from_resource(resource, template, workflow = nil, task = nil)
-    template += '.haml' unless template =~ /.+\..+/
+  def locate_workflow_template(template, workflow = nil, task = nil)
+    resources = workflow_resources
+    resources.unshift workflow.libdir.www.views if workflow
 
-    paths = []
-    paths << resource[workflow][task][template] if task and workflow
-    paths << resource[workflow][template] if workflow
-    paths << resource[template]
+    paths = [template]
+    paths.unshift [workflow.to_s, template.to_s]*"/" if workflow 
+    paths.unshift [workflow.to_s, task.to_s, template.to_s]*"/" if workflow and task
 
-    paths.each do |path|
-      return path.find if path.exists?
-    end 
+    path = nil
+    paths.each do |location|
+      path ||= locate_server_file(location, resources, 'haml')
+    end
 
-    nil
-  end   
+    raise TemplateMissing, "Template not found: [#{ template }, #{workflow}, #{ task }]" if path.nil?
 
-  def locate_workflow_template(template, workflow = nil, task = nil)
+    path
+  end
 
-    if workflow
-      path = locate_workflow_template_from_resource(workflow.libdir.www.views.find, template, workflow, task)
-      return path if path and path.exists?
-    end
+  #def locate_workflow_template_from_resource(resource, template, workflow = nil, task = nil)
+  #  template += '.haml' unless template =~ /.+\..+/
+
+  #  paths = []
+  #  paths << resource[workflow][task][template] if task and workflow
+  #  paths << resource[workflow][template] if workflow
+  #  paths << resource[template]
+
+  #  paths.each do |path|
+  #    return path.find if path.exists?
+  #  end 
+
+  #  nil
+  #end   
+
+  #def locate_workflow_template(template, workflow = nil, task = nil)
+
+  #  if workflow
+  #    path = locate_workflow_template_from_resource(workflow.libdir.www.views.find, template, workflow, task)
+  #    return path if path and path.exists?
+  #  end
+
+  #  workflow_resources.each do |resource|
+  #    path = locate_workflow_template_from_resource(resource, template, workflow, task)
+  #    return path if path and path.exists?
+  #  end
+
+  #  raise "Template not found: [#{ template }, #{workflow}, #{ task }]"
+  #end
 
-    workflow_resources.each do |resource|
-      path = locate_workflow_template_from_resource(resource, template, workflow, task)
-      return path if path and path.exists?
-    end
 
-    raise "Template not found: [#{ template }, #{workflow}, #{ task }]"
-  end
 end

data/share/views/partials/tabs.haml

@@ -0,0 +1,28 @@
+
+- id = "tab_menu_"  + rand(1000).to_s unless defined? id and not id.nil?
+- iii active
+- active = false unless defined? active and not active.nil?
+- active = headers.first if TrueClass === active
+- iii active
+.ui.top.attached.tabular.stackable.menu(id=id)
+  - headers.each do |header|
+    - code = codes[header] || Misc.digest(header)
+    - tab_active = (active and active == header) ? 'active' : ''
+    .ui.item(data-tab=code class=tab_active)= header
+
+- headers.each do |header|
+  - code = codes[header] || Misc.digest(header)
+  - next if content[header].nil?
+  - tab_active = (active and active == header) ? 'active' : ''
+  .ui.tab.bottom.attached.segment.content(data-tab=code class=tab_active)
+    = content[header]
+
+:deferjs
+  $("##{id} > .item[data-tab]").tab()
+
+  $('##{id} > .item[data-tab=close]').click(function(item){
+    var tool = $(this).parents('.cytoscape_tool').first()
+    tool.find('.tab.active, .item.active').removeClass('active')
+    return false
+  })
+

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

@@ -43,6 +43,13 @@ rbbt.ajax = function(params){
     params.config = config
   }
 
+  // circunvent m.request parametrizeUrl
+
+  params.url.replace(/:[a-z]\w+/gi, function(token){
+    if (undefined === params.data) params.data = {}
+    params.data[token.slice(1)] = token
+  })
+
   req = m.request(params)
 
   return req
@@ -53,6 +60,7 @@ rbbt.insist_request = function(params, deferred, timeout, missing){
   if (undefined === timeout) timeout = 1000
   if (timeout > 20000) timeout = 20000
 
+
   params.extract = function(xhr, xhrOptions){
     if (xhr.status != '200') throw(xhr)
     return xhr.responseText.length === 0 && xhrOptions.deserialize === JSON.parse ? null : xhr.responseText

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

@@ -39,9 +39,11 @@ fav_module.toggleFavourite_entity = function(){
  var entity = rbbt.page.entity();
 
  if (fav_module.isFavourite_entity(entity)){
-  rbbt.post({url: '/remove_favourite_entity/' + entity.type + '/' + clean_element(entity.code), data: entity.info}).then(fav_module.update)
+  var url = '/remove_favourite_entity/' + entity.type + '/' + clean_element(entity.code)
+  rbbt.post({url: url, data: entity.info}).then(fav_module.update)
  }else{
-  rbbt.post({url: '/add_favourite_entity/' + entity.type + '/' + clean_element(entity.code), data: entity.info}).then(fav_module.update)
+  var url = '/add_favourite_entity/' + entity.type + '/' + clean_element(entity.code)
+  rbbt.post({url: url, data: entity.info}).then(fav_module.update)
  }
 }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbbt-rest
 version: !ruby/object:Gem::Version
-  version: 1.8.44
+  version: 1.8.45
 platform: ruby
 authors:
 - Miguel Vazquez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-09 00:00:00.000000000 Z
+date: 2017-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -166,6 +166,7 @@ files:
 - lib/rbbt/rest/common/render.rb
 - lib/rbbt/rest/common/resources.rb
 - lib/rbbt/rest/common/table.rb
+- lib/rbbt/rest/common/tabs.rb
 - lib/rbbt/rest/common/users.rb
 - lib/rbbt/rest/entity.rb
 - lib/rbbt/rest/entity/action_card.rb
@@ -258,6 +259,7 @@ files:
 - share/views/partials/table/files.haml
 - share/views/partials/table/filters.haml
 - share/views/partials/table/page.haml
+- share/views/partials/tabs.haml
 - share/views/public/cnio.png
 - share/views/public/favicon.gif
 - share/views/public/fonts/font-awesome/fontawesome-webfont.eot