geo_magic 0.2.3 → 0.2.3.1

data/VERSION

@@ -1 +1 @@
-0.2.3
+0.2.3.1

data/geo_magic.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{geo_magic}
-  s.version = "0.2.3"
+  s.version = "0.2.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kristian Mandrup"]
-  s.date = %q{2011-01-22}
+  s.date = %q{2011-01-24}
   s.description = %q{Get IP and location data using freegeoip.net - can also  calculate of distance between map points using haversine supporting multiple distance units}
   s.email = %q{kmandrup@gmail.com}
   s.extra_rdoc_files = [

data/lib/geo_magic/geocode/geocoder.rb

@@ -57,28 +57,28 @@ module GeoMagic
       # Address
       
       def street
-        thoroughfare["ThoroughfareName"]
+        thoroughfare["ThoroughfareName"] ? thoroughfare["ThoroughfareName"] : ""
       end
 
       def postal_code
-        locality["PostalCode"]["PostalCodeNumber"]
+        locality["PostalCode"] ? locality["PostalCode"]["PostalCodeNumber"] : ""
       end 
       alias_method :zip, :postal_code
     
       def city
-        subadm_api["SubAdministrativeAreaName"]
+        subadm_api["SubAdministrativeAreaName"] ? subadm_api["SubAdministrativeAreaName"] : ""
       end
 
       def state
-        adm_api["AdministrativeAreaName"]
+        adm_api["AdministrativeAreaName"] ? adm_api["AdministrativeAreaName"] : ""
       end
 
       def country_code
-        country_api["CountryNameCode"]
+        country_api["CountryNameCode"] ? country_api["CountryNameCode"] : ""
       end
 
       def country_name
-        country_api["CountryName"].gsub(/Bundesrepublik /, '')
+        country_api["CountryName"] ? country_api["CountryName"] : ""
       end
       alias_method :country, :country_name
 
@@ -105,18 +105,20 @@ module GeoMagic
       def thoroughfare
         @thoroughfare ||= begin
           thorough = [:subadm_api, :locality_api, :dependent_locality_api].select do |api|
-            send(api)["Thoroughfare"]
+            x = send(api)
+            x ? x["Thoroughfare"] : nil
           end         
-          send(thorough.first)["Thoroughfare"]   
+          thorough.empty? ? {} : send(thorough.first)["Thoroughfare"]          
         end
       end
 
       def locality
         @locality ||= begin
-          thorough = [:locality_api, :dependent_locality_api].select do |api|
-            send(api)["PostalCode"]
-          end         
-          send(thorough.first)   
+          loc = [:locality_api, :dependent_locality_api].select do |api|
+            x = send(api)
+            x ? x["PostalCode"] || x["LocalityName"] : nil
+          end
+          loc.empty? ? {} : send(loc.first)          
         end
       end
 

data/spec/geo_magic/geocoder_spec.rb

@@ -19,7 +19,7 @@ describe "GeoMagic Geocoder" do
   end        
 
   it "should create location and address hashes" do
-    location = @geocoder.instance.geocode "Marienplatz 14, munich, Germany"
+    location = @geocoder.instance.geocode "Pilotystrasse 11, munich, Germany"
     p location.location_hash
     p location.address_hash
   end        

metadata

@@ -6,7 +6,8 @@ version: !ruby/object:Gem::Version
   - 0
   - 2
   - 3
-  version: 0.2.3
+  - 1
+  version: 0.2.3.1
 platform: ruby
 authors: 
 - Kristian Mandrup
@@ -14,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-22 00:00:00 +01:00
+date: 2011-01-24 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -192,7 +193,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -701075083202968492
+      hash: 3152749513202391524
       segments: 
       - 0
       version: "0"