From cd7d63794be38301e8069739aef9771c6142db9b Mon Sep 17 00:00:00 2001
From: Erik Michaels-Ober <sferik@gmail.com>
Date: Tue, 31 Dec 2013 19:51:53 +0100
Subject: [PATCH] Update geokit to version 1.8.3

---
 Gemfile.lock                                  | 2 +-
 app/models/thing.rb                           | 5 +++--
 config/initializers/geokit.rb                 | 1 -
 test/controllers/addresses_controller_test.rb | 3 +++
 4 files changed, 7 insertions(+), 4 deletions(-)
 delete mode 100644 config/initializers/geokit.rb

diff --git a/Gemfile.lock b/Gemfile.lock
index 37cedb6..32715fc 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -58,7 +58,7 @@ GEM
     fastercsv (1.5.5)
     font-awesome-rails (4.0.3.0)
       railties (>= 3.2, < 5.0)
-    geokit (1.7.1)
+    geokit (1.8.3)
       multi_json (>= 1.3.2)
     haml (4.0.4)
       tilt
diff --git a/app/models/thing.rb b/app/models/thing.rb
index 9b33d76..c3388b7 100644
--- a/app/models/thing.rb
+++ b/app/models/thing.rb
@@ -1,6 +1,7 @@
+require 'geokit'
+
 class Thing < ActiveRecord::Base
   include ActiveModel::ForbiddenAttributesProtection
-  include Geokit::Geocoders
   validates_uniqueness_of :city_id, :allow_nil => true
   validates_presence_of :lat, :lng
   belongs_to :user
@@ -17,7 +18,7 @@ class Thing < ActiveRecord::Base
   end
 
   def reverse_geocode
-    @reverse_geocode ||= MultiGeocoder.reverse_geocode([lat, lng])
+    @reverse_geocode ||= Geokit::Geocoders::MultiGeocoder.reverse_geocode([lat, lng])
   end
 
   def street_number
diff --git a/config/initializers/geokit.rb b/config/initializers/geokit.rb
deleted file mode 100644
index 1d7114f..0000000
--- a/config/initializers/geokit.rb
+++ /dev/null
@@ -1 +0,0 @@
-Geokit::Geocoders::provider_order = [:google3]
diff --git a/test/controllers/addresses_controller_test.rb b/test/controllers/addresses_controller_test.rb
index abbb35d..f30f104 100644
--- a/test/controllers/addresses_controller_test.rb
+++ b/test/controllers/addresses_controller_test.rb
@@ -13,6 +13,9 @@ class AddressesControllerTest < ActionController::TestCase
     stub_request(:get, "http://maps.google.com/maps/api/geocode/json").
       with(:query => {:address => ", ", :sensor => "false"}).
       to_return(:body => File.read(File.expand_path('../../fixtures/unknown_address.json', __FILE__)))
+    stub_request(:get, "http://geocoder.us/service/csv/geocode").
+      with(:query => {:address => ", "}).
+      to_return(:body => File.read(File.expand_path('../../fixtures/unknown_address.json', __FILE__)))
     get :show, :address => '', :city_state => '', :format => 'json'
     assert_response :missing
   end