rbbt-rest 1.8.1 → 1.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e5a15e2401428dad996aad8a55691eafbdb1072e
-  data.tar.gz: ab4a0ab01e3f193522dfb07780e2a753eb346c71
+  metadata.gz: 9db115f33017c66595437648ad05997d452733a6
+  data.tar.gz: abda02054f71c7d38d6024524d755bcc2fb1dff6
 SHA512:
-  metadata.gz: 956ef3ffb42a95aa91fe3d04afcc1c2f1759c98fb17008669889ce254fd9476e9aa8cc1d4b44a8cdd08ff736208f3b06532b22f36ec1ac52750b9e05f18e6a21
-  data.tar.gz: 5243450b240ae44c7b24f53c79f4527acaa014a8e88000402cbbba5daac5462dccb4ceb20c83e5ab202c9d9594d67ceca0904717938263b3e67b71f90779e810
+  metadata.gz: ea5dbd2c6b35d1de6975818ac8916a2ea7430680ad5a17bf73be7b5d01c5b3136360a2ff138654593a7cefe97d51120fa1b87972265f8bb7d7b7cfdb3331546d
+  data.tar.gz: 15a3cbed98f5c0b531df9aa0b56936c644dca35b17676bb88bab6f0ea61ef8b4e8b7838c551f78f674ac25e2aa8d5d4a44d77c592dc91143d9c2fdfae555b02b

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

@@ -290,13 +290,16 @@ module RbbtRESTHelpers
       value = value[0..99]
     end
 
-    res = if options[:span]
+    res = case options[:span]
+          when true, "true", :true
             Array === value ? value.collect{|v| "<span class='table_value'>#{v.to_s}</span>"} * ", " : "<span class='table_value'>#{value}</span>"
+          when :long, "long"
+            Array === value ? value.collect{|v| "<span class='table_value long'>#{v.to_s}</span>"} * " " : "<span class='table_value long'>#{value}</span>"
           else
             Array === value ? value.collect{|v| v.to_s} * ", " : value
           end
 
-    res = "<span class='table_value strip'>[#{ strip } entries, 100 shown]</span>" + res if strip
+    res = "<span class='table_value strip'>[#{ strip } entries, 100 shown]</span> " + res if strip
 
     res
   end
@@ -317,6 +320,7 @@ module RbbtRESTHelpers
     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

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

@@ -1,7 +1,8 @@
 class ListContainer
-  attr_accessor :lists
-  def initialize
+  attr_accessor :lists, :block
+  def initialize(&block)
     @lists = []
+    @block = block
   end
 
   def add(list_id, list = nil, text = nil, options = {}, &block)

data/share/views/compass/app.sass

@@ -50,3 +50,13 @@ table > caption
 
 .filters + p
   margin-top: 2em
+
+.table_value
+  white-space: nowrap
+  &.strip
+    font-weight: bold
+  &.long
+    overflow: hidden
+    text-overflow: ellipsis
+    float: left
+    clear: left

data/share/views/entity_partials/list_container.haml

@@ -1,51 +1,54 @@
 .entity_list.ui.styled.accordion
-  - container.lists.each do |id, list, text, options|
-    - if Proc === list
-      = fragment do
-        - list = list.call
-        - next if list.nil?
-        .title
-          = list.respond_to?(:list_link) ? list.list_link(:length, id) : list.length
-          %span.title
-            - title = text || id 
-            = title.sub('--', '—').sub('->', '⇨')
-        .content 
-          - if (defined? force and force) or list.length < 500
-            - if list.respond_to? :link
-              = list.link * ", "
-            - else
-              = list * ", "
-          - else
-            = modal_fragment "Too many entities to list" do
+  = fragment do
+    - if container.block
+      - container.block.call(container)
+    - container.lists.each do |id, list, text, options|
+      - if Proc === list
+        = fragment do
+          - list = list.call
+          - next if list.nil?
+          .title
+            = list.respond_to?(:list_link) ? list.list_link(:length, id) : list.length
+            %span.title
+              - title = text || id 
+              = title.sub('--', '&#8212;').sub('->', '&#8680;')
+          .content 
+            - if (defined? force and force) or list.length < 500
               - if list.respond_to? :link
                 = list.link * ", "
               - else
                 = list * ", "
-    - else
-      - if list.empty?
-        .title
-          = 0
-          %span.title
-            - title = text || id 
-            = title.sub('--', '&#8212;').sub('->', '&#8680;')
-      - else
-        .title
-          = list.respond_to?(:list_link) ? list.list_link(:length, id) : list.length
-          %span.title
-            - title = text || id 
-            = title.sub('--', '&#8212;').sub('->', '&#8680;')
-        .content
-          - if (defined? force and force) or list.length < 500
-            - if list.respond_to? :link
-              = list.link * ", "
             - else
-              = list * ", "
-          - else
-            = reveal "Too many entities to list" do
-              = fragment do
+              = modal_fragment "Too many entities to list" do
                 - if list.respond_to? :link
                   = list.link * ", "
                 - else
                   = list * ", "
+      - else
+        - if list.empty?
+          .title
+            = 0
+            %span.title
+              - title = text || id 
+              = title.sub('--', '&#8212;').sub('->', '&#8680;')
+        - else
+          .title
+            = list.respond_to?(:list_link) ? list.list_link(:length, id) : list.length
+            %span.title
+              - title = text || id 
+              = title.sub('--', '&#8212;').sub('->', '&#8680;')
+          .content
+            - if (defined? force and force) or list.length < 500
+              - if list.respond_to? :link
+                = list.link * ", "
+              - else
+                = list * ", "
+            - else
+              = reveal "Too many entities to list" do
+                = fragment do
+                  - if list.respond_to? :link
+                    = list.link * ", "
+                  - else
+                    = list * ", "
 
 

data/share/views/job_result/job_control.haml

@@ -2,9 +2,9 @@
   %dt.ui.header Job control
   %dd.job_control
     .ui.buttons
-      %a.ui.small.button(href="/#{[workflow.to_s, task, jobname] * "/"}?_update=clean") clean
-      %a.ui.small.button(href="/#{[workflow.to_s, task, jobname, "info"] * "/"}") info
-      %a.ui.small.button(href="/#{[workflow.to_s, task, jobname] * "/"}?_format=raw") raw
+      %a.ui.small.button(href="/#{[workflow.to_s, task, jobname] * "/"}?_update=clean") clean job
+      %a.ui.small.button(href="/#{[workflow.to_s, task, jobname, "info"] * "/"}") job info
+      %a.ui.small.button(href="/#{[workflow.to_s, task, jobname] * "/"}?_format=raw") get raw result file
 
   - files = job.files - ["html", "html.info"]
   - if files.any?

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

@@ -27,7 +27,7 @@ function contract_ellipsis(elem, max){
       elem.text(new_content);
     }else{
       var links = [];
-      var head = elements.slice(0, max);
+      var head = elements.slice(0, max).removeClass('long');
       head.each(function(){ links.push(this.outerHTML)})
       new_content = links.join(", ");
       elem.html(new_content);

metadata

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