geocoder-us 1.0.0 → 1.1.0

data/Manifest.txt

@@ -4,4 +4,3 @@ README
 Rakefile
 lib/geocoder_us.rb
 test/test_geocoder_us.rb
-test/uri_stub.rb

data/README

@@ -35,7 +35,7 @@ http://geocoder.us/user/signup
 And here's how you use your account:
 
   require 'rubygems'
-  require 'geocoder-us'
+  require 'geocoder_us'
   
   gu = GeocoderUs.new 'username', 'password'
   p gu.locate('1924 E Denny Way, Seattle, WA')

data/Rakefile

@@ -8,7 +8,7 @@ $VERBOSE = nil
 
 spec = Gem::Specification.new do |s|
   s.name = 'geocoder-us'
-  s.version = '1.0.0'
+  s.version = '1.1.0'
   s.summary = 'Geocoder.us API Library'
   s.description = 'Map addresses to latitude and longitude using geocoder.us'
   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/geocoder_us.rb

@@ -1,16 +1,18 @@
-require 'open-uri'
+require 'rc_rest'
 
 ##
 # A library for lookup up coordinates with geocoder.us' API.
 #
 # http://geocoder.us/help/
 
-class GeocoderUs
+class GeocoderUs < RCRest
+
+  Location = Struct.new :latitude, :longitude, :address
 
   ##
   # Base error class
 
-  class Error < RuntimeError; end
+  class Error < RCRest::Error; end
 
   ##
   # Raised if you give an unlocatable address.
@@ -32,11 +34,11 @@ class GeocoderUs
 
   def initialize(user = nil, password = nil)
     if user and password then
-      @url = URI.parse 'http://geocoder.us/member/service/csv'
+      @url = URI.parse 'http://geocoder.us/member/service/rest/geocode'
       @url.user = user
       @url.password = password
     else
-      @url = URI.parse 'http://rpc.geocoder.us/service/csv'
+      @url = URI.parse 'http://rpc.geocoder.us/service/rest/geocode'
     end
   end
 
@@ -45,19 +47,39 @@ class GeocoderUs
   # raises an AddressError.
 
   def locate(address)
-    url = @url.dup
-    url.query = "address=#{URI.escape address}"
-
-    url.open do |f|
-      response = f.read
-      raise AddressError, $' if response =~ /^2: /
-      lat, lon, = response.split ',', 3
-      lat = lat.to_f
-      lon = lon.to_f
-      return lat, lon
-    end
-  rescue OpenURI::HTTPError => e
-    raise LoginError if e.message =~ /^401 /
+    get :address => address
+  end
+
+  def parse_response(xml)
+    location = Location.new
+    location.address = xml.elements['rdf:RDF/geo:Point/dc:description'].text
+
+    location.latitude = xml.elements['rdf:RDF/geo:Point/geo:lat'].text.to_f
+    location.longitude = xml.elements['rdf:RDF/geo:Point/geo:long'].text.to_f
+
+    return location
+  end
+
+  def check_error(xml)
+    raise AddressError, xml.text if xml.text == 'couldn\'t find this address! sorry'
+  end
+
+end
+
+##
+# A Location contains the following fields:
+#
+# +latitude+:: Latitude of the location
+# +longitude+:: Longitude of the location
+# +address+:: Street address of the result.
+
+class GeocoderUs::Location
+
+  ##
+  # The coordinates for this location.
+
+  def coordinates
+    return [latitude, longitude]
   end
 
 end

data/test/test_geocoder_us.rb

@@ -1,5 +1,5 @@
 require 'test/unit'
-require 'test/uri_stub'
+require 'rc_rest/uri_stub'
 require 'geocoder_us'
 
 class TestGeocoderUs < Test::Unit::TestCase
@@ -12,34 +12,72 @@ class TestGeocoderUs < Test::Unit::TestCase
   end
 
   def test_locate
