rbbt-rest 1.4.2 → 1.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e8d9b16fc1e559f1ea8bcf38a58768634327f9c1
-  data.tar.gz: c7c9548194b885e097a8d2429ef0ab846939c3f8
+  metadata.gz: 8812343a2a8345c1f58516ea3564d9f7c69a242c
+  data.tar.gz: 0a82376a6d54a79d43e0dec28a621c042648ccdd
 SHA512:
-  metadata.gz: 3d108573834a36a21719721c7b7d87bef951a34f4671d01aa59aa054a8a892489c90ae3ef90537271586e84da45092175851b4ca5cdf5ad83736e006cf7bbc1b
-  data.tar.gz: 6637db025c1ce3f51b2c48974ee6dd5a2153944d3aeb85609b0d52a8610eb3e3e85a0b8dda02f9f03e9bad3d8e41159f0152aed4b36a04a56147406a93af1f29
+  metadata.gz: ea16ac1a23c93d58ca5d8c808a7b4c650022fa250e7831403203c75b8e0e25474bf19232343102e0b07a4af397a39ee9c192924f5d1b0dc3222ef869f933ad08
+  data.tar.gz: 6fb04bf125f9cdccefa1db06f0723133f60b65e8761314aaba1288e14ad9bbfd3f4441e5bfc65bd0968e9dc10a8510f952e44a3489f086197c83658013126e23

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

@@ -15,7 +15,7 @@ module RbbtRESTHelpers
 
   def cache(name, params = {}, &block)
     @cache_type ||= params[:cache_type] if params[:cache_type]
-    return yield if name.nil? or cache_type.nil? or cache_type == :none
+    return yield if name.nil? or @cache_type.nil? or @cache_type == :none
 
     send_file = consume_parameter(:_send_file, params)
 

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

@@ -77,7 +77,7 @@ module RbbtRESTHelpers
 
   def template_render(template, locals = {}, cache = nil, cache_options = {})
     template_file = locate_template(template)
-    layout_file = layout ? locate_template("layout") : nil
+    layout_file = @layout ? locate_template("layout") : nil
 
     render(template_file, locals, layout_file, cache, cache_options)
   end
@@ -149,7 +149,7 @@ module RbbtRESTHelpers
     text ||= filename
 
     filename = Misc.sanitize_filename(filename)
-    f = File.join(settings.file_dir, filename)
+    f = settings.file_dir[filename].find
     FileUtils.mkdir_p(File.dirname(f))
     yield(f)
 

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

@@ -215,9 +215,9 @@ module RbbtRESTHelpers
 
     entity_options = options[:entity_options]
 
-    Misc.prepare_entity(value, type, entity_options) if Entity.formats.include? type and not options[:unnamed]
+    Misc.prepare_entity(value, type, entity_options) if Entity.formats.include?(type) and not options[:unnamed]
 
-    value = value.link if value.respond_to? :link
+    value = value.link if value.respond_to? :link and not options[:unnamed]
 
     Array === value ? value.collect{|v| v.to_s} * ", " : value
   end

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

@@ -25,7 +25,7 @@ module Entity
         Entity.entity_list_cache[entity_type.to_s][user.to_s][id]
       end
 
-      path.exists? ? path.find : nil
+      path.find
     end
 
     def self.list_files(user = nil)
@@ -60,8 +60,7 @@ module Entity
       path = list_file(entity_type, id, :public) unless path != nil and File.exists? path
       path = list_file(entity_type, id) unless path != nil and File.exists? path
 
-      iii path
-      raise "List not found: #{ id }" if path.nil?
+      raise "List not found: #{ id }" if path.nil? or not File.exists? path
 
       begin
         list = Annotated.load_tsv TSV.open(path)

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

@@ -175,7 +175,7 @@ module Entity
       reuse = options.delete("reuse") if reuse.nil?
       reuse = true if reuse.nil?
 
-      Entity::List.save_list(entity_type.to_s, id, self) unless reuse and File.exists? Entity::List.list_file(entity_type.to_s, id, self)
+      Entity::List.save_list(entity_type.to_s, id, self) unless reuse and File.exists?(Entity::List.list_file(entity_type.to_s, id, self))
 
       klasses = self.klasses
       klasses << 'entity_list'

data/lib/rbbt/rest/knowledge_base/query.rb

@@ -1,7 +1,11 @@
 require 'rbbt/util/misc'
 require 'rbbt/knowledge_base'
+require 'rbbt/rest/knowledge_base/helpers'
 
 class KnowledgeBaseRESTQuery <  Sinatra::Application
+  include RbbtRESTHelpers
+  include KnowledgeBaseRESTHelpers
+  register Sinatra::RbbtAuth
 
   get '/knowledge_base/:name/:database/children/:entity' do 
     name = consume_parameter :name
@@ -205,6 +209,7 @@ class KnowledgeBaseRESTQuery <  Sinatra::Application
       acc
     }
 
+    @format ||= :json
     case @format
     when :tsv
       content_type "text/tab-separated-values"

data/share/views/compass/layout.sass

@@ -115,7 +115,6 @@ ul.list_comparison
 
 .wait
   ul.step_messages
-    +clean_list(false)
     li
       color: darken($color_main, 30)
       margin-bottom: 1.5em

data/share/views/compass/workflow.sass

@@ -1,5 +1,5 @@
 ul.tasks 
-  margin-top: 2em
+  margin-top: 1em
   li
     display: block !important
 
@@ -35,23 +35,30 @@ ul.tasks
       width: 5em
       float: right
   .examples
+    margin: 2em 0
     ul
       li
         +rbbt_menu_item($color_bg: $base3, $color_menu_border: $base3)
 
-dd.job_control, dd.job_files
-  +clear_fix
-  ul
-    +rbbt_button_list($color_bg: $color_menu_bg)
-    +clear_fix
-    background-color: $color_top_menu
-    width: auto
-    float: left
-    li a
+.job_control
+  +clear_fix()
+  margin: 1em 0
+  dt
+    display: none
+  //dt, dd
+    display: inline-block
+  dd.job_control, dd.job_files
+    ul
+      +rbbt_button_list($color_bg: $color_menu_bg)
+      background-color: $color_top_menu
+      width: auto
+      float: left
+      li a
 
 
 .workflow.tasks
   font-size: 1.2em
   p
     max-width: 60em
+    margin-left: 1em
 

data/share/views/form.haml

@@ -5,12 +5,12 @@
 .workflow_task(id=id)
   .title
     %h3
+      %a(href="/#{workflow.to_s}")= workflow
+      —
       =Misc.humanize task
-      .workflow_link
-        %a(href="/#{workflow.to_s}")= workflow
   .description
     - if task_info[:description]
-      .task_description
+      %p.task_description
         :markdown
           #{task_info[:description]}
 

data/share/views/job_result.haml

@@ -1,5 +1,6 @@
 - if job 
-  = workflow_partial('job_result/job_control', workflow, task, locals)
+  .job_control
+    = workflow_partial('job_result/job_control', workflow, task, locals)
 
 - case type
 - when :tsv

data/share/views/partials/table.haml

@@ -12,8 +12,13 @@
 
 - list_links  = table_options[:list_links]   unless defined? list_links and list_links
 
+- footer  = table_options[:footer]   unless defined? footer and footer
+- footer = true if footer.nil?
+
 - page = @page unless defined? page and not page.nil?
 
+- unnamed = table_options[:unnamed]
+
 %table(id="#{Misc.snake_case(table_id)}" class=table_class attr-url=table_url attr-total_size=total_size attr-page=page)
 
   - if table_id
@@ -41,28 +46,29 @@
         - row.each_with_index do |value, i|
           - 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 => table_options[:unnamed], :entity_options => entity_options)
+          - val = table_value(value, field, :list_id => list_id, :unnamed => unnamed, :entity_options => entity_options)
           %td= Float === val ? "%.5g" % val : val.to_s
 
 
   -#{{{ TFOOT
-  %tfoot
-    %tr
-      %th(colspan="#{header ? header.length : 100}")
+  - if footer
+    %tfoot
+      %tr
+        %th(colspan="#{header ? header.length : 100}")
 
-        - if page
-          = partial_render('partials/table/page', :page => page, :total_size => total_size) 
+          - if page
+            = partial_render('partials/table/page', :page => page, :total_size => total_size) 
 
-        - if table_url
-          %ul.table_actions
+          - if table_url
+            %ul.table_actions
 
-            = 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/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/files', :table_url => table_url) 
-            
-            
-            
-            
+              = 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.4.2
+  version: 1.4.3
 platform: ruby
 authors:
 - Miguel Vazquez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-16 00:00:00.000000000 Z
+date: 2014-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake