rbbt-rest 1.1.5 → 1.2.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YmU4OTJhZGMwZTZkYzY0MTcxZjVlNjNlM2QyYjc2YTMyOWIyYjc0MA==
+    ZDEwYTAxNGNmZTM1OTk0MTIwM2JiZWRlOGM4NjVlNTE1M2M3MTE0MA==
   data.tar.gz: !binary |-
-    YjIwNDcyMzgzMWViOGY4NTI1ZTM5YjkzZTA5Y2Q1MzdlYjJmNzk4Nw==
+    NzYzOGQ3M2E3NmRkMzkzMDBlYjMxNjdiYjNhMzFjOGMwZWFkZGFhZg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NmZjNDljMWQxYTc3NTEwYjJkOTgyNWFhNjcyZjI3ODA2YTk4NzYzNTdiZDA1
-    ZjY0MTE1YmQxZDdhMWI2MmRkMmJmNzMxMWQ0MTIyMThlOGY3ODc0Njg4NGY0
-    NzgyYTU4MDcyOTkyYmM3OGE2YjM4MDQ3MTM2ZTkwM2YxYzJkNWE=
+    ZGZlZjJkMjdhZDIxOTVhZjBmOGRhOGFmMDY5Y2I5N2RhODFlM2RiYmE3YjI2
+    ODNhMjJjNTIwNmE2MzA2ZWZjMGFmNzQ2NzkwNmFhMTg4MTBhNTQxYTJiNDEx
+    NzEzNmJmMjRjNjljMDJkOGViOTQ4OWM3YWIwOWEyYmU3YzlkNzE=
   data.tar.gz: !binary |-
-    ZjVlOGQxMTBkZGY3N2IxYTgwODU3MDc5NmE4OGIyYzMyY2I1NDdhNDc5ODZk
-    NzFlM2FlMDhjMzhlNDU0Y2QzZjJmZjUxOGQyMGM2NmNhN2U2ZWIzMzNmN2Uz
-    MGE0MDZlNDRlMWVjY2U2NTE2ZjRkM2Y3NGE5MGI4OTY2ZTI3OTk=
+    OWNhNTk4MjJjZGMxOWE4MmE0MmExMzYyZGFjY2QwMWIyOGQzYzZiOWJkNDU1
+    MjkwNDIxNjFhMGQzNTgxYTM2MWNiMDdmZTllMWI0MDJjMTljMjY0ZWQ4ZTlk
+    ZTQ2ZmM0NzIwODQ3NDg1ZThjZDhlZjEwYmU0YTZjNDJiNjE0ZjQ=

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

@@ -19,6 +19,8 @@ module RbbtRESTHelpers
 
     send_file = consume_parameter(:_send_file, params)
 
+    # Setup Step
+    
     check = [params[:_template_file]].compact
     check += consume_parameter(:_cache_check, params) || []
     check.flatten!
@@ -29,11 +31,14 @@ module RbbtRESTHelpers
     task = Task.setup(:name => "Sinatra cache", :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
 
     self.instance_variable_set("@step", step)
 
+    # Return fragment
+
     if @fragment
       fragment_file = step.file(@fragment)
       if File.exists?(fragment_file)
@@ -73,6 +78,7 @@ module RbbtRESTHelpers
           tsv.excel(excel_file, :name => @excel_use_name,:sort_by => @excel_sort_by, :sort_by_cast => @excel_sort_by_cast)
           send_file excel_file, :type => 'application/vnd.ms-excel', :filename => 'table.xls'
         else
+          cache_control :public, :max_age => 360000 if production?
           send_file fragment_file
         end
       else
@@ -85,8 +91,9 @@ module RbbtRESTHelpers
       end
     end
 
+    # Clean/update job
 
-    if old_cache(path, check) or update == :reload
+    if old_cache(step.path, check) or update == :reload
       begin
         pid = step.info[:pid]
         step.abort if pid and Misc.pid_exists? pid
@@ -97,6 +104,8 @@ module RbbtRESTHelpers
       step.clean 
     end
 
+    # Issue
+    
     step.fork unless step.started?
 
     step.join if cache_type == :synchronous or cache_type == :sync
@@ -108,31 +117,41 @@ module RbbtRESTHelpers
       redirect to(url)
     end
 
+    # Monitor
+    
     begin
-      case step.status
-      when :error, :aborted
-        error_for step, !@ajax
-      when :done
+
+      if step.done?
         case
         when @permalink
           redirect to(permalink(step.path))
         when send_file
           send_file step.path
         else
+          cache_control :public, :max_age => 360000 if production?
           step.load
         end
       else
-        if File.exists?(step.info_file) and Time.now - File.atime(step.info_file) > 60
-          Log.debug("Checking on #{step.info_file}")
-          running = step.running?
-          if FalseClass === running
-            Log.debug("Aborting zombie #{step.info_file}")
-            step.abort unless step.done?
-            raise RbbtRESTHelpers::Retry
+
+        case step.status
+        when :error, :aborted
+          error_for step, !@ajax
+
+        else
+          # check for problems
+          if File.exists?(step.info_file) and Time.now - File.atime(step.info_file) > 60
+            Log.debug("Checking on #{step.info_file}")
+            running = step.running?
+            if FalseClass === running
+              Log.debug("Aborting zombie #{step.info_file}")
+              step.abort unless step.done?
+              raise RbbtRESTHelpers::Retry
+            end
+            FileUtils.touch(step.info_file)
           end
-          FileUtils.touch(step.info_file)
+
+          wait_on step, false
         end
-        wait_on step, false
       end
     rescue RbbtRESTHelpers::Retry
       retry

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

@@ -1,6 +1,8 @@
 module RbbtRESTHelpers
   attr_accessor :template_resources, :sass_resources, :javascript_resources, :plugin_resources
 
+  class TemplateMissing < StandardError; end
+
   #{{{ TEMPLATE
   
   def self.template_resources
@@ -21,7 +23,7 @@ module RbbtRESTHelpers
       return path if path.exists?
     end
 
-    raise "Template #{ template } not found"
+    raise TemplateMissing, "Template #{ template } not found"
   end
  
   #{{{ SASS
@@ -35,7 +37,7 @@ module RbbtRESTHelpers
   end
 
   def sass_resources
-    [Rbbt.www.views.find(:lib)] + RbbtRESTHelpers.sass_resources
+    RbbtRESTHelpers.sass_resources
   end
 
   def locate_sass_from_resource(resource, template)
@@ -48,17 +50,17 @@ module RbbtRESTHelpers
       return path if path.exists?
     end
 
-    raise "Sass template #{ template } not found"
+    raise TemplateMissing, "Sass template #{ template } not found"
   end
 
   #{{{ JAVASCRIPT
 
   def self.javascript_resources
-    @javascript_resources ||= [Rbbt.share.views.js.find(:lib), Rbbt.share.views.public.find(:lib)]
+    @javascript_resources ||= [Rbbt.share.views.public.find(:lib), Rbbt.share.views.public.js.find(:lib)]
   end
 
   def javascript_resources
-    [Rbbt.www.views.js.find(:lib), Rbbt.www.views.public.find(:lib)] + RbbtRESTHelpers.javascript_resources
+    RbbtRESTHelpers.javascript_resources
   end
 
 
@@ -74,6 +76,6 @@ module RbbtRESTHelpers
       return path if path.exists?
     end
 
-    raise "Script #{ script } not found"
+    raise TemplateMissing, "Script #{ script } not found"
   end
 end

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

@@ -13,6 +13,10 @@ module RbbtRESTHelpers
     end
   end
 
+  def development?
+    ENV["RACK_ENV"] == "develoment"
+  end
+
   def production?
     ENV["RACK_ENV"] == "production"
   end

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

@@ -17,10 +17,16 @@ module RbbtRESTHelpers
   end
 
   def wait_on(job, layout = nil)
+    ddd "wait"
     3.times do
       sleep 1
-      raise RbbtRESTHelpers::Retry if job.done? or job.error?
     end
+    ddd job.status
+    ddd job.done?
+    ddd job.error?
+    raise RbbtRESTHelpers::Retry if job.done? or job.error?
+
+    ddd "Render"
 
     layout = @layout if layout.nil?
 
@@ -32,6 +38,8 @@ module RbbtRESTHelpers
   end
 
   def render(template_file, locals = {}, layout_file = nil, cache = nil, cache_options = {})
+    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?
     if layout_file
       Haml::Engine.new(Open.read(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
@@ -63,13 +71,14 @@ module RbbtRESTHelpers
     render(template_file, locals, nil, cache, cache_options)
   end
 
-  def fragment(link = nil,&block)
+  def fragment(link = nil, &block)
+    fragment_code, link = [link.to_s, nil] if link and not link.to_s[0] == '<'
     if block_given?
       if defined? @step and cache_type == :asynchronous or cache_type == :async
-        fragment_code = (rand * 100000).to_i.to_s
+        fragment_code ||= (rand * 100000).to_i.to_s
         fragment_file = @step.file(fragment_code)
 
-        pid = @step.child {
+        pid = @step.child{
           begin
             res = capture_haml &block
             Open.write(fragment_file, res)
@@ -82,6 +91,7 @@ module RbbtRESTHelpers
 
         url = request.fullpath
         url = remove_GET_param(url, "_update")
+        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')

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

@@ -42,7 +42,7 @@ module RbbtRESTHelpers
           begin
             path = locate_javascript(file)
           rescue
-            path = locate_javascript(File.basename(file))
+            path = locate_javascript(file.split("/")[2..-1] * "/")
           end
 
           Open.read(path)

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

@@ -134,13 +134,21 @@ module RbbtRESTHelpers
     if filter and filter.to_s != "false"
       filter.split(";;").each do |f|
         key, value = f.split("~")
+        if value =~ /^!\s*(.*)/
+          value = $1
+          invert = true
+        else
+          invert = false
+        end
         case
         when value =~ /^([<>]=?)(.*)/
-          tsv = tsv.select(key){|k| k = k.first if Array === k; k.to_f.send($1, $2.to_f)}
-        when value =~ /^\/(.+)\/.{0,2}$/
-          tsv = tsv.select(key => Regexp.new($1))
+          tsv = tsv.select(key, invert){|k| k = k.first if Array === k; k.to_f.send($1, $2.to_f)}
+        when value =~ /^\/(.+)\/.{0,2}\s*$/
+          tsv = tsv.select({key => Regexp.new($1)}, invert)
+        when (value =~ /^\d+$/ and tsv.type == :double or tsv.type == :flat)
+          tsv = tsv.select({key => value.to_i}, invert)
         else
-          tsv = tsv.select(key => value)
+          tsv = tsv.select({key => value}, invert)
         end
       end
     end
@@ -188,6 +196,17 @@ module RbbtRESTHelpers
   def self.save_tsv(tsv, path)
     Open.write(path, tsv.to_s)
     table_options = {:tsv_entity_options => tsv.entity_options}
+    if tsv.entity_templates and tsv.entity_templates.any?
+      table_options[:headers] ||= {}
+      tsv.entity_templates.each do |field,template|
+        next if table_options[:headers].include? field
+        info = template.info
+        info.delete :format
+        info.delete :annotation_types
+        info.delete :annotated_array
+        table_options[:headers][field] = [template.annotation_types.last.to_s, info]
+      end
+    end
     Open.write(path + '.table_options', table_options.to_yaml )
   end
 
@@ -197,7 +216,7 @@ module RbbtRESTHelpers
     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]
-    headers.each{|field,p| tsv.entity_templates[field] = Misc.prepare_entity("TEMPLATE", p.first, p.last) } unless headers.nil?
+    headers.each{|field,p| tsv.entity_templates[field] = Misc.prepare_entity("TEMPLATE", p.first, (tsv.entity_options || {}).merge(p.last)) } unless headers.nil?
 
     [tsv, table_options]
   end
@@ -237,6 +256,15 @@ module RbbtRESTHelpers
       @table_headers = {}
     end
 
+    if tsv.entity_templates and tsv.entity_templates.any?
+      options[:headers] ||= {}
+      tsv.entity_templates.each do |field,template|
+        next if options[:headers].include? field
+        next if template.nil?
+        options[:headers][field] = [template.annotation_types.last.to_s, template.info]
+      end
+    end
+
     if @table_filters and @table_filters.any?
       options[:filters] = @table_filters
       @table_filters = {}
@@ -247,10 +275,12 @@ module RbbtRESTHelpers
 
     total_size = tsv.size
     if options[:page].nil?  and total_size > PAGE_SIZE * 1.2
-        @page = "1"
+      @page = "1"
+    else
+      @page = options[:page]
     end
 
-    tsv2html(table_file)
+    tsv2html(table_file, options)
   end
 
 

data/lib/rbbt/rest/entity.rb

@@ -22,6 +22,7 @@ require 'rbbt/rest/entity/entity_map_card'
 require 'rbbt/rest/entity/action_card'
 require 'rbbt/rest/entity/list_container'
 require 'rbbt/rest/entity/action_controller'
+require 'rbbt/rest/knowledge_base'
 
 require 'rbbt/statistics/rank_product'
 
@@ -154,9 +155,10 @@ module Sinatra
 
             raise "List file not found: #{ list_id }"
           when :json
-            list_info = {:entities => list, :info => list.info}
-            halt 200, list_info.to_json
+            content_type "application/json"
+            halt 200, list_json(list)
           when :info
+            content_type "application/json"
             halt 200, list.info.to_json
           when :list
             content_type "text/plain"
@@ -475,7 +477,6 @@ module Sinatra
           content_type "application/json"
 
           favs = {}
-
           favourite_entities.each{|type, list|
             type_favs = {}
             list.each do |entity| 
@@ -486,6 +487,7 @@ module Sinatra
             favs[type] = type_favs
           }
 
+          cache_control :public, :max_age => 360000 if production?
           favs.to_json
         end
  

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

@@ -6,12 +6,14 @@ module EntityRESTHelpers
     raise "You need to login to have favourites" unless authorized?
 
     dir = Path.setup(File.join(settings.favourites_dir, user))
+
     favourites = {}
     dir.glob('**').each do |file|
       type = File.basename(file)
       entities = Annotated.load_tsv(TSV.open(file))
       favourites[type] = entities
     end
+
     favourites
   end
 
@@ -85,6 +87,8 @@ module EntityRESTHelpers
 
     if (file = dir[entity_type]).exists?
       lists = Open.read(file).split("\n")
+      ddd lists
+      ddd list
       lists -= [list]
       if lists.any?
         Open.write(file, lists * "\n")
@@ -128,7 +132,6 @@ module EntityRESTHelpers
       maps = [map]
       Open.write(file, maps * "\n")
     end
-    ddd favourite_entity_maps
   end
 
   def remove_favourite_entity_map(entity_type, column, map)

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

@@ -1,6 +1,18 @@
 
 module EntityRESTHelpers
 
+  def list_hash(list)
+    return {:entities => list} unless list.respond_to? :base_entity
+    info = list.info
+    info.delete :annotation_types
+    info.delete :annotated_array
+    {:entities => list, :info => list.info, :entity_type => list.base_entity}
+  end
+
+  def list_json(list)
+    list_hash(list).to_json
+  end
+
   def list(list, list_id = nil, text = nil)
     partial_render('entity_partials/entity_list', :list => list, :list_id => list_id, :text => text)
   end

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

@@ -37,7 +37,7 @@ module Entity
       klasses = []
       klasses << base_type.to_s if base_type
       klasses << format if self.respond_to? :format and format
-      klasses.collect{|klass| klass.gsub(/\s/, '_') }
+      klasses.collect{|klass| klass.gsub(/[^\w]/, '_') }
     end
     
     def entity_type
@@ -131,7 +131,11 @@ module Entity
       attributes[:href] = Entity::REST.entity_url(self, entity_type.to_s, link_params)
       attributes["attr-entity_id"] = self.to_s
 
-      text = self.respond_to?(:name)? self.name || self : self if text.nil?
+      begin
+        text = self.respond_to?(:name)? self.name || self : self if text.nil?
+      rescue
+        text = self
+      end
       attributes[:title] = text if attributes[:title].nil?
 
       Misc.html_tag('a', text, attributes)