rbbt-rest 1.8.7 → 1.8.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6bc0fe7eaafce2183ccf6ee2d770f12155d7a299
-  data.tar.gz: aaf7c556b8d81606ba8c6d80fee43c5067c8e293
+  metadata.gz: cff29021a179c10bc6cc157b4b68c167f0d0cbce
+  data.tar.gz: bd58e81210656647a893ce423b3afacd1959f36a
 SHA512:
-  metadata.gz: 35fe38872275c9f1295a7cb909b5245c240dd3debcda09d8c39dee192675abef2d3e67afb546921c32a677d7c5cd0927f5f736d576ff049bd74cab857bcb8e32
-  data.tar.gz: 68971666513419c4539039371587eb50c06f5e21c27d807b2fa6a2fabf8e70f6098fa5b803d32ebfe23260bf3c9cac9f5f9ac06c478810f5a16ebbabf282f3b2
+  metadata.gz: 3813b05fb8974c6b8ca3141bd0f2eb7108f8e979e68f932a888dc9ce8c9e505c978120037e11e2d9a4087bf2bcd1c21056aff5f95b941c9425b11c1de6d84d6a
+  data.tar.gz: eb7519b674f9c552f771d6fcd7f4ac75c8a244820a28820c80b5c42742d0b7fb1b0138727fd3a5a23439a88a9430884ac1c62f68279f363f77a277e7eb95814f

data/lib/rbbt/rest/entity.rb

@@ -293,7 +293,6 @@ module Sinatra
           when :name
             file = Entity::Map.map_file(entity_type.split(":").first, column, map_id, user)
             file = Entity::Map.map_file(entity_type.split(":").first, column, map_id, nil) unless File.exists? file
-            #new = TSVWorkflow.job(:swap_id, "Map #{ map_id }", :format => "Associated Gene Name", :tsv => TSV.open(file)).exec
             new = TSV.open(file).change_key "Associated Gene Name"
             new_id = map_id << " [Names]"
             Entity::Map.save_map(entity_type, column, new_id, new, user)
@@ -301,7 +300,7 @@ module Sinatra
           when :ensembl
             file = Entity::Map.map_file(entity_type.split(":").first, column, map_id, user)
             file = Entity::Map.map_file(entity_type.split(":").first, column, map_id, nil) unless File.exists? file
-            new = TSVWorkflow.job(:change_id, "Map #{ map_id }", :format => "Ensembl Gene ID", :tsv => TSV.open(file)).exec
+            new = TSV.open(file).change_key "Ensembl Gene ID"
             new_id = map_id << " [Ensembl]"
             Entity::Map.save_map(entity_type, column, new_id, new, user)
             redirect to(Entity::REST.entity_map_url(new_id, entity_type, column))
@@ -323,7 +322,7 @@ module Sinatra
           when :ranks
             file = Entity::Map.map_file(entity_type.split(":").first, column, map_id, user)
             file = Entity::Map.map_file(entity_type.split(":").first, column, map_id, nil) unless File.exists? file
-            tsv =  TSV.open(file)
+            tsv =  TSV.open(file, :cast => :to_f)
             new = tsv.ranks_for(tsv.fields.first)
             new_id = map_id << " [Ranks]"
             column = 'Ranks'
@@ -411,13 +410,14 @@ module Sinatra
           file1 = Entity::Map.map_file(entity_type.split(":").first, column, map1, user)
           file1 = Entity::Map.map_file(entity_type.split(":").first, column, map1, nil) unless File.exists? file1
           raise "Map not found: #{ map1 }" unless File.exists? file1
-          tsv1 =  TSV.open(file1) 
+          tsv1 =  TSV.open(file1, :cast => :to_f) 
 
           file2 = Entity::Map.map_file(entity_type.split(":").first, column2, map2, user)
           file2 = Entity::Map.map_file(entity_type.split(":").first, column2, map2, nil) unless File.exists? file2
           raise "Map not found: #{ map2 } - #{ file2 }" unless File.exists? file2
-          tsv2 =  TSV.open(file2)
+          tsv2 =  TSV.open(file2, :cast => :to_f)
 
+          tsv1 = tsv1.select :key => tsv2.keys
           tsv1.attach tsv2, :fields => tsv2.fields
 
           new = TSV.setup(tsv1.rank_product(tsv1.fields), :key_field => tsv1.key_field, :fields => ["Log rank-product"], :type => :single, :cast => :to_f)

data/lib/rbbt/rest/helpers.rb

@@ -45,7 +45,7 @@ module Sinatra
       parts = name.split("_")
       hash = parts.pop
       clean_name = parts * "_"
-      "<span class='name' jobname='#{ name }'>#{ clean_name }</span><span class='hash'>#{ hash }</span>"
+      "<span class='name' jobname='#{ name }'>#{ clean_name }</span> <span class='hash'>#{ hash }</span>"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbbt-rest
 version: !ruby/object:Gem::Version
-  version: 1.8.7
+  version: 1.8.8
 platform: ruby
 authors:
 - Miguel Vazquez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-20 00:00:00.000000000 Z
+date: 2016-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake