Pr0d1r2-geokit 1.3.2.5 → 1.3.2.6

data/lib/geokit.rb

@@ -1,5 +1,5 @@
 module Geokit
-  VERSION = '1.3.2.5'
+  VERSION = '1.3.2.6'
   # These defaults are used in Geokit::Mappable.distance_to and in acts_as_mappable
   @@default_units = :miles
   @@default_formula = :sphere

data/lib/geokit/cached/geocodable.rb

@@ -16,19 +16,27 @@ module Geokit
         end
       end
 
+      def complete_address
+        "%s, %s" % [address, country]
+      end
+
       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
       end
 
-      def cache_location!
-        cached_location.cache!(:lat => lat, :lng => lng, :provider => provider) if cache_locations?
-      end
-
       def cache_locations?
         self.class::CACHE_LOCATIONS
       end
 
+      def cached_location
+        CachedLocation.find_by_address(complete_address) || CachedLocation.new(:address => complete_address)
+      end
+
+      def cache_location!
+        cached_location.cache!(:lat => lat, :lng => lng, :provider => provider) if cache_locations?
+      end
+
     end
   end
 end

data/lib/geokit/cached/model.rb

@@ -2,6 +2,12 @@ module Geokit
   module Cached
     module Model
 
+      def self.included(base)
+        base.class_eval do
+          validates_presence_of :address
+        end
+      end
+
       def cache!(attributes)
         self.attributes = attributes
         save if new_record? || changed?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: Pr0d1r2-geokit
 version: !ruby/object:Gem::Version 
-  version: 1.3.2.5
+  version: 1.3.2.6
 platform: ruby
 authors: 
 - Andre Lewis and Bill Eisenhauer and Pr0d1r2 (Marcin Nowicki)