rbbt-rest 1.4.7 → 1.4.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ed44cd9c2fdfc19e20a2379705cab17e8b39d685
-  data.tar.gz: 0a3690b989742b71a19f725ed5081e376a5f6f47
+  metadata.gz: 74d57e3e450bfc476f4744ed76407a6f4c77dfa6
+  data.tar.gz: 28df7c8ca43f059b5a37423219a8b958080b5769
 SHA512:
-  metadata.gz: 816f58d50ac608708b968cb9c5122b9badee007df934a1f61dac23967809d06100cc5463649d811c1facb1ba8200862ba8c1dce4812082b4e651a3d7feb0fe89
-  data.tar.gz: 3db6fcc754a4206b5550970b92df5e4486f5a82254b0972d1b13a84a1f3911a3e5dd3aafdb03c3ebf7d2b87691671b6301c2b41cc542730e86db9110c99c3398
+  metadata.gz: 2e495dd72919cb6a1a050723057c631154559bf58b217a07dab6be104ffbd6e8102ab2ce86998fcaba4f12d2b0d376a1800916d58342550f430f636d7d784cef
+  data.tar.gz: 070398ee95b0ee17249771380e3f19a62c5be3fd388d8a1d2ed2e66c08dde3e730c6f45d3d454fea95b233480c773937474536a9445224cf45c5803be7f7c3d6

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

@@ -25,10 +25,11 @@ module RbbtRESTHelpers
     check += consume_parameter(:_cache_check, params) || []
     check.flatten!
     
+    orig_name = name
     name += "_" << Misc.hash2md5(params) if params.any?
 
     path = settings.cache_dir[name].find
-    task = Task.setup(:name => "Sinatra cache", :result_type => :string, &block)
+    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?
@@ -92,7 +93,7 @@ module RbbtRESTHelpers
       else
         if File.exists?(fragment_file + '.error') 
           klass, _sep, message = Open.read(fragment_file + '.error').partition(": ")
-          raise Kernel.const_get(klass), message
+          raise Kernel.const_get(klass), message || "no message"
           #halt 500, html_tag(:span, File.read(fragment_file + '.error'), :class => "message") + 
           #  html_tag(:ul, File.read(fragment_file + '.backtrace').split("\n").collect{|l| html_tag(:li, l)} * "\n", :class => "backtrace") 
         else

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

@@ -7,10 +7,10 @@ module EntityRESTHelpers
   def setup_entity(type, entity, params)
     base_type, format = type.split ":"
     entity_class = case
-                   when Entity.formats.include?(format)
-                     Entity.formats[format] 
                    when Entity.formats.include?(base_type)
                      Entity.formats[base_type] 
+                   when Entity.formats.include?(format)
+                     Entity.formats[format] 
                    else
                      nil
                    end

data/lib/rbbt/rest/knowledge_base.rb

@@ -204,13 +204,10 @@ module Sinatra
       entities.each do |entity|
         _matches_h = kb.neighbours(database, entity)
         _matches_h.each do |key, _matches|
-          target_type = case key
-                        when :children
-                          _matches.target_entity_type
-                        when :parents
-                          _matches.source_entity_type
-                        end
+          target_type = _matches.target_entity_type
+
           _matches = acc[target_type].concat _matches if acc[target_type] and acc[target_type].any?
+
           acc.merge!({ target_type => _matches }) if _matches and _matches.any?
         end
       end

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

@@ -70,7 +70,7 @@ module KnowledgeBaseRESTHelpers
             TSV.open(tsv)
           end
 
-    tsv = tsv.to_double{|v| v.split ";;" } unless tsv.type == :double
+    tsv = tsv.to_double{|v| v.nil? ? nil : v.split(";;") } unless tsv.fields.nil? or tsv.fields.empty? or tsv.type == :double
 
     tsv2html tsv, options
   end

data/share/views/compass/finder.sass

@@ -1,6 +1,6 @@
 li.find
   @media #{$only-large}
-    width: 19em
+    width: 10em
     margin-left: $indent
     margin-right: $indent
   @media #{$not-large}
@@ -25,6 +25,6 @@ li.find
       @media #{$not-large}
         display: none
       position: absolute
-      bottom: -3px
+      top: 0px
       right: 0
       height: 2em

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbbt-rest
 version: !ruby/object:Gem::Version
-  version: 1.4.7
+  version: 1.4.8
 platform: ruby
 authors:
 - Miguel Vazquez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-07 00:00:00.000000000 Z
+date: 2014-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake