pubmed_search 0.3.0 → 0.4.0

data/Rakefile

@@ -9,7 +9,6 @@ begin
     gem.email = "rschenk@gmail.com"
     gem.homepage = "http://github.com/rschenk/pubmed_search"
     gem.authors = ["Ryan Schenk"]
-    gem.add_dependency 'rschenk-simple_uri_template'
     gem.add_dependency 'nokogiri'
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.4.0

data/lib/pubmed_search.rb

@@ -3,7 +3,6 @@ require 'open-uri'
 
 require 'rubygems'
 require 'nokogiri'
-require 'simple_uri_template'   # sudo gem install rschenk-simple_uri_template
 
 
 class PubmedSearch
@@ -26,7 +25,7 @@ class PubmedSearch
                      :email => '',
                      :load_all_pmids => false }
                      
-  @uri_template = SimpleURITemplate.new('http://eutils.ncbi.nlm.nih.gov/entrez/eutils/esearch.fcgi?db=pubmed&tool={tool}&email={email}&retmax={retmax}&retstart={retstart}&term={term}')
+  @uri_template = 'http://eutils.ncbi.nlm.nih.gov/entrez/eutils/esearch.fcgi?db=pubmed&tool={tool}&email={email}&retmax={retmax}&retstart={retstart}&term={term}'
   
   class << self
     # Performs a search to PubMed via eUtils with the given term +String+, and returns a +PubmedSearch+ object modeling the response.
@@ -71,7 +70,7 @@ class PubmedSearch
     def do_search(results, term, options)
       wait
       
-      esearch_url = @uri_template.expand(options.merge({:term => term}))
+      esearch_url = expand_uri(@uri_template, options.merge({:term => term}))
       doc = Nokogiri::XML( open esearch_url )
 
       results.count = doc.xpath('/eSearchResult/Count').first.content.to_i
@@ -88,6 +87,11 @@ class PubmedSearch
 
       results
     end
+    
+    # This is a semi-hack to do URI templating. It used to be its own gem, but shit happened.
+    def expand_uri(uri, options)
+      uri.gsub(/\{(.*?)\}/) { URI.encode( (options[$1] || options[$1.to_sym] || '').to_s ) rescue '' }
+    end
   end
   
   

data/pubmed_search.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{pubmed_search}
-  s.version = "0.3.0"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ryan Schenk"]
-  s.date = %q{2010-12-13}
+  s.date = %q{2011-04-20}
   s.email = %q{rschenk@gmail.com}
   s.extra_rdoc_files = [
     "LICENSE",
@@ -34,7 +34,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = %q{http://github.com/rschenk/pubmed_search}
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.5.0}
   s.summary = %q{A PubMed searching library with more features than BioRuby}
   s.test_files = [
     "spec/pubmed_search_spec.rb",
@@ -42,18 +42,14 @@ Gem::Specification.new do |s|
   ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rschenk-simple_uri_template>, [">= 0"])
       s.add_runtime_dependency(%q<nokogiri>, [">= 0"])
     else
-      s.add_dependency(%q<rschenk-simple_uri_template>, [">= 0"])
       s.add_dependency(%q<nokogiri>, [">= 0"])
     end
   else
-    s.add_dependency(%q<rschenk-simple_uri_template>, [">= 0"])
     s.add_dependency(%q<nokogiri>, [">= 0"])
   end
 end

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: pubmed_search
 version: !ruby/object:Gem::Version 
-  hash: 19
-  prerelease: false
-  segments: 
-  - 0
-  - 3
-  - 0
-  version: 0.3.0
+  prerelease: 
+  version: 0.4.0
 platform: ruby
 authors: 
 - Ryan Schenk
@@ -15,37 +10,20 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-13 00:00:00 -05:00
+date: 2011-04-20 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rschenk-simple_uri_template
+  name: nokogiri
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: nokogiri
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  version_requirements: *id002
 description: 
 email: rschenk@gmail.com
 executables: []
@@ -85,23 +63,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
 summary: A PubMed searching library with more features than BioRuby