entrez 0.5.2 → 0.5.3

data/README.rdoc

@@ -35,7 +35,7 @@ ESummary takes the same arguments.
 
 args:
 * database
-* term hash
+* search terms (hash will be converted to term[field]+AND+another_term[another_field] notation. It can also be a string literal.)
 * params hash (optional)
 
   Entrez.ESearch('genomeprj', {WORD: 'hapmap', SEQS: 'inprogress'}, retmode: :xml)

data/lib/entrez.rb

@@ -22,8 +22,9 @@ class Entrez
 
     # E.g. Entrez.ESearch('genomeprj', {WORD: 'hapmap', SEQS: 'inprogress'}, retmode: :xml)
     # returns response. For convenience, response.ids() returns array of ID integers from result set.
+    # search_terms can also be string literal.
     def ESearch(db, search_terms = {}, params = {})
-      params[:term] = convert_search_term_hash(search_terms)
+      params[:term] = search_terms.is_a?(Hash) ? convert_search_term_hash(search_terms) : search_terms
       response = perform '/esearch.fcgi', db, params
       parse_ids_and_extend response if response[:retmode].nil? || response[:retmode] == :xml
       response

data/lib/entrez/version.rb

@@ -1,3 +1,3 @@
 module Entrez
-  VERSION = "0.5.2"
+  VERSION = "0.5.3"
 end

data/spec/entrez_spec.rb

@@ -37,6 +37,11 @@ describe Entrez do
     response.ids.should be_empty
   end
 
+  it '#ESearch accepts string as search_terms parameter' do
+    response = Entrez.ESearch('genomeprj', 'hapmap[WORD]', retmode: :xml)
+    response.ids.should include(60153)
+  end
+
   it 'should respect query limit' do
     requests = proc { 4.times { Entrez.EFetch('taxonomy', id: 9606) } }
     requests.should take_longer_than(1.0)

metadata

@@ -2,7 +2,7 @@
 name: entrez
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors: 
 - Jared Ning