Pr0d1r2-geokit 1.3.2.7 → 1.3.2.8

data/generators/geokit_cached/geokit_cached_generator.rb

@@ -1,7 +1,7 @@
 class GeokitCachedGenerator < RspecModelGenerator
 
   def initialize(runtime_args, runtime_options = {})
-    runtime_args = ['CachedLocation', 'address:string', 'provider:string', 'lng:float', 'lat:float']
+    runtime_args = ['CachedLocation', 'address:string', 'provider:string', 'lng:float', 'lat:float', 'city:string']
     super
   end
 

data/lib/geokit/cached/geocodable.rb

@@ -22,7 +22,7 @@ module Geokit
 
       def geocode_address_cached
         @geo = multi_geocoder.geocode(complete_address)
-        self.lat, self.lng, self.provider = @geo.lat, @geo.lng, @geo.provider if @geo.success
+        self.lat, self.lng, self.provider, self.city = @geo.lat, @geo.lng, @geo.provider, @geo.city if @geo.success
       end
 
       def cache_locations?
@@ -34,9 +34,9 @@ module Geokit
       end
 
       def cache_location!
-        cached_location.cache!(:lat => lat, :lng => lng, :provider => provider) if cache_locations?
+        cached_location.cache!(:lat => lat, :lng => lng, :provider => provider, :city => city) if cache_locations?
       end
 
     end
   end
-end
+end

data/lib/geokit/cached/model.rb

@@ -19,7 +19,7 @@ module Geokit
 
       def update!
         if !by_google? && geo.success
-          self.lat, self.lng, self.provider = geo.lat, geo.lng, geo.provider
+          self.lat, self.lng, self.provider, self.city = geo.lat, geo.lng, geo.provider, geo.city
           save if changed?
         end
       end
@@ -35,7 +35,7 @@ module Geokit
 
       def fake_geoloc
         geoloc = Geokit::GeoLoc.new
-        geoloc.lat, geoloc.lng, geoloc.provider, geoloc.success = lat, lng, provider, success?
+        geoloc.lat, geoloc.lng, geoloc.provider, geoloc.city, geoloc.success = lat, lng, provider, city, success?
         geoloc
       end
 
@@ -56,7 +56,7 @@ module Geokit
       end
 
       def changed?
-        lat_changed? || lng_changed? || changed_to_google?
+        lat_changed? || lng_changed? || changed_to_google? || city_changed?
       end
 
       def geocoding_occured?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: Pr0d1r2-geokit
 version: !ruby/object:Gem::Version 
-  version: 1.3.2.7
+  version: 1.3.2.8
 platform: ruby
 authors: 
 - Andre Lewis and Bill Eisenhauer and Pr0d1r2 (Marcin Nowicki)
@@ -9,11 +9,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-11 00:00:00 -07:00
+date: 2009-11-30 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
-description: Geokit Gem
+description: Geokit Gem modified to have support for caching
 email: 
 - andre@earthcode.com / bill_eisenhauer@yahoo.com / pr0d1r2@gmail.com
 executables: []
@@ -48,6 +48,8 @@ files:
 - lib/geokit/geocoders/cached_multi_geocoder.rb
 has_rdoc: true
 homepage: http://geokit.rubyforge.org
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --main
@@ -69,7 +71,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: geokit
-rubygems_version: 1.2.0
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 2
 summary: none