-    URI::HTTP.responses << <<-EOF
-47.618620,-122.306942,1924 E Denny Way,Seattle,WA,98122
+    URI::HTTP.responses << <<-EOF.strip
+<?xml version="1.0"?>
+<rdf:RDF
+  xmlns:dc="http://purl.org/dc/elements/1.1/"
+  xmlns:geo="http://www.w3.org/2003/01/geo/wgs84_pos#"
+  xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+>
+
+<geo:Point rdf:nodeID="aid86937982">
+    
+    <dc:description>1600 Pennsylvania Ave NW, Washington DC 20502</dc:description>
+    <geo:long>-77.037684</geo:long>
+    <geo:lat>38.898748</geo:lat>
+
+</geo:Point>
+
+
+</rdf:RDF>
+
     EOF
 
-    assert_equal [47.618620, -122.306942],
-                 @gu.locate('1924 E Denny Way, Seattle, WA')
+    location = @gu.locate('1600 Pennsylvania Ave, Washington DC')
+    assert_equal [38.898748, -77.037684], location.coordinates
+    assert_equal '1600 Pennsylvania Ave NW, Washington DC 20502',
+                 location.address
+                 
     assert_equal true, URI::HTTP.responses.empty?
     assert_equal 1, URI::HTTP.uris.length
-    assert_equal 'http://rpc.geocoder.us/service/csv?address=1924%20E%20Denny%20Way,%20Seattle,%20WA',
+    assert_equal 'http://rpc.geocoder.us/service/rest/geocode?address=1600%20Pennsylvania%20Ave,%20Washington%20DC',
                  URI::HTTP.uris.first
   end
 
   def test_locate_with_account
-    URI::HTTP.responses << <<-EOF
-47.618620,-122.306942,1924 E Denny Way,Seattle,WA,98122
+    URI::HTTP.responses << <<-EOF.strip
+<?xml version="1.0"?>
+<rdf:RDF
+  xmlns:dc="http://purl.org/dc/elements/1.1/"
+  xmlns:geo="http://www.w3.org/2003/01/geo/wgs84_pos#"
+  xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+>
+
+<geo:Point rdf:nodeID="aid86937982">
+    
+    <dc:description>1600 Pennsylvania Ave NW, Washington DC 20502</dc:description>
+    <geo:long>-77.037684</geo:long>
+    <geo:lat>38.898748</geo:lat>
+
+</geo:Point>
+
+
+</rdf:RDF>
+
     EOF
 
     gu = GeocoderUs.new 'username', 'password'
-    assert_equal [47.618620, -122.306942],
-                 gu.locate('1924 E Denny Way, Seattle, WA')
+    location = gu.locate('1600 Pennsylvania Ave, Washington DC')
+    assert_equal [38.898748, -77.037684], location.coordinates
+
     assert_equal true, URI::HTTP.responses.empty?
     assert_equal 1, URI::HTTP.uris.length
-    assert_equal 'http://username:password@geocoder.us/member/service/csv?address=1924%20E%20Denny%20Way,%20Seattle,%20WA',
+    assert_equal 'http://username:password@geocoder.us/member/service/rest/geocode?address=1600%20Pennsylvania%20Ave,%20Washington%20DC',
                  URI::HTTP.uris.first
   end
 
   def test_locate_bad_address
-    URI::HTTP.responses << '2: couldn\'t find this address! sorry'
+    URI::HTTP.responses << 'couldn\'t find this address! sorry'
 
     @gu.locate('yuck')
   rescue GeocoderUs::AddressError => e
@@ -47,7 +85,7 @@ class TestGeocoderUs < Test::Unit::TestCase
 
     assert_equal true, URI::HTTP.responses.empty?
     assert_equal 1, URI::HTTP.uris.length
-    assert_equal 'http://rpc.geocoder.us/service/csv?address=yuck',
+    assert_equal 'http://rpc.geocoder.us/service/rest/geocode?address=yuck',
                  URI::HTTP.uris.first
   else
     flunk 'Expected GeocoderUs::AddressError'

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.8.11.15
+rubygems_version: 0.8.99
 specification_version: 1
 name: geocoder-us
 version: !ruby/object:Gem::Version 
-  version: 1.0.0
-date: 2006-06-13 00:00:00 -07:00
+  version: 1.1.0
+date: 2006-06-16 00:00:00 -07:00
 summary: Geocoder.us API Library
 require_paths: 
 - lib
@@ -35,7 +35,6 @@ files:
 - Rakefile
 - lib/geocoder_us.rb
 - test/test_geocoder_us.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
-