graticule 0.2.12 → 1.0.0.pre

data/lib/graticule.rb

@@ -2,22 +2,20 @@ $:.unshift(File.dirname(__FILE__))
 
 require 'active_support'
 
-require 'graticule/version'
 require 'graticule/core_ext'
 require 'graticule/location'
 require 'graticule/geocoder'
 require 'graticule/geocoder/base'
 require 'graticule/geocoder/bogus'
-require 'graticule/geocoder/rest'
 require 'graticule/geocoder/google'
 require 'graticule/geocoder/host_ip'
 require 'graticule/geocoder/multi'
 require 'graticule/geocoder/yahoo'
 require 'graticule/geocoder/geocoder_ca'
 require 'graticule/geocoder/geocoder_us'
+require 'graticule/geocoder/geonames'
 require 'graticule/geocoder/local_search_maps'
-require 'graticule/geocoder/meta_carta'
-require 'graticule/geocoder/postcode_anywhere'
+require 'graticule/geocoder/freethepostcode'
 require 'graticule/geocoder/multimap'
 require 'graticule/geocoder/mapquest'
 require 'graticule/distance'

data/test/config.yml

@@ -0,0 +1,32 @@
+google:
+  responses:
+    success: "http://maps.google.com/maps/geo?q=1600+amphitheatre+mtn+view+ca&output=xml"
+    missing_address: "http://maps.google.com/maps/geo?output=xml"
+    unknown_address: "http://maps.google.com/maps/geo?q=xxxxx&output=xml"
+    partial: "http://maps.google.com/maps/geo?q=sf+ca&output=xml"
+    multiple: "http://maps.google.com/maps/geo?output=xml&q=Queen%20St%20West,%20Toronto,%20ON%20CA"
+    #unavailable: no way to reproduce this
+    #limit: no way to reproduce this  
+    #server_error: no way to reproduce this
+geocoder_ca:
+  responses:
+    success.xml: http://geocoder.ca/?locate=200+mutcalf%2C+ottawa+on&geoit=xml&standard=1&showpostal=1
+geocoder_us:
+  responses:
+    success.xml: http://rpc.geocoder.us/service/rest/geocode?address=1600%20Pennsylvania%20Ave%20NW,%20Washington%20DC
+    unknown.xml: http://rpc.geocoder.us/service/rest/geocode?address=1600
+host_ip:
+  responses:
+    private.txt: http://api.hostip.info/get_html.php?ip=192.168.0.1&position=true
+    success.txt: http://api.hostip.info/get_html.php?ip=64.233.167.99&position=true
+    unknown.txt: http://api.hostip.info/get_html.php?ip=254.254.254.254&position=true
+local_search_maps:
+  responses:
+    success.txt: http://geo.localsearchmaps.com/?street=48+Leicester+Square&city=London&country=UK
+    empty.txt: http://geo.localsearchmaps.com/
+    not_found.txt: http://geo.localsearchmaps.com/?street=48
+yahoo:
+  key: XMfT4AnV34H8_yIPq2yGchqatp_PCTDAPpnoxr6TB54Dsscv0UjtarOVx_g8Ajd2edvR8WQ-
+  responses:
+    success.xml: http://api.local.yahoo.com/MapsService/V1/geocode?location=701%20First%20Street,%20Sunnyvale,%20CA&output=xml&appid=:key
+    unknown_address.xml: http://api.local.yahoo.com/MapsService/V1/geocode?location=thisprobablycantbefound&output=xml&appid=:key

data/test/config.yml.default

@@ -1,12 +1,12 @@
 google:
   key: PUT YOUR KEY HERE
   responses:
-    success.xml: http://maps.google.com/maps/geo?q=1600+amphitheatre+mtn+view+ca&output=xml&key=:key
+    success.xml: "http://maps.google.com/maps/geo?q=1600+amphitheatre+mtn+view+ca&output=xml&key=:key"
     badkey.xml: http://maps.google.com/maps/geo?q=1600+amphitheatre+mtn+view+ca&output=xml&key=this_is_a_bad_key
-    missing_address.xml: http://maps.google.com/maps/geo?output=xml&key=:key
-    unavailable.xml: http://maps.google.com/maps/geo?q=42-44+Hanway+Street,+London&output=xml&key=:key
-    unknown_address.xml: http://maps.google.com/maps/geo?q=1600&output=xml&key=:key
-    partial.xml: http://maps.google.com/maps/geo?q=sf+ca&output=xml&key=:key
+    missing_address.xml: "http://maps.google.com/maps/geo?output=xml&key=:key"
+    unknown_address.xml: "http://maps.google.com/maps/geo?q=xxxxx&output=xml&key=:key"
+    partial.xml: "http://maps.google.com/maps/geo?q=sf+ca&output=xml&key=:key"
+    #unavailable.xml: no way to reproduce this
     #limit.xml: no way to reproduce this  
     #server_error.xml: no way to reproduce this
 geocoder_us:
@@ -23,14 +23,11 @@ local_search_maps:
     success.txt: http://geo.localsearchmaps.com/?street=48+Leicester+Square&city=London&country=UK
     empty.txt: http://geo.localsearchmaps.com/
     not_found.txt: http://geo.localsearchmaps.com/?street=48
-meta_carta:
-  responses:
-    bad_address.xml: http://labs.metacarta.com/GeoParser/?q=aoeueou&output=locations
-    # doesn't work
-    #multiple.xml: http://labs.metacarta.com/GeoParser/?q=seattle&output=locations
-    success.xml: http://labs.metacarta.com/GeoParser/?q=baghdad&output=locations
 yahoo:
   key: PUT YOUR KEY HERE
   responses:
     success.xml: http://api.local.yahoo.com/MapsService/V1/geocode?location=701%20First%20Street,%20Sunnyvale,%20CA&output=xml&appid=:key
-    unknown_address.xml: http://api.local.yahoo.com/MapsService/V1/geocode?location=thisprobablycantbefound&output=xml&appid=:key
+    unknown_address.xml: http://api.local.yahoo.com/MapsService/V1/geocode?location=thisprobablycantbefound&output=xml&appid=:key
+geonames:
+  responses:
+      success.xml: http://ws.geonames.org/timezone?formatted=true&lat=41.85&lng=-87.65&style=full

data/test/fixtures/responses/freethepostcode/not_found.txt

@@ -0,0 +1,3 @@
+# looking up postcode z12 9pp
+
+

data/test/fixtures/responses/freethepostcode/success.txt

@@ -0,0 +1,2 @@
+# looking up postcode w12 1aa
+51.503172 -0.241641 W12 9AE

data/test/fixtures/responses/geocoder_ca/success.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<geodata>
+  <latt>45.418076</latt>
+  <longt>-75.693293</longt>
+  <postal>K2P1P6</postal>
+  <standard>
+    <stnumber>200</stnumber>
+    <staddress>MUTCALF  </staddress>
+    <city>ottawa</city>
+    <prov>ON</prov>
+  </standard>
+</geodata>

data/test/fixtures/responses/geocoder_us/success.xml

@@ -1,18 +1,8 @@
 <?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="aid15626963">
-    
+<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="aid78656681">
     <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>
-
-
+  </geo:Point>
 </rdf:RDF>
-

data/test/fixtures/responses/geonames/missing.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<geonames>
+<status message="missing lat/lng" value="14"/>
+</geonames>

data/test/fixtures/responses/geonames/success.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<geonames>
+<timezone>
+<countryCode>US</countryCode>
+<countryName>United States</countryName>
+<lat>41.85</lat>
+<lng>-87.65</lng>
+<timezoneId>America/Chicago</timezoneId>
+<dstOffset>-5.0</dstOffset>
+<gmtOffset>-6.0</gmtOffset>
+<rawOffset>-6.0</rawOffset>
+<time>2009-10-07 15:08</time>
+</timezone>
+</geonames>

data/test/fixtures/responses/geonames/unknown.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<geonames>
+<status message="no timezone information found for lat/lng" value="12"/>
+</geonames>

data/test/fixtures/responses/google/partial.xml

@@ -1 +1,16 @@
-<?xml version="1.0" encoding="UTF-8"?><kml xmlns="http://earth.google.com/kml/2.1"><Response><name>sf ca</name><Status><code>200</code><request>geocode</request></Status><Placemark><address>San Francisco, CA, USA</address><AddressDetails Accuracy="4" xmlns="urn:oasis:names:tc:ciq:xsdschema:xAL:2.0"><Country><CountryNameCode>US</CountryNameCode><AdministrativeArea><AdministrativeAreaName>CA</AdministrativeAreaName><Locality><LocalityName>San Francisco</LocalityName></Locality></AdministrativeArea></Country></AddressDetails><Point><coordinates>-122.418333,37.775000,0</coordinates></Point></Placemark></Response></kml>
+<?xml version="1.0" encoding="UTF-8" ?>
+<kml xmlns="http://earth.google.com/kml/2.0"><Response>
+  <name>sf ca</name>
+  <Status>
+    <code>200</code>
+    <request>geocode</request>
+  </Status>
+  <Placemark id="p1">
+    <address>San Francisco, CA, USA</address>
+    <AddressDetails Accuracy="4" xmlns="urn:oasis:names:tc:ciq:xsdschema:xAL:2.0"><Country><CountryNameCode>US</CountryNameCode><CountryName>USA</CountryName><AdministrativeArea><AdministrativeAreaName>CA</AdministrativeAreaName><Locality><LocalityName>San Francisco</LocalityName></Locality></AdministrativeArea></Country></AddressDetails>
+    <ExtendedData>
+      <LatLonBox north="37.8457283" south="37.7046163" east="-122.2911496" west="-122.5472684" />
+    </ExtendedData>
+    <Point><coordinates>-122.4192090,37.7752060,0</coordinates></Point>
+  </Placemark>
+</Response></kml>

data/test/fixtures/responses/google/success.xml

@@ -1 +1,16 @@
-<?xml version="1.0" encoding="UTF-8"?><kml xmlns="http://earth.google.com/kml/2.1"><Response><name>1600 amphitheatre mtn view ca</name><Status><code>200</code><request>geocode</request></Status><Placemark><address>1600 Amphitheatre Pkwy, Mountain View, CA 94043, USA</address><AddressDetails Accuracy="8" xmlns="urn:oasis:names:tc:ciq:xsdschema:xAL:2.0"><Country><CountryNameCode>US</CountryNameCode><AdministrativeArea><AdministrativeAreaName>CA</AdministrativeAreaName><SubAdministrativeArea><SubAdministrativeAreaName>Santa Clara</SubAdministrativeAreaName><Locality><LocalityName>Mountain View</LocalityName><Thoroughfare><ThoroughfareName>1600 Amphitheatre Pkwy</ThoroughfareName></Thoroughfare><PostalCode><PostalCodeNumber>94043</PostalCodeNumber></PostalCode></Locality></SubAdministrativeArea></AdministrativeArea></Country></AddressDetails><Point><coordinates>-122.083739,37.423021,0</coordinates></Point></Placemark></Response></kml>
+<?xml version="1.0" encoding="UTF-8" ?>
+<kml xmlns="http://earth.google.com/kml/2.0"><Response>
+  <name>1600 amphitheatre mtn view ca</name>
+  <Status>
+    <code>200</code>
+    <request>geocode</request>
+  </Status>
+  <Placemark id="p1">
+    <address>1600 Amphitheatre Pkwy, Mountain View, CA 94043, USA</address>
+    <AddressDetails Accuracy="8" xmlns="urn:oasis:names:tc:ciq:xsdschema:xAL:2.0"><Country><CountryNameCode>US</CountryNameCode><CountryName>USA</CountryName><AdministrativeArea><AdministrativeAreaName>CA</AdministrativeAreaName><Locality><LocalityName>Mountain View</LocalityName><Thoroughfare><ThoroughfareName>1600 Amphitheatre Pkwy</ThoroughfareName></Thoroughfare><PostalCode><PostalCodeNumber>94043</PostalCodeNumber></PostalCode></Locality></AdministrativeArea></Country></AddressDetails>
+    <ExtendedData>
+      <LatLonBox north="37.4251196" south="37.4188244" east="-122.0809954" west="-122.0872906" />
+    </ExtendedData>
+    <Point><coordinates>-122.0850350,37.4231390,0</coordinates></Point>
+  </Placemark>
+</Response></kml>

data/test/fixtures/responses/google/unknown_address.xml

@@ -1 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?><kml xmlns="http://earth.google.com/kml/2.1"><Response><name>1600</name><Status><code>602</code><request>geocode</request></Status></Response></kml>
+<?xml version="1.0" encoding="UTF-8" ?>
+<kml xmlns="http://earth.google.com/kml/2.0"><Response>
+  <name>xxxxx</name>
+  <Status>
+    <code>602</code>
+    <request>geocode</request>
+  </Status>
+</Response></kml>

data/test/fixtures/responses/yahoo/success.xml

@@ -1,3 +1,3 @@
 <?xml version="1.0"?>
-<ResultSet xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:yahoo:maps" xsi:schemaLocation="urn:yahoo:maps http://api.local.yahoo.com/MapsService/V1/GeocodeResponse.xsd"><Result precision="address" warning="The exact location could not be found, here is the closest match: 701 First Ave, Sunnyvale, CA 94089"><Latitude>37.416384</Latitude><Longitude>-122.024853</Longitude><Address>701 FIRST AVE</Address><City>SUNNYVALE</City><State>CA</State><Zip>94089-1019</Zip><Country>US</Country></Result></ResultSet>
-<!-- ws06.search.re2.yahoo.com uncompressed/chunked Wed Apr 25 15:13:01 PDT 2007 -->
+<ResultSet xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:yahoo:maps" xsi:schemaLocation="urn:yahoo:maps http://api.local.yahoo.com/MapsService/V1/GeocodeResponse.xsd"><Result precision="address" warning="The exact location could not be found, here is the closest match: 701 1st Ave, Sunnyvale, CA 94089"><Latitude>37.416397</Latitude><Longitude>-122.025055</Longitude><Address>701 1st Ave</Address><City>Sunnyvale</City><State>CA</State><Zip>94089-1019</Zip><Country>US</Country></Result></ResultSet>
+<!-- ws01.ydn.re2.yahoo.com uncompressed/chunked Sun Oct  4 17:27:51 PDT 2009 -->

data/test/fixtures/responses/yahoo/unknown_address.xml

@@ -3,4 +3,4 @@
 		The following errors were detected:
 		<Message>unable to parse location</Message>
 </Error>
-<!-- ws05.search.re2.yahoo.com uncompressed/chunked Wed Apr 25 15:13:01 PDT 2007 -->
+<!-- ws03.ydn.re2.yahoo.com uncompressed/chunked Sun Oct  4 17:27:52 PDT 2009 -->

data/test/{unit/graticule → graticule}/distance_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../../test_helper')
+require 'test_helper'
 
 module Graticule
   module Distance

data/test/graticule/geocoder/freethepostcode_test.rb

@@ -0,0 +1,36 @@
+require 'test_helper'
+
+module Graticule
+  module Geocoder
+    class FreeThePostcodeTest < Test::Unit::TestCase
+      
+      def setup
+        URI::HTTP.responses = []
+        URI::HTTP.uris = []
+        @geocoder = FreeThePostcode.new
+      end
+    
+      def test_success
+        return unless prepare_response(:success)
+      
+        location = Location.new(
+          :latitude => 51.503172,
+          :longitude => -0.241641)
+
+        assert_equal location, @geocoder.locate('W1A 1AA')
+      end
+      
+      def test_locate_unknown_address
+        return unless prepare_response(:not_found)
+        assert_raises(AddressError) { @geocoder.locate 'Z12 9pp' }
+      end
+      
+    protected
+
+      def prepare_response(id = :success)
+        URI::HTTP.responses << response('freethepostcode', id, 'txt')
+      end
+  
+    end
+  end
+end

data/test/graticule/geocoder/geocoder_ca_test.rb

@@ -0,0 +1,41 @@
+require 'test_helper'
+
+module Graticule
+  module Geocoder
+    class GeocoderCaTest < Test::Unit::TestCase
+      
+      def setup
+        URI::HTTP.responses = []
+        URI::HTTP.uris = []
+        
+        @geocoder = GeocoderCa.new
+        @location = Location.new(
+          :latitude => 45.418076,
+          :longitude => -75.693293,
+          :locality => "ottawa",
+          :precision => :unknown,
+          :region => "ON",
+          :street => "200 MUTCALF  "
+        )
+      end
+      
+      def test_success
+        prepare_response(:success)
+        assert_equal @location, @geocoder.locate('200 mutcalf, ottawa on')
+      end
+      
+      def test_url
+        prepare_response(:success)
+        @geocoder.locate('200 mutcalf, ottawa on')
+        assert_equal 'http://geocoder.ca/?geoit=XML&locate=200%20mutcalf,%20ottawa%20on&showpostal=1&standard=1',
+                     URI::HTTP.uris.first
+      end
+
+    protected
+      def prepare_response(id)
+        URI::HTTP.responses << response('geocoder_ca', id)
+      end
+
+    end
+  end
+end

data/test/{unit/graticule → graticule}/geocoder/geocoder_us_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../../../test_helper')
+require 'test_helper'
 
 module Graticule
   module Geocoder

data/test/{unit/graticule → graticule}/geocoder/geocoders.rb

@@ -1,5 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../../../test_helper')
-
+require 'test_helper'
 
 module Graticule
   

data/test/graticule/geocoder/geonames_test.rb

@@ -0,0 +1,48 @@
+require 'test_helper'
+
+module Graticule
+  module Geocoder
+    class GeonamesTest < Test::Unit::TestCase
+      def setup
+        URI::HTTP.responses = []
+        URI::HTTP.uris = []
+        @geocoder = Geonames.new
+      end
+
+      def test_time_zone
+        return unless prepare_response(:success)
+        
+        chicago = Location.new(:latitude => 41.85, :longitude => -87.65)
+        assert_equal 'America/Chicago', @geocoder.time_zone(chicago)
+        
+      end
+          
+      # def test_locate_server_error
+      #   return unless prepare_response(:server_error)
+      #   assert_raises(Error) { @geocoder.locate 'x' }
+      # end
+      # 
+      # def test_locate_too_many_queries
+      #   return unless prepare_response(:limit)
+      #   assert_raises(CredentialsError) { @geocoder.locate 'x' }
+      # end
+      # 
+      # def test_locate_unavailable_address
+      #   return unless prepare_response(:unavailable)
+      #   assert_raises(AddressError) { @geocoder.locate 'x' }
+      # end
+      # 
+      # def test_locate_unknown_address
+      #   return unless prepare_response(:unknown_address)
+      #   assert_raises(AddressError) { @geocoder.locate 'x' }
+      # end
+
+    protected
+
+      def prepare_response(id = :success)
+        URI::HTTP.responses << response('geonames', id)
+      end
+  
+    end
+  end
+end

data/test/{unit/graticule → graticule}/geocoder/google_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../../../test_helper')
+require 'test_helper'
 
 module Graticule
   module Geocoder
@@ -6,26 +6,25 @@ module Graticule
       def setup
         URI::HTTP.responses = []
         URI::HTTP.uris = []
-        @geocoder = Google.new(:key => 'APP_ID')
+        @geocoder = Google.new('APP_ID')
       end
-    
+      
       def test_success
         return unless prepare_response(:success)
-      
+        
         location = Location.new(
           :street => "1600 Amphitheatre Pkwy",
           :locality => "Mountain View",
           :region => "CA",
           :postal_code => "94043",
           :country => "US",
-          :longitude => -122.083739,
-          :latitude => 37.423021,
+          :longitude => -122.0850350,
+          :latitude => 37.4231390,
           :precision => :address
         )
         assert_equal location, @geocoder.locate('1600 Amphitheatre Parkway, Mountain View, CA')
       end
       
-
       # The #locate parameters are broad, so the XML response contains 
       # multiple results at street-level precision. We expect to get the 
       # first result back, and it should not contain a postal code.
@@ -44,18 +43,14 @@ module Graticule
         )
         assert_equal location, @geocoder.locate('Queen St West, Toronto, ON CA')
       end
-
-
-        # <?xml version='1.0' encoding='UTF-8'?><kml xmlns='http://earth.google.com/kml/2.0'><Response><name>15-17 </name><Status><code>200</code><request>geocode</request></Status><Placemark id='p1'><Point><coordinates>-17.000000,15.000000,0</coordinates></Point></Placemark></Response></kml>
-        def test_only_coordinates
-          return unless prepare_response(:only_coordinates)
-
-          location = Location.new(:longitude => -17.000000, :latitude => 15.000000)
-          assert_equal location, @geocoder.locate('15-17 & 16 Railroad Square, Nashua, NH, 03064')
-        end
+      
+      def test_only_coordinates
+        return unless prepare_response(:only_coordinates)
         
-
-
+        location = Location.new(:longitude => -17.000000, :latitude => 15.000000)
+        assert_equal location, @geocoder.locate('15-17 & 16 Railroad Square, Nashua, NH, 03064')
+      end
+      
       def test_partial
         return unless prepare_response(:partial)
         
@@ -63,19 +58,14 @@ module Graticule
           :locality => "San Francisco",
           :region => "CA",
           :country => "US",
-          :longitude => -122.418333,
-          :latitude => 37.775000,
-          :precision => :city
+          :longitude => -122.419209,
+          :latitude => 37.775206,
+          :precision => :locality
         )
         
         assert_equal location, @geocoder.locate('sf ca')
       end
     
-      def test_bad_key
-        return unless prepare_response(:badkey)
-        assert_raises(CredentialsError) { @geocoder.locate('x') }
-      end
-    
       def test_locate_missing_address
         return unless prepare_response(:missing_address)
         assert_raises(AddressError) { @geocoder.locate 'x' }
@@ -100,6 +90,11 @@ module Graticule
         return unless prepare_response(:unknown_address)
         assert_raises(AddressError) { @geocoder.locate 'x' }
       end
+      
+      def test_bad_key
+        return unless prepare_response(:badkey)
+        assert_raises(CredentialsError) { @geocoder.locate('x') }
+      end
 
     protected
 

data/test/{unit/graticule → graticule}/geocoder/host_ip_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../../../test_helper')
+require 'test_helper'
 
 module Graticule
   module Geocoder

data/test/{unit/graticule → graticule}/geocoder/local_search_maps_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../../../test_helper')
+require 'test_helper'
 
 module Graticule
   module Geocoder

data/test/{unit/graticule → graticule}/geocoder/mapquest_test.rb

@@ -1,9 +1,11 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', 'test_helper')
+require 'test_helper'
 
 module Graticule
   module Geocoder
     class MapquestTest < Test::Unit::TestCase
       def setup
+        URI::HTTP.responses = []
+        URI::HTTP.uris = []
         @geocoder = Mapquest.new('client_id', 'password')
       end
 
