rbbt-rest 1.1.3 → 1.1.4

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    MjY4NGQ1Mjg4YTIyYmRjYWQ0OWFkMjQ4NmQxMjU3NmIwYjIzN2M1Yw==
+  data.tar.gz: !binary |-
+    MTQ3MGVlMzE3NjU2ZDc3ZmI4YjM4MDA1MjY0ZDI4NjFkYTY5ZDAxOQ==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    OTg5MGEwZmQ5YmYyOWRmNzM2YjQ4OTZkNzI1YjRiZGQ5ZjkzYWRhMjJjNTVj
+    ZTliMjJlYWE0YjJhOGI1ZTdhZWVkNzM4MjFmODllZGRhZDA2OGE3NjQ1ZDQ5
+    ZTBmYTkyOTY2ZDAxNzlmMGYzYzFiZjY2NmFlN2Q5M2M1OWM1NmU=
+  data.tar.gz: !binary |-
+    ZTQ3Y2Q5YTFjOGQ4YTlmMzlhMmJhNTUwZTFlODUxNjhjYjEwNzBmZDg2YmNk
+    OWI2OGQzNzI1MzNmYTQzYzVjYWJlYmZiNWY2NDY5NGRmYWE2OWQ4ZjE4YjBm
+    MDliZDczODJmNjdlYWNiODZiOGY3Mzk3MTFjZGFkMDMzZjBhYTU=

data/lib/rbbt/rest/client.rb

@@ -22,16 +22,19 @@ class WorkflowRESTClient
   end
 
   def self.get_raw(url, params = {})
+    Log.debug("RestClient get_raw #{}: #{ url } - #{params.inspect}")
     params = params.merge({ :_format => 'raw' })
     RestClient.get(url, :params => params)
   end
  
   def self.post_jobname(url, params = {})
+    Log.debug("RestClient post_jobname #{}: #{ url } - #{params.inspect}")
     params = params.merge({ :_format => 'jobname' })
     RestClient.post(url, params)
   end
   
   def self.get_json(url, params = {})
+    Log.debug("RestClient get_json #{}: #{ url } - #{params.inspect}")
     params = params.merge({ :_format => 'json' })
     res = RestClient.get(url, :params => params)
     begin
@@ -93,7 +96,7 @@ class WorkflowRESTClient
       end
     end
 
-    def _exec
+    def _exec(noload = false)
       if Array === @url
         url, params = @url
       else
@@ -102,17 +105,21 @@ class WorkflowRESTClient
 
       params[:jobname] = @name if @name
 
-      case result_type
-      when :string
+      if noload and %w(boolean string tsv).include? result_type
         WorkflowRESTClient.get_raw(url, params) 
-      when :boolean
-        WorkflowRESTClient.get_raw(url, params) == "true"
-      when :tsv
-        TSV.open(StringIO.new(WorkflowRESTClient.get_raw(url, params)))
-      when :annotations
-        Annotated.load_tsv(TSV.open(StringIO.new(WorkflowRESTClient.get_raw(url, params))))
       else
-        WorkflowRESTClient.get_json(url, params)
+        case result_type
+        when :string
+          WorkflowRESTClient.get_raw(url, params) 
+        when :boolean
+          WorkflowRESTClient.get_raw(url, params) == "true"
+        when :tsv
+          TSV.open(StringIO.new(WorkflowRESTClient.get_raw(url, params)))
+        when :annotations
+          Annotated.load_tsv(TSV.open(StringIO.new(WorkflowRESTClient.get_raw(url, params))))
+        else
+          WorkflowRESTClient.get_json(url, params)
+        end
       end
     end
 
@@ -121,8 +128,12 @@ class WorkflowRESTClient
       prepare_result(res, result_type)
     end
 
-    def run
-      exec
+    def run(noload = false)
+      if noload
+        _exec(noload)
+      else
+        exec
+      end
     end
 
     def load
@@ -278,7 +289,6 @@ class WorkflowRESTClient
       end
     else
 
-      ddd task
       if Task === task
         task_name = task.name
       else

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

@@ -9,10 +9,7 @@ module RbbtRESTHelpers
 
     result = render template_file, {:job => job}, layout_file
 
-    job.clean
-
-    status 500
-    result
+    halt 500, result
   end
 
   def wait_on(job, layout = nil)

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

@@ -164,7 +164,7 @@ module RbbtRESTHelpers
     url = remove_GET_param(url, "_")
 
     table_class = []
-    table_class << 'wide' if tsv.fields.length > 4
+    table_class << 'wide responsive' if tsv.fields.length > 4
 
     options[:url] = url
     options[:table_class] = table_class

data/lib/rbbt/rest/main.rb

@@ -34,7 +34,7 @@ module Sinatra
         end
 
         before do
-          Log.debug("IP #{request.ip}: " << request.path_info << ". Params: " << Misc.remove_long_items(params).inspect)
+          Log.info("IP #{request.ip}: " << request.path_info << ". Params: " << Misc.remove_long_items(params).inspect)
           process_common_parameters
 
           if profile

data/lib/rbbt/rest/workflow.rb

@@ -108,11 +108,12 @@ module Sinatra
 
         job = workflow.load_id(File.join(task, job))
 
-        clean_job(workflow, job) 
+        clean_job(workflow, job) if update == :clean
 
         begin
-          done = job.done?
           started = job.info.any?
+          done = job.done?
+          error = job.error?
 
           if done
             show_result job, workflow, task

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

@@ -129,14 +129,18 @@ module WorkflowRESTHelpers
       show_exec_result job.exec, workflow, task
     when :synchronous, :sync
       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
+      begin
+        job.run(false) unless File.exists? job.info_file
+        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
+      rescue
+        halt 500, $!.message
+      end
     when :asynchronous, :async, nil
       job.clean if update == :reload
-      job.fork
+      job.fork unless File.exists? job.info_file
       job_url = to(File.join("/", workflow.to_s, task, job.name)) 
       job_url += "?_format=#{@format}" if @format
       halt 200, job.name if format === :jobname

data/share/views/compass/app.sass

@@ -5,6 +5,7 @@
 @import form
 @import table
 @import tabs
+@import responsive_table
 
 @import style_mixins
 

data/share/views/compass/colors.sass

@@ -46,12 +46,19 @@ $section-title-bg-active-tabs:    $section_active_bg
 $section-content-bg:              $section_content_bg
 
 //{{{{{{{{{
-//{{{ SECTION
+//{{{ TABS
 //{{{{{{{{{
 
-$tab-border-color: $section_active_bg
-$tab-color-bg: $section_title_bg
-$tab-active-color-bg: white
+$tab-background: $section-title-bg
+$tab-border-color: $section-active-bg
+$tab-content-border-color: $primary-color
+
+$tab-active-border-color: darken($section-title-bg-active-tabs, 10%)
+$tab-active-color-bg: $section-title-bg-active-tabs
+$tab-active-content-color-bg: white
+
+$tab-inactive-border-color: $section_title_bg
+$tab-inactive-color-bg: darken(white, 5%)
 
 
 //{{{{{{{{{

data/share/views/compass/responsive_table.sass

@@ -0,0 +1,80 @@
+@media only screen and (max-width: 767px)
+  table.flipped, table.wide
+    display: block
+    position: relative
+    width: 100%
+    border-collapse: collapse
+    border-spacing: 0
+    th, td 
+      margin: 0
+      vertical-align: top
+      height: 2em
+
+    th 
+      text-align: left
+
+    thead 
+      display: block
+      float: left
+      max-width: 40%
+      white-space: nowrap
+      overflow: auto
+      overflow-y: hidden
+
+    tfoot
+      width: 100%
+      float: right
+
+    tbody 
+      display: block
+      width: auto
+      position: relative
+      overflow-x: auto
+      white-space: nowrap
+     
+
+    thead tr 
+      display: block
+     
+
+    th 
+      display: block
+      text-align: right
+     
+
+    tbody tr 
+      display: inline-block
+      vertical-align: top
+     
+
+    td 
+      display: block
+      min-height: 1.25em
+      text-align: left
+   
+    /* sort out borders */
+
+    th 
+      border-bottom: 0
+      border-left: 0
+     
+
+    td 
+      border-left: 0
+      border-right: 0
+      border-bottom: 0
+     
+
+    tbody tr 
+      border-left: 1px solid #babcbf
+     
+
+    //th:last-child, td:last-child 
+    tfoot
+      border: 2px solid #babcbf
+      border-top: 1px solid #babcbf
+     
+
+
+
+

data/share/views/compass/tabs.sass

@@ -1,34 +1,81 @@
+@import colors
+@import "normalize"
+@import "foundation/_variables"
+@import foundation/components/_global
 dl.tabs
   position: relative
-  & > dd:not(.selected)
-    visibility: hidden
-    height: 0px
-    margin: 0px
-    padding: 0px
-    border: none
+  background: $tab-background
+  border: 1px solid $tab-border-color
+  margin-bottom: 0
+  padding-bottom: 0
+
   & > dt
-    margin: 0px
-    padding: 5px
-    padding-bottom: 2px
     display: inline-block
-    border: 1px solid $tab-border-color
-    border-bottom: 2px solid white
-    z-index: 5
-    margin-bottom: 5px
-    background: $tab-active-color-bg
-
-    &:not(.selected)
-      cursor: pointer
-      border: none
-      background: $tab-color-bg
+    max-width: 40%
+    overflow: hidden
+    text-overflow: ellipsis
+    cursor: pointer
+    &.selected
+      cursor: auto
+      
+
   & > dd
     float: right
     width: 100%
-    padding: 5px
+    height: 0px
     margin: 0px
-    margin-top: -6px
+    overflow: hidden
+    visibility: hidden
+    &.selected
+      height: auto
+      visibility: visible
+      overflow-x: auto
+
+  & > dt
     border: 1px solid $tab-border-color
-    z-index: 4
-    margin-bottom: 5px
-    table
-      margin: 0px
+    background: $tab-inactive-color-bg
+    padding: 5px
+    margin: 10px 0px 5px 5px
+
+    &.selected
+      background: $tab-active-color-bg
+      border-bottom: 2px solid $primary-color
+
+  & > dd
+    border: none
+    margin: 0
+    padding: 0
+    &.selected
+      padding: 5px
+      border: 2px solid $tab-content-border-color
+      background: white
+      border-top: 1px solid $tab-border-color
+      table
+        margin: 0px
+
+  //  &:not(.selected)
+  //    height: 0px
+  //    margin: 0px
+  //    border: none
+
+  //& > dt
+  //  z-index: 5
+  //  margin: 0px
+  //  margin-bottom: 0px
+  //  padding: 5px
+  //  padding-bottom: 2px
+
+  //  &:not(.selected)
+  //    z-index: 3
+  //    margin-bottom: 3px
+
+  //& > dd
+  //  padding: 5px
+  //  margin: 0px
+  //  margin-bottom: 5px
+  //  z-index: 4
+
+  //  &:not(.selected) 
+  //    padding: 0px
+
+

data/share/views/public/js/tables.js

@@ -221,9 +221,9 @@ register_dom_update('table[attr-page] > thead > tr > th', function(th){
     var direction
 
     if (th.is('.headerSortDown')){
-      direction = -1
+      direction = 1
       }else{
-        direction = 1
+        direction = -1
       }
 
       if (direction == -1){
@@ -240,7 +240,7 @@ register_dom_update('table[attr-page] > thead > tr > th', function(th){
         var th = table.find('thead > tr > th:contains(' + field + ')')
         table.addClass('sorted').attr('rbbt-update_tags','')
         table.attr('attr-page', format_page(num, size, ffield))
-        if (direction == 1){
+        if (direction == -1){
           th.removeClass('headerSortUp');
           th.addClass('headerSortDown');
         }else{

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: rbbt-rest
 version: !ruby/object:Gem::Version
-  version: 1.1.3
-  prerelease: 
+  version: 1.1.4
 platform: ruby
 authors:
 - Miguel Vazquez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-22 00:00:00.000000000 Z
+date: 2013-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: zurb-foundation
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -62,7 +55,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: compass
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -78,7 +69,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -86,7 +76,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -94,7 +83,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: haml
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -102,7 +90,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -110,7 +97,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -118,7 +104,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -126,7 +111,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra-authorization
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -134,7 +118,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -142,7 +125,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra-cross_origin
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -150,7 +132,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -207,6 +188,7 @@ files:
 - share/views/compass/list_container.sass
 - share/views/compass/lists.sass
 - share/views/compass/offcanvas.sass
+- share/views/compass/responsive_table.sass
 - share/views/compass/style.sass
 - share/views/compass/style_mixins.sass
 - share/views/compass/table.sass
@@ -759,26 +741,25 @@ files:
 - LICENSE
 homepage: http://github.com/mikisvaz/rbbt-rest
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Rbbt Web and REST interfaces
 test_files: []