rbbt-rest 1.4.12 → 1.4.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 03ac08862f5707ebc79b0e51e5397046a7e6ad38
-  data.tar.gz: 74c3d63378c74626aeacb3212e8c80b831cd89bb
+  metadata.gz: 0f6369a018efc715d4d43812781989fc9c81e0be
+  data.tar.gz: fd448c6fb71b1b145a2eb03291e2a55b9266677e
 SHA512:
-  metadata.gz: 8c7704649631cabb4753b778d624018990a1750df9640e12a525a2dea2c0e771f348f067be3ccb74a64ccd96b8816d64ec968524da60de9cdf1d28af35a6b717
-  data.tar.gz: a2316d0ee4cb476a236e64baffd240169b5f247ea32367c28177d1fb0a978b9a8e2e6bbc35c31e523d9de2896908615b9e59530ad1b9da0202dd15674b908405
+  metadata.gz: 805eaf6fbefae98774f067f47ab2da03fe14f041772017cc602151ccce5b64368954fb627210a4b4645f74b446e2fc0cc3ced93ffe43319980a8ada0d3c7bb5b
+  data.tar.gz: fadc91b35639e826b830b68cbef1a40f793ba2291256361869bdaf65464f1a995524703dd6ac6d70e6f888bc4a3735b8646453c0cbd55b906eee9ac785a36958

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

@@ -14,7 +14,7 @@ module RbbtRESTHelpers
   end
 
   def cache(name, params = {}, &block)
-    @cache_type ||= params[:cache_type] if params[:cache_type]
+    @cache_type ||= params.delete :cache_type if params[:cache_type]
     return yield if name.nil? or @cache_type.nil? or @cache_type == :none
 
     send_file = consume_parameter(:_send_file, params)
@@ -32,7 +32,6 @@ module RbbtRESTHelpers
     task = Task.setup(:name => orig_name, :result_type => :string, &block)
 
     step = Step.new(path, task, nil, nil, self)
-    #last_modified File.mtime(step.path.find) if step.done?
 
     halt 200, step.info.to_json if @format == :info
 

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

@@ -94,7 +94,7 @@ module RbbtRESTHelpers
              when :string
                nil
              when :float
-               "0.1"
+               "any"
              when :integer
                1
              end

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

@@ -226,7 +226,7 @@ module Haml::Filters::DeferJS
 
   def render(text)
     defer_text =<<-EOF
-%script(defer)
+%script
   :plain
     defer(function(){
 #{text.gsub(/^/,"      ")}

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

@@ -53,7 +53,7 @@ module RbbtRESTHelpers
     raise TemplateMissing, "Template #{ template_file } not found" unless template_file.exists?
     raise TemplateMissing, "Template #{ layout_file } not found" unless layout_file.nil? or layout_file.exists?
     layout_file = layout_file.find if layout_file.respond_to? :find
-    template_file = template_file.find if layout_file.respond_to? :find
+    template_file = template_file.find if template_file.respond_to? :find
     if layout_file
       Tilt::HamlTemplate.new(layout_file, :filename => layout_file, :ugly => production?).render(self, locals) do
         cache(cache, locals.merge(:_template_file => template_file, :user => user).merge(cache_options)) do
@@ -69,6 +69,13 @@ module RbbtRESTHelpers
     end
   end
 
+  def render_sass(file)
+    renderer = Sass::Engine.new(Open.read(file), :filename => file, 
+                                :style => production? ? :compressed : nil, 
+                                :debug_info => development? ? true : false)
+    renderer.render
+  end
+
   def render_partial(template_file, locals = {}, cache = nil, cache_options = {})
     render(template_file, locals, nil, cache, cache_options)
   end
@@ -87,8 +94,11 @@ module RbbtRESTHelpers
 
   def fragment(link = nil, &block)
     fragment_code, link = [link.to_s, nil] if link and not link.to_s[0] == '<'
+    text = fragment_code if fragment_code
+
     if block_given?
       if defined? @step and (@cache_type == :asynchronous or @cache_type == :async)
+
         fragment_code ||= (rand * 100000).to_i.to_s
         fragment_file = @step.file(fragment_code)
 
@@ -111,12 +121,18 @@ module RbbtRESTHelpers
         url = remove_GET_param(url, "_")
         fragment_url = add_GET_param(url, "_fragment", fragment_code)
         if link.nil?
-          html_tag('a', "", :href => fragment_url, :class => 'fragment')
+          html_tag('a', "", :href => fragment_url, :class => 'fragment', "data-text" => text)
         else
           if link =~ / href=/
-            link.sub(/ href=('|")/," href='#{fragment_url}'")
+            link = link.sub(/ href=('|")/," href='#{fragment_url}'")
           else
-            link.sub(/<a /,"<a href='#{fragment_url}' ")
+            link = link.sub(/<a /,"<a href='#{fragment_url}' ")
+          end
+
+          if text
+            link.sub(/<a /,"<a data-text='#{text}' ")
+          else
+            link
           end
         end
       else
@@ -124,9 +140,15 @@ module RbbtRESTHelpers
       end
     else
       if link =~ / class=/
-        link.sub(/ class=('|")/,' class=\1fragment ')
+        link = link.sub(/ class=('|")/,' class=\1fragment ')
+      else
+        link = link.sub(/<a /,'<a class="fragment" ')
+      end
+      
+      if text
+        link.sub(/<a /,"<a data-text='#{text}' ")
       else
-        link.sub(/<a /,'<a class="fragment" ')
+        link
       end
     end
   end
@@ -155,7 +177,7 @@ module RbbtRESTHelpers
     type ||= :link
     case type
     when :image
-      "<img src='/files/#{ filename }' class='file_resource'/>"
+      "<img src='/files/#{ filename }' alt='#{text}' class='file_resource'/>"
     when :link
       "<a href='/files/#{ filename }' class='file_resource'>#{ text }</a>"
     when :linked_image

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

@@ -99,6 +99,7 @@ Counts
 Ratio
 Size
 size
+Matches
                 EOF
                ).split("\n")
 
@@ -263,11 +264,24 @@ 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[type] and not options[:unnamed]
 
     value = value.link if value.respond_to? :link and not options[:unnamed]
 
-    Array === value ? value.collect{|v| v.to_s} * ", " : value
+    if Array === value and value.length > 100
+      strip = value.length
+      value = value[0..99]
+    end
+
+    res = if options[:span]
+      Array === value ? value.collect{|v| "<span class='table_value'>#{v.to_s}</span>"} * ", " : "<span class='table_value'>#{value}</span>"
+    else
+      Array === value ? value.collect{|v| v.to_s} * ", " : value
+    end
+
+    res = "<span class='table_value strip'>[#{ strip } entries, 100 shown]</span>" + res if strip
+
+    res
   end
 
   def header(field, entity_type, entity_options = {})
@@ -334,7 +348,7 @@ module RbbtRESTHelpers
       url = remove_GET_param(url, "_")
     end
 
-    table_class = options[:table_class] || []
+    table_class = options[:table_class] || options[:class] || []
     table_class = [table_class] unless Array === table_class
     table_class << 'wide responsive' if tsv.fields.length > 4
 

data/lib/rbbt/rest/entity.rb

@@ -481,6 +481,7 @@ module Sinatra
           favourite_entities.each{|type, list|
             type_favs = {}
             list.each do |entity| 
+              next unless entity.respond_to? :link
               info = entity.info
               info.delete :annotation_types
               type_favs[entity] = {:info => info, :link => entity.link} 

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

@@ -121,6 +121,7 @@ module Entity
     def link(text = nil, options = {})
       #return self.tap{|a| a.extend AnnotatedArray}.collect{|e| e.link(text, options) } if Array === self
       return self.collect{|e| e.link(text, options) } if Array === self
+      return self.split(";").collect{|e| self.annotate(e).link(text, options) } * ", " if self.include? ";"
 
       klasses = self.klasses
       klasses <<  'entity'

data/lib/rbbt/rest/main.rb

@@ -9,6 +9,24 @@ require 'json'
 
 module Sinatra
   module RbbtRESTMain
+
+    def self.add_resource_path(path, priority_templates = false)
+      Log.low "Adding resource path: #{Misc.fingerprint path}"
+      KnowledgeBaseRESTHelpers.association_resources.unshift path
+      EntityRESTHelpers.entity_resources.unshift path
+
+      if priority_templates
+        RbbtRESTHelpers.template_resources.unshift path 
+      else
+        RbbtRESTHelpers.template_resources.push path 
+      end
+
+      RbbtRESTHelpers.add_sass_load_path path.compass if path.compass.exists?
+
+      RbbtRESTHelpers.javascript_resources.unshift path.public.js if path.public.js.exists?
+      RbbtRESTHelpers.sass_resources.unshift path.compass if path.compass.exists?
+    end
+
     def add_sass_load_path(path)
       path = path.find if Path === path
       Sass::Engine::DEFAULT_OPTIONS[:load_paths].unshift path if File.exists? path
@@ -21,10 +39,6 @@ module Sinatra
 
         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
-        #set :permalink_dir, Rbbt.var.sinatra.permalink.find unless settings.respond_to? :permalink_dir and settings.permalink_dir != nil
-
         set :public_folder, Rbbt.share.views.public.find 
 
         set :environment, ENV["RACK_ENV"].to_sym if ENV["RACK_ENV"]
@@ -119,21 +133,17 @@ module Sinatra
           send_file script_file
         end
 
-        get '/stylesheets/:name.css' do
-          name = consume_parameter :name
+        get '/stylesheets/*' do
+          name = consume_parameter :splat
 
-          file = locate_sass(name)
+          file = locate_sass((name*"/").sub(/.css$/,''))
 
           content_type 'text/css', :charset => 'utf-8'
           cache_control :public, :max_age => 360000 if production?
 
-          @cache_type = production? ? :synchronous : :none
-          cache('css', :_template_file => file, :_send_file => true) do
+          cache("css: #{File.basename(file)}", :_template_file => file, :_send_file => true, :cache_type => production? ? :synchronous : :none) do
             Log.debug{ "Rendering stylesheets" }
-            renderer = Sass::Engine.new(Open.read(file), :filename => file, 
-                                        :style => production? ? :compressed : nil, 
-                                        :debug_info => development? ? true : false)
-            renderer.render
+            render_sass(file)
           end
         end
 
@@ -186,7 +196,7 @@ module Sinatra
 
         get '/fonts/*' do
           filename = params[:splat].first
-          file = File.join(FontAwesome::Sass.fonts_path, filename)
+          file = File.join(settings.public_folder, 'fonts', filename)
           send_file file
         end
 
@@ -195,6 +205,18 @@ module Sinatra
           file = locate_file(Path.setup('public/opt')[filename])
           send_file file.find
         end
+
+        get '/images/*' do
+          filename = params[:splat].first
+          file = locate_file(Path.setup('public/images')[filename])
+          send_file file.find
+        end
+
+        get '/file/*' do
+          filename = params[:splat].first
+          file = locate_file(Path.setup('public')[filename])
+          send_file file.find
+        end
         
         require 'rbbt/rest/monitor'
         register Sinatra::RbbtRESTMonitor

data/lib/rbbt/rest/web_tool.rb

@@ -3,7 +3,25 @@ module Sinatra
   module RbbtToolHelper
     def tool(toolname, options = {})
       options[:id] ||= toolname.to_s + "_#{rand(10000)}"
-      partial_render("tools/#{toolname}", options)
+
+      template_file = locate_template("tools/#{toolname}")
+      content = Tilt::HamlTemplate.new(template_file, :filename => template_file, :ugly => production?).render(self, options)
+
+      styles = begin
+                 path = locate_sass("tools/#{toolname}")
+                 link_css "/stylesheets/tools/#{toolname}" if path.exists?
+               rescue Exception
+                 ""
+               end
+
+      javascript = begin
+                     path = locate_javascript("tools/#{toolname}")
+                     link_js "/js-find/tools/#{toolname}" if path.exists?
+                   rescue Exception
+                     ""
+                   end
+
+      styles + content + javascript
     end
   end
 end

data/lib/rbbt/rest/workflow.rb

@@ -19,18 +19,12 @@ module Sinatra
   module RbbtRESTWorkflow
     WORKFLOWS = []
 
-    def add_workflow_resource(workflow)
+
+    def add_workflow_resource(workflow, add_templates = false)
       views_dir = workflow.respond_to?(:libdir)? workflow.libdir.www.views.find(:lib) : nil
       if views_dir and views_dir.exists?
         Log.debug "Registering views for #{ workflow }: #{ views_dir.find }"
-        KnowledgeBaseRESTHelpers.association_resources.unshift views_dir
-        EntityRESTHelpers.entity_resources.unshift views_dir
-        RbbtRESTHelpers.template_resources.unshift views_dir
-
-        RbbtRESTHelpers.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?
+        RbbtRESTMain.add_resource_path(views_dir, add_templates)
       end
     end
 
@@ -40,7 +34,7 @@ module Sinatra
 
       Log.debug "Adding #{ workflow } to REST server" 
 
-      add_workflow_resource(workflow) if add_resource
+      add_workflow_resource(workflow, add_resource == :all) if add_resource
       workflow.documentation
 
 

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

@@ -28,7 +28,7 @@ module WorkflowRESTHelpers
       cache_file = job.file('html')
       render(template_file, locals, layout_file, [task,workflow,job.name] * "-", :cache_type => cache_type, :cache_file => cache_file)
     else
-      render(template_file, locals, layout_file)
+      render(template_file, locals, layout_file, [workflow, task, template_file].compact * "-", :cache_type => :async )
     end
   end
 

data/share/views/compass/app.sass

@@ -1 +1,3 @@
-@import "_app"
+@charset "UTF-8"
+@import "init"
+//@import "CSS:semantic-ui"

data/share/views/compass/base/backgrounds.sass

@@ -0,0 +1,41 @@
+%background-white
+  background: white
+  a:not([href="#"])
+    color: $color-link
+
+%background-main
+  background: $color-background-main
+  a:not([href="#"])
+    color: $color-link-alt
+
+%background-subtle
+  background: $color-background-subtle
+  a:not([href="#"])
+    color: $color-link-alt
+
+%background-glassy
+  background: $color-background-glassy
+
+%background-hover
+  background: $color-background-hover
+  a:not([href="#"])
+    color: $color-link-alt
+
+%background-active
+  background: $color-background-active
+  &, a:not([href="#"])
+    color: white
+  
+%background-error
+  background: $color-background-error
+  color: $color-accent
+  & > a
+    color: $color-accent
+  
+=subtle_background
+  @extend %background-subtle
+
+=white_background
+  @extend %background-white
+
+

data/share/views/compass/base/blocks.sass

@@ -0,0 +1,92 @@
+@import "susy"
+@import "base/misc"
+@import "base/screen_sizes"
+@import "base/colors"
+@import "base/material"
+@import "base/hide"
+
+=raisable($depth: 1)
+  &.show, &.active
+    +material($depth)
+
+=border( $size: 1px, $padding: 0.25 ) 
+  +rhythm-borders($size,$padding)
+  border-color: $subtle-border
+  &:hover
+    border-color: darken($subtle-border, 20)
+
+=block
+  text-overflow: ellipsis
+  @media #{$only-small}
+    width: 100% 
+
+=padded_block($padsize: 1 of 50, $verticalpad: 1)
+  padding: 16px
+
+=medium_size
+  @media #{$only-small}
+    width: 100% !important
+  @media #{$not-very-large}
+    width: span(1 of 2)
+  @media #{$only-very-large}
+    width: span(1 of 3)
+
+=full_block
+  +block
+  width: 100%
+  overflow: show
+  text-overflow: show
+
+=large_block
+  +block
+  @media #{$only-very-large}
+    +gallery(1 of 2)
+
+=medium_block
+  +block
+  @media #{$not-small}
+    +gallery(1 of 2)
+  @media #{$only-large}
+    +gallery(1 of 3)
+  &.masonry
+    @media #{$only-very-large}
+      +gallery(1 of 4)
+
+=small_block
+  +block
+  @media #{$not-small}
+    +gallery(1 of 2)
+  @media #{$only-very-large}
+    +gallery(1 of 4)
+  &.masonry
+    +gallery(1 of 2)
+    @media #{$only-large}
+      +gallery(4 of 12)
+    @media #{$only-very-large}
+      +gallery(1 of 5)
+
+=ease_margin
+  @include transition-property(margin)
+  @include transition-duration(3s)
+  @include transition-timing-function(ease-in)
+=ease_width
+  @include transition-property(width)
+  @include transition-duration(3s)
+  @include transition-timing-function(ease-in)
+=ease_height
+  @include transition-property(border)
+  @include transition-property(max-height)
+  @include transition-duration(1s)
+  @include transition-timing-function(ease-in)
+=ease_color
+  @include transition-property(color)
+  @include transition-duration(3s)
+  @include transition-timing-function(ease-in)
+
+=ease
+  @include transition-property(top)
+  @include transition-duration(0.6s)
+  @include transition-timing-function(ease-in)
+  
+=boxed
+  +padded_block