graticule 0.1.2 → 0.1.3

data/CHANGELOG.txt

@@ -1,6 +1,8 @@
+0.1.3 (2007-02-14)
+* fixed Google geocoder
+* fixed CLI
 
-
-0.1.2
+0.1.2 (2007-02-12)
 * added "geocode" executable. See "geocode --help" for more information
 * declared dependency on ActiveSupport
 

data/README.txt

@@ -22,4 +22,8 @@ Graticule includes a command line interface (CLI).
 
   $ geocode -s yahoo -a yahookey Washington, DC
   Washington, DC US
-  latitude: 38.895222, longitude: -77.036758
+  latitude: 38.895222, longitude: -77.036758
+
+= Source
+
+The source code for Graticule is available at http://source.collectiveidea.com/public/geocode/trunk

data/bin/geocode

@@ -1,19 +1,5 @@
 #!/usr/bin/env ruby
-#
-# This file was generated by RubyGems.
-#
-# The application 'geocode' is installed as part of a gem, and
-# this file is here to facilitate running it. 
-#
 
-require 'rubygems'
-version = "> 0"
-if ARGV.size > 0 && ARGV[0][0]==95 && ARGV[0][-1]==95
-  if Gem::Version.correct?(ARGV[0][1..-2])
-    version = ARGV[0][1..-2] 
-    ARGV.shift
-  end
-end
-require_gem 'graticule', version
+require 'graticule'
 
-Graticule::Cli.start
+Graticule::Cli.start ARGV

data/lib/graticule/cli.rb

@@ -19,10 +19,10 @@ module Graticule
   #     -h, --help                       Help
   class Cli
     
-    def self.start
+    def self.start(args)
       options = { :service => :yahoo, :api_key => 'YahooDemo' }
       
-      option_parser = OptionParser.new do |opts|
+      OptionParser.new do |opts|
         opts.banner = "Usage: geocode [options] location"
         opts.separator ""
         opts.separator "Options: "
@@ -37,8 +37,10 @@ module Graticule
           puts opts
           exit
         end
-      end.parse!
+      end.parse! args
 
+      options[:location] = args.join(" ")
+      
       result = Graticule.service(options[:service]).new(options[:api_key]).locate(options[:location])
       location = (result.is_a?(Array) ? result.first : result)
       if location
@@ -46,12 +48,11 @@ module Graticule
       else
         puts "Location not found"
       end
-    rescue OptionParser::InvalidArgument => error
-      $stderr.puts error.message
-    rescue OptionParser::InvalidOption => error
-      $stderr.puts error.message
     rescue Graticule::CredentialsError
       $stderr.puts "Invalid API key. Pass your #{options[:service]} API key using the -a option. "
+    rescue OptionParser::InvalidArgument, OptionParser::InvalidOption,
+        Graticule::Error => error
+      $stderr.puts error.message
     end
     
     

data/lib/graticule/geocoders/google.rb

@@ -45,16 +45,19 @@ module Graticule
 
     # Extracts a Location from +xml+.
     def parse_response(xml) #:nodoc:
+      address = REXML::XPath.first(xml, '//xal:AddressDetails', 'xal' => "urn:oasis:names:tc:ciq:xsdschema:xAL:2.0")
+
       longitude, latitude, = xml.elements['/kml/Response/Placemark/Point/coordinates'].text.split(',').map { |v| v.to_f }
+      
       Location.new \
-        :street => text(xml.elements['/kml/Response/Placemark/AddressDetails/Country/AdministrativeArea/SubAdministrativeArea/Locality/Thoroughfare/ThoroughfareName']),
-        :city => text(xml.elements['/kml/Response/Placemark/AddressDetails/Country/AdministrativeArea/SubAdministrativeArea/Locality/LocalityName']),
-        :state => text(xml.elements['/kml/Response/Placemark/AddressDetails/Country/AdministrativeArea/AdministrativeAreaName']),
-        :zip => text(xml.elements['/kml/Response/Placemark/AddressDetails/Country/AdministrativeArea/SubAdministrativeArea/Locality/PostalCode/PostalCodeNumber']),
-        :country => text(xml.elements['/kml/Response/Placemark/AddressDetails/Country/CountryNameCode']),
+        :street => address.elements['Country/AdministrativeArea/SubAdministrativeArea/Locality/Thoroughfare/ThoroughfareName/text()'].value,
+        :city => address.elements['Country/AdministrativeArea/SubAdministrativeArea/Locality/LocalityName/text()'].value,
+        :state => address.elements['Country/AdministrativeArea/AdministrativeAreaName/text()'].value,
+        :zip => address.elements['Country/AdministrativeArea/SubAdministrativeArea/Locality/PostalCode/PostalCodeNumber/text()'].value,
+        :country => address.elements['Country/CountryNameCode/text()'].value,
         :latitude => latitude,
         :longitude => longitude,
-        :precision => PRECISION[xml.elements['/kml/Response/Placemark/AddressDetails'].attribute('Accuracy').value.to_i] || :unknown
+        :precision => PRECISION[address.attribute('Accuracy').value.to_i] || :unknown
     end
 
     # Extracts and raises an error from +xml+, if any.

data/lib/graticule/version.rb

@@ -2,7 +2,7 @@ module Graticule #:nodoc:
   module Version #:nodoc:
     MAJOR = 0
     MINOR = 1
-    TINY = 2
+    TINY = 3
   
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

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

@@ -1,4 +1,4 @@
-<kml>
+<kml xmlns="http://earth.google.com/kml/2.0">
   <Response>
     <name>1600 amphitheatre mtn view ca</name>
     <Status>
@@ -9,7 +9,7 @@
       <address> 
         1600 Amphitheatre Pkwy, Mountain View, CA 94043, USA
       </address>
-      <AddressDetails Accuracy="8">
+      <AddressDetails xmlns="urn:oasis:names:tc:ciq:xsdschema:xAL:2.0" Accuracy="8">
         <Country>
           <CountryNameCode>US</CountryNameCode>
  	  <AdministrativeArea>

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: graticule
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
-date: 2007-02-12 00:00:00 -05:00
+  version: 0.1.3
+date: 2007-02-14 00:00:00 -05:00
 summary: API for using all the popular geocoding services.
 require_paths: 
 - lib
@@ -109,5 +109,5 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.1.7
+        version: 1.2.0
     version: