yahoo-search 1.1.1 → 2.0.0

data/History.txt

@@ -1,3 +1,8 @@
+= 2.0.0
+
+* New maintainer: davidw@dedasys.com
+* Depend on rc-rest >= 3.0.0 and utilize Nokogiri
+
 = 1.1.1
 
 * Upgraded to rc-rest 2.0.0 and yahoo 1.1.1

data/LICENSE.txt

@@ -1,4 +1,5 @@
-Copyright 2006 Eric Hodel, The Robot Co-op.  All rights reserved.
+Copyright 2006 Eric Hodel, The Robot Co-op.
+Copyright 2010 David N. Welton, DedaSys LLC.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions

data/README.txt

@@ -1,12 +1,12 @@
 = yahoo-search
 
-Rubyforge Project:
+Github Project:
 
-http://rubyforge.org/projects/rctools/
+http://github.com/davidw/yahoo-search-gem
 
 Documentation:
 
-http://dev.robotcoop.com/Libraries/yahoo-search/
+FIXME
 
 == About
 

data/Rakefile

@@ -7,13 +7,13 @@ DEV_DOC_PATH = 'Libraries/yahoo-search'
 hoe = Hoe.new 'yahoo-search', Yahoo::Search::VERSION do |p|
   p.summary = 'A Ruby Yahoo Search API Implementation'
   p.description = 'An interface to Yahoo\'s Search services.'
-  p.author = 'Eric Hodel'
-  p.email = 'drbrain@segment7.net'
-  p.url = "http://dev.robotcoop.com/#{DEV_DOC_PATH}"
+  p.author = 'David N. Welton'
+  p.email = 'davidw@dedasys.com'
+  p.url = "http://github.com/davidw/yahoo-search-gem"
   p.changes = File.read('History.txt').scan(/\A(=.*?)^=/m).first.first
   p.rubyforge_name = 'rctools'
 
-  p.extra_deps << ['yahoo', '>= 1.1.1']
+  p.extra_deps << ['yahoo', '>= 2.0.0']
 end
 
 SPEC = hoe.spec

data/lib/yahoo/local_search.rb

@@ -59,40 +59,39 @@ class Yahoo::LocalSearch < Yahoo::Search
   def parse_response(xml) # :nodoc:
     search_results = []
 
-    result_set_map_url = URI.parse xml.elements['ResultSet/ResultSetMapUrl'].text
+    result_set_map_url = URI.parse(xml.at_xpath('//xmlns:ResultSetMapUrl').content)
     total_results_available, total_results_returned, first_result_position =
-      parse_result_info xml
+      parse_result_info(xml)
 
-    xml.elements['ResultSet'].each do |r|
-      next unless r.name == 'Result'
+    xml.xpath('//xmlns:Result').each do |r|
       sr = Result.new
 
-      sr.id        = r.attributes['id'].to_i
-      sr.title     = r.elements['Title'].text
-      sr.address   = r.elements['Address'].text
-      sr.city      = r.elements['City'].text
-      sr.state     = r.elements['State'].text
-      sr.phone     = r.elements['Phone'].text
-      sr.latitude  = r.elements['Latitude'].text.to_f
-      sr.longitude = r.elements['Longitude'].text.to_f
-
-      rating = r.elements['Rating']
-      sr.average_rating    = rating.elements['AverageRating'].text.to_f
-      sr.total_ratings     = rating.elements['TotalRatings'].text.to_i
-      sr.total_reviews     = rating.elements['TotalReviews'].text.to_i
-      sr.last_review_date  = Time.at rating.elements['LastReviewDate'].text.to_i
-      sr.last_review_intro = rating.elements['LastReviewIntro'].text
-
-      sr.distance           = r.elements['Distance'].text.to_f
-      sr.url                = URI.parse r.elements['Url'].text
-      sr.click_url          = URI.parse r.elements['ClickUrl'].text
-      sr.map_url            = URI.parse r.elements['MapUrl'].text
-      sr.business_url       = URI.parse r.elements['BusinessUrl'].text
-      sr.business_click_url = URI.parse r.elements['BusinessClickUrl'].text
+      sr.id        = r['id'].to_i
+      sr.title     = r.at_xpath('xmlns:Title').content
+      sr.address   = r.at_xpath('xmlns:Address').content
+      sr.city      = r.at_xpath('xmlns:City').content
+      sr.state     = r.at_xpath('xmlns:State').content
+      sr.phone     = r.at_xpath('xmlns:Phone').content
+      sr.latitude  = r.at_xpath('xmlns:Latitude').content.to_f
+      sr.longitude = r.at_xpath('xmlns:Longitude').content.to_f
+
+      rating = r.at_xpath('xmlns:Rating')
+      sr.average_rating    = rating.at_xpath('xmlns:AverageRating').content.to_f
+      sr.total_ratings     = rating.at_xpath('xmlns:TotalRatings').content.to_i
+      sr.total_reviews     = rating.at_xpath('xmlns:TotalReviews').content.to_i
+      sr.last_review_date  = Time.at rating.at_xpath('xmlns:LastReviewDate').content.to_i
+      sr.last_review_intro = rating.at_xpath('xmlns:LastReviewIntro').content
+
+      sr.distance           = r.at_xpath('xmlns:Distance').content.to_f
+      sr.url                = URI.parse r.at_xpath('xmlns:Url').content
+      sr.click_url          = URI.parse r.at_xpath('xmlns:ClickUrl').content
+      sr.map_url            = URI.parse r.at_xpath('xmlns:MapUrl').content
+      sr.business_url       = URI.parse r.at_xpath('xmlns:BusinessUrl').content
+      sr.business_click_url = URI.parse r.at_xpath('xmlns:BusinessClickUrl').content
 
       sr.categories = {}
-      r.elements['Categories'].each do |c|
-        sr.categories[c.text] = c.attributes['id'].to_i
+      r.xpath('.//xmlns:Category').each do |c|
+        sr.categories[c.content] = c['id'].to_i
       end
 
       search_results << sr

data/lib/yahoo/search.rb

@@ -5,17 +5,17 @@ require 'yahoo'
 
 class Yahoo::Search < Yahoo
 
-  VERSION = '1.1.1'
+  VERSION = '2.0.0'
 
   ##
   # Returns the total results available, returned, and first result position
   # for the returned results.
 
   def parse_result_info(xml) # :nodoc:
-    rs = xml.elements['ResultSet']
-    total_results_available = rs.attributes['totalResultsAvailable'].to_i
-    total_results_returned  = rs.attributes['totalResultsReturned'].to_i
-    first_result_position   = rs.attributes['firstResultPosition'].to_i
+    rs = xml.at_xpath('//xmlns:ResultSet')
+    total_results_available = rs['totalResultsAvailable'].to_i
+    total_results_returned  = rs['totalResultsReturned'].to_i
+    first_result_position   = rs['firstResultPosition'].to_i
 
     return total_results_available, total_results_returned,
            first_result_position

data/lib/yahoo/web_search.rb

@@ -37,18 +37,20 @@ class Yahoo::WebSearch < Yahoo::Search
     total_results_available, total_results_returned, first_result_position =
       parse_result_info xml
 
-    xml.elements['ResultSet'].each do |r|
-      next if REXML::Text === r
+    xml.xpath('//xmlns:Result').each do |r|
       result = Result.new
 
