rbbt-views 0.1.2 → 1.0.0

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

@@ -4,6 +4,27 @@ require 'rbbt/tsv/manipulate'
 module Sinatra
   module SinatraRbbt
 
+    def production?
+      ENV.include? "RACK_ENV" and not ENV["RACK_ENV"].nil? and ENV['RACK_ENV'].downcase == "production"
+    end
+
+    def cache(type, options)
+      name = type  + ":" + Misc.hash2md5(options)
+      if production?
+        @@cache ||= Persist.open_tokyocabinet 'sinatra.cache', true
+        return @@cache[name] if @@cache.include? name
+        res = yield
+        Misc.lock @@cache.persistence_path do
+          @@cache.write
+          @@cache[name] = res 
+          @@cache.read
+        end
+        res
+      else
+        yield
+      end
+    end
+
     def job_cache(workflow, task, jobname)
       jobname = File.basename(jobname)
       @job_cache ||= {}
@@ -53,58 +74,6 @@ module Sinatra
       session["context"] = context
     end
 
-
-    def self.locate_file(workflow, task, file)
-      file = case
-             when file =~  /\.[a-z]{2,4}$/
-               file
-             when file =~ /(.*)\/$/
-               $1
-             else
-               file + '.haml'
-             end
-
-      webapp_dir_views = WorkflowREST.www.views.find(:lib, Sinatra::Application.root)
-      workflow_dir_views = (workflow.nil? or workflow.libdir.nil?) ? nil : workflow.libdir.www.views
-      global_views = WorkflowREST.share.views
-
-      # workflow = workflow.to_s unless workflow.nil? or String === workflow
-
-      path = case
-             when webapp_dir_views[workflow][task][file].exists?
-               webapp_dir_views[workflow][task][file]
-             when webapp_dir_views[task][file].exists?
-               webapp_dir_views[task][file]
-             when webapp_dir_views[workflow][file].exists?
-               webapp_dir_views[workflow][file]
-             when webapp_dir_views[file].exists?
-               webapp_dir_views[file]
-
-             when (not workflow_dir_views.nil? and workflow_dir_views[workflow][task][file].exists?)
-               workflow_dir_views[workflow][task][file]
-             when (not workflow_dir_views.nil? and workflow_dir_views[task][file].exists?)
-               workflow_dir_views[task][file]
-             when (not workflow_dir_views.nil? and workflow_dir_views[workflow][file].exists?)
-               workflow_dir_views[workflow][file]
-             when (not workflow_dir_views.nil? and workflow_dir_views[file].exists?)
-               workflow_dir_views[file]
-
-             when global_views[workflow][task][file].exists?
-               global_views[workflow][task][file]
-             when global_views[task][file].exists?
-               global_views[task][file]
-             when global_views[workflow][file].exists?
-               global_views[workflow][file]
-             when global_views[file].exists?
-               global_views[file]
-             else
-               raise "File not found: #{[workflow, task, file].compact * ", "}"
-             end
-
-      Log.debug "File #{[workflow, task, file].collect{|v| "'#{ v }'"} * ", "} located at #{ path }"
-      path
-    end
-
     def add_param(url, key, value)
       if url =~ /\?/
         url += "&#{ key }=#{ value }"
@@ -119,13 +88,13 @@ module Sinatra
       end
       url
     end
-
-    def locate_file(workflow, task, file)
-      SinatraRbbt.locate_file(workflow, task, file)
-    end
-
     #{{{ Params
-     
+    #
+    def get_email(params)
+      IndiferentHash.setup(params)
+      params.delete :email
+    end
+   
     def get_jobname(params)
       IndiferentHash.setup(params)
       jobname = params.delete :jobname
@@ -187,7 +156,7 @@ module Sinatra
 
       filter = params.delete :_filter
 
-      size = params.delete :_size
+      size = params.delete(:_size) || params.delete("_size")
       
       layout = params.delete :_layout
 
@@ -198,7 +167,10 @@ module Sinatra
       { :_format => format, 
         :_page => page, 
         :_filter => filter, 
-        :_layout => layout }
+        :_layout => layout,
+        :_size => size,
+        :_xhr => request.xhr?,
+      }
     end
 
     def has_all_inputs(workflow, name, params)
@@ -207,6 +179,54 @@ module Sinatra
       workflow.rec_inputs(name).reject{|input| params.include? input}.empty?
     end
 
+    def fix_input(type, value, param_file = nil)
+      case type
+      when nil, :string
+        value
+      when :integer
+        value.to_i
+      when :float
+        value.to_f
+      when :boolean
+        Persist::TRUE_STRINGS.include? value.chomp.strip
+
+      when :text
+        case 
+        when (param_file.nil? and not (value.nil? or value.empty?))
+          value
+        when (not param_file.nil?)
+          value[:tempfile].read
+        end
+
+      when :array
+        case 
+        when (param_file.nil? and not (value.nil? or value.empty?))
+          case
+          when String === value
+            value.split(/\n|,/).collect{|l| l.strip}
+          when Array === value
+            value
+          else
+            raise "Input #{ input } must be Array or String: #{value.class}"
+          end
+        when (not param_file.nil?)
+          text = value[:tempfile].read
+          text.split(/\n|,/).collect{|l| l.strip}
+        end
+
+      when :tsv
+        case 
+        when (param_file.nil? and not (value.nil? or value.empty?))
+          TSV.open(StringIO.new(value))
+        when (not param_file.nil?)
+          text = value[:tempfile].read
+          TSV.open(StringIO.new(text))
+        end
+      end
+
+
+    end
+
     def get_inputs(workflow, name, params)
       inputs = {}
 
@@ -228,50 +248,7 @@ module Sinatra
           value.sub!(/local:(.*):(.*)/, 'local:\1:' + user + '/\2')
         end
 
-        new_value = case input_types[param]
-                    when nil, :string
-                      value
-                    when :integer
-                      value.to_i
-                    when :float
-                      value.to_f
-                    when :boolean
-                      Persist::TRUE_STRINGS.include? value.chomp.strip
-
-                    when :text
-                      case 
-                      when (param_file.nil? and not (value.nil? or value.empty?))
-                        value
-                      when (not param_file.nil?)
-                        value[:tempfile].read
-                      end
-
-                    when :array
-                      case 
-                      when (param_file.nil? and not (value.nil? or value.empty?))
-                        case
-                        when String === value
-                          value.split(/\n|,/).collect{|l| l.strip}
-                        when Array === value
-                          value
-                        else
-                          raise "Input #{ input } must be Array or String: #{value.class}"
-                        end
-                      when (not param_file.nil?)
-                        text = value[:tempfile].read
-                        text.split(/\n|,/).collect{|l| l.strip}
-                      end
-
-                    when :tsv
-                      case 
-                      when (param_file.nil? and not (value.nil? or value.empty?))
-                        TSV.open(StringIO.new(value))
-                      when (not param_file.nil?)
-                        text = value[:tempfile].read
-                        TSV.open(StringIO.new(text))
-                      end
-                    end
-
+        new_value = fix_input(input_types[param], value, param_file)
         inputs[param] = new_value unless new_value.nil?
       end
 

data/share/views/compass/_base.sass

@@ -5,9 +5,6 @@ $blueprint_grid_margin: 10px
 $font_color: #333
 $blueprint-font-size: 14px
 
-@import compass/reset
-@import compass/utilities
-@import blueprint
 @import "compass/css3/inline-block"
 @import "blueprint/form"
 @import "blueprint/grid"

data/share/views/compass/app.sass

@@ -1,103 +0,0 @@
-@import "main"
-@import "form"
-
-body
-  margin: 10px
-  font-size: 12px
-  width: auto
-
-span.short_task_description
-  display: block
-  color: gray
-
-.embedded
-  margin: 0
-  padding: 0
-  &.reloading
-    span.status
-      font-size: 2em
-      color: gray
-
-#header 
-  background-color: #F2F2F2
-  h1 
-    font-size: 15px
-    a
-      text-decoration: none
-      color: blue
-    span.login
-      float: right
-
-#menu
-  font-size: 0.9em
-  overflow: auto
-  overflow-x: hidden
-  +column(5)
-  ul
-    +clean_list
-    li
-      display: block
-        
-  .workflow_menu
-    margin-bottom: 20px
-
-ul.context_control
-  +clean_list(true)
-  height: 2em
-  li
-    float: left
-    padding: 3px
-    margin-left: 5px
-
-
-ul.job_control
-  +clean_list(true)
-  height: 2em
-  li
-    float: right
-    padding: 3px
-    margin-right: 15px
-
-#content
-  +column(19)
-  #main
-    width: auto
-    padding: 10px
-    &.contracted
-      +border_radius(4px, 4px)
-      overflow: auto
-      border: solid 1px gray
-  #details_controls
-    ul
-      +clean_list
-      li
-        margin: 0px
-        padding: 0px
-      a
-        +subtle_link(gray)
-  #details
-    +border_radius(4px, 4px)
-    padding: 10px
-    height: 200px
-    border: solid 1px gray
-    background-color: #F2F2F2
-    overflow: auto
-    &.expanded
-      height: auto
-      overflow: none
-
-  #other_task_jobs
-    +column(5)
-    float: right
-
-#footer
-  margin-top: 20px
-  color: orange
-
-span.input_name
-  font-weight: bold
-
-table tfoot 
-  input
-    &.pnum, &.psize
-      width: 3em

data/share/views/compass/compass.config

@@ -12,19 +12,19 @@ else
 end
 
 Sass::Engine::DEFAULT_OPTIONS[:load_paths].tap do |load_paths| 
-  load_paths << WorkflowREST.views.compass.find(:lib, Sinatra::Application.root).to_s 
+  load_paths << Rbbt.views.compass.find(:lib, Sinatra::Application.root).to_s 
   Workflow.workflows.each do |workflow|
-    load_paths << WorkflowREST.www.views.compass.find(:lib, workflow.libdir).to_s 
+    load_paths << Rbbt.www.views.compass.find(:lib, workflow.libdir).to_s 
   end
-  load_paths << WorkflowREST.share.views.compass.find(:lib).to_s 
+  load_paths << Rbbt.share.views.compass.find(:lib).to_s 
 
   load_paths << "#{Gem.loaded_specs['compass'].full_gem_path}/frameworks/compass/stylesheets"
   load_paths << "#{Gem.loaded_specs['compass'].full_gem_path}/frameworks/blueprint/stylesheets"
 end
 
 # This is common configuration
-sass_dir = WorkflowREST.share.views.compass.find(:lib, Sinatra::Application.root).to_s
-cache_dir = WorkflowREST.var.cache.sass.find
+sass_dir = Rbbt.share.views.compass.find(:lib, Sinatra::Application.root).to_s
+cache_dir = Rbbt.var.cache.sass.find
 images_dir = File.join 'public', 'images'
 http_path = "/"
 http_images_path = "/images"

data/share/views/compass/layout.sass

@@ -0,0 +1,133 @@
+@import "main"
+@import "form"
+
+body
+  margin: 10px
+  font-size: 14px
+  width: auto
+  background-color: #F0F0F0
+
+span.short_task_description
+  display: block
+  color: gray
+#header 
+  h1 
+    font-size: 15px
+    a
+      text-decoration: none
+      color: blue
+    span.login
+      float: right
+
+#menu
+  padding: 5px
+  font-size: 0.9em
+  overflow: auto
+  overflow-x: hidden
+  +column(5)
+  ul
+    +clean_list
+    li
+      display: block
+
+  .workflow_menu
+    margin-bottom: 20px
+
+ul.context_control
+  +clean_list(true)
+  height: 2em
+  li
+    float: left
+    padding: 3px
+    margin-left: 5px
+
+
+ul.job_control
+  +clean_list(true)
+  height: 2em
+  li
+    float: right
+    padding: 3px
+    margin-right: 15px
+
+#content
+  +column(19)
+  #main
+    width: auto
+    padding: 10px
+    &.contracted
+      +border_radius(4px, 4px)
+      overflow: auto
+      border: solid 1px gray
+  #details_controls
+    ul
+      +clean_list
+      li
+        margin: 0px
+        padding: 0px
+  #details
+    +border_radius(4px, 4px)
+    padding: 10px
+    height: 200px
+    border: solid 1px gray
+    background-color: #F2F2F2
+    overflow: auto
+    &.expanded
+      height: auto
+      overflow: none
+
+  #other_task_jobs
+    +column(5)
+    float: right
+
+#footer
+  margin-top: 20px
+  color: orange
+
+span.input_name
+  font-weight: bold
+
+table tfoot 
+  text-align: left
+  h3
+    display: inline
+    margin-right: 15px
+  input
+    &.pnum, &.psize
+      width: 3em
+
+table td
+  word-spacing: 5px
+
+thead th
+  color: white
+  background: black
+
+a.entity, a.entity_list, a.entity_action, a.entity_list_action
+  text-decoration: none
+  white-space: nowrap
+  word-spacing: 0px
+
+a.replace
+  +border_radius(4px, 4px)
+  +shadowed_box()
+  display: inline-block
+  padding: 5px
+
+.embedded
+  +border_radius(4px, 4px)
+  +shadowed_box()
+  padding: 10px 25px
+  &.reloading
+    span.status
+      font-size: 2em
+      color: gray
+
+div.form_input label
+  margin-top: 10px
+
+span.user
+  color: gray
+
+a.button
+  +button_link()