campfire_logic 1.1.10 → 1.2.0

data/Gemfile

@@ -2,13 +2,14 @@ source 'http://rubygems.org'
 
 gem 'bson_ext'
 gem 'fastercsv'
-gem 'google_maps_geocoder'
-gem 'mongoid'
+gem 'geocoder'
 gem 'mongoid-tree'
 gem 'rails', '~> 3.0.0'
+gem 'redis'
 gem 'scaffold_logic'
 gem 'stateflow'
 gem 'stringex'
+gem 'SystemTimer'
 
 group :development do
   gem 'jeweler'
@@ -18,7 +19,6 @@ group :test do
   gem 'be_valid_asset'
   gem 'cucumber-rails'
   gem 'database_cleaner'
-  gem 'launchy'
   gem 'mocha'
   gem 'rspec-rails'
-end
+end

data/Gemfile.local

@@ -2,12 +2,14 @@ source 'http://rubygems.org'
 
 gem 'bson_ext'
 gem 'fastercsv'
-gem 'google_maps_geocoder', :path => '~/Documents/projects/google_maps_geocoder'
+gem 'geocoder'
 gem 'mongoid-tree'
-gem 'rails', '3.0.10'
+gem 'rails', '~> 3.0.0'
+gem 'redis'
 gem 'scaffold_logic', :path => '~/Documents/projects/scaffold_logic'
 gem 'stateflow'
 gem 'stringex'
+gem 'SystemTimer'
 
 group :development do
   gem 'jeweler'
@@ -17,7 +19,6 @@ group :test do
   gem 'be_valid_asset'
   gem 'cucumber-rails'
   gem 'database_cleaner'
-  gem 'launchy'
   gem 'mocha'
   gem 'rspec-rails'
 end

data/VERSION

@@ -1 +1 @@
-1.1.10
+1.2.0

data/app/controllers/directory_controller.rb

@@ -51,10 +51,7 @@ class DirectoryController < ApplicationController
   end
 
   def search_by_zip
-    # find matching zip or create one
-    _zip = ZipCode.first(:conditions => {:zip => params[:criteria]}) || ZipCode.create(:zip => params[:criteria])
-
-    @locations = Location.near(:lat_lng => _zip.lat_lng).limit(10)
+    @locations = Location.near(params[:criteria]).limit(10)
   end
 
   # Returns a hash specifying the abbreviation for a two-letter query or the name otherwise. Blank queries return null.

data/app/models/geocoder_google_result.rb

@@ -0,0 +1,106 @@
+require 'active_support'
+require 'logger'
+require 'net/http'
+require 'rack'
+
+class GeocoderGoogleResult
+  # Returns the complete formatted address with standardized abbreviations.
+  attr_reader :formatted_address
+  # Returns the formatted street address with standardized abbreviations.
+  attr_reader :formatted_street_address
+  # Self-explanatory
+  attr_reader :city, :country_long_name, :country_short_name, :county, :lat, :lng, :postal_code, :state_long_name, :state_short_name
+
+  # Instance Methods: Overrides ====================================================================
+
+  # Returns a GeocoderGoogleResult initialized with the specified Google geocoding results.
+  #
+  # ==== Attributes
+  #
+  # * +google_result+ - a hash of Google geocoding results
+  #
+  # ==== Examples
+  #
+  #    white_house = GoogleMapsGeocoder.new '1600 Pennsylvania Washington'
+  #    white_house.formatted_address
+  #     => "1600 Pennsylvania Ave NW, Washington D.C., DC 20500, USA"
+  def initialize google_result
+    @json = google_result
+    @city, @country_short_name, @country_long_name, @county, @formatted_address, @formatted_street_address, @lat, @lng, @postal_code, @state_long_name, @state_short_name = parse_city, parse_country_short_name, parse_country_long_name, parse_county, parse_formatted_address, parse_formatted_street_address, parse_lat, parse_lng, parse_postal_code, parse_state_long_name, parse_state_short_name
+  end
+
+  # Instance Methods ===============================================================================
+
+  # Returns true if the address Google returns is an exact match.
+  #
+  # ==== Examples
+  #
+  #    white_house = GoogleMapsGeocoder.new('1600 Pennsylvania Ave')
+  #    white_house.exact_match?
+  #     => true
+  def exact_match?
+    ! self.partial_match?
+  end
+
+  # Returns true if the address Google returns isn't an exact match.
+  #
+  # ==== Examples
+  #
+  #    white_house = GoogleMapsGeocoder.new('1600 Pennsylvania Washington')
+  #    white_house.exact_match?
+  #     => false
+  def partial_match?
+    @json['partial_match'] == true
+  end
+
+  private
+
+  def parse_address_component_type(type, name='long_name')
+    _address_component = @json['address_components'].detect{ |ac| ac['types'] && ac['types'].include?(type) }
+    _address_component && _address_component[name]
+  end
+
+  def parse_city
+    parse_address_component_type('sublocality') || parse_address_component_type('locality')
+  end
+
+  def parse_country_long_name
+    parse_address_component_type('country')
+  end
+
+  def parse_country_short_name
+    parse_address_component_type('country', 'short_name')
+  end
+
+  def parse_county
+    parse_address_component_type('administrative_area_level_2')
+  end
+
+  def parse_formatted_address
+    @json['formatted_address']
+  end
+
+  def parse_formatted_street_address
+    "#{parse_address_component_type('street_number')} #{parse_address_component_type('route')}"
+  end
+
+  def parse_lat
+    @json['geometry']['location']['lat']
+  end
+
+  def parse_lng
+    @json['geometry']['location']['lng']
+ end
+
+  def parse_postal_code
+    parse_address_component_type('postal_code')
+  end
+
+  def parse_state_long_name
+    parse_address_component_type('administrative_area_level_1')
+  end
+
+  def parse_state_short_name
+    parse_address_component_type('administrative_area_level_1', 'short_name')
+  end
+end

data/app/models/locale.rb

@@ -3,23 +3,20 @@ class Locale
   require 'stringex'
 
   include LuckySneaks::StringExtensions
+  include Geocoder::Model::Mongoid
   include Mongoid::Document
   include Mongoid::Timestamps
   include Mongoid::Tree
 
-  # Constants ======================================================================================
-
   # Mongo Config ===================================================================================
+  belongs_to :location
   field :name
   field :abbreviation
   field :slug
   field :accuracy, :type => Integer
-  field :lat_lng, :type => Array
+  field :coordinates, :type => Array
   field :kind
-  index [[ :lat_lng, Mongo::GEO2D ]], :min => -200, :max => 200
-
-  # Relationships ==================================================================================
-  referenced_in :location
+  index [[ :coordinates, Mongo::GEO2D ]], :min => -200, :max => 200
 
   # Scopes =========================================================================================
   scope :canada, :where => {:name => 'Canada'}
@@ -34,6 +31,7 @@ class Locale
 
   # Macros =========================================================================================
   attr_accessor :skip_geocoding
+  geocoded_by :geocoding_address
 
   # Class Methods: Initialization ==================================================================
 
@@ -54,7 +52,7 @@ class Locale
 
   def post_process
     self.set_slug
-    self.geocode
+    self.geocode unless self.skip_geocoding || self.geocoding_address.blank?
     self.set_kind
     self.save
   end
@@ -62,8 +60,8 @@ class Locale
   # Instance methods: Overrides ====================================================================
 
   # Returns this locale's latitude/longitude, delegating to location as needed (to prevent duplicate/conflicting coordinates).
-  def lat_lng
-    self.location ? self.location.lat_lng : self[:lat_lng]
+  def coordinates
+    self.location ? self.location.coordinates : self[:coordinates]
   end
 
   def friendly_name
@@ -81,25 +79,9 @@ class Locale
 
   # Instance methods: Geocoding ====================================================================
 
-  # Geocodes this location.
-  def geocode
-    return if self.skip_geocoding || self.geocoding_address.blank?
-
-    unless @geocoder
-      @geocoder = GoogleMapsGeocoder.new(self.geocoding_address)
-      self.lat_lng = [@geocoder.lat, @geocoder.lng]
-    end
-
-    @geocoder
-  rescue SocketError
-    Rails.logger.error "Can't geocode without a network connection!"
-  rescue RuntimeError
-    Rails.logger.error "Can't geocode, over query limit!"
-  end
-
   # Returns true if this location has a latitude and longitude.
   def geocoded?
-    self.lat_lng.is_a?(Array)
+    self.coordinates.is_a?(Array)
   end
 
   # Returns this locale's address for geocoding.

data/app/models/location.rb

@@ -2,6 +2,7 @@ Stateflow.persistence = :mongoid
 
 class Location
   include CampfireLogic::Base
+  include Geocoder::Model::Mongoid
   include Mongoid::Document
   include Mongoid::Timestamps
   include Stateflow
@@ -26,18 +27,24 @@ class Location
   field :meta_description
   field :accuracy, :type => Integer
   field :address_status
-  field :lat_lng, :type => Array
+  field :coordinates, :type => Array
   field :validated_address1
   field :validated_city
   field :validated_zip
-  index [[ :lat_lng, Mongo::GEO2D ]], :min => -200, :max => 200
-  references_one :locale, :dependent => :destroy
-  references_and_referenced_in_many :services, :inverse_of => :locations
-
-  # Callbacks ======================================================================================
+  has_and_belongs_to_many :services, :inverse_of => :locations
+  has_one :locale, :dependent => :destroy
+  index [[ :coordinates, Mongo::GEO2D ]], :min => -200, :max => 200
 
   # Macros =========================================================================================
-  attr_reader :geocoder
+  attr_accessor :geocoder_result
+  geocoded_by :geocoding_address do |location, results|
+    if geo = results.first
+      location.geocoder_result = GeocoderGoogleResult.new geo.data
+      location.country, location.country_long_name, location[:state], location.state_long_name = geo.country_code, geo.country, geo.state_code, geo.state
+      location.coordinates = [geo.longitude, geo.latitude]
+    end
+  end
+
   trimmed_fields :address1, :address2, :city, :email, :fax, :location_number, :name, :phone, :state, :zip
   validates_presence_of :address1, :city, :state
 
@@ -60,7 +67,7 @@ class Location
 
     # Validates this location's address by geocoding. Partial matches are flagged; exact matches are flagged as "validated".
     event :validate_address do
-      transitions :from => any, :to => [:new, :partial_match, :validated], :decide => :geocode
+      transitions :from => any, :to => [:new, :partial_match, :validated], :decide => :call_geocode
     end
   end
 
@@ -95,38 +102,26 @@ class Location
   # Instance methods: Geocoding ====================================================================
 
   # Geocodes this location.
-  def geocode
+  def call_geocode
     return :new if self.geocoding_address.blank?
-
-    unless @geocoder
-      @geocoder = GoogleMapsGeocoder.new(self.geocoding_address)
-      self.country, self.country_long_name, self[:state], self.state_long_name = @geocoder.country_short_name, @geocoder.country_long_name, @geocoder.state_short_name, @geocoder.state_long_name
-      self.lat_lng = [@geocoder.lat, @geocoder.lng]
-      audit_address
-    end
-
-    @geocoder.partial_match? ? :partial_match : :validated
-  rescue SocketError
-    Rails.logger.error "Can't geocode without a network connection!"
-    :new
-  rescue RuntimeError
-    Rails.logger.error "Can't geocode!"
-    :new
+    geocode
+    audit_address
+    self.geocoder_result.try(:partial_match?) ? :partial_match : :validated
   end
 
   # Returns true if this location has a latitude and longitude.
   def geocoded?
-    self.lat_lng.is_a?(Array)
+    self.coordinates.is_a?(Array)
   end
 
   # Returns true if the specified address field matches the geocoder's results.
   def matches_geocoder?(attribute)
-    @geocoder.blank? || self.send(attribute) == @geocoder.send(GOOGLE_MAPS_GEOCODER_FIELDS_BY_LOCATION_FIELD[attribute])
+    geocoder_result.blank? || self.send(attribute) == geocoder_result.send(GOOGLE_MAPS_GEOCODER_FIELDS_BY_LOCATION_FIELD[attribute])
   end
 
   # Returns the n nearest locations.
   def nearby_locations(n = 5)
-    Location.near(:lat_lng => self.lat_lng).limit(n + 1).select{ |l| l != self }
+    Location.near(:coordinates => self.coordinates).limit(n + 1).select{ |l| l != self }
   end
 
   # Instance methods: Locales ======================================================================
@@ -157,18 +152,18 @@ class Location
 
   # Compares this location's address with the geocoder's results.
   def audit_address
-    if @geocoder.partial_match?
+    if self.geocoder_result && self.geocoder_result.partial_match?
       GOOGLE_MAPS_GEOCODER_FIELDS_BY_LOCATION_FIELD.keys.each do |field|
         # set "validated_" field to geocoder's result
-        self.send("validated_#{field}=", @geocoder.send(GOOGLE_MAPS_GEOCODER_FIELDS_BY_LOCATION_FIELD[field])) unless self.matches_geocoder?(field)
+        self.send("validated_#{field}=", geocoder_result.send(GOOGLE_MAPS_GEOCODER_FIELDS_BY_LOCATION_FIELD[field])) unless self.matches_geocoder?(field)
       end
     end
   end
 
   # Clears all addressing data set by the geocoder.
   def clear_geocoding
-    @geocoder = nil
-    self.country, self.country_long_name, self.lat_lng, self.state_long_name, self.validated_address1, self.validated_city, self.validated_zip = nil
+    self.geocoder_result = nil
+    self.country, self.country_long_name, self.coordinates, self.state_long_name, self.validated_address1, self.validated_city, self.validated_zip = nil
     clear_address
   end
 

data/app/views/shared/_map.html.erb

@@ -5,9 +5,9 @@
   var directionsService = new google.maps.DirectionsService();
   var locations = [
 <%- if place && place.location? && place.geocoded? -%>
-    <%= raw "['#{h(escape_javascript place.location.name)}', #{place.lat_lng[0]}, #{place.lat_lng[1]}, '#{h(escape_javascript place.location.name)}<br />#{h(escape_javascript place.location.address1)}<br />#{h(escape_javascript place.location.city)}, #{h(escape_javascript place.location.state)} #{h(escape_javascript place.location.zip)}<br /><br />Directions: <a href=\"javascript:showDirectionsTo(0)\">To here<\/a> / <a href=\"javascript:showDirectionsFrom(0)\">From here<\/a>']" -%>
+    <%= raw "['#{h(escape_javascript place.location.name)}', #{place.coordinates[0]}, #{place.coordinates[1]}, '#{h(escape_javascript place.location.name)}<br />#{h(escape_javascript place.location.address1)}<br />#{h(escape_javascript place.location.city)}, #{h(escape_javascript place.location.state)} #{h(escape_javascript place.location.zip)}<br /><br />Directions: <a href=\"javascript:showDirectionsTo(0)\">To here<\/a> / <a href=\"javascript:showDirectionsFrom(0)\">From here<\/a>']" -%>
 <%- else -%>
-    <%= raw locations.select{ |l| l.geocoded? }.inject([]) { |a, l| i = a.size; a << "['#{h(escape_javascript l.name)}', #{l.lat_lng[0]}, #{l.lat_lng[1]}, '#{link_to h(escape_javascript l.name), l.locale.to_url}<br />#{h(escape_javascript l.address1)}<br />#{h(escape_javascript l.city)}, #{h(escape_javascript l.state)} #{h(escape_javascript l.zip)}<br /><br />Directions: <a href=\"javascript:showDirectionsTo(#{i})\">To here<\/a> / <a href=\"javascript:showDirectionsFrom(#{i})\">From here<\/a>']"; a } * ",\r" -%>
+    <%= raw locations.select{ |l| l.geocoded? }.inject([]) { |a, l| i = a.size; a << "['#{h(escape_javascript l.name)}', #{l.coordinates[0]}, #{l.coordinates[1]}, '#{link_to h(escape_javascript l.name), l.locale.to_url}<br />#{h(escape_javascript l.address1)}<br />#{h(escape_javascript l.city)}, #{h(escape_javascript l.state)} #{h(escape_javascript l.zip)}<br /><br />Directions: <a href=\"javascript:showDirectionsTo(#{i})\">To here<\/a> / <a href=\"javascript:showDirectionsFrom(#{i})\">From here<\/a>']"; a } * ",\r" -%>
 <%- end -%>
   ];
   var map;
@@ -18,9 +18,9 @@
     var myOptions = {
       zoom: <%= place && place.zoom_level || 4 -%>,
   <%- if place && place.geocoded? -%>
-      center: new google.maps.LatLng(<%= place.lat_lng[0] -%>, <%= place.lat_lng[1] -%>),
+      center: new google.maps.LatLng(<%= place.coordinates[0] -%>, <%= place.coordinates[1] -%>),
   <%- elsif place && place.parent && place.parent.geocoded? -%>
-      center: new google.maps.LatLng(<%= place.parent.lat_lng[0] -%>, <%= place.parent.lat_lng[1] -%>),
+      center: new google.maps.LatLng(<%= place.parent.coordinates[0] -%>, <%= place.parent.coordinates[1] -%>),
   <%- else -%>
       center: new google.maps.LatLng(37.09024, -95.712891),
   <%- end -%>

data/campfire_logic.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "campfire_logic"
-  s.version = "1.1.10"
+  s.version = "1.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Roderick Monje"]
-  s.date = "2012-01-23"
+  s.date = "2012-01-29"
   s.description = "Users can browse locations by country, city, and state and search locations by string or zip code. Administrators can manage locations and the services they offer."
   s.email = "rod@seologic.com"
   s.extra_rdoc_files = [
@@ -26,12 +26,11 @@ Gem::Specification.new do |s|
     "app/controllers/locations_controller.rb",
     "app/controllers/services_controller.rb",
     "app/helpers/application_helper.rb",
+    "app/models/geocoder_google_result.rb",
     "app/models/locale.rb",
     "app/models/location.rb",
     "app/models/location_import.rb",
     "app/models/service.rb",
-    "app/models/zip_code.rb",
-    "app/models/zip_code_import.rb",
     "app/views/directory/_search_form.html.erb",
     "app/views/directory/_show_children.html.erb",
     "app/views/directory/_show_location.html.erb",
@@ -62,6 +61,7 @@ Gem::Specification.new do |s|
     "config/environment.rb",
     "config/environments/test.rb",
     "config/initializers/campfire_logic.rb",
+    "config/initializers/geocoder.rb",
     "config/initializers/metric_fu.rb",
     "config/initializers/secret_token.rb",
     "config/initializers/session_store.rb",
@@ -69,7 +69,6 @@ Gem::Specification.new do |s|
     "config/mongoid.yml",
     "config/routes.rb",
     "db/seeds.rb",
-    "db/zip_codes.txt",
     "features/admin_manages_locations.feature",
     "features/customer_browses_directory.feature",
     "features/customer_searches_directory.feature",
@@ -141,7 +140,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/ivanoblomov/campfire_logic"
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.10"
+  s.rubygems_version = "1.8.11"
   s.summary = "Rails engine that adds a location directory to your web app"
 
   if s.respond_to? :specification_version then
@@ -150,38 +149,41 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<bson_ext>, [">= 0"])
       s.add_runtime_dependency(%q<fastercsv>, [">= 0"])
-      s.add_runtime_dependency(%q<google_maps_geocoder>, [">= 0"])
-      s.add_runtime_dependency(%q<mongoid>, [">= 0"])
+      s.add_runtime_dependency(%q<geocoder>, [">= 0"])
       s.add_runtime_dependency(%q<mongoid-tree>, [">= 0"])
       s.add_runtime_dependency(%q<rails>, ["~> 3.0.0"])
+      s.add_runtime_dependency(%q<redis>, [">= 0"])
       s.add_runtime_dependency(%q<scaffold_logic>, [">= 0"])
       s.add_runtime_dependency(%q<stateflow>, [">= 0"])
       s.add_runtime_dependency(%q<stringex>, [">= 0"])
+      s.add_runtime_dependency(%q<SystemTimer>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, [">= 0"])
       s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
     else
       s.add_dependency(%q<bson_ext>, [">= 0"])
       s.add_dependency(%q<fastercsv>, [">= 0"])
-      s.add_dependency(%q<google_maps_geocoder>, [">= 0"])
-      s.add_dependency(%q<mongoid>, [">= 0"])
+      s.add_dependency(%q<geocoder>, [">= 0"])
       s.add_dependency(%q<mongoid-tree>, [">= 0"])
       s.add_dependency(%q<rails>, ["~> 3.0.0"])
+      s.add_dependency(%q<redis>, [">= 0"])
       s.add_dependency(%q<scaffold_logic>, [">= 0"])
       s.add_dependency(%q<stateflow>, [">= 0"])
       s.add_dependency(%q<stringex>, [">= 0"])
+      s.add_dependency(%q<SystemTimer>, [">= 0"])
       s.add_dependency(%q<jeweler>, [">= 0"])
       s.add_dependency(%q<rspec>, [">= 1.2.9"])
     end
   else
     s.add_dependency(%q<bson_ext>, [">= 0"])
     s.add_dependency(%q<fastercsv>, [">= 0"])
-    s.add_dependency(%q<google_maps_geocoder>, [">= 0"])
-    s.add_dependency(%q<mongoid>, [">= 0"])
+    s.add_dependency(%q<geocoder>, [">= 0"])
     s.add_dependency(%q<mongoid-tree>, [">= 0"])
     s.add_dependency(%q<rails>, ["~> 3.0.0"])
+    s.add_dependency(%q<redis>, [">= 0"])
     s.add_dependency(%q<scaffold_logic>, [">= 0"])
     s.add_dependency(%q<stateflow>, [">= 0"])
     s.add_dependency(%q<stringex>, [">= 0"])
+    s.add_dependency(%q<SystemTimer>, [">= 0"])
     s.add_dependency(%q<jeweler>, [">= 0"])
     s.add_dependency(%q<rspec>, [">= 1.2.9"])
   end

data/config/environments/test.rb

@@ -1,3 +1,4 @@
+ENV['REDISTOGO_URL'] = 'redis://redistogo:7002f835e9680a65750e24a03065319e@perch.redistogo.com:9744'
 CampfireLogic::Application.configure do
   config.cache_classes = true
   config.whiny_nils = true

data/config/initializers/geocoder.rb

@@ -0,0 +1,5 @@
+uri = URI.parse ENV['REDISTOGO_URL']
+REDIS = Redis.new :host => uri.host, :port => uri.port, :password => uri.password
+Geocoder::Configuration.cache = REDIS
+Geocoder::Configuration.lookup = :google
+Geocoder::Configuration.timeout = 15

data/db/seeds.rb

@@ -1,4 +1,2 @@
-puts 'Importing zip codes...'
-ZipCodeImport.test
 puts 'Importing locations...'
 LocationImport.test

data/features/step_definitions/directory_steps.rb

@@ -11,7 +11,6 @@ Then /^the directory shows an address vcard$/ do
 end
 
 Given /^zip-coded locations$/ do
-  ZipCode.expects(:first).returns(ZipCode.new :lat_lng => [0, 0])
   Location.expects(:near).returns(Location.all)
 end
 

data/spec/controllers/directory_controller_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe DirectoryController do
   it 'show action should render show template' do
-    Locale.stubs(:find).returns(Locale.new :lat_lng => [], :slug => 'foo')
+    Locale.stubs(:find).returns(Locale.new :coordinates => [], :slug => 'foo')
     Locale.stubs(:us).returns([Locale.find])
     Locale.any_instance.stubs(:children).returns([])
     get :show, :slug => 'foo'

data/spec/models/locale_spec.rb

@@ -4,7 +4,6 @@ describe Locale do
   before :all do
     Locale.delete_all
     Locale.init_root
-    GoogleMapsGeocoder.stubs(:new).returns(stub('prospect park zoo', :city => 'Brooklyn', :country_long_name => 'United States', :country_short_name => 'US', :formatted_address => '450 Flatbush Avenue', :formatted_street_address => '450 Flatbush Avenue', :lat => 1, :lng => 1, :partial_match? => false, :postal_code => '11217', :state_long_name => 'New York', :state_short_name => 'NY'))
     location = Location.new :address1 => '450 Flatbush Avenue', :city => 'Brooklyn', :name => 'Prospect Park Zoo', :state => 'NY'
     location.validate_address!
     location.localize

data/spec/models/location_spec.rb

@@ -1,10 +1,7 @@
 require 'spec_helper'
 
 describe Location do
-  it 'handles query-limit errors' do
-    ActiveSupport::JSON.stubs(:decode)
-    location = Location.new(:city => 'new york').geocode.should == :new
-  end
+  it 'handles query-limit errors'
 end
 
 describe Location do
@@ -14,22 +11,18 @@ describe Location do
   end
 
   before(:each) do
-    GoogleMapsGeocoder.stubs(:new).returns(stub('white house', :city => 'Washington', :country_short_name => 'US', :country_long_name => 'United States', :formatted_address => '1600 Pennsylvania Ave NW', :formatted_street_address => '1600 Pennsylvania Ave NW', :lat => 1, :lng => 1, :partial_match? => true, :postal_code => '20500', :state_long_name => 'District of Columbia', :state_short_name => 'DC'))
     @white_house = Location.new :address1 => '1600 Pennsylvania', :city => 'Washington', :name => 'White House'
     @white_house.validate_address!
     @white_house.localize
 
-    GoogleMapsGeocoder.stubs(:new).returns(stub('tea lounge', :city => 'Brooklyn', :country_short_name => 'US', :country_long_name => 'United States', :formatted_address => '837 Union St', :formatted_street_address => '837 Union St', :lat => 1, :lng => 1, :partial_match? => false, :postal_code => '11217', :state_long_name => 'New York', :state_short_name => 'NY'))
-    @tea_lounge = Location.new :address1 => ' 837 Union St ', :address2 => ' Suite 1 ', :city => ' Brooklyn ', :name => ' Tea Lounge ', :state => ' NY ', :zip => ' 11217 '
+    @tea_lounge = Location.new :address1 => ' 837 Union St ', :address2 => ' Suite 1 ', :city => ' Brooklyn ', :name => ' Tea Lounge ', :state => ' NY ', :zip => ' 11215 '
     @tea_lounge.validate_address!
     @tea_lounge.localize
 
-    GoogleMapsGeocoder.stubs(:new).returns(stub('two boots', :city => 'Brooklyn', :country_short_name => 'US', :country_long_name => 'United States', :formatted_address => '837 Union St', :formatted_street_address => '837 Union St', :lat => 1, :lng => 1, :partial_match? => false, :postal_code => '11217', :state_long_name => 'New York', :state_short_name => 'NY'))
     @two_boots = Location.new(:address1 => '514 2nd Street', :city => 'Brooklyn', :name => 'Two Boots of Brooklyn', :state => 'NY')
     @two_boots.validate_address!
     @two_boots.localize
 
-    GoogleMapsGeocoder.stubs(:new).returns(stub('new park', :city => 'Howard Beach', :country_short_name => 'US', :country_long_name => 'United States', :formatted_address => '15671 Crossbay Boulevard', :formatted_street_address => '15671 Crossbay Boulevard', :lat => 1, :lng => 1, :partial_match? => false, :postal_code => '11217', :state_long_name => 'New York', :state_short_name => 'NY'))
     @new_park = Location.new(:address1 => '15671 Crossbay Boulevard', :city => 'Howard Beach', :name => 'New Park Pizza', :state => 'NY')
     @new_park.validate_address!
     @new_park.localize
@@ -87,7 +80,6 @@ describe Location do
 
     it 're-validates modified addresses with Google Maps' do
       @white_house.address1 = ''
-      GoogleMapsGeocoder.stubs(:new).returns(stub('white house', :city => 'Washington', :country_short_name => 'US', :country_long_name => 'United States', :formatted_address => '1600 Pennsylvania Ave NW', :formatted_street_address => '1600 Pennsylvania Ave NW', :lat => 1, :lng => 1, :partial_match? => false, :postal_code => '20500', :state_long_name => 'District of Columbia', :state_short_name => 'DC'))
       @white_house.validate_address!
       @white_house.should be_validated
     end
@@ -99,8 +91,7 @@ describe Location do
 
     it 'clears geocoding if any address field is modified' do
       @white_house.city = 'New York'
-      @white_house.geocoder.should be_nil
-      @white_house.lat_lng.should be_nil
+      @white_house.coordinates.should be_nil
       @white_house.state_long_name.should be_nil
       @white_house.validated_address1.should be_nil
       @white_house.validated_city.should be_nil
@@ -148,7 +139,6 @@ describe Location do
       @tea_lounge.address1 = '1600 Pennsylvania Ave NW'
       @tea_lounge.city = 'Washington'
       @tea_lounge.state = 'DC'
-      GoogleMapsGeocoder.stubs(:new).returns(stub('overridden tea lounge', :city => 'Washington', :country_short_name => 'US', :country_long_name => 'United States', :formatted_address => '1600 Pennsylvania Ave NW', :formatted_street_address => '1600 Pennsylvania Ave NW', :lat => 1, :lng => 1, :partial_match? => false, :postal_code => '20500', :state_long_name => 'District of Columbia', :state_short_name => 'DC'))
       @tea_lounge.validate_address!
       @tea_lounge.localize
       @tea_lounge.city_locale.city?.should be_true