-      result.title             = r.elements['Title'].text
-      result.summary           = r.elements['Summary'].text
-      result.url               = URI.parse r.elements['Url'].text
-      result.click_url         = URI.parse r.elements['ClickUrl'].text
-      result.mime_type         = r.elements['MimeType'].text
-      result.modification_date = Time.at r.elements['ModificationDate'].text.to_i
-      result.cache_url         = URI.parse r.elements['Cache/Url'].text
-      result.cache_size        = r.elements['Cache/Size'].text.to_i
+      result.title             = r.at_xpath('xmlns:Title').content
+      result.summary           = r.at_xpath('xmlns:Summary').content
+      result.url               = URI.parse(r.at_xpath('xmlns:Url').content)
+      result.click_url         = URI.parse(r.at_xpath('xmlns:ClickUrl').content)
+      result.mime_type         = r.at_xpath('xmlns:MimeType').content
+      result.modification_date = Time.at(r.at_xpath('xmlns:ModificationDate').content.to_i)
+      cacheurl = r.at_xpath('xmlns:Cache/xmlns:Url')
+      if cacheurl
+        result.cache_url         = URI.parse(cacheurl.content)
+        result.cache_size        = r.at_xpath('xmlns:Cache/xmlns:Size').content.to_i
+      end
 
       search_results << result
     end

data/test/test_web_search.rb

@@ -1,4 +1,5 @@
 require 'test/unit'
+require 'rubygems'
 require 'rc_rest/uri_stub'
 require 'yahoo/web_search'
 

metadata

@@ -1,62 +1,22 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.0.6
-specification_version: 1
 name: yahoo-search
 version: !ruby/object:Gem::Version 
-  version: 1.1.1
-date: 2006-11-27 00:00:00 -08:00
-summary: A Ruby Yahoo Search API Implementation
-require_paths: 
-- lib
-email: drbrain@segment7.net
-homepage: http://dev.robotcoop.com/Libraries/yahoo-search
-rubyforge_project: rctools
-description: An interface to Yahoo's Search services.
-autorequire: 
-default_executable: 
-bindir: bin
-has_rdoc: true
-required_ruby_version: !ruby/object:Gem::Version::Requirement 
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      version: 0.0.0
-  version: 
+  version: 2.0.0
 platform: ruby
-signing_key: 
-cert_chain: 
-post_install_message: 
 authors: 
 - Eric Hodel
-files: 
-- History.txt
-- LICENSE.txt
-- Manifest.txt
-- README.txt
-- Rakefile
-- lib/yahoo/local_search.rb
-- lib/yahoo/search.rb
-- lib/yahoo/web_search.rb
-- test/test_local_search.rb
-- test/test_web_search.rb
-test_files: 
-- test/test_local_search.rb
-- test/test_web_search.rb
-rdoc_options: []
-
-extra_rdoc_files: []
-
-executables: []
-
-extensions: []
-
-requirements: []
-
+- David N. Welton
+autorequire: 
+bindir: bin
+cert_chain: 
+date: 2010-01-13 00:00:00 +01:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: hoe
+  type: :runtime
   version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -64,10 +24,61 @@ dependencies:
     version: 
 - !ruby/object:Gem::Dependency 
   name: yahoo
+  type: :runtime
   version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.1.1
+        version: 2.0.0
     version: 
+description: An interface to Yahoo's Search services.
+email: davidw@dedasys.com
+executables: []
+
+extensions: []
+
+extra_rdoc_files: []
+
+files: 
+- History.txt
+- LICENSE.txt
+- Manifest.txt
+- README.txt
+- Rakefile
+- lib/yahoo/local_search.rb
+- lib/yahoo/search.rb
+- lib/yahoo/web_search.rb
+- test/test_local_search.rb
+- test/test_web_search.rb
+has_rdoc: true
+homepage: http://github.com/davidw/yahoo-search-gem
+licenses: []
+
+post_install_message: 
+rdoc_options: []
+
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">"
+    - !ruby/object:Gem::Version 
+      version: 0.0.0
+  version: 
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+requirements: []
+
+rubyforge_project: rctools
+rubygems_version: 1.3.5
+signing_key: 
+specification_version: 1
+summary: A Ruby Yahoo Search API Implementation
+test_files: 
+- test/test_local_search.rb
+- test/test_web_search.rb