graticule 0.2.2 → 0.2.3

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

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

data/test/fixtures/responses/host_ip/private.txt

@@ -1,4 +1,4 @@
 Country: (Private Address) (XX)
 City: (Private Address)
 Latitude: 
-Longitude:
+Longitude: 

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

@@ -1,4 +1,4 @@
 Country: UNITED STATES (US)
 City: Mountain View, CA
 Latitude: 37.402
-Longitude: -122.078
+Longitude: -122.078

data/test/fixtures/responses/host_ip/unknown.txt

@@ -1,4 +1,4 @@
 Country: (Unknown Country?) (XX)
 City: (Unknown City?)
 Latitude: 
-Longitude: 
+Longitude: 

data/test/fixtures/responses/local_search_maps/empty.txt

@@ -0,0 +1 @@
+alert('Please provide a location');

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

@@ -0,0 +1 @@
+alert('location not found');

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

@@ -1 +1 @@
-map.centerAndZoom(new GPoint(-0.130427, 51.510036), 4);
+map.centerAndZoom(new GPoint(-0.130427, 51.510036), 4);

data/test/fixtures/responses/meta_carta/bad_address.xml

@@ -1,9 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" ?>
+
 <!DOCTYPE Locations SYSTEM "Locations.dtd">
-<Locations xmlns:gml="http://www.opengis.net/gml" CreatedBy="MetaCarta GeoParser v3.5.0-labs-alpha" CreatedOn="Sat Jun 17 02:05:42 2006" ConvertedFromBinaryFormat="False" InputByteLength="0">
-  <ViewBox>
-    <gml:Box srsName="epsg:4326">
-      <gml:coordinates>-90.000000,-180.000000 90.000000,180.000000</gml:coordinates>
-    </gml:Box>
-  </ViewBox>
+
+<Locations
+	xmlns:gml="http://www.opengis.net/gml"
+	CreatedBy="MetaCarta GeoParser v3.7.0-labs"
+	CreatedOn="Wed Apr 25 22:12:33 2007"
+	ConvertedFromBinaryFormat="0"
+	InputByteLength="0">
+	<ViewBox>
+
+		<gml:Box srsName="epsg:4326">
+			<gml:coordinates>-180.000000,-90.000000 180.000000,90.000000</gml:coordinates>
+		</gml:Box>
+	</ViewBox>
 </Locations>

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

@@ -1,23 +1,31 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" ?>
+
 <!DOCTYPE Locations SYSTEM "Locations.dtd">
-<Locations xmlns:gml="http://www.opengis.net/gml" CreatedBy="MetaCarta GeoParser v3.5.0-labs-alpha" CreatedOn="Thu Jun 15 23:56:50 2006" ConvertedFromBinaryFormat="False" InputByteLength="0">
-  <ViewBox>
-    <gml:Box srsName="epsg:4326">
-      <gml:coordinates>26.238611,37.293889 40.438611,51.493889</gml:coordinates>
-    </gml:Box>
-  </ViewBox>
-  <Location Name="Baghdad" Type="PPLC" Population="5672516" Hierarchy="Iraq/Baghdad/Baghdad">
-    <ViewBox>
-      <gml:Box srsName="epsg:4326">
-        <gml:coordinates>26.238611,37.293889 40.438611,51.493889</gml:coordinates>
-      </gml:Box>
-    </ViewBox>
-    <RemainingQuery/>
-    <Confidence>0.195185</Confidence>
-    <Centroid>
-      <gml:Point>
-        <gml:coordinates>44.393889,33.338611</gml:coordinates>
-      </gml:Point>
-    </Centroid>
-  </Location>
+
+<Locations
+	xmlns:gml="http://www.opengis.net/gml"
+	CreatedBy="MetaCarta GeoParser v3.7.0-labs"
+	CreatedOn="Wed Apr 25 22:12:33 2007"
+	ConvertedFromBinaryFormat="0"
+	InputByteLength="0">
+	<ViewBox>
+
+		<gml:Box srsName="epsg:4326">
+			<gml:coordinates>43.593900,32.538600 45.193900,34.138600</gml:coordinates>
+		</gml:Box>
+	</ViewBox>
+<Location
+
+	Name="Baghdad"
+	Type=""
+	Population="-1"
+	Hierarchy="">
+	<ViewBox>
+		<gml:Box srsName="epsg:4326">
+			<gml:coordinates>43.593900,32.538600 45.193900,34.138600</gml:coordinates>
+		</gml:Box>
+	</ViewBox>
+	<RemainingQuery></RemainingQuery>
+	<Confidence>0.566875</Confidence>	<Centroid><gml:Point><gml:coordinates>44.393900000000002,33.3386</gml:coordinates></gml:Point></Centroid>
+</Location>
 </Locations>

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"><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>
-<!-- ws01.search.re2.yahoo.com compressed/chunked Sun Oct 15 18:23:09 PDT 2006 -->
+<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 -->

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

@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Error xmlns="urn:yahoo:api">
-		The following errors were detected:
-		<Message>unable to parse location</Message>
-</Error>
-<!-- ws02.search.scd.yahoo.com uncompressed/chunked Thu Jun  8 15:53:20 PDT 2006 -->
+<?xml version="1.0" encoding="UTF-8"?>
+<Error xmlns="urn:yahoo:api">
+		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 -->

data/test/mocks/uri.rb

@@ -40,11 +40,12 @@ class URI::HTTP # :nodoc:
 
   alias original_open open
 
-  def open
+  def open(*args)
     self.class.uris << self.to_s
     io = StringIO.new(self.class.responses.shift)
     OpenURI::Meta.init(io)
-    yield io
+    yield io if block_given?
+    io
   end
 
 end

data/test/unit/graticule/geocoder/google_test.rb

@@ -24,6 +24,20 @@ module Graticule
         )
         assert_equal location, @geocoder.locate('1600 Amphitheatre Parkway, Mountain View, CA')
       end
+      
+      def test_partial
+        return unless prepare_response(:partial)
+        
+        location = Location.new(
+          :locality => "San Francisco",
+          :region => "CA",
+          :country => "US",
+          :longitude => -122.418333,
+          :latitude => 37.775000
+        )
+        
+        assert_equal location, @geocoder.locate('sf ca')
+      end
     
       def test_bad_key
         return unless prepare_response(:badkey)

data/test/unit/graticule/geocoder/host_ip_test.rb

@@ -28,6 +28,7 @@ module Graticule
         prepare_response :private
         assert_raises(AddressError) { @geocoder.locate('127.0.0.1') }
       end
+      
     private
     
       def prepare_response(id = :success)

data/test/unit/graticule/geocoder/meta_carta_test.rb

@@ -14,7 +14,7 @@ module Graticule
       def test_locate
         prepare_response(:success)
 
-        expected = Location.new :latitude => 44.393889, :longitude => 33.338611
+        expected = Location.new :latitude => 44.3939, :longitude => 33.3386
         
         assert_equal expected, @geocoder.locate('baghdad')
         assert_equal true, URI::HTTP.responses.empty?

data/test/unit/graticule/location_test.rb

@@ -29,7 +29,7 @@ module Graticule
       assert_equal Location.new, Location.new
 
       attrs = {:latitude => 100.5389, :longitude => -147.5893, :street => '123 A Street',
-          :locality => 'Somewhere', :region => 'NO', :postal_code => '12345', :country => 'USA', :precision => :address}
+          :locality => 'Somewhere', :region => 'NO', :postal_code => '12345', :country => 'USA'}
       
       assert_equal Location.new(attrs), Location.new(attrs)
       attrs.each do |k,v|

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: graticule
 version: !ruby/object:Gem::Version 
-  version: 0.2.2
-date: 2007-03-27 00:00:00 -04:00
+  version: 0.2.3
+date: 2007-04-27 00:00:00 -04:00
 summary: API for using all the popular geocoding services.
 require_paths: 
 - lib
@@ -43,6 +43,7 @@ files:
 - lib/graticule/distance/spherical.rb
 - lib/graticule/distance/vincenty.rb
 - lib/graticule/geocoder.rb
+- lib/graticule/geocoder/base.rb
 - lib/graticule/geocoder/bogus.rb
 - lib/graticule/geocoder/geocoder_ca.rb
 - lib/graticule/geocoder/geocoder_us.rb
@@ -55,11 +56,16 @@ files:
 - lib/graticule/geocoder/yahoo.rb
 - lib/graticule/location.rb
 - lib/graticule/version.rb
+- site/index.html
+- site/plugin.html
+- site/stylesheets/style.css
+- test/config.yml.default
 - test/fixtures/responses/geocoder_us/success.xml
 - test/fixtures/responses/geocoder_us/unknown.xml
 - test/fixtures/responses/google/badkey.xml
 - test/fixtures/responses/google/limit.xml
 - test/fixtures/responses/google/missing_address.xml
+- test/fixtures/responses/google/partial.xml
 - test/fixtures/responses/google/server_error.xml
 - test/fixtures/responses/google/success.xml
 - test/fixtures/responses/google/unavailable.xml
@@ -67,6 +73,8 @@ files:
 - test/fixtures/responses/host_ip/private.txt
 - test/fixtures/responses/host_ip/success.txt
 - test/fixtures/responses/host_ip/unknown.txt
+- test/fixtures/responses/local_search_maps/empty.txt
+- test/fixtures/responses/local_search_maps/not_found.txt
 - test/fixtures/responses/local_search_maps/success.txt
 - test/fixtures/responses/meta_carta/bad_address.xml
 - test/fixtures/responses/meta_carta/multiple.xml
@@ -91,7 +99,6 @@ files:
 - test/unit/graticule/geocoder_test.rb
 - test/unit/graticule/location_test.rb
 test_files: 
-- test/unit/graticule/cli_test.rb
 - test/unit/graticule/distance_test.rb
 - test/unit/graticule/geocoder_test.rb
 - test/unit/graticule/location_test.rb

data/test/unit/graticule/cli_test.rb

@@ -1,26 +0,0 @@
-require File.dirname(__FILE__) + '/../../test_helper'
-require 'graticule/cli'
-
-module Graticule
-  class CliTest < Test::Unit::TestCase
-    
-    def setup
-      URI::HTTP.responses = []
-      URI::HTTP.uris = []
-    end
-    
-    def test_start
-      prepare_response(:success)
-      Kernel.expects(:puts)
-      Kernel.stubs(:puts)
-      result = Graticule::Cli.start ['-s', 'yahoo', '-a', 'YahooDemo', 'Saugatuck,', 'MI']
-    end
-
-  protected
-
-    def prepare_response(id)
-      URI::HTTP.responses << response('yahoo', id)
-    end
-
-  end  
-end