Pr0d1r2-geokit 1.3.2.1 → 1.3.2.2

data/Rakefile

@@ -14,8 +14,8 @@ end
 
 project=Hoe.new('geokit', Geokit::VERSION) do |p|
   #p.rubyforge_name = 'geokit' # if different than lowercase project name
-  p.developer('Andre Lewis', 'andre@earthcode.com')
-  p.summary="Geokit provides geocoding and distance calculation in an easy-to-use API"
+  p.developer('Andre Lewis', 'andre@earthcode.com', 'pr0d1r2@gmail.com')
+  p.summary="Geokit provides geocoding and distance calculation in an easy-to-use API with caching in MultiGeocoder"
 end
 
 

data/generators/geokit_cached/geokit_cached_generator.rb

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

data/generators/geokit_cached/templates/model.rb

@@ -0,0 +1,5 @@
+class <%= class_name %> < ActiveRecord::Base
+
+  include Geokit::Cached::Model
+
+end

data/generators/geokit_cached/templates/model_spec.rb

@@ -0,0 +1,15 @@
+require File.expand_path(File.dirname(__FILE__) + '<%= '/..' * class_nesting_depth %>/../spec_helper')
+
+describe <%= class_name %> do
+  before(:each) do
+    @valid_attributes = {
+<% attributes.each_with_index do |attribute, attribute_index| -%>
+      :<%= attribute.name %> => <%= attribute.default_value %><%= attribute_index == attributes.length - 1 ? '' : ','%>
+<% end -%>
+    }
+  end
+
+  it "should create a new instance given valid attributes" do
+    <%= class_name %>.create!(@valid_attributes)
+  end
+end

data/lib/geokit.rb

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

data/lib/geokit/cached.rb

@@ -0,0 +1,2 @@
+require 'geokit/cached/model'
+require 'geokit/cached/geocodable'

data/lib/geokit/cached/geocodable.rb

@@ -0,0 +1,34 @@
+module Geokit
+  module Cached
+    module Geocodable
+
+      def self.included(base)
+        base.class_eval do
+          attr_accessor :provider
+        end
+      end
+
+      def geocoder
+        if cache_locations?
+          Geokit::Geocoders::CachedMultiGeocoder
+        else
+          Geokit::Geocoders::MultiGeocoder
+        end
+      end
+
+      def geocode_address_cached
+        @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
+
+    end
+  end
+end

data/lib/geokit/cached/model.rb

@@ -0,0 +1,58 @@
+module Geokit
+  module Cached
+    module Model
+
+      def cache!(attributes)
+        self.attributes = attributes
+        save if new_record? || changed?
+      end
+
+      def update!
+        if !by_google? && geo.success
+          self.lat, self.lng, self.provider = geo.lat, geo.lng, geo.provider
+          save if changed?
+        end
+      end
+
+      def update_and_return!
+        update!
+        geoloc
+      end
+
+      def geo
+        @geo ||= Geokit::Geocoders::MultiGeocoder.geocode(address)
+      end
+
+      def fake_geoloc
+        geoloc = Geokit::GeoLoc.new
+        geoloc.lat, geoloc.lng, geoloc.provider, geoloc.success = lat, lng, provider, true
+        geoloc
+      end
+
+      def successful_geoloc
+        geo if geocoding_occured? && geo.success
+      end
+
+      def geoloc
+        successful_geoloc || fake_geoloc
+      end
+
+      def by_google?
+        provider == 'google'
+      end
+
+      def changed_to_google?
+        by_google? && provider_changed?
+      end
+
+      def changed?
+        lat_changed? || lng_changed? || changed_to_google?
+      end
+
+      def geocoding_occured?
+        !@geo.nil?
+      end
+
+    end
+  end
+end

data/lib/geokit/geocoders/cached_multi_geocoder.rb

@@ -0,0 +1,19 @@
+module Geokit
+  module Geocoders
+    class CachedMultiGeocoder
+
+     class << self
+
+        def cached_location(location)
+          CachedLocation.find_by_address(location) || CachedLocation.new(:address => location)
+        end
+
+        def geocode(location)
+          cached_location(location).update_and_return!
+        end
+      
+      end
+
+    end
+  end
+end

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
 name: Pr0d1r2-geokit
 version: !ruby/object:Gem::Version 
-  version: 1.3.2.1
+  version: 1.3.2.2
 platform: ruby
 authors: 
-- Andre Lewis and Bill Eisenhauer
+- Andre Lewis and Bill Eisenhauer and Pr0d1r2 (Marcin Nowicki)
 autorequire: 
 bindir: bin
 cert_chain: []
@@ -15,7 +15,7 @@ dependencies: []
 
 description: Geokit Gem
 email: 
-- andre@earthcode.com / bill_eisenhauer@yahoo.com
+- andre@earthcode.com / bill_eisenhauer@yahoo.com / pr0d1r2@gmail.com
 executables: []
 
 extensions: []
@@ -39,6 +39,13 @@ files:
 - test/test_multi_geocoder.rb
 - test/test_us_geocoder.rb
 - test/test_yahoo_geocoder.rb
+- generators/geokit_cached/geokit_cached_generator.rb
+- generators/geokit_cached/templates/model.rb
+- generators/geokit_cached/templates/model_spec.rb
+- lib/geokit/cached.rb
+- lib/geokit/cached/geocodable.rb
+- lib/geokit/cached/model.rb
+- lib/geokit/geocoders/cached_multi_geocoder.rb
 has_rdoc: true
 homepage: http://geokit.rubyforge.org
 post_install_message: