google_geocoding 0.1.3 → 0.1.4

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.1.4

data/google_geocoding.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{google_geocoding}
-  s.version = "0.1.3"
+  s.version = "0.1.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Rodrigo Kochenburger"]

data/lib/google_geocoding/response.rb

@@ -6,7 +6,7 @@ module GoogleGeocoding
     def initialize(resp_body)
       @data = JSON.parse(resp_body)
     end
-    
+
     # Return the status code included in the server response.
     #
     # @return [Integer] 
@@ -14,17 +14,17 @@ module GoogleGeocoding
     def status_code
       Integer(@data["Status"]["code"])
     end
-    
+
     # Return whether response successfully resolved the geolocation
     def success?
       status_code == 200
     end
-    
+
     # Return whether response failed to resolved the geolocation
     def failure?
       !success?
     end
-    
+
     # Return the placemarks included in the response.
     #
     # @return [Array<Placemark>]
@@ -33,7 +33,7 @@ module GoogleGeocoding
         raise Errors::ServiceError.build(status_code)
       else
         placemarks = []
-        
+
         @data["Placemark"].each do |placemark_data|
           details               = placemark_data["AddressDetails"]
           coordinates           = placemark_data["Point"]["coordinates"][2..1]
@@ -41,37 +41,30 @@ module GoogleGeocoding
           placemark             = Placemark.new
           placemark.accurracy   = accurracy
           placemark.coordinates = coordinates
-          
-          next if accurracy >= 9
 
-          if accurracy >= 1
-            country = details["Country"]
+          if country = details["Country"]
             placemark.country_name = country["CountryName"],
             placemark.country_code = country["CountryNameCode"]
-            
-            if accurracy >= 2
-              admarea = country["AdministrativeArea"]
+
+            if admarea = country["AdministrativeArea"]
               placemark.region = admarea["AdministrativeAreaName"]
-              
-              if accurracy >= 3
-                subadmarea = admarea["SubAdministrativeArea"]
-                
-                if accurracy >= 4
-                  locality = subadmarea ? subadmarea["Locality"] : admarea["Locality"]
-                  placemark.city = locality["LocalityName"]
-                  
-                  if accurracy >= 5
-                    placemark.postal_code = locality["PostalCode"]["PostalCodeNumber"]
-                  end
-                  
-                  if accurracy >= 6
-                    placemark.street = locality["Thoroughfare"]["ThoroughfareName"]
-                  end
+              subadmarea       = admarea["SubAdministrativeArea"]                
+              locality         = subadmarea ? subadmarea["Locality"] : admarea["Locality"]
+
+              if locality
+                placemark.city = locality["LocalityName"]
+
+                if postal_code = locality["PostalCode"]
+                  placemark.postal_code = postal_code["PostalCodeNumber"]
+                end
+
+                if thoroughfare = locality["Thoroughfare"]
+                  placemark.street = thoroughfare["ThoroughfareName"]
                 end
               end
             end
           end
-          
+
           placemarks << placemark
         end
         placemarks

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: google_geocoding
 version: !ruby/object:Gem::Version 
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors: 
 - Rodrigo Kochenburger