google-geocode 1.1.0 → 1.2.0

data/Manifest.txt

@@ -4,4 +4,3 @@ README
 Rakefile
 lib/google_geocode.rb
 test/test_google_geocode.rb
-test/uri_stub.rb

data/Rakefile

@@ -8,7 +8,7 @@ $VERBOSE = nil
 
 spec = Gem::Specification.new do |s|
   s.name = 'google-geocode'
-  s.version = '1.1.0'
+  s.version = '1.2.0'
   s.summary = 'Google Geocoder API Library'
   s.description = 'Map addresses to latitude and longitude with Google\'s Geocoder.'
   s.author = 'Eric Hodel'
@@ -17,13 +17,15 @@ spec = Gem::Specification.new do |s|
   s.has_rdoc = true
   s.files = File.read('Manifest.txt').split($/)
   s.require_path = 'lib'
+  
+  s.add_dependency 'rc-rest', '>= 1.0.0'
 end
 
 desc 'Run tests'
 task :default => [ :test ]
 
 Rake::TestTask.new('test') do |t|
-  t.libs << 'test'
+  t.libs << '../rc-rest/lib'
   t.pattern = 'test/test_*.rb'
   t.verbose = true
 end

data/lib/google_geocode.rb

@@ -1,17 +1,16 @@
-require 'open-uri'
-require 'rexml/document'
+require 'rc_rest'
 
 ##
 # Library for looking up coordinates with Google's Geocoding API.
 #
 # http://www.google.com/apis/maps/documentation/#Geocoding_HTTP_Request
 
-class GoogleGeocode
+class GoogleGeocode < RCRest
 
   ##
   # Base error class
 
-  class Error < RuntimeError; end
+  class Error < RCRest::Error; end
 
   ##
   # Raised when you try to locate an invalid address.
@@ -46,7 +45,8 @@ class GoogleGeocode
     get :q => address
   end
 
-  private
+  ##
+  # Extracts a Location from +xml+.
 
   def parse_response(xml)
     l = Location.new
@@ -59,10 +59,11 @@ class GoogleGeocode
     return l
   end
 
-  def check_error(obj)
-    obj = REXML::Document.new obj.read unless REXML::Document === obj
+  ##
+  # Extracts and raises an error from +xml+, if any.
 
-    status = obj.elements['/kml/Response/Status/code'].text.to_i
+  def check_error(xml)
+    status = xml.elements['/kml/Response/Status/code'].text.to_i
     case status
     when 200 then # ignore, ok
     when 500 then
@@ -82,31 +83,15 @@ class GoogleGeocode
     end
   end
 
-  def get(params)
-    url = make_url params
-
-    url.open do |xml|
-      res = REXML::Document.new xml.read
-
-      check_error res
-      return parse_response(res)
-    end
-  rescue OpenURI::HTTPError => e
-    check_error e.io
-    raise
-  end
+  ##
+  # Creates a URL from the Hash +params+.  Automatically adds the key and
+  # sets the output type to 'xml'.
 
   def make_url(params)
     params[:key] = @key
     params[:output] = 'xml'
 
-    escaped_params = params.sort_by { |k,v| k.to_s }.map do |k,v|
-      "#{URI.escape k.to_s}=#{URI.escape v.to_s}"
-    end
-
-    url = @url.dup
-    url.query = escaped_params.join '&'
-    return url
+    super params
   end
 
 end

data/test/test_google_geocode.rb

@@ -1,5 +1,5 @@
 require 'test/unit'
-require 'test/uri_stub'
+require 'rc_rest/uri_stub'
 
 require 'google_geocode'
 

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.8.11.15
+rubygems_version: 0.8.99
 specification_version: 1
 name: google-geocode
 version: !ruby/object:Gem::Version 
-  version: 1.1.0
-date: 2006-06-12 00:00:00 -07:00
+  version: 1.2.0
+date: 2006-06-16 00:00:00 -07:00
 summary: Google Geocoder API Library
 require_paths: 
 - lib
@@ -35,7 +35,6 @@ files:
 - Rakefile
 - lib/google_geocode.rb
 - test/test_google_geocode.rb
-- test/uri_stub.rb
 test_files: []
 
 rdoc_options: []
@@ -48,5 +47,13 @@ extensions: []
 
 requirements: []
 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: rc-rest
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Version::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.0.0
+    version: 

data/test/uri_stub.rb

@@ -1,17 +0,0 @@
-require 'open-uri'
-
-class URI::HTTP
-
-  class << self
-    attr_accessor :responses, :uris
-  end
-
-  alias original_open open
-
-  def open
-    self.class.uris << self.to_s
-    yield StringIO.new(self.class.responses.shift)
-  end
-
-end
-