RubyGems - rails-geocoder - Versions diffs - 0.9.3 → 0.9.4 - Mend

rails-geocoder 0.9.3 → 0.9.4

Files changed (8) hide show

data/CHANGELOG.rdoc +4 -0
data/README.rdoc +5 -15
data/VERSION +1 -1
data/lib/geocoder.rb +12 -16
data/rails-geocoder.gemspec +1 -1
data/test/fixtures/madison_square_garden.xml +69 -16
data/test/geocoder_test.rb +2 -2
metadata +2 -2

data/CHANGELOG.rdoc CHANGED Viewed

@@ -2,6 +2,10 @@
 Per-release changes to Geocoder.
+== 0.9.4 (2010 Aug 2)
+* Google Maps API key no longer required (uses geocoder v3).
 == 0.9.3 (2010 Aug 2)
 * Fix incompatibility with Rails 3 RC 1.

data/README.rdoc CHANGED Viewed

@@ -1,10 +1,8 @@
 = Geocoder
-Geocoder adds object geocoding and database-agnostic distance calculations to Ruby on Rails. It's as simple as calling <tt>fetch_coordinates!</tt> on your objects, and then using a scope like <tt>Venue.near("Billings, MT")</tt>.
+Geocoder adds object geocoding and database-agnostic distance calculations to Ruby on Rails. It's as simple as calling <tt>fetch_coordinates!</tt> on your objects, and then using a scope like <tt>Venue.near("Billings, MT")</tt>. Since it does not rely on proprietary database functions finding geocoded objects in a given area works with out-of-the-box MySQL or even SQLite.
-Geocoder does not rely on proprietary database functions so finding geocoded objects in a given area is easily done using out-of-the-box MySQL or even SQLite.
-<b>Geocoder is currently compatible with Rails 2.x and Rails 3.</b>
+<b>Geocoder is currently compatible with Rails 2.x and Rails 3.</b> Also, a Google Maps API key is no longer necessary.
 == 1. Install
@@ -41,21 +39,16 @@ or as a gem:
 == 2. Configure
-A) Get a Google Maps API key (see http://code.google.com/apis/maps/signup.html) and store it in a constant:
-  # eg, in config/initializers/google_maps.rb
-  GOOGLE_MAPS_API_KEY = "..."
-B) Add +latitude+ and +longitude+ columns to your model:
+A) Add +latitude+ and +longitude+ columns to your model:
   script/generate migration AddLatitudeAndLongitudeToYourModel latitude:float longitude:float
   rake db:migrate
-C) Tell geocoder where your model stores its address:
+B) Tell geocoder where your model stores its address:
   geocoded_by :address
-D) Optionally, auto-fetch coordinates every time your model is saved:
+C) Optionally, auto-fetch coordinates every time your model is saved:
   after_validation :fetch_coordinates
@@ -154,9 +147,6 @@ If anyone has a more elegant solution to this problem I am very interested in se
 * make 'near' scope work with 'select' options
 * prepend table names to column names in SQL distance expression (required
   to do joins on another geocoded model)
-* prevent NameError when GOOGLE_MAPS_API_KEY is missing: show nice msg
-* <tt>install.rb</tt> should do some setup when installed as a plugin
-  * create initializer with GOOGLE_MAPS_API_KEY?
 Copyright (c) 2009-10 Alex Reisner, released under the MIT license

data/VERSION CHANGED Viewed

	@@ -1 +1 @@
1	- 0.9.3
1	+ 0.9.4

data/lib/geocoder.rb CHANGED Viewed

@@ -181,10 +181,10 @@ module Geocoder
     if options != {}
       warn "DEPRECATION WARNING: The 'options' argument to the nearbys " +
         "method is deprecated and will be removed from rails-geocoder in " +
-        "version 0.9.4. Nearbys now returns a scope so you should specify " +
-        "more scopes and/or conditions via chaining. For example: " +
+        "a future version. Nearbys now returns a scope so you should " +
+        "specify more scopes and/or conditions via chaining. For example: " +
         "city.nearbys(20).order('name').limit(10). Support for Rails 2.x " +
-        "will be discontinued after rails-geocoder 0.9.3."
+        "will be discontinued soon."
     end
     return [] unless geocoded?
     options.reverse_merge!(:conditions => ["id != ?", id])
@@ -223,15 +223,14 @@ module Geocoder
     return nil unless doc = self.search(query)
     # make sure search found a result
-    e = doc.elements['kml/Response/Status/code']
-    return nil unless (e and e.text == "200")
+    e = doc.elements['GeocodeResponse/status']
+    return nil unless (e and e.text == "OK")
     # isolate the relevant part of the result
-    place = doc.elements['kml/Response/Placemark']
+    place = doc.elements['GeocodeResponse/result/geometry/location']
-    # if there are multiple results, blindly use the first
-    coords = place.elements['Point/coordinates'].text
-    coords.split(',')[0...2].reverse.map{ |i| i.to_f }
+    # blindly use the first results (assume they are most accurate)
+    ['lat', 'lng'].map{ |i| place.elements[i].text.to_f }
   end
   ##
@@ -331,13 +330,10 @@ module Geocoder
   #
   def self._fetch_xml(query)
     params = {
-      :q      => query,
-      :key    => GOOGLE_MAPS_API_KEY,
-      :output => "xml",
-      :sensor => "false",
-      :oe     => "utf8"
+      :address => query,
+      :sensor  => "false"
     }
-    url    = "http://maps.google.com/maps/geo?" + params.to_query
+    url = "http://maps.google.com/maps/api/geocode/xml?" + params.to_query
     # Query geocoder and make sure it responds quickly.
     begin

data/rails-geocoder.gemspec CHANGED Viewed

@@ -5,7 +5,7 @@
 Gem::Specification.new do |s|
   s.name = %q{rails-geocoder}
-  s.version = "0.9.3"
+  s.version = "0.9.4"
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Alex Reisner"]

data/test/fixtures/madison_square_garden.xml CHANGED Viewed

@@ -1,16 +1,69 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<kml xmlns="http://earth.google.com/kml/2.0"><Response>
-  <name>4 Penn Plaza, New York, NY</name>
-  <Status>
-    <code>200</code>
-    <request>geocode</request>
-  </Status>
-  <Placemark id="p1">
-    <address>4 Penn Plaza, New York, NY 10001, USA</address>
-    <AddressDetails Accuracy="8" xmlns="urn:oasis:names:tc:ciq:xsdschema:xAL:2.0"><Country><CountryNameCode>US</CountryNameCode><CountryName>USA</CountryName><AdministrativeArea><AdministrativeAreaName>NY</AdministrativeAreaName><SubAdministrativeArea><SubAdministrativeAreaName>New York</SubAdministrativeAreaName><Locality><LocalityName>New York</LocalityName><Thoroughfare><ThoroughfareName>4 Penn Plaza</ThoroughfareName></Thoroughfare><PostalCode><PostalCodeNumber>10001</PostalCodeNumber></PostalCode></Locality></SubAdministrativeArea></AdministrativeArea></Country></AddressDetails>
-    <ExtendedData>
-      <LatLonBox north="40.7527158" south="40.7464206" east="-73.9885076" west="-73.9948028" />
-    </ExtendedData>
-    <Point><coordinates>-73.9916733,40.7495760,0</coordinates></Point>
-  </Placemark>
-</Response></kml>
+<GeocodeResponse>
+ <status>OK</status>
+ <result>
+  <type>street_address</type>
+  <formatted_address>4 Penn Plaza, New York, NY 10001, USA</formatted_address>
+  <address_component>
+   <long_name>4</long_name>
+   <short_name>4</short_name>
+   <type>street_number</type>
+  </address_component>
+  <address_component>
+   <long_name>Penn Plaza</long_name>
+   <short_name>Penn Plaza</short_name>
+   <type>route</type>
+  </address_component>
+  <address_component>
+   <long_name>Manhattan</long_name>
+   <short_name>Manhattan</short_name>
+   <type>sublocality</type>
+   <type>political</type>
+  </address_component>
+  <address_component>
+   <long_name>New York</long_name>
+   <short_name>New York</short_name>
+   <type>locality</type>
+   <type>political</type>
+  </address_component>
+  <address_component>
+   <long_name>New York</long_name>
+   <short_name>New York</short_name>
+   <type>administrative_area_level_2</type>
+   <type>political</type>
+  </address_component>
+  <address_component>
+   <long_name>New York</long_name>
+   <short_name>NY</short_name>
+   <type>administrative_area_level_1</type>
+   <type>political</type>
+  </address_component>
+  <address_component>
+   <long_name>United States</long_name>
+   <short_name>US</short_name>
+   <type>country</type>
+   <type>political</type>
+  </address_component>
+  <address_component>
+   <long_name>10001</long_name>
+   <short_name>10001</short_name>
+   <type>postal_code</type>
+  </address_component>
+  <geometry>
+   <location>
+    <lat>40.7503540</lat>
+    <lng>-73.9933710</lng>
+   </location>
+   <location_type>ROOFTOP</location_type>
+   <viewport>
+    <southwest>
+     <lat>40.7473324</lat>
+     <lng>-73.9965316</lng>
+    </southwest>
+    <northeast>
+     <lat>40.7536276</lat>
+     <lng>-73.9902364</lng>
+    </northeast>
+   </viewport>
+  </geometry>
+ </result>
+</GeocodeResponse>

data/test/geocoder_test.rb CHANGED Viewed

@@ -4,8 +4,8 @@ class GeocoderTest < Test::Unit::TestCase
   def test_fetch_coordinates
     v = Venue.new(*venue_params(:msg))
-    assert_equal [40.7495760, -73.9916733], v.fetch_coordinates
-    assert_equal [40.7495760, -73.9916733], [v.latitude, v.longitude]
+    assert_equal [40.750354, -73.993371], v.fetch_coordinates
+    assert_equal [40.750354, -73.993371], [v.latitude, v.longitude]
   end
   # sanity check

metadata CHANGED Viewed

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments:
   - 0
   - 9
-  - 3
-  version: 0.9.3
+  - 4
+  version: 0.9.4
 platform: ruby
 authors:
 - Alex Reisner