rbbt-views 1.0.1 → 2.0.0

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

@@ -2,6 +2,7 @@ require 'rbbt/resource/path'
 require 'rbbt/tsv/manipulate'
 
 module Sinatra
+  class Retry < StandardError; end
   module SinatraRbbt
 
     def production?
@@ -20,13 +21,11 @@ module Sinatra
       
       check = [check] if not check.nil? and not Array === check
 
-      name = type  + ":" + Misc.hash2md5(options)
+      params = options
+      params[:visualization_params].delete :_xhr if params.include? :visualization_params
+      name = type  + ":" + Misc.hash2md5(params)
 
-      if production?
-        cache_type ||= :memory
-      else
-        cache_type = :none
-      end
+      cache_type ||= :memory
       
       case cache_type.to_sym
       when :sync, :synchronous
@@ -56,7 +55,7 @@ module Sinatra
             messages = step.messages || []
             backtrace = step.info[:backtrace] || []
             step.clean
-            "<span class='cache_status'>" << status.to_s << "</span> " << "\n" <<
+            "<span class='status'>" << status.to_s << "</span> " << "\n" <<
             "<span class='cache_message'>" << messages.last << "</span> "  << "\n" <<
             "<ul class='backtrace'>" + backtrace.collect{|line| "<li>" << line << "</li>"} * "\n"
           when step.done?
@@ -64,24 +63,34 @@ module Sinatra
           else
             if request.xhr? 
               status 202
-              "<span class='cache_status'>" << (step.status || "starting").to_s << "</span>"
+              "<span class='status'>" << (step.status || "starting").to_s << "</span>"
             else
-              retry unless step.done? and not step.error?
+              raise Retry unless step.done? and not step.error?
               step.load
             end
           end
+        rescue Retry
+          retry
         end
 
 
-      when :async
-
+      when :async, :asynchronous
         path = File.join(settings.cache_dir, "sinatra", name)
         task = Task.setup(:result_type => :string, &block)
         step = Step.new(path, task, nil, nil, self)
 
         step.clean if old_cache(path, check)
 
+        Step.log_relay_step = step
         case
+        when (step.started? and update == 'delete')
+          step.abort unless step.done?
+          sleep 1
+          step.clean
+          sleep 1
+        when (step.started? and update == 'abort')
+          step.abort
+          sleep 1
         when (not step.started? and not update == 'check')
           step.fork
           sleep 0.5
@@ -92,45 +101,54 @@ module Sinatra
           sleep 0.5
           sleep 2 unless step.done?
         end
+        Step.log_relay_step = nil
 
         begin
           case
+          when step.aborted?
+            status 299
+            step.clean
+            "<span class='status'>" << "aborted" << "</span>"
+
           when (not step.started?)
             status 202
-            "<span class='cache_status'>" << "not started" << "</span>"
+            "<span class='status'>" << "not started" << "</span>"
+
           when step.error?
             status 500
             status = step.status || "error"
             messages = step.messages || []
             backtrace = step.info[:backtrace] || []
             step.clean
-            "<span class='cache_status'>" << status.to_s << "</span> " << "\n" <<
-            "<span class='cache_message'>" << messages.last << "</span> "  << "\n" <<
-            "<ul class='backtrace'>" + backtrace.collect{|line| "<li>" << line << "</li>"} * "\n"
+            if request.xhr? 
+              workflow_render('error', :message => (messages[-2] || messages * ", "), :backtrace => backtrace)
+            else
+              workflow_render('error', :message => (messages[-2] || messages * ", "), :backtrace => backtrace, :_layout => false)
+            end
  
-         when step.done?
+          when step.done?
             step.load
           else
+            status 202
             if request.xhr? 
-              status 202
-              "<span class='cache_status'>" << (step.status || "starting").to_s << "</span>"
+              workflow_render('wait',  :step => step, :_layout => false)
             else
-              step.join
-              case
-              when step.error?
-                retry
-              when step.done? 
+              sleep 3
+              if step.done?
+                status 200
                 step.load
               else
-                retry 
+                workflow_render('wait',  :step => step)
               end
             end
           end
+        rescue Retry
+          retry
         end
 
       when :memory
         @@cache ||= {}
-        @@cache.delete name if not check.nil?
+        @@cache.delete name if update == "reload" or not check.nil?
         @@cache[name] ||= yield
       else
         yield
@@ -273,7 +291,7 @@ module Sinatra
       
       layout = params.delete :_layout
 
-      layout = "false" if request.xhr?
+      layout ||= "false" if request.xhr?
       layout = "true" if layout.nil?
       layout = layout == "true"
 
@@ -294,7 +312,7 @@ module Sinatra
 
     def fix_input(type, value, param_file = nil)
       case type
-      when nil, :string
+      when nil, :string, :select
         value
       when :integer
         value.to_i
@@ -306,7 +324,7 @@ module Sinatra
       when :text
         case 
         when (param_file.nil? and not (value.nil? or value.empty?))
-          value
+          value.gsub(/\r\n/, "\n")
         when (not param_file.nil?)
           value[:tempfile].read
         end
@@ -336,8 +354,6 @@ module Sinatra
           TSV.open(StringIO.new(text))
         end
       end
-
-
     end
 
     def get_inputs(workflow, name, params)
@@ -413,7 +429,7 @@ module Sinatra
       end
 
       [new_job, result]
-
     end
+
   end
 end

data/share/views/compass/_base.sass

@@ -1,15 +1,7 @@
-$blueprint_grid_columns: 16
-$blueprint_grid_width: 40px
-$blueprint_grid_margin: 10px
-
-$font_color: #333
-$blueprint-font-size: 14px
-
 @import "compass/css3/inline-block"
 @import "blueprint/form"
 @import "blueprint/grid"
 @import "blueprint/typography"
 @import "compass/utilities/general/clearfix"
-@import "compass/css3/border-radius"
 
 +blueprint-typography

data/share/views/compass/colors.sass

@@ -0,0 +1,10 @@
+$blueprint_grid_columns: 16
+$blueprint_grid_width: 40px
+$blueprint_grid_margin: 10px
+
+$font_color: #333
+
+$not_quite_white: #f0f0f0
+$bit_darker: #d6d6d6
+$bit_lighter: #fdfdfd
+

data/share/views/compass/colors/ventana_azul.sass

@@ -0,0 +1,5 @@
+$color1: #F2385A
+$color2: #F5A503
+$color3: #E9F1DF
+$color4: #4AD9D9
+$color5: #36B1BF

data/share/views/compass/compass.config

@@ -14,7 +14,8 @@ end
 Sass::Engine::DEFAULT_OPTIONS[:load_paths].tap do |load_paths| 
   load_paths << Rbbt.views.compass.find(:lib, Sinatra::Application.root).to_s 
   Workflow.workflows.each do |workflow|
-    load_paths << Rbbt.www.views.compass.find(:lib, workflow.libdir).to_s 
+    workflow_compass = Rbbt.www.views.compass.find(:lib, workflow.libdir).to_s
+    load_paths << workflow_compass if File.exists? workflow_compass
   end
   load_paths << Rbbt.share.views.compass.find(:lib).to_s 
 

data/share/views/compass/details.sass

@@ -0,0 +1,50 @@
+#details_controls
+  background-color: $not_quite_white
+  width: $content_size
+  margin: auto
+  padding-left: 24px
+  padding-right: 24px
+  padding-bottom: 3px
+  display: none
+  span.entity_type
+    font-size: 1.2em
+    font-weight: bold
+  ul
+    +clean_list
+    display: inline
+    margin-left: $indent * 2
+    li
+      vertical-align: baseline
+      margin: 0px 
+      padding: 0px
+      &.save, &.select
+        margin-left: $indent * 2
+
+  span.list_id
+    display: inline-block
+    margin-left: $indent * 2
+    overflow: hidden
+    text-overflow: ellipsis
+    -o-text-overflow: ellipsis
+    width: 300px
+    white-space: nowrap
+
+
+#details
+  +border_radius(4px, 4px)
+  display: none
+  position: relative
+  width: $content_size
+  padding: $vspace * 2 $indent * 2
+  background-color: $bit_lighter
+  margin: auto
+  margin-bottom: $vspace / 2
+  height: 200px
+  border: solid 1px gray
+  overflow: auto
+  z-index: 1
+  &.expanded
+    height: auto
+    overflow: none
+
+

data/share/views/compass/dom.sass

@@ -0,0 +1,64 @@
+h1 
+  line-height: 2
+table
+  width: 100%
+  
+table td
+  word-spacing: 5px
+  height: 50px
+  overflow: hidden
+  text-overflow: ellipsis
+  max-width: 250px
+
+thead th
+  color: white
+  background: black
+
+span.short_task_description
+  display: block
+  color: gray
+
+a.button
+  +button_link()
+ 
+dl.toggle dt:before
+  content: "[+] "
+
+dl.toggle dt.opened:before
+  content: "[-] "
+
+dl.toggle dt
+  cursor: pointer
+
+dl
+  dd
+    margin-bottom: 10px
+
+p, dd
+  text-align: justify
+  a.entity, a.entity_list, a.entity_action, a.entity_list_action
+    white-space: normal
+
+dd
+  margin: auto
+
+.clear_floats, .clear_both
+  +clear_floats()
+
+span.note
+  color: gray
+
+img
+  border: black 1px solid
+
+.mapped_image
+  border: 1px solid gray
+  width: 100%
+  height: 400px
+  overflow: scroll
+  overflow-x: scroll
+  overflow-y: scroll
+
+dl.info
+  dd
+    margin-left: $indent

data/share/views/compass/embedded.sass

@@ -0,0 +1,111 @@
+$header_font_size: 1.5em
+$main_header_font_size: 2 * $header_font_size
+
+$header_top_margin_scale: 1.3
+$header_bottom_margin_scale: 0.5
+$header_padded_height: $header_font_size * ($header_top_margin_scale + $header_bottom_margin_scale + 1)
+
+a.replace, a.check_replace, a.closed_replace
+  position: relative
+  display: inline-block
+  width: 95%
+  margin-top: $header_top_margin_scale * 1em
+  font-style: italic
+  font-size: $header_font_size
+
+header
+  font-size: $header_font_size
+  font-weight: bold
+  width: 80%
+
+#main > header:first-of-type
+  font-size: $main_header_font_size
+  
+
+.embedded
+  &:not(.contracted_embedded)
+    +shadowed_box()
+    +border_radius(4px, 4px)
+    margin-bottom: 10px
+    margin-top: $header_padded_height
+
+  padding: 10px 25px
+  position: relative
+  &.reloading
+    span.status
+      font-size: 2em
+
+  & > span.status
+    position: absolute
+    top: 0px
+    right: 0px
+    color: red
+
+  .embedded_control
+    visibility: hidden
+
+  &.active_controls > header > .embedded_control,  &.active_controls > .embedded_control
+    visibility: visible
+
+  header
+    position: absolute
+    top: - 1em * (0.95 + $header_bottom_margin_scale)
+    left: - 2px
+    padding-right: 20%
+    height: 1.3em
+    line-height: 1.3em
+    overflow: hidden
+    text-overflow: ellipsis
+    -o-text-overflow: ellipsis
+    white-space: nowrap
+    &:hover
+      cursor: pointer
+
+.contracted_embedded
+  font-size: $header_font_size
+  margin: 0
+  padding: 0
+  font-weight: bold
+  border: none
+  margin-top: 1em * ($header_top_margin_scale)
+  //padding-bottom: 1em * ($header_bottom_margin_scale)
+  padding-right: 20%
+  width: 80%
+  ul.embedded_control
+    top: 7px
+    right: 3px
+  
+
+ul.embedded_control
+  position: absolute
+  top: 0px
+  right: 0px
+  font-size: 12px
+  font-weight: normal
+  +clean_list()
+  li > a
+    +button_link()
+    margin-left: 3px
+
+a.retry_error, a.abort_embedded, a.start_checked
+  +button_link()
+  font-size: 12px
+  //margin-top: 16 / 12 * $header_font_size * $header_top_margin_scale 
+  //vertical-align: text-bottom
+  position: relative
+  bottom: 0
+
+.embedded + a.abort_embedded, .embedded + a.retry_error
+  position: relative
+  left: 0
+  display: block
+  width: auto
+  text-align: center
+  margin-top: $vspace / 2
+
+    
+span.status
+  margin: 0px 12px
+  color: $bit_darker
+  text-decoration: none
+