geokit-rails3-1beta 0.2.0.beta1 → 0.3.1.beta1

data/Rakefile

@@ -0,0 +1,17 @@
+require 'bundler'
+Bundler::GemHelper.install_tasks
+
+require 'rake/rdoctask'
+Rake::RDocTask.new do |rdoc|
+  version = File.exist?('VERSION') ? File.read('VERSION') : ""
+
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title = "geokit-rails3-1beta #{version}"
+  rdoc.rdoc_files.include('README*')
+  rdoc.rdoc_files.include('lib/**/*.rb')
+end
+
+load 'test/tasks.rake'
+
+desc 'Default: run unit tests.'
+task :default => :test

data/geokit-rails3-1beta.gemspec

@@ -0,0 +1,31 @@
+# -*- encoding: utf-8 -*-
+require File.expand_path("../lib/geokit-rails3-1beta/version", __FILE__)
+
+Gem::Specification.new do |s|
+  s.name        = "geokit-rails3-1beta"
+  s.version     = GeokitRails31Beta::VERSION
+  s.platform    = Gem::Platform::RUBY
+  s.authors     = ["Bruno S. Barros"]
+  s.email       = ["bkether@gmail.com"]
+  s.homepage    = "http://github.com/bkether/geokit-rails3-1beta"
+  s.summary     = "Integrate Geokit with Rails 3.1.beta1"
+  s.description = "Port of the Rails plugin \"geokit-rails\" to Rails 3.1.beta1, as a gem"
+
+  s.required_rubygems_version = ">= 1.3.6"
+  # s.rubyforge_project         = "test_gem"
+
+  s.add_runtime_dependency 'rails', '~> 3.1.0.beta1'
+  s.add_runtime_dependency 'geokit', '~> 1.5.0'
+
+  s.add_development_dependency "bundler", "~> 1.0.0"
+  s.add_development_dependency "rcov", "~> 0.9.9"
+  s.add_development_dependency "mocha", "~> 0.9.8"
+  s.add_development_dependency "mysql", "~> 2.8.1"
+  s.add_development_dependency "mysql2", "~> 0.2.6"
+  s.add_development_dependency "pg", "~> 0.10.0"
+
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ["lib"]
+end

data/lib/geokit-rails3-1beta.rb

@@ -0,0 +1,10 @@
+require 'geokit'
+
+require 'geokit-rails3-1beta/railtie'
+require 'geokit-rails3-1beta/core_extensions'
+
+require 'geokit-rails3-1beta/defaults'
+require 'geokit-rails3-1beta/adapters/abstract'
+require 'geokit-rails3-1beta/acts_as_mappable'
+require 'geokit-rails3-1beta/geocoder_control'
+require 'geokit-rails3-1beta/ip_geocode_lookup'

data/lib/{geokit-rails3 → geokit-rails3-1beta}/railtie.rb

@@ -1,4 +1,4 @@
-require 'geokit-rails3'
+require 'geokit-rails3-1beta'
 require 'rails'
 
 module Geokit
@@ -8,14 +8,14 @@ module Geokit
     config.geokit = ActiveSupport::OrderedOptions.new
     config.geokit.geocoders = ActiveSupport::OrderedOptions.new
 
-    initializer 'geokit-rails3.insert_into_active_record' do
+    initializer 'geokit-rails3-1beta.insert_into_active_record' do
       ActiveSupport.on_load :active_record do
         ActiveRecord::Base.send(:include, Geokit::ActsAsMappable::Glue)
         Geokit::Geocoders.logger = ActiveRecord::Base.logger
       end
     end
 
-    initializer 'geokit-rails3.insert_into_action_controller' do
+    initializer 'geokit-rails3-1beta.insert_into_action_controller' do
       ActiveSupport.on_load :action_controller do
         ActionController::Base.send(:include, Geokit::GeocoderControl)
         ActionController::Base.send(:include, GeoKit::IpGeocodeLookup)

data/lib/geokit-rails3-1beta/version.rb

@@ -0,0 +1,3 @@
+module GeokitRails31Beta
+  VERSION = "0.3.1.beta1"
+end

metadata

@@ -2,7 +2,7 @@
 name: geokit-rails3-1beta
 version: !ruby/object:Gem::Version 
   prerelease: 6
-  version: 0.2.0.beta1
+  version: 0.3.1.beta1
 platform: ruby
 authors: 
 - Bruno S. Barros
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-13 00:00:00 -03:00
+date: 2011-05-16 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -101,7 +101,7 @@ dependencies:
         version: 0.10.0
   type: :development
   version_requirements: *id008
-description: Port of the Rails plugin "geokit-rails" to Rails 3.1, as a gem
+description: Port of the Rails plugin "geokit-rails" to Rails 3.1.beta1, as a gem
 email: 
 - bkether@gmail.com
 executables: []
@@ -111,45 +111,26 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- lib/geokit-rails3/acts_as_mappable.old.rb
-- lib/geokit-rails3/acts_as_mappable.rb
-- lib/geokit-rails3/adapters/abstract.rb
-- lib/geokit-rails3/adapters/mysql.rb
-- lib/geokit-rails3/adapters/mysql2.rb
-- lib/geokit-rails3/adapters/postgresql.rb
-- lib/geokit-rails3/adapters/sqlserver.rb
-- lib/geokit-rails3/core_extensions.rb
-- lib/geokit-rails3/defaults.rb
-- lib/geokit-rails3/geocoder_control.rb
-- lib/geokit-rails3/ip_geocode_lookup.rb
-- lib/geokit-rails3/railtie.rb
-- lib/geokit-rails3/version.rb
-- lib/geokit-rails3.rb
-- test/acts_as_mappable_test.rb
-- test/boot.rb
-- test/database.yml
-- test/fixtures/companies.yml
-- test/fixtures/custom_locations.yml
-- test/fixtures/locations.yml
-- test/fixtures/mock_addresses.yml
-- test/fixtures/mock_families.yml
-- test/fixtures/mock_houses.yml
-- test/fixtures/mock_organizations.yml
-- test/fixtures/mock_people.yml
-- test/fixtures/stores.yml
-- test/ip_geocode_lookup_test.disabled.rb
-- test/models/company.rb
-- test/models/custom_location.rb
-- test/models/location.rb
-- test/models/mock_address.rb
-- test/models/mock_family.rb
-- test/models/mock_house.rb
-- test/models/mock_organization.rb
-- test/models/mock_person.rb
-- test/models/store.rb
-- test/schema.rb
-- test/tasks.rake
-- test/test_helper.rb
+- CONFIG.markdown
+- Gemfile
+- MIT-LICENSE
+- README.markdown
+- Rakefile
+- geokit-rails3-1beta.gemspec
+- lib/geokit-rails3-1beta.rb
+- lib/geokit-rails3-1beta/acts_as_mappable.old.rb
+- lib/geokit-rails3-1beta/acts_as_mappable.rb
+- lib/geokit-rails3-1beta/adapters/abstract.rb
+- lib/geokit-rails3-1beta/adapters/mysql.rb
+- lib/geokit-rails3-1beta/adapters/mysql2.rb
+- lib/geokit-rails3-1beta/adapters/postgresql.rb
+- lib/geokit-rails3-1beta/adapters/sqlserver.rb
+- lib/geokit-rails3-1beta/core_extensions.rb
+- lib/geokit-rails3-1beta/defaults.rb
+- lib/geokit-rails3-1beta/geocoder_control.rb
+- lib/geokit-rails3-1beta/ip_geocode_lookup.rb
+- lib/geokit-rails3-1beta/railtie.rb
+- lib/geokit-rails3-1beta/version.rb
 has_rdoc: true
 homepage: http://github.com/bkether/geokit-rails3-1beta
 licenses: []
@@ -177,30 +158,6 @@ rubyforge_project:
 rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
-summary: Integrate Geokit with Rails 3.1
-test_files: 
-- test/acts_as_mappable_test.rb
-- test/boot.rb
-- test/database.yml
-- test/fixtures/companies.yml
-- test/fixtures/custom_locations.yml
-- test/fixtures/locations.yml
-- test/fixtures/mock_addresses.yml
-- test/fixtures/mock_families.yml
-- test/fixtures/mock_houses.yml
-- test/fixtures/mock_organizations.yml
-- test/fixtures/mock_people.yml
-- test/fixtures/stores.yml
-- test/ip_geocode_lookup_test.disabled.rb
-- test/models/company.rb
-- test/models/custom_location.rb
-- test/models/location.rb
-- test/models/mock_address.rb
-- test/models/mock_family.rb
-- test/models/mock_house.rb
-- test/models/mock_organization.rb
-- test/models/mock_person.rb
-- test/models/store.rb
-- test/schema.rb
-- test/tasks.rake
-- test/test_helper.rb
+summary: Integrate Geokit with Rails 3.1.beta1
+test_files: []
+

data/lib/geokit-rails3.rb

@@ -1,10 +0,0 @@
-require 'geokit'
-
-require 'geokit-rails3/railtie'
-require 'geokit-rails3/core_extensions'
-
-require 'geokit-rails3/defaults'
-require 'geokit-rails3/adapters/abstract'
-require 'geokit-rails3/acts_as_mappable'
-require 'geokit-rails3/geocoder_control'
-require 'geokit-rails3/ip_geocode_lookup'

data/lib/geokit-rails3/version.rb

@@ -1,3 +0,0 @@
-module GeokitRails3
-  VERSION = "0.2.0.beta1"
-end

data/test/acts_as_mappable_test.rb

@@ -1,420 +0,0 @@
-require 'test_helper'
-
-Geokit::Geocoders::provider_order = [:google, :us]
-
-class ActsAsMappableTest < GeokitTestCase
-
-  LOCATION_A_IP = "217.10.83.5"
-
-  def setup
-    @location_a = GeoKit::GeoLoc.new
-    @location_a.lat = 32.918593
-    @location_a.lng = -96.958444
-    @location_a.city = "Irving"
-    @location_a.state = "TX"
-    @location_a.country_code = "US"
-    @location_a.success = true
-
-    @sw = GeoKit::LatLng.new(32.91663,-96.982841)
-    @ne = GeoKit::LatLng.new(32.96302,-96.919495)
-    @bounds_center=GeoKit::LatLng.new((@sw.lat+@ne.lat)/2,(@sw.lng+@ne.lng)/2)
-
-    @starbucks = companies(:starbucks)
-    @loc_a = locations(:a)
-    @custom_loc_a = custom_locations(:a)
-    @loc_e = locations(:e)
-    @custom_loc_e = custom_locations(:e)
-
-    @barnes_and_noble = mock_organizations(:barnes_and_noble)
-    @address = mock_addresses(:address_barnes_and_noble)
-  end
-
-  def test_override_default_units_the_hard_way
-    Location.default_units = :kms
-    locations = Location.geo_scope(:origin => @loc_a).where("distance < 3.97")
-    assert_equal 5, locations.all.size
-    assert_equal 5, locations.count
-    Location.default_units = :miles
-  end
-
-  def test_include
-    locations = Location.geo_scope(:origin => @loc_a).includes(:company).where("company_id = 1").all
-    assert !locations.empty?
-    assert_equal 1, locations[0].company.id
-    assert_equal 'Starbucks', locations[0].company.name
-  end
-
-  def test_distance_between_geocoded
-    GeoKit::Geocoders::MultiGeocoder.expects(:geocode).with("Irving, TX").returns(@location_a)
-    GeoKit::Geocoders::MultiGeocoder.expects(:geocode).with("San Francisco, CA").returns(@location_a)
-    assert_equal 0, Location.distance_between("Irving, TX", "San Francisco, CA")
-  end
-
-  def test_distance_to_geocoded
-    GeoKit::Geocoders::MultiGeocoder.expects(:geocode).with("Irving, TX").returns(@location_a)
-    assert_equal 0, @custom_loc_a.distance_to("Irving, TX")
-  end
-
-  def test_distance_to_geocoded_error
-    GeoKit::Geocoders::MultiGeocoder.expects(:geocode).with("Irving, TX").returns(GeoKit::GeoLoc.new)
-    assert_raise(GeoKit::Geocoders::GeocodeError) { @custom_loc_a.distance_to("Irving, TX")  }
-  end
-
-  def test_custom_attributes_distance_calculations
-    assert_equal 0, @custom_loc_a.distance_to(@loc_a)
-    assert_equal 0, CustomLocation.distance_between(@custom_loc_a, @loc_a)
-  end
-
-  def test_distance_column_in_select
-    locations = Location.geo_scope(:origin => @loc_a).order("distance ASC")
-    assert_equal 6, locations.all.size
-    assert_equal 0, @loc_a.distance_to(locations.first)
-    assert_in_delta 3.97, @loc_a.distance_to(locations.last, :units => :miles, :formula => :sphere), 0.01
-  end
-
-  def test_find_with_distance_condition
-    locations = Location.geo_scope(:origin => @loc_a, :within => 3.97)
-    assert_equal 5, locations.all.size
-    assert_equal 5, locations.count
-  end
-
-  def test_find_with_distance_condition_with_units_override
-    locations = Location.geo_scope(:origin => @loc_a, :units => :kms, :within => 6.387)
-    assert_equal 5, locations.all.size
-    assert_equal 5, locations.count
-  end
-
-  def test_find_with_distance_condition_with_formula_override
-    locations = Location.geo_scope(:origin => @loc_a, :formula => :flat, :within => 6.387)
-    assert_equal 6, locations.all.size
-    assert_equal 6, locations.count
-  end
-
-  def test_find_within
-    locations = Location.within(3.97, :origin => @loc_a)
-    assert_equal 5, locations.all.size
-    assert_equal 5, locations.count
-  end
-
-  def test_find_within_with_coordinates
-    locations = Location.within(3.97, :origin =>[@loc_a.lat,@loc_a.lng])
-    assert_equal 5, locations.all.size
-    assert_equal 5, locations.count
-  end
-
-  def test_find_with_compound_condition
-    locations = Location.geo_scope(:origin => @loc_a).where("distance < 5 and city = 'Coppell'")
-    assert_equal 2, locations.all.size
-    assert_equal 2, locations.count
-  end
-
-  def test_find_with_secure_compound_condition
-    locations = Location.geo_scope(:origin => @loc_a).where(["distance < ? and city = ?", 5, 'Coppell'])
-    assert_equal 2, locations.all.size
-    assert_equal 2, locations.count
-  end
-
-  def test_find_beyond
-    locations = Location.beyond(3.95, :origin => @loc_a)
-    assert_equal 1, locations.all.size
-    assert_equal 1, locations.count
-  end
-
-  def test_find_beyond_with_token
-    # locations = Location.find(:all, :beyond => 3.95, :origin => @loc_a)
-    locations = Location.geo_scope(:beyond => 3.95, :origin => @loc_a)
-    assert_equal 1, locations.all.size
-    assert_equal 1, locations.count
-  end
-
-  def test_find_beyond_with_coordinates
-    locations = Location.beyond(3.95, :origin =>[@loc_a.lat, @loc_a.lng])
-    assert_equal 1, locations.all.size
-    assert_equal 1, locations.count
-  end
-
-  def test_find_range_with_token
-    locations = Location.geo_scope(:range => 0..10, :origin => @loc_a)
-    assert_equal 6, locations.all.size
-    assert_equal 6, locations.count
-  end
-
-  def test_find_range_with_token_with_conditions
-    locations = Location.geo_scope(:origin => @loc_a, :range => 0..10).where(["city = ?", 'Coppell'])
-    assert_equal 2, locations.all.size
-    assert_equal 2, locations.count
-  end
-
-  def test_find_range_with_token_with_hash_conditions
-    locations = Location.geo_scope(:origin => @loc_a, :range => 0..10).where(:city => 'Coppell')
-    assert_equal 2, locations.all.size
-    assert_equal 2, locations.count
-  end
-
-  def test_find_range_with_token_excluding_end
-    locations = Location.geo_scope(:range => 0...10, :origin => @loc_a)
-    assert_equal 6, locations.all.size
-    assert_equal 6, locations.count
-  end
-
-  def test_find_nearest
-    assert_equal @loc_a, Location.nearest(:origin => @loc_a).first
-  end
-
-  def test_find_nearest_with_coordinates
-    assert_equal @loc_a, Location.nearest(:origin =>[@loc_a.lat, @loc_a.lng]).first
-  end
-
-  def test_find_farthest
-    assert_equal @loc_e, Location.farthest(:origin => @loc_a).first
-  end
-
-  def test_find_farthest_with_coordinates
-    assert_equal @loc_e, Location.farthest(:origin =>[@loc_a.lat, @loc_a.lng]).first
-  end
-
-  def test_scoped_distance_column_in_select
-    locations = @starbucks.locations.geo_scope(:origin => @loc_a).order("distance ASC")
-    assert_equal 5, locations.all.size
-    assert_equal 0, @loc_a.distance_to(locations.first)
-    assert_in_delta 3.97, @loc_a.distance_to(locations.last, :units => :miles, :formula => :sphere), 0.01
-  end
-
-  def test_scoped_find_with_distance_condition
-    locations = @starbucks.locations.geo_scope(:origin => @loc_a).where("distance < 3.97")
-    assert_equal 4, locations.all.size
-    assert_equal 4, locations.count
-  end
-
-  def test_scoped_find_within
-    locations = @starbucks.locations.within(3.97, :origin => @loc_a)
-    assert_equal 4, locations.all.size
-    assert_equal 4, locations.count
-  end
-
-  def test_scoped_find_with_compound_condition
-    locations = @starbucks.locations.geo_scope(:origin => @loc_a).where("distance < 5 and city = 'Coppell'")
-    assert_equal 2, locations.all.size
-    assert_equal 2, locations.count
-  end
-
-  def test_scoped_find_beyond
-    locations = @starbucks.locations.beyond(3.95, :origin => @loc_a)
-    assert_equal 1, locations.all.size
-    assert_equal 1, locations.count
-  end
-
-  def test_scoped_find_nearest
-    assert_equal @loc_a, @starbucks.locations.nearest(:origin => @loc_a).first
-  end
-
-  def test_scoped_find_farthest
-    assert_equal @loc_e, @starbucks.locations.farthest(:origin => @loc_a).first
-  end
-
-  def test_ip_geocoded_distance_column_in_select
-    GeoKit::Geocoders::MultiGeocoder.expects(:geocode).with(LOCATION_A_IP).returns(@location_a)
-    locations = Location.geo_scope(:origin => LOCATION_A_IP).order("distance ASC")
-    assert_equal 6, locations.all.size
-    assert_equal 0, @loc_a.distance_to(locations.first)
-    assert_in_delta 3.97, @loc_a.distance_to(locations.last, :units => :miles, :formula => :sphere), 0.01
-  end
-
-  def test_ip_geocoded_find_with_distance_condition
-    GeoKit::Geocoders::MultiGeocoder.expects(:geocode).with(LOCATION_A_IP).returns(@location_a)
-    locations = Location.geo_scope(:origin => LOCATION_A_IP).where2("distance < 3.97")
-    assert_equal 5, locations.all.size
-    assert_equal 5, locations.count
-  end
-
-  def test_ip_geocoded_find_within
-    GeoKit::Geocoders::MultiGeocoder.expects(:geocode).with(LOCATION_A_IP).returns(@location_a)
-    locations = Location.within(3.97, :origin => LOCATION_A_IP)
-    assert_equal 5, locations.all.size
-    assert_equal 5, locations.count
-  end
-
-  def test_ip_geocoded_find_with_compound_condition
-    GeoKit::Geocoders::MultiGeocoder.expects(:geocode).with(LOCATION_A_IP).returns(@location_a)
-    locations = Location.geo_scope(:origin => LOCATION_A_IP).where("distance < 5 and city = 'Coppell'")
-    assert_equal 2, locations.all.size
-    assert_equal 2, locations.count
-  end
-
-  def test_ip_geocoded_find_with_secure_compound_condition
-    GeoKit::Geocoders::MultiGeocoder.expects(:geocode).with(LOCATION_A_IP).returns(@location_a)
-    locations = Location.geo_scope(:origin => LOCATION_A_IP).where(["distance < ? and city = ?", 5, 'Coppell'])
-    assert_equal 2, locations.all.size
-    assert_equal 2, locations.count
-  end
-
-  def test_ip_geocoded_find_beyond
-    GeoKit::Geocoders::MultiGeocoder.expects(:geocode).with(LOCATION_A_IP).returns(@location_a)
-    locations = Location.beyond(3.95, :origin => LOCATION_A_IP)
-    assert_equal 1, locations.all.size
-    assert_equal 1, locations.count
-  end
-
-  def test_ip_geocoded_find_nearest
-    GeoKit::Geocoders::MultiGeocoder.expects(:geocode).with(LOCATION_A_IP).returns(@location_a)
-    assert_equal @loc_a, Location.nearest(:origin => LOCATION_A_IP).first
-  end
-
-  def test_ip_geocoded_find_farthest
-    GeoKit::Geocoders::MultiGeocoder.expects(:geocode).with(LOCATION_A_IP).returns(@location_a)
-    assert_equal @loc_e, Location.farthest(:origin => LOCATION_A_IP).first
-  end
-
-  def test_ip_geocoder_exception
-    GeoKit::Geocoders::MultiGeocoder.expects(:geocode).with('127.0.0.1').returns(GeoKit::GeoLoc.new)
-    assert_raises GeoKit::Geocoders::GeocodeError do
-      Location.farthest(:origin => '127.0.0.1').first
-    end
-  end
-
-  def test_address_geocode
-    GeoKit::Geocoders::MultiGeocoder.expects(:geocode).with('Irving, TX').returns(@location_a)
-    locations = Location.geo_scope(:origin => 'Irving, TX').where(["distance < ? and city = ?", 5, 'Coppell'])
-    assert_equal 2, locations.all.size
-    assert_equal 2, locations.count
-  end
-
-  def test_find_with_custom_distance_condition
-    locations = CustomLocation.geo_scope(:origin => @loc_a).where("dist < 3.97")
-    assert_equal 5, locations.all.size
-    assert_equal 5, locations.count
-  end
-
-  def test_find_with_custom_distance_condition_using_custom_origin
-    locations = CustomLocation.geo_scope(:origin => @custom_loc_a).where("dist < 3.97")
-    assert_equal 5, locations.all.size
-    locations = CustomLocation.count(:origin => @custom_loc_a).where("dist < 3.97")
-    assert_equal 5, locations.count
-  end
-
-  def test_find_within_with_custom
-    locations = CustomLocation.within(3.97, :origin => @loc_a)
-    assert_equal 5, locations.all.size
-    assert_equal 5, locations.count
-  end
-
-  def test_find_within_with_coordinates_with_custom
-    locations = CustomLocation.within(3.97, :origin =>[@loc_a.lat, @loc_a.lng])
-    assert_equal 5, locations.all.size
-    assert_equal 5, locations.count
-  end
-
-  def test_find_with_compound_condition_with_custom
-    locations = CustomLocation.geo_scope(:origin => @loc_a).where("dist < 5 and city = 'Coppell'")
-    assert_equal 1, locations.all.size
-    assert_equal 1, locations.count
-  end
-
-  def test_find_with_secure_compound_condition_with_custom
-    locations = CustomLocation.geo_scope(:origin => @loc_a).where(["dist < ? and city = ?", 5, 'Coppell'])
-    assert_equal 1, locations.all.size
-    assert_equal 1, locations.count
-  end
-
-  def test_find_beyond_with_custom
-    locations = CustomLocation.beyond(3.95, :origin => @loc_a)
-    assert_equal 1, locations.all.size
-    assert_equal 1, locations.count
-  end
-
-  def test_find_beyond_with_coordinates_with_custom
-    locations = CustomLocation.beyond(3.95, :origin =>[@loc_a.lat, @loc_a.lng])
-    assert_equal 1, locations.all.size
-    assert_equal 1, locations.count
-  end
-
-  def test_find_nearest_with_custom
-    assert_equal @custom_loc_a, CustomLocation.nearest(:origin => @loc_a).first
-  end
-
-  def test_find_nearest_with_coordinates_with_custom
-    assert_equal @custom_loc_a, CustomLocation.nearest(:origin =>[@loc_a.lat, @loc_a.lng]).first
-  end
-
-  def test_find_farthest_with_custom
-    assert_equal @custom_loc_e, CustomLocation.farthest(:origin => @loc_a).first
-  end
-
-  def test_find_farthest_with_coordinates_with_custom
-    assert_equal @custom_loc_e, CustomLocation.farthest(:origin =>[@loc_a.lat, @loc_a.lng]).first
-  end
-
-  def test_find_with_array_origin
-    locations = Location.geo_scope(:origin =>[@loc_a.lat,@loc_a.lng]).where("distance < 3.97")
-    assert_equal 5, locations.all.size
-    assert_equal 5, locations.count
-  end
-
-
-  # Bounding box tests
-
-  def test_find_within_bounds
-    locations = Location.in_bounds([@sw,@ne])
-    assert_equal 2, locations.all.size
-    assert_equal 2, locations.count
-  end
-
-  def test_find_within_bounds_ordered_by_distance
-    locations = Location.in_bounds([@sw,@ne], :origin=>@bounds_center).order('distance asc')
-    assert_equal locations[0], locations(:d)
-    assert_equal locations[1], locations(:a)
-  end
-
-  def test_find_within_bounds_with_token
-    locations = Location.geo_scope(:bounds=>[@sw,@ne])
-    assert_equal 2, locations.all.size
-    assert_equal 2, locations.count
-  end
-
-  def test_find_within_bounds_with_string_conditions
-    locations = Location.geo_scope(:bounds=>[@sw,@ne]).where("id !=#{locations(:a).id}")
-    assert_equal 1, locations.all.size
-  end
-
-  def test_find_within_bounds_with_array_conditions
-    locations = Location.geo_scope(:bounds=>[@sw,@ne]).where(["id != ?", locations(:a).id])
-    assert_equal 1, locations.all.size
-  end
-
-  def test_find_within_bounds_with_hash_conditions
-    locations = Location.geo_scope(:bounds=>[@sw,@ne]).where({:id => locations(:a).id})
-    assert_equal 1, locations.all.size
-  end
-
-  def test_auto_geocode
-    GeoKit::Geocoders::MultiGeocoder.expects(:geocode).with("Irving, TX").returns(@location_a)
-    store=Store.new(:address=>'Irving, TX')
-    store.save
-    assert_equal store.lat,@location_a.lat
-    assert_equal store.lng,@location_a.lng
-    assert_equal 0, store.errors.size
-  end
-
-  def test_auto_geocode_failure
-    GeoKit::Geocoders::MultiGeocoder.expects(:geocode).with("BOGUS").returns(GeoKit::GeoLoc.new)
-    store=Store.new(:address=>'BOGUS')
-    store.save
-    assert store.new_record?
-    assert_equal 1, store.errors.size
-  end
-
-  # Test :through
-
-  def test_find_with_through
-    organizations = MockOrganization.geo_scope(:origin => @location_a).order('distance ASC')
-    assert_equal 2, organizations.all.size
-    organizations = MockOrganization.geo_scope(:origin => @location_a).where("distance < 3.97")
-    assert_equal 1, organizations.count
-  end
-
-  def test_find_with_through_with_hash
-    people = MockPerson.geo_scope(:origin => @location_a).order('distance ASC')
-    assert_equal 2, people.size
-    assert_equal 2, people
-  end
-end