rbbt-rest 1.1.0 → 1.1.2

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

@@ -39,7 +39,9 @@ module RbbtRESTHelpers
           content_type "text/tab-separated-values"
           send_file fragment_file
         when "table"
-          tsv2html fragment_file
+          halt 200, tsv2html(fragment_file)
+        when "json"
+          halt 200, tsv_process(TSV.open(fragment_file)).to_json
         when "excel"
           require 'rbbt/tsv/excel'
           tsv = TSV.open(Open.open(fragment_file))

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

@@ -52,8 +52,10 @@ module RbbtRESTHelpers
     @splat = consume_parameter :splat
     @captures = consume_parameter :captures
 
-    # Pagination
+    # TSV table pagination, filtering, and slicing
     @page = consume_parameter :_page
+    @filter = consume_parameter :_filter
+    @column = consume_parameter :_column
 
     # Fix boolean inputs sumbitted using checkboxes
     params.keys.each do |param|
@@ -106,14 +108,19 @@ module RbbtRESTHelpers
                value
              end
 
-      if Array === text
+      case
+      when Array === text
         text
-      else
-        if text =~ /\[.*\]/
+      when text =~ /^list:([^:]+):(.+)$/
+        Entity::List.load_list($1, $2, user)
+      when text =~ /\[.*\]/
           JSON.parse(text)
-        else
-          text.split(/\r?\n|\|/).collect{|l| l.strip}
-        end
+      when text =~ /\n/
+        text.split(/\r?\n/).collect{|l| l.strip}
+      when text =~ /\|/
+        text.split(/\|/).collect{|l| l.strip}
+      else
+        text.split(/,/).collect{|l| l.strip}
       end
 
     when :tsv

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

@@ -49,7 +49,6 @@ module RbbtRESTHelpers
         } * "\n"
 
         FileUtils.mkdir_p File.dirname(filename) unless File.exists? File.dirname(filename)
-        #Open.write(filename, YUI::JavaScriptCompressor.new(:munge => false).compress(text))
         Open.write(filename, Uglifier.compile(text))
       end
 

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

@@ -94,7 +94,31 @@ module RbbtRESTHelpers
     end
   end
 
-  def tsv_rows(tsv, page = nil)
+  def tsv_process(tsv, filter = nil, column = nil)
+    filter = @filter if filter.nil?
+    column = @column if column.nil?
+
+    if filter and filter.to_s != "false"
+      filter.split("|").each do |f|
+        key, value = f.split("~")
+        case
+        when value =~ /^([<>]=?)(.*)/
+          tsv = tsv.select(key){|k| k.send($1, $2)}
+        when value =~ /^\/.*\/$/
+          tsv = tsv.select(key => Regexp.new(value))
+        else
+          tsv = tsv.select(key => value)
+        end
+      end
+    end
+
+    tsv = tsv.column(column) if column and not column.empty?
+
+    tsv
+  end
+
+  def tsv_rows(tsv, page = nil, filter = nil, column = nil)
+    tsv = tsv_process(tsv, filter, column)
     page = @page if page.nil?
     if page.nil? or page.to_s == "false"
       tsv_rows_full(tsv)
@@ -122,6 +146,11 @@ module RbbtRESTHelpers
     @table_headers[field] = [entity_type, entity_options]
   end
 
+  def filter(field, type = :string)
+    @table_filters ||= {}
+    @table_filters[field] = type
+  end
+
   def table(options = {})
     options = {} if options.nil?
 
@@ -146,24 +175,36 @@ module RbbtRESTHelpers
       @table_headers = {}
     end
 
+    if @table_filters and @table_filters.any?
+      options[:filters] = @table_filters
+      @table_filters = {}
+    end
+
     Open.write table_file, tsv.to_s
     Open.write table_file + '.table_options', options.to_yaml if defined? options.any?
 
     total_size = tsv.size
     if options[:page].nil?  and total_size > PAGE_SIZE * 1.2
-        page = "1"
+        @page = "1"
     end
 
-    partial_render('partials/table', {:page => page, :total_size => total_size, :rows => tsv_rows(tsv, page), :header => tsv.all_fields, :url => url, :table_class => table_class * " ", :table_options => options.dup})
+    tsv2html(table_file)
+  end
+
+  def load_tsv(file)
+    tsv
   end
 
   def tsv2html(file)
     tsv = TSV.open(Open.open(file))
-    table_options = YAML.load_file(file + '.table_options') if File.exists? file + '.table_options'
+
+    table_options = File.exists?(file + '.table_options') ? YAML.load_file(file + '.table_options') : {}
     tsv.entity_options = table_options[:tsv_entity_options]
     headers = table_options[:headers]
+    filters = table_options[:filters]
     headers.each{|field,p| tsv.entity_templates[field] = Misc.prepare_entity("TEMPLATE", p.first, p.last) } unless headers.nil?
+
     content_type "text/html"
-    halt 200, partial_render('partials/table', {:total_size => tsv.size, :rows => tsv_rows(tsv), :header => tsv.all_fields, :table_options => table_options})
+    partial_render('partials/table', {:filters => filters, :total_size => tsv.size, :rows => tsv_rows(tsv), :header => tsv.all_fields, :table_options => table_options})
   end
 end

data/lib/rbbt/rest/entity.rb

@@ -110,6 +110,13 @@ module Sinatra
             send_file global_file if File.exists? global_file
 
             raise "List file not found: #{ list_id }"
+          when :json
+            list = Entity::List.load_list(entity_type.split(":").first, list_id, user)
+            list_info = {:entities => list, :info => list.info}
+            halt 200, list_info.to_json
+          when :info
+            list = Entity::List.load_list(entity_type.split(":").first, list_id, user)
+            halt 200, list.info.to_json
           when :list
             list = Entity::List.load_list(entity_type.split(":").first, list_id, user)
             

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

@@ -14,7 +14,7 @@ module EntityRESTHelpers
     end
   end
 
-  def action_parameters(values = nil, &block)
+  def action_parameters(values = nil, action_options = {}, form_options = {}, &block)
     o = Object.new
     o.extend AnnotatedModule
 
@@ -46,8 +46,9 @@ module EntityRESTHelpers
     locals[:action] = @ajax_url
     locals[:klass] = 'action_parameter_form'
     locals[:info] = info
+    locals = locals.merge(form_options)
 
-    html_tag :div, partial_render('partials/form', locals), :class => 'action_parameters'
+    html_tag :div, partial_render('partials/form', locals), {:class => 'action_parameters'}.merge(action_options)
   end
 
   def page_type(path = nil)

data/lib/rbbt/rest/main.rb

@@ -17,6 +17,8 @@ module Sinatra
         helpers RbbtRESTHelpers
         register Sinatra::RbbtAuth
 
+        add_sass_load_path Rbbt.share.views.compass.find(:lib)
+
         set :cache_dir, Rbbt.var.sinatra.cache.find unless settings.respond_to? :cache_dir and settings.cache_dir != nil
         set :file_dir, Rbbt.var.sinatra.files.find unless settings.respond_to? :file_dir and settings.file_dir != nil
 
@@ -32,7 +34,7 @@ module Sinatra
         end
 
         before do
-          Log.debug("IP #{request.ip}: " << request.path_info << ". Params: " << params.inspect)
+          Log.debug("IP #{request.ip}: " << request.path_info << ". Params: " << Misc.remove_long_items(params).inspect)
           process_common_parameters
 
           if profile

data/lib/rbbt/rest/web_tool.rb

@@ -0,0 +1,8 @@
+
+module Sinatra
+  module RbbtToolHelper
+    def tool(toolname, options = {})
+      partial_render("tools/#{toolname}", options)
+    end
+  end
+end

data/lib/rbbt/rest/workflow.rb

@@ -26,6 +26,7 @@ module Sinatra
         add_sass_load_path views_dir.compass if views_dir.compass.exists?
 
         RbbtRESTHelpers.javascript_resources.unshift views_dir.public.js if views_dir.public.js.exists?
+        RbbtRESTHelpers.sass_resources.unshift views_dir.compass if views_dir.compass.exists?
       end
     end
 
@@ -36,7 +37,7 @@ module Sinatra
 
       Log.debug("Adding #{ workflow } to REST server")
 
-      load workflow.libdir.lib['sinatra.rb'] if File.exists? workflow.libdir.lib['sinatra.rb']
+      self.instance_eval workflow.libdir.lib['sinatra.rb'].read if File.exists? workflow.libdir.lib['sinatra.rb']
 
       get "/#{workflow.to_s}" do
         case format

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

@@ -129,12 +129,14 @@ module WorkflowRESTHelpers
       job.clean if update == :reload
       job.run
       job_url = to(File.join("/", workflow.to_s, task, job.name)) 
+      job_url += "?_format=#{@format}" if @format
       halt 200, job.name if format === :jobname
       redirect job_url
     when :asynchronous, :async, nil
       job.clean if update == :reload
       job.fork
       job_url = to(File.join("/", workflow.to_s, task, job.name)) 
+      job_url += "?_format=#{@format}" if @format
       halt 200, job.name if format === :jobname
       redirect job_url
     else

data/share/views/compass/_foundation_setup.sass

@@ -1,14 +1,10 @@
-// Make sure the charset is set appropriately
 @charset "UTF-8"
 
-// This includes all of the foundation global elements that are needed to work with any of the other files.
-//
-// RENAME THIS TO _foundation-global.scss ONCE ALL THE OLD VARIABLES ARE OUT OF THE FILE.
-
 @import "normalize"
 @import "foundation/_variables"
 @import "foundation/components/global"
 @import "colors"
+
 $breakpoint: 1050px
 
 $small-screen: emCalc($breakpoint) 
@@ -40,7 +36,6 @@ $indent: 15px
 $vindent: 22px
 $white: #EEEEEE
 
-
 // Foundation Components
 @import foundation/components/grid
 @import foundation/components/visibility

data/share/views/compass/actions.sass

@@ -1,9 +1,7 @@
 .action_controller
   ul.controls, ul.actions
-    @include inline-list()
-    @include button-group-container()
 
-#body .action_parameters
+.action_controller .action_parameters
   @extend .offcanvas
 
 .action_loader

data/share/views/compass/app.sass

@@ -1,18 +1,20 @@
 @import _foundation_setup
+@import lists
+@import list_container
+@import dom
+@import form
+@import table
+@import tabs
+
 @import style_mixins
+
 @import topbar
 @import favourites
 @import footer
 @import entity_card
 @import actions
-@import lists
-@import list_container
-@import form
-@import dom
-@import table
 @import offcanvas
 @import fragment
-@import tabs
 @import workflow
 @import style
 

data/share/views/compass/dom.sass

@@ -11,9 +11,6 @@
   display: inline-block
   padding: 0px 10px
 
-.embedded
-  // @include transition(1.25s height ease-in)
-
 .hide
   display: none
 
@@ -30,13 +27,6 @@ dl.float
   dt dd
     float: left
 
-//dl.meta
-  dt, dd
-    font-size: 0.7em
-    display: inline
-  dd
-    margin-right: 1em
-
 i[class*="foundicon-"] 
   display: inline-block
 

data/share/views/compass/form.sass

@@ -26,3 +26,5 @@
   select.favourite_lists
     width: 175px
 
+.action_parameters form
+  +clearfix()

data/share/views/compass/list_container.sass

@@ -24,9 +24,11 @@ dl.list_container
       a.entity_list
         display: block
         z-index: 15
-        margin-right: 2em
+        margin-right: 1em
         color: $primary-color
         width: 1.5em
         float: left
-        padding: 2 0 0 5
+        padding-top: 0.2em
+        padding-bottom: 0px
+        padding-right: 20px
 

data/share/views/compass/offcanvas.sass

@@ -3,7 +3,7 @@
   min-height: 2em
 
 .offcanvas_button
-  position: absolute
+  position: absolute !important
   top: - 30px
   height: 1em
   right: 14px
@@ -63,4 +63,4 @@
 
 @media #{$not_small}
   .offcanvas_button
-    display: none
+    display: none !important

data/share/views/compass/style.sass

@@ -1,9 +1,10 @@
 @import "colors"
 @import url(http://fonts.googleapis.com/css?family=Noticia+Text)
+@import url(http://fonts.googleapis.com/css?family=Open+Sans)
 
 body, p, h1, h2, h3, h4, h5, h6
-  font-family: Arial,Liberation Sans,DejaVu Sans,sans-serif
-  font-family: "Noticia Text", Verdana, Arial, "Helvetica Neue", Helvetica, sans-serif
+  //font-family: Arial, Liberation Sans,DejaVu Sans,sans-serif
+  font-family: "Open Sans", "Trebuchet MS", "Noticia Text", Verdana, Arial, "Helvetica Neue", Helvetica, sans-serif
   line-height: 1.4em
 
 body
@@ -26,21 +27,8 @@ footer
     background-color: darken($primary-color, 30%)
 
   ul.controls, ul.actions
-    margin: 0
-    margin-top: 5px
-    margin-bottom: 5px
-    li
-      margin: 0 2px 0 0
-        
-      a
-        @include button-base
-        @include button-size
-        @include button-style
-        @include radius
-        @include single-transition
-        margin-bottom: 2px
-        font-size: 0.8em
-
+    @extend .button-group-list
+    
   ul.controls 
     li.parameters:not(.active), li.reload:not(.active)
       a

data/share/views/compass/style_mixins.sass

@@ -1,3 +1,4 @@
+@import foundation/components/inline-lists
 =dl_indented()
   dt
     font-weight: bold
@@ -9,4 +10,21 @@
   //border: solid 1px darken($white, 10%)
   @extend .panel
 
- 
+.button-group-list
+  @include inline-list()
+  @include button-group-container()
+  margin: 0
+  margin-top: 5px
+  margin-bottom: 5px
+  li
+    margin: 0 2px 0 0
+      
+    a
+      @include button-base
+      @include button-size
+      @include button-style
+      @include radius
+      @include single-transition
+      margin-bottom: 2px
+      font-size: 0.8em
+

data/share/views/compass/table.sass

@@ -19,6 +19,9 @@ table
       @include button-group-container()
       margin-bottom: 0
       float: right
+      li.filter
+        .filter_controls
+          display: none
 
 
   &.sorted

data/share/views/compass/tabs.sass

@@ -1,8 +1,12 @@
 dl.tabs
   position: relative
-  dd:not(.selected)
-    display: none
-  dt
+  & > dd:not(.selected)
+    visibility: hidden
+    height: 0px
+    margin: 0px
+    padding: 0px
+    border: none
+  & > dt
     margin: 0px
     padding: 5px
     padding-bottom: 2px
@@ -14,21 +18,10 @@ dl.tabs
     background: $tab-active-color-bg
 
     &:not(.selected)
+      cursor: pointer
       border: none
       background: $tab-color-bg
-
-  //  
-    float: left
-    line-height: 2
-    height: 2em
-    border-bottom: 0
-    padding: 0 1em
-    position: relative
-    left: 35px
-    margin-right: 1px
-    cursor: pointer
-
-  dd
+  & > dd
     float: right
     width: 100%
     padding: 5px