rbbt-rest 1.6.19 → 1.6.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7d08766d3d4b92f104d088d234b6e14b3520dd03
-  data.tar.gz: 3423b44e0e90dbab4c4b08123b29572197694a45
+  metadata.gz: d5cd34f1db85993bd78544fa98040b17aaf58a64
+  data.tar.gz: d3c0a8fa349101d98e99652ecdb6d774318702e1
 SHA512:
-  metadata.gz: eafefedf6cfaced11c2d9de90f12d85d49a0135317d19374883b544adb8249bb82e19dfb661062ef06113f90e50928fb811b00d81d01cb782bc4819cdf4c165a
-  data.tar.gz: db75b68e8318690ac638c0f58f16ae690f10bb5504e0750db667591f4051314ffec3b8a45725da5f24948c33aae09d9169d2a3dc23c9494753be4a5f6f8ebf68
+  metadata.gz: f16c7d46b03b38fac0d484cc5f09c2edc4da16fde42bd9af1e79536025039a2de49291933d60c09d58864b04636bd3706839e78973001b5ed07261ce8c3089b0
+  data.tar.gz: 9763b5f89fce2f6ed684b76486f5d13febc6d16bc918e9f2ede89592abe5a36eeda5e31f53c1626e8fecc670a42add97c34b0da28ce97285e472b2179fb9ea47

data/lib/rbbt/rest/entity.rb

@@ -42,39 +42,27 @@ module Sinatra
         #{{{ Finder
 
         get '/find' do
+          raise "No finder defined" unless settings.respond_to? :finder and not settings.finder.nil?
           halt 200 if params[:term].nil? or params[:term].empty?
-
           term = params[:term]
-          sorted_results = finder_find(term)
-
-          raise "No finder defined" unless settings.respond_to? :finder and not settings.finder.nil?
           if request.xhr?
+            sorted_results = finder_find(term)
             content_type "application/json" 
             halt 200, sorted_results.to_json
           else
-            i = sorted_results.first
-            raise "Term not recognized: #{ term }" if i.nil?
-            redirect to(Entity::REST.entity_url(i[:code], i[:format], i[:namespace]))
+            url = find_entity_url(term)
+            redirect to(url)
           end
         end
 
         post '/find' do
           term = consume_parameter :term 
-          if term =~ /(.*) \[(.*)\]$/
-            term = $1
-            namespace, format = $2.split(":")
-            format, namespace = namespace, nil if format.nil?
-
-            redirect to(Entity::REST.entity_url(term, format, :organism => namespace))
-          else
-            sorted_results = finder_find(term)
-            i = sorted_results.first
-            halt 404, "Term not recognized: #{ term }" if i.nil?
-            redirect to(Entity::REST.entity_url(i[:code], i[:format], :organism => i[:namespace]))
-          end
+          url = find_entity_url(term)
+          redirect to(url)
         end
 
 
+
         #{{{ Entities
 
         get '/entity/:entity_type/:entity' do

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

@@ -24,7 +24,28 @@ module EntityRESTHelpers
         info[:best] = score[1]
       end
 
+      info[:format] ||= info[:type]
+
       info 
     }.sort_by{|i| i[:score] || 0}.reverse
   end
+
+  def find_entity_url(term)
+    if term =~ /(.*) \[(.*)\]$/
+      term = $1
+      namespace, format = $2.split(":")
+      format, namespace = namespace, nil if format.nil?
+
+      Entity::REST.entity_url(term, format, :organism => namespace)
+    else
+      sorted_results = finder_find(term)
+      organism = sorted_results.select{|r| r[:type] == 'organism' }.first
+      sorted_results = sorted_results.reject{|r| r[:type] == 'organism' }
+      i = sorted_results.first
+      halt 404, "Term not recognized: #{ term }" if i.nil?
+      organism_code = i[:namespace]
+      organism_code = organism[:code] unless organism.nil? or organism[:code].nil?
+      Entity::REST.entity_url(i[:code], i[:format], :organism => organism_code)
+    end
+  end
 end

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

@@ -66,7 +66,7 @@ module Entity
     def self.entity_url(entity, type = nil, params = nil)
       if type.nil?
         type = entity.annotation_types.last.to_s
-        type << ":" << entity.format if entity.respond_to? :format
+        type << ":" << entity.format if entity.respond_to? :format and entity.format
       end
 
       if params.nil?

metadata

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