@@ -30,7 +32,7 @@ module Graticule
           :locality => "Stony Brook",
           :longitude => -73.141403,
           :postal_code => nil,
-          :precision => :city,
+          :precision => :locality,
           :region => "NY",
           :street => nil
         )

data/test/{unit/graticule → graticule}/geocoder/multi_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../../../test_helper')
+require 'test_helper'
 
 module Graticule
   module Geocoder
@@ -37,7 +37,15 @@ module Graticule
         @geocoder = Multi.new(*@mock_geocoders) {|r| r == 3 }
         assert_raises(Graticule::AddressError) { @geocoder.locate('test') }
       end
-
+      
+      def test_timeout
+        @mock = @mock_geocoders.first
+        def @mock.locate(*x)
+          sleep 1
+        end
+        @geocoder = Multi.new(@mock, :timeout => 0.1)
+        assert_raise(Timeout::Error) { @geocoder.locate('foo') }
+      end
     end
   end
 end

data/test/{unit/graticule → graticule}/geocoder/multimap_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../../../test_helper')
+require 'test_helper'
 
 module Graticule
   module Geocoder
@@ -10,7 +10,7 @@ module Graticule
         @geocoder = Multimap.new 'API_KEY'
         @location = Location.new(
           :street => "Oxford Street",
-          :locality => "London",
+          :locality => "LONDON",
           :postal_code => "W1",
           :country => "GB",
           :longitude => -0.14839,

data/test/{unit/graticule → graticule}/geocoder/yahoo_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../../../test_helper')
+require 'test_helper'
 
 module Graticule
   module Geocoder
@@ -9,14 +9,15 @@ module Graticule
         URI::HTTP.uris = []
         @geocoder = Yahoo.new 'APP_ID'
         @location = Location.new(
-          :street => "701 First Ave",
+          :street => "701 1st Ave",
           :locality => "Sunnyvale",
           :region => "CA",
           :postal_code => "94089-1019",
           :country => "US",
-          :longitude => -122.024853,
-          :latitude => 37.416384,
-          :precision => :address
+          :longitude => -122.025055,
+          :latitude => 37.416397,
+          :precision => :address,
+          :warning => "The exact location could not be found, here is the closest match: 701 First Ave, Sunnyvale, CA 94089"
         )
       end
 

data/test/{unit/graticule → graticule}/geocoder_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../../test_helper')
+require 'test_helper'
 
 module Graticule
   class GeocoderTest < Test::Unit::TestCase
@@ -19,9 +19,5 @@ module Graticule
       assert_equal Geocoder::GeocoderUs, Graticule.service(:geocoder_us)
     end
 
-    def test_meta_carta_service
-      assert_equal Geocoder::MetaCarta, Graticule.service(:meta_carta)
-    end
-  
   end
 end

data/test/{unit/graticule → graticule}/location_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../../test_helper')
+require 'test_helper'
 
 module Graticule
   class LocationTest < Test::Unit::TestCase
@@ -69,5 +69,13 @@ module Graticule
         assert !Location.new(attr => 'Foo').blank?
       end
     end
+    
+    def test_time_zone
+      URI::HTTP.uris = []
+      URI::HTTP.responses = []
+      URI::HTTP.responses << response('geonames', :success)
+      chicago = Location.new(:latitude => 41.85, :longitude => -87.65)
+      assert_equal 'America/Chicago', chicago.time_zone
+    end
   end
 end

data/test/test_helper.rb

@@ -1,11 +1,10 @@
 $:.unshift(File.dirname(__FILE__) + '/../lib')
-$:.unshift(File.dirname(__FILE__) + '/mocks')
 
 require 'rubygems'
-require 'yaml'
 require 'test/unit'
 require 'graticule'
 require 'mocha'
+require 'mocks/uri'
 
 TEST_RESPONSE_PATH = File.dirname(__FILE__) + '/fixtures/responses'