rbbt-rest 1.8.37 → 1.8.38

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 907a1b31052e9688f8af570b771d662e913daecf
-  data.tar.gz: 781280a50c9eebc1aed87a656d3378747b066dfe
+  metadata.gz: df38cca124c115de7e9f144b2c1234e7138c8501
+  data.tar.gz: fe6002b363933c90433912c7c4c943742faf4236
 SHA512:
-  metadata.gz: b95d87d47c5ab47d68dc4d42a1e42f164e14074902545609d1df32374495392f354622b06e84a06bb2a2d1138ce0514c56cf361b85ef5b5570e60d2fc8b2cb7e
-  data.tar.gz: a532c5ac019c414a5851457af736347142e0f0bbb42781b64401ee48024be11063ef6a51c9755da5145e4b5d40f0cf9e72c6bbd9187a055b976d135f4fbcca3d
+  metadata.gz: 2fb51ca64c49a4845d9eb795a748bb52604b18f749c4132c50359ef2cbd12bd5367131279d3b72b576221f7c2898b80fd6abf5061886997668ce410220df1e78
+  data.tar.gz: a214ff4effdb4bb8c8d4521f9bc950b0a97353beb291dc4bc06cb8fc8c2f5d16c74ef425aece9a2c2d743a01b10b1c1cf8cc2f2de80c3d9c5c5ac814846f0750

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

@@ -323,23 +323,31 @@ module RbbtRESTHelpers
     @table_filters[field] = type
   end
 
-  def self.save_tsv(tsv, path)
-    Open.write(path, tsv.to_s)
-    table_options = {:tsv_entity_options => tsv.entity_options}
-    if tsv.entity_templates and tsv.entity_templates.any?
-      table_options[:headers] ||= {}
-      tsv.entity_templates.each do |field,template|
-        next if template.nil?
-        next if table_options[:headers].include? field
-        info = template.info
-        info.delete :format
-        info.delete :annotation_types
-        info.delete :annotated_array
-        table_options[:headers][field] = [template.annotation_types.last.to_s, info]
-      end
-    end
-    Open.write(path + '.table_options', table_options.to_yaml )
-  end
+  #def self.save_tsv(tsv, path)
+  #  iii :SAVE
+  #  Open.write(path, tsv.to_s)
+  #  table_options = {:tsv_entity_options => tsv.entity_options, :tsv_entity_templates => tsv.entity_templates}
+  #  iii table_options
+  #  if tsv.entity_templates and tsv.entity_templates.any?
+  #    table_options[:headers] ||= {}
+  #    tsv.entity_templates.each do |field,template|
+  #      next if template.nil?
+  #      next if table_options[:headers].include? field
+  #      info = template.info
+  #      info.delete :format
+  #      info.delete :annotation_types
+  #      info.delete :annotated_array
+  #      table_options[:headers][field] = [template.annotation_types.last.to_s, info]
+  #    end
+  #  end
+  #  Open.write(path + '.table_options', table_options.to_yaml )
+  #end
+  #
+  #def save_tsv(file)
+  #  RbbtRESTHelpers.save_tsv(file)
+  #end
+
+
 
   def self.load_tsv(file)
     tsv = TSV.open(Open.open(file))
@@ -352,11 +360,6 @@ module RbbtRESTHelpers
     [tsv, table_options]
   end
 
-  def save_tsv(file)
-    RbbtRESTHelpers.save_tsv(file)
-  end
-
-
   def load_tsv(file)
     RbbtRESTHelpers.load_tsv(file)
   end

data/share/views/partials/table/column.haml

@@ -1,12 +1,21 @@
 - table_columns_id = "rbbt_table_columns_" << (rand * 1000).to_i.to_s
+- entity_headers = {} unless defined?(entity_headers) and entity_headers
 = reveal :column, table_columns_id, :class => 'ui compact button table_column' do
   %ul.table_column_selector.clean_list
     - if header
-      - header.each do |field|
+      - header.each_with_index do |field,i|
         %li.ui.basic.segment
           %span.field= field
           %a.save_column_map.ui.compact.button(href="#") save map
-          - if Entity.formats.include? field and Entity.formats[field].include? Entity::REST 
+          - entity_type, options = entity_headers[field]  || entity_headers[i]
+          - entity_type ||= Entity.formats.include?(field) && Entity.formats[field]
+          - begin
+            - entity_type = Entity.formats[entity_type] if String === entity_type and Entity.formats.include? entity_type
+            - entity_type = Kernel.const_get(entity_type) if String === entity_type
+          - rescue
+            - Log.exception $! 
+            - entity_type = nil
+          - if entity_type and  entity_type.include? Entity::REST 
             %a.save_column_list.ui.compact.button(href="#") save list
     - else
       NO column selection

data/share/views/partials/table.haml

@@ -1,6 +1,6 @@
 - table_options = {} unless defined? table_options and table_options
 - entity_options = table_options[:tsv_entity_options] unless defined? entity_options and entity_options
-- headers     = table_options[:headers]
+- entity_headers = table_options[:headers] unless defined? entity_headers and entity_headers
 - table_id    = table_options[:table_id]  unless defined? table_id and table_id
 - caption     = table_options[:caption]  unless defined? caption and caption
 - table_class = table_options[:table_class]  unless defined? table_class and table_class
@@ -74,7 +74,7 @@
 
               = partial_render('partials/table/filters', :table_url => table_url, :header => header, :id => "rbbt_reveal_" << Misc.digest(table_url)) 
                 
-              = partial_render('partials/table/column', :table_url => table_url, :header => header) 
+              = partial_render('partials/table/column', :table_url => table_url, :header => header, :entity_headers => entity_headers) 
 
               = partial_render('partials/table/files', :table_url => table_url) 
               

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbbt-rest
 version: !ruby/object:Gem::Version
-  version: 1.8.37
+  version: 1.8.38
 platform: ruby
 authors:
 - Miguel Vazquez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-28 00:00:00.000000000 Z
+date: 2016-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake