rbbt-rest 1.2.30 → 1.2.31

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NjI5YmRlOTNhMjY0NzVhNTA4YTI4Y2NiZjhmZGQ4ZWU3NGY5MTJlMg==
+    OWMyY2U0NDU1YWMxYzA1ZjNiZmViMjRkMjk1OGMzMjk2NWRhNWVhNA==
   data.tar.gz: !binary |-
-    MGJhZTIyMDQwY2U2NzY3ZTIzNDIzZDAzNDBlYThlM2NkZjBkOGZhNQ==
+    ZWYzMjRiNzE1ZTIyYzMwMTZjMThkMTYzYWYxMDhhNDhjMjJmMmU0Yg==
 SHA512:
   metadata.gz: !binary |-
-    NGNhN2Q1MzIxYzAyNDFjYzI0ODBkYTNlMzUwMmY2ZDhmMTQ5ZmNmNjQ1ZjEw
-    NGM5ZDY0ZTI1OTlhZjEzYWQ1MzU1MGJjMGUwY2U3N2MwYTEwZTQ3N2ZlOTk2
-    ODUxYTMzMDFjMGZmY2YwNzM3YThmZmFlNWIzOGI0OTNkNmJjMGI=
+    NTRkZmQ3MGFiMDU3NDA1OGMzNjc0Mjk4ZWMzMmJmMDI5MzEzNTBkMzVkNDM3
+    OGNkZjYzZmVkZWExZDM2YmU4YWVhODM1Mzk0M2Q0YTIyMTVkYzhkYWNkODRj
+    NTQyMzRmNDQ2MGZkYWZhZmI0NjRjZWFiN2MwYjVhZDZhOGZmNjM=
   data.tar.gz: !binary |-
-    ODdmMmU2NTZjMjE5NjkzYTEzYjgwMWRhN2EwZDkxYjgxZDk1MTlkYzc3ZDQw
-    YzUyYzZiZjc0MDA3NjdlNDE4NmRlYTE4YzAzOTYyMTNkMTRkYzY2MzJhYjMx
-    ZDA1ZDY2ZTljN2NhNWM1ZmEyYTZjMDEwNDc5OWM4ZDc5N2MwMDc=
+    N2ZjM2JhOTMyMjBjYWJjNWQ4OWY5YzM0MWY3NzQzZWNlODBkZTBmYjUyZGY3
+    YmYzY2RmYzg1NTVmNGU3NjAwMGViZWFhN2U3YzRmMzE5ZTQzZjQxNjMzODQ3
+    YzkyYjcyY2Q1OWNlMTQ3ZWQ1NGU2NzE1ZGU2NDE1OWQyMWE3ODM=

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

@@ -80,7 +80,7 @@ module RbbtRESTHelpers
           content_type "text/html"
           data = nil
           excel_file = TmpFile.tmp_file
-          tsv.excel(excel_file, :name => @excel_use_name,:sort_by => @excel_sort_by, :sort_by_cast => @excel_sort_by_cast)
+          tsv.excel(excel_file, :name => @excel_use_name, :sort_by => @excel_sort_by, :sort_by_cast => @excel_sort_by_cast, :name => true)
           send_file excel_file, :type => 'application/vnd.ms-excel', :filename => 'table.xls'
         else
           send_file fragment_file
@@ -99,8 +99,8 @@ module RbbtRESTHelpers
 
     if old_cache(step.path, check) or update == :reload
       begin
-        pid = step.info[:pid]
-        step.abort if pid and Misc.pid_exists? pid
+        pid = step.info[:pid] 
+        step.abort if pid and Misc.pid_exists?(pid) and not pid == Process.pid
         step.pid = nil
       rescue Exception
         Log.medium{$!.message}
@@ -109,10 +109,14 @@ module RbbtRESTHelpers
     end
 
     # Issue
-    
-    step.fork unless step.started?
+    if not step.started?
+      if cache_type == :synchronous or cache_type == :sync
+        step.run 
+      else
+        step.fork
+      end
+    end
 
-    step.join if cache_type == :synchronous or cache_type == :sync
 
     if update == :reload
       url = request.url

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

@@ -71,7 +71,7 @@ module RbbtRESTHelpers
   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
+      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)
 
@@ -100,8 +100,7 @@ module RbbtRESTHelpers
           end
         end
       else
-        yield
-        nil
+        capture_haml &block
       end
     else
       if link =~ / class=/

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

@@ -14,7 +14,7 @@ module Link
         val
       end
     else
-      ""
+      0
     end
   end
 end
@@ -125,9 +125,9 @@ module RbbtRESTHelpers
 
     object.with_unnamed do
       if entity and entity.respond_to? :tsv_sort
-        object.page(num, size, field, just_keys, reverse, &entity.method(:tsv_sort))
+        object.page(num, size, field, false, reverse, &entity.method(:tsv_sort))
       else
-        object.page(num, size, field, just_keys, reverse)
+        object.page(num, size, field, false, reverse)
       end
     end
   end

data/lib/rbbt/rest/entity.rb

@@ -164,11 +164,13 @@ module Sinatra
             content_type "text/plain"
             halt 200, list * "\n"
           when :name
-            content_type "text/plain"
-            halt 200, list.name * "\n"
+            name = list.name
+            a = name.list_link :length, list_id.sub(/ \(format:.*?\)|$/, " (format: Name)"), :ensembl => false
+            redirect to(a.match(/href=(["'])(.*?)\1/)[2])
           when :ensembl
-            content_type "text/plain"
-            halt 200, list.ensembl * "\n"
+            ensembl = list.ensembl
+            a = ensembl.list_link :length, list_id.sub(/ \(format:.*?\)|$/, " (format: Ensembl)")
+            redirect to(a.match(/href=(["'])(.*?)\1/)[2])
           else
             entity_list_render(list, list_id)
           end

data/share/views/compass/solarized.sass

@@ -32,25 +32,3 @@ $green:     #859900
     color: $accent1
   h1,h2,h3,h4,h5,h6 
     color: $accent2
-
-
-//@mixin rebase($rebase03,$rebase02,$rebase01,$rebase00,$rebase0,$rebase1,$rebase2,$rebase3)
-//{
-//    background-color:$rebase03;
-//    color:$rebase0;
-//    * { color:$rebase0; }
-//    h1,h2,h3,h4,h5,h6 { color:$rebase1; border-color: $rebase0; }
-//    a, a:active, a:visited { color: $rebase1; }
-//}
-//@mixin accentize($accent) {
-//    a, a:active, a:visited, code.url { color: $accent; }
-//    h1,h2,h3,h4,h5,h6 {color:$accent}
-//}
-///* light is default mode, so pair with general html definition */
-//html, .light { @include rebase($base3,$base2,$base1,$base0,$base00,$base01,$base02,$base03)}
-//.dark  { @include rebase($base03,$base02,$base01,$base00,$base0,$base1,$base2,$base3)}
-//html * {
-//    color-profile: sRGB;
-//    rendering-intent: auto;
-//}
-//

data/share/views/entity_partials/entity_list_card.haml

@@ -21,12 +21,15 @@
               %a.compare_list(href="#" data-reveal-id='modal1') Compare
             %li
               %a.list_list(href="#{request.path_info + "?_format=list"}") List
+
             - if list.respond_to? :name
               %li
                 %a.name_list(href="#{request.path_info + "?_format=name"}") Name
+
             - if list.respond_to? :ensembl
               %li
                 %a.ensembl_list(href="#{request.path_info + "?_format=ensembl"}") Ensembl
+
             %li
               %a.download_list(href="#{request.path_info + "?_format=raw"}") Raw
             %li

data/share/views/layout.haml

@@ -25,13 +25,17 @@
 
   // Thid party frameworks
 
+  -# record_js '/plugins/json/json2.js'
   - record_js "/plugins/underscore/js/underscore.js"
+
   = serve_js
+
   - %w(jquery-2.0.0 jquery.cookie jquery.form).each do |jquery_file|
     - record_js File.join('/plugins/jquery/js/', jquery_file)
 
   - record_js '/plugins/jquery-ui/js/jquery-ui-1.8.14.custom.min.js'
 
+
   -# %w(foundation foundation.cookie foundation.reveal foundation.dropdown foundation.section foundation.topbar custom.modernizr).each do |file|
     - record_js "/js/#{ file }"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbbt-rest
 version: !ruby/object:Gem::Version
-  version: 1.2.30
+  version: 1.2.31
 platform: ruby
 authors:
 - Miguel Vazquez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-28 00:00:00.000000000 Z
+date: 2013-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake