ym4r 0.5.4 → 0.6.0

data/lib/ym4r/google_maps/geocoding.rb

@@ -30,13 +30,13 @@ module Ym4r
         placemarks = Placemarks.new(response.elements['name'].text,response.elements['Status/code'].text.to_i)
         response.elements.each("Placemark") do |placemark|
           data = placemark.elements
-          data_country = data['//CountryNameCode']
-          data_administrative = data['//AdministrativeAreaName']
-          data_sub_administrative = data['//SubAdministrativeAreaName']
-          data_locality = data['//LocalityName']
-          data_dependent_locality = data['//DependentLocalityName']
-          data_thoroughfare = data['//ThoroughfareName']
-          data_postal_code = data['//PostalCodeNumber']
+          data_country = data['descendant::CountryNameCode']
+          data_administrative = data['descendant::AdministrativeAreaName']
+          data_sub_administrative = data['descendant::SubAdministrativeAreaName']
+          data_locality = data['descendant::LocalityName']
+          data_dependent_locality = data['descendant::DependentLocalityName']
+          data_thoroughfare = data['descendant::ThoroughfareName']
+          data_postal_code = data['descendant::PostalCodeNumber']
           placemarks << Geocoding::Placemark.new(data['address'].text,
                                                  data_country.nil? ? "" : data_country.text,
                                                  data_administrative.nil? ? "" : data_administrative.text,
@@ -45,7 +45,7 @@ module Ym4r
                                                  data_dependent_locality.nil? ? "" : data_dependent_locality.text,
                                                  data_thoroughfare.nil? ? "" : data_thoroughfare.text,
                                                  data_postal_code.nil? ? "" : data_postal_code.text,
-                                                 *(data['//coordinates'].text.split(",")[0..1].collect {|l| l.to_f }))
+                                                 *(data['descendant::coordinates'].text.split(",")[0..1].collect {|l| l.to_f }))
         end
         placemarks
       end

data/rakefile.rb

@@ -24,13 +24,13 @@ spec = Gem::Specification::new do |s|
   s.platform = Gem::Platform::RUBY
 
   s.name = 'ym4r'
-  s.version = "0.5.4"
+  s.version = "0.6.0"
   s.summary = "Helping the use of Google Maps and Yahoo! Maps API's from Ruby and Rails"
   s.description = <<EOF
 EOF
   s.author = 'Guilhem Vellut'
-  s.email = 'guilhem.vellut@gmail.com'
-  s.homepage = "http://thepochisuperstarmegashow.com"
+  s.email = 'guilhem.vellut+ym4r@gmail.com'
+  s.homepage = "http://thepochisuperstarmegashow.com/projects/#ym4r"
   
   s.requirements << 'none'
   s.require_path = 'lib'

data/test/test_geocoding.rb

@@ -26,10 +26,6 @@ class TestGeocoding< Test::Unit::TestCase
     assert_equal(result1.longitude,result2.longitude)
   end
 
-  def test_garbage_location
-    assert_raise(BadRequestException) {Ym4r::YahooMaps::BuildingBlock::Geocoding::get(:location => "AZEAEAEAEAEAE")}
-  end
-
   def test_no_location
     assert_raise(MissingParameterException) {Ym4r::YahooMaps::BuildingBlock::Geocoding::get(:hello => "world")}
   end

data/test/test_gm_geocoding.rb

@@ -24,5 +24,40 @@ class TestGmGeocoding< Test::Unit::TestCase
     assert_equal("PK",placemark.country_code)
     assert_equal("Lahore",placemark.locality)
     assert_equal("",placemark.thoroughfare)
+  end	
+	
+  def test_google_maps_multiple_matches
+    placemarks = Ym4r::GoogleMaps::Geocoding.get("gooseberry")
+    assert_equal(Ym4r::GoogleMaps::Geocoding::GEO_SUCCESS,placemarks.status)
+    assert_equal(4,placemarks.length)
+    
+    placemark = placemarks[0]
+    assert_equal("US",placemark.country_code)
+    assert_equal("UT", placemark.administrative_area)
+    assert_equal("Blanding",placemark.locality)
+    assert_equal("Gooseberry",placemark.thoroughfare)
+    assert_equal("84511",placemark.postal_code)
+    
+    placemark = placemarks[1]
+    assert_equal("US",placemark.country_code)
+    assert_equal("OR", placemark.administrative_area)
+    assert_equal("",placemark.locality)
+    assert_equal("",placemark.thoroughfare)
+    assert_equal("",placemark.postal_code)
+    
+    placemark = placemarks[2]
+    assert_equal("US",placemark.country_code)
+    assert_equal("UT", placemark.administrative_area)
+    assert_equal("Salina",placemark.locality)
+    assert_equal("",placemark.thoroughfare)
+    assert_equal("",placemark.postal_code)
+    
+    placemark = placemarks[3]
+    assert_equal("US",placemark.country_code)
+    assert_equal("CA", placemark.administrative_area)
+    assert_equal("",placemark.locality)
+    assert_equal("Gooseberry",placemark.thoroughfare)
+    assert_equal("93651",placemark.postal_code)
+  
   end
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.0
+rubygems_version: 0.9.2
 specification_version: 1
 name: ym4r
 version: !ruby/object:Gem::Version 
-  version: 0.5.4
-date: 2006-10-30 00:00:00 +01:00
+  version: 0.6.0
+date: 2007-09-12 00:00:00 +02:00
 summary: Helping the use of Google Maps and Yahoo! Maps API's from Ruby and Rails
 require_paths: 
 - lib
-email: guilhem.vellut@gmail.com
-homepage: http://thepochisuperstarmegashow.com
+email: guilhem.vellut+ym4r@gmail.com
+homepage: http://thepochisuperstarmegashow.com/projects/#ym4r
 rubyforge_project: 
 description: ""
 autorequire: 
@@ -29,18 +29,18 @@ post_install_message:
 authors: 
 - Guilhem Vellut
 files: 
-- lib/ym4r.rb
-- lib/ym4r/google_maps.rb
-- lib/ym4r/yahoo_maps.rb
 - lib/ym4r/google_maps/api_key.rb
 - lib/ym4r/google_maps/geocoding.rb
+- lib/ym4r/google_maps.rb
 - lib/ym4r/yahoo_maps/app_id.rb
-- lib/ym4r/yahoo_maps/building_block.rb
 - lib/ym4r/yahoo_maps/building_block/exception.rb
 - lib/ym4r/yahoo_maps/building_block/geocoding.rb
 - lib/ym4r/yahoo_maps/building_block/local_search.rb
 - lib/ym4r/yahoo_maps/building_block/map_image.rb
 - lib/ym4r/yahoo_maps/building_block/traffic.rb
+- lib/ym4r/yahoo_maps/building_block.rb
+- lib/ym4r/yahoo_maps.rb
+- lib/ym4r.rb
 - lib/ym4r/google_maps/config/config.yml
 - test/test_geocoding.rb
 - test/test_gm_geocoding.rb