rbbt-rest 1.6.9 → 1.6.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 05c447d083fa7c7d20eb9ec6b35fd40def102fac
-  data.tar.gz: 223225ff89f70995dc1f0adef68da27519513630
+  metadata.gz: e3b50ab27bb389a1da33618271e97b558d93351d
+  data.tar.gz: 6d5f18b50e6d688812ad81f8128c1b87373a118d
 SHA512:
-  metadata.gz: 45eb8f221717d239d99e2d55b8952c02c13e16a973d7a2e1fb2a2cd9ea90f95bad7fb7f86e7f2930717d1742742e52be5f4a0f768d487cda3de6c870f760bdb9
-  data.tar.gz: 80ca57f493f3d6460053c4a5f775658b6d7bac446c8b95a3023b7d7451e070d234e3c4077ad7012f7f3eec5c2cd40b106ccb0ce5351d7410eee19044c5ab8fde
+  metadata.gz: 10c855ba74e528f11af3417894f4ddcd013bfd621c34f39587e98b5fd03988c96aee95aad187fe9479c9fff7f3d809e94874d45e1df4fb33a3987d22130b683b
+  data.tar.gz: 9ff5b63dbcf94703512ed09b2b11c2f28eb01987245a8461414d7c1d41d6248d835bf3524e6f947fab5fe2f7bac633a33952970c0c35676370a92227aa6cce22

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

@@ -45,6 +45,7 @@ module RbbtRESTHelpers
     @fullpath = request.fullpath
 
     @layout = consume_parameter(:_layout)
+
     @layout = false if @layout.nil? and     @ajax
     @layout = true  if @layout.nil? and not @ajax
     @layout = false if @layout == "false"

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

@@ -218,6 +218,13 @@ module RbbtRESTHelpers
           name = false
         end
 
+        if value =~ /^:length:\s*(.*)/
+          value = $1
+          length = true
+        else
+          length = false
+        end
+
         if name
           old_tsv = tsv
           tsv = tsv.reorder(:key, key).add_field "NAME" do |k,values|
@@ -226,6 +233,14 @@ module RbbtRESTHelpers
           key = "NAME"
         end
         
+        if length
+          old_tsv = tsv
+          tsv = tsv.reorder(:key, key).add_field "LENGTH" do |k,values|
+            NamedArray === values ? values[key].length.to_s : values.length.to_s
+          end
+          key = "LENGTH"
+        end
+        
         case
         when value =~ /^([<>]=?)(.*)/
           tsv = tsv.select(key, invert){|k| k = k.first if Array === k; (k.nil? or (String === k and k.empty?)) ? false : k.to_f.send($1, $2.to_f)}
@@ -237,7 +252,8 @@ module RbbtRESTHelpers
           tsv = tsv.select({key => value}, invert)
         end
 
-        tsv = old_tsv.select(tsv.keys) if name
+        tsv = old_tsv.select(tsv.keys) if name or length
+
       end
     end
 

data/share/views/compass/app.sass

@@ -65,6 +65,10 @@ $subtle-font: rgba(0,0,0,0.30)
     float: left
 
 =small_screen
+  table:not(.collapsing)
+    caption
+      width: 100%
+
   form.workflow_task
     .input.field.submit
       input, select
@@ -306,9 +310,5 @@ label[title]
 .progress.ui.message:empty
   display: none
 
-table
-  caption
-    width: 100%
-
 .examples
   clear: both

data/share/views/partials/table/filters.haml

@@ -16,5 +16,6 @@
       - *String of text*: perfect match (e.g. `Cancer`)
       - *Regular expression*: flexible match (e.g. `/(bladder|breast)\s+cancer/i`)
       - *Numeric comparison*: lower of grater than (e.g. `< 0.1` or `>= 2`)
-      - *Names: for entities* with names, such as genes or pathways; regular expression accepted (e.g. `:name:SF3B1` or `:name:/CDK\d/`)
+      - *Names*: for entities with names, such as genes or pathways; regular expression accepted (e.g. `:name: SF3B1` or `:name: /CDK\d/`)
+      - *Length*: for lists (e.g. `:length: > 2`)
 

data/share/views/public/js/_ajax_replace.js

@@ -24,9 +24,7 @@ $.ajax = function(url, options){
     url = options['url'];
   }
 
-  url = add_parameter(url, '_layout', 'false')
-  options['url'] = url
-  options["crossDomain"] = true
+  options = $.merge(options, {url: url, crossDomain: true})
 
   add_ajax(url);
 
@@ -35,6 +33,8 @@ $.ajax = function(url, options){
   if (typeof complete == 'function'){ options['complete'] = [complete, function(){ remove_ajax(url)}] }
   if (typeof complete == 'array'){ options['complete'].push(function(){ remove_ajax(url)}) }
 
+  options.headers = {'X-Requested-With': 'XMLHttpRequest'}
+
   return $.old_ajax(options);
 }
 

data/share/views/public/js/rbbt.basic.js

@@ -3,6 +3,11 @@ rbbt.mlog = function(data){
   console.log(data)
 }
 
+rbbt.ajax = function(params){
+  params.config = function(xhr, options){ xhr.setRequestHeader( "X-Requested-With", "XMLHttpRequest"); return xhr; }
+  return m.request(params)
+}
+
 rbbt.insist_request = function(params, deferred, timeout, missing){
   if (undefined === deferred) deferred = m.deferred()
   if (undefined === timeout) timeout = 1000
@@ -13,7 +18,8 @@ rbbt.insist_request = function(params, deferred, timeout, missing){
     return xhr.responseText
   }
 
-  m.request(params).then(
+
+  rbbt.ajax(params).then(
     function(res){
       deferred.resolve(res)
     }, 

data/share/views/public/js/rbbt.favourites.js

@@ -59,9 +59,9 @@ fav_module.toggleFavourite_map = function(){
  var map = rbbt.page.map();
 
  if (fav_module.isFavourite_map(map)){
-  rbbt.post({url: '/remove_favourite_entity_map/' + map.type + '/' + map.column + '/' + clean_element(map.id)}).then(fav_module.update)
+  rbbt.post({url: '/remove_favourite_entity_map/' + map.type + '/' + clean_element(map.column) + '/' + clean_element(map.id)}).then(fav_module.update)
  }else{
-  rbbt.post({url: '/add_favourite_entity_map/' + map.type + '/' + map.column + '/' + clean_element(map.id)}).then(fav_module.update)
+  rbbt.post({url: '/add_favourite_entity_map/' + map.type + '/' + clean_element(map.column) + '/' + clean_element(map.id)}).then(fav_module.update)
  }
 }
 

data/share/views/public/js/rbbt.views.js

@@ -23,7 +23,10 @@ rbbt.mview.plot = function(content, title, caption){
       var download = m('.download.ui.labeled.icon.button',{onclick: download_func}, [m('i.icon.download'), "Download"])
       if (title) elems.push(m('.ui.header', title))
       elems.push(m('.content.svg', m.trust(content)))
-      if (caption) elems.push(m('figcaption', m.trust(caption)))
+      if (caption){ 
+        elems.push(m('figcaption', m.trust(caption)))
+        elems.push(m('hr'))
+      }
       if (content) elems.push(download)
 
       plot = m('figure.ui.segment', elems)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbbt-rest
 version: !ruby/object:Gem::Version
-  version: 1.6.9
+  version: 1.6.10
 platform: ruby
 authors:
 - Miguel Vazquez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-12 00:00:00.000000000 Z
+date: 2015-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -365,7 +365,6 @@ files:
 - share/views/public/js/foundation/index.js
 - share/views/public/js/helpers.js
 - share/views/public/js/jquery-ui.js
-- share/views/public/js/ng-favourites.js
 - share/views/public/js/rbbt.aesthetics.js
 - share/views/public/js/rbbt.basic.js
 - share/views/public/js/rbbt.entity.js

data/share/views/public/js/ng-favourites.js

@@ -1,13 +0,0 @@
-var rbbt_angular = angular.module('rbbt', [])
-
-rbbt_angular.controller('FavourtiesController', ['$scope', function($scope){
- $scope.favourite = 'not_favourite'; 
- $scope.toggle = function(){
-  if ($scope.favourite == 'favourite'){
-   $scope.favourite = 'not_favourite'
-  }else{
-   $scope.favourite = 'favourite'
-  }
- }
-}]);
-