geokit-rails 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 344c3a01e104ef0d6b79be9cebe2ad8c1a2ca194
-  data.tar.gz: 96b07a5c6ca0940aef6b3c1f659aae5b1e0fc36b
+  metadata.gz: ea862dfaa5a3d928db10ab95a7c65c5fce23491c
+  data.tar.gz: 6ffd65c47a279ed164c7d875078dc44d5d28ff78
 SHA512:
-  metadata.gz: 2cdc20079f29590779baea71816ab3e64cd55f58bfb95bc930118a09a40aec9f8d7a12dc6e876f53bcbaf62241f0ea18868ef260a15e8a6cee8f5b9740c4e09d
-  data.tar.gz: db71e76adac5e6ff9269c02926d9f053603874ff61ca87a404df80b9aabf4617fc94b2a189d3c96b8379f2eb15510bbd95312709fbfecc5d6dfa896bd0b0f30d
+  metadata.gz: 6f6b87d14fc319e5331327953f683201a08c164529ff2b5d2a52ed1ca266af0878b22453901405da5cb79576319b7f2bc40c2e8d6d66efbbd43abccde3069497
+  data.tar.gz: c60c6c131318bd68e34388250fb41a3c2934fd79e84a971c8946a6dc26e48dd1769928c4edba763d15e5c8b4251ae206321ceb671809319c8279735a8874186e

data/.travis.yml

@@ -17,3 +17,5 @@ script: "bundle exec rake coverage"
 before_install:
   - gem install bundler
 
+bundler_args: --retry 5
+cache: bundler

data/README.markdown

@@ -3,7 +3,7 @@ Geokit Rails
 
 [![Gem Version](https://badge.fury.io/rb/geokit-rails.png)](http://badge.fury.io/rb/geokit-rails)
 [![Build Status](https://travis-ci.org/geokit/geokit-rails.png?branch=master)](https://travis-ci.org/geokit/geokit-rails)
-[![Coverage Status](https://coveralls.io/repos/geokit/geokit-rails/badge.png)](https://coveralls.io/r/geokit/geokit-rails)
+[![Coverage Status](https://coveralls.io/repos/geokit/geokit-rails/badge.png?branch=master)](https://coveralls.io/r/geokit/geokit-rails)
 [![Dependency Status](https://gemnasium.com/geokit/geokit-rails.png?travis)](https://gemnasium.com/geokit/geokit-rails)
 [![Code Climate](https://codeclimate.com/github/geokit/geokit-rails.png)](https://codeclimate.com/github/geokit/geokit-rails)
 
@@ -49,7 +49,7 @@ Geokit provides key functionality for location-oriented Rails applications:
   in your database within a 50-mile radius.
 - IP-based location lookup utilizing hostip.info. Provide an IP address, and get
   city name and latitude/longitude in return
-- A before_filter helper to geocoder the user's location based on IP address,
+- A before_action helper to geocoder the user's location based on IP address,
   and retain the location in a cookie.
 - Geocoding from multiple providers. It provides a fail-over mechanism, in case
   your input fails to geocode in one service. Geocoding is provided by the Geokit
@@ -90,7 +90,7 @@ end
 
 The optional parameters are `units`, `formula`, and `distance_field_name`.
 Values for **units** can be `:miles`, `:kms` (kilometers), or `:nms` (nautical miles),
-with `:miles` as the default. 
+with `:miles` as the default.
 Values for **formula** can be `:sphere` or `:flat` with `:sphere` as the default.
 `:sphere` gives you Haversine calculations, while `:flat` gives the Pythagoreum Theory.
 These defaults persist through out the gem.
@@ -122,13 +122,13 @@ A few examples :
 Location.within(5, :origin => @somewhere)
 # is the same as
 Location.geo_scope(:within => 5, :origin => @somewhere)
-```    
+```
 
 ```ruby
 Location.in_range(2..5, :origin => @somewhere)
 # is the same as
 Location.geo_scope(:range => 2..5, :origin => @somewhere)
-```    
+```
 
 ```ruby
 Location.in_bounds([@south_west_point, @north_east_point], :origin => @somewhere)
@@ -242,7 +242,7 @@ One would expect to build a query like this :
 
 ```ruby
 scoped  = Location.geo_scope(:origin => @somewhere)
-scoped  = scoped.where('distance <= 5)
+scoped  = scoped.where('distance <= 5')
 results = scoped.all
 ```
 
@@ -390,7 +390,7 @@ Ordering is done through `Geokit::Geocoders::provider_order` and
 ## IP GEOCODING HELPER
 
 A class method called geocode_ip_address has been mixed into the
-ActionController::Base.  This enables before_filter style lookup of
+ActionController::Base.  This enables before_action style lookup of
 the IP address.  Since it is a filter, it can accept any of the
 available filter options.
 
@@ -585,20 +585,20 @@ A few quick examples to get you started ....
    datatypes to store your latitude/longitude
 
 2. use `acts_as_mappable` on your store model:
-3. 
+3.
   ```ruby
   class Store < ActiveRecord::Base
      acts_as_mappable
      ...
   end
   ```
-  
+
 3. finders now have extra capabilities:
-  
+
   ```ruby
   Store.find(:all, :origin =>[32.951613,-96.958444], :within=>10)
   ```
-  
+
 ## How to geocode an address
 
 1. configure your geocoder key(s) in `config/initializers/geokit_config.rb`
@@ -610,7 +610,7 @@ A few quick examples to get you started ....
   ```ruby
   Geokit::Geocoders::provider_order=[:google]
   ```
-  
+
 3. Test it out in script/console
 
   ```ruby
@@ -620,7 +620,7 @@ A few quick examples to get you started ....
   puts res.lng
   puts res.full_address
   ```
-  
+
     ... etc. The return type is GeoLoc, see the API for
     all the methods you can call on it.
 
@@ -636,13 +636,13 @@ A few quick examples to get you started ....
   ```ruby
   Store.find(:all, :origin=>'100 Spear st, San Francisco, CA', :within=>10)
   ```
-  
+
 4. you can also use a zipcode, or anything else that's geocodable:
 
   ```ruby
   Store.find(:all, :origin=>'94117', :conditions=>'distance<10')
   ```
-  
+
 ## How to sort a query by distance from an origin
 
 You now have access to a 'distance' column, and you can use it
@@ -690,7 +690,7 @@ end
 ## Database Compatability
 
 * Geokit works with MySQL (tested with version 5.0.41), PostgreSQL (tested with version 8.2.6) and Microsoft SQL Server (tested with 2000).
-* Geokit is known to *not* work with Postgres versions under 8.1 -- it uses the least() funciton.
+* Geokit is known to *not* work with Postgres versions under 8.1 -- it uses the least() function.
 
 
 ## HIGH-LEVEL NOTES ON WHAT'S WHERE
@@ -699,7 +699,7 @@ end
 module which gets mixed into your models to provide the
 location-based finder goodness.
 
-`ip_geocode_lookup.rb` contains the before_filter helper method which
+`ip_geocode_lookup.rb` contains the before_action helper method which
 enables auto lookup of the requesting IP address.
 
 ### The Geokit gem provides the building blocks of distance-based operations:
@@ -721,9 +721,7 @@ AND the Mappable module goodness for free.
 ## IMPORTANT POST-INSTALLATION NOTES:
 
 *1. The configuration file*: Geokit for Rails uses a configuration file in config/initializers.
-You *must* add your own keys for the various geocoding services if you want to use geocoding.
-If you need to refer to the original template again, see the `assets/api_keys_template` file.
-
-*2. The gem dependency*: Geokit for Rails depends on the Geokit gem. Tell Rails about this
-dependency in `config/environment.rb`, within the initializer block:
-config.gem "geokit"
+You *must* add your own keys for the various geocoding services if you want to use geocoding. You can generate a sample initializer file by run:
+```sh
+$ rails g geokit_rails:install
+```

data/gemfiles/rails3.gemfile

@@ -1,11 +1,7 @@
 source 'https://rubygems.org'
-gemspec :path => "../"
 
 group :development, :test do
-  gem 'rake'
-  gem 'rspec'
-  gem 'simplecov'
-  gem 'simplecov-rcov'
-  gem 'sqlite3'
   gem 'activerecord', '~> 3.2.0'
 end
+
+gemspec :path => "../"

data/gemfiles/rails4.gemfile

@@ -1,11 +1,8 @@
 source 'https://rubygems.org'
-gemspec :path => "../"
 
 group :development, :test do
-  gem 'rake'
-  gem 'rspec'
-  gem 'simplecov'
-  gem 'simplecov-rcov'
-  gem 'sqlite3'
-  gem 'activerecord', '~> 4.0.0'
+  gem 'activerecord', '~> 4.0'
+  gem 'test-unit'
 end
+
+gemspec :path => "../"

data/geokit-rails.gemspec

@@ -23,6 +23,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "simplecov"
   spec.add_development_dependency "simplecov-rcov"
   spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'test-unit'
   spec.add_development_dependency "mocha", "~> 0.9"
   spec.add_development_dependency 'coveralls'
   spec.add_development_dependency "mysql", "~> 2.8"

data/lib/generators/geokit_rails/install_generator.rb

@@ -0,0 +1,13 @@
+module GeokitRails
+  module Generators
+    class InstallGenerator < Rails::Generators::Base
+      source_root File.expand_path("../../templates", __FILE__)
+
+      desc "Creates a sample Geokit initializer."
+
+      def copy_initializer
+        copy_file "geokit_config.rb", "config/initializers/geokit_config.rb"
+      end
+    end
+  end
+end

data/lib/generators/templates/geokit_config.rb

@@ -0,0 +1,100 @@
+# These defaults are used in Geokit::Mappable.distance_to and acts_as_mappable
+Geokit::default_units = :miles # others :kms, :nms, :meters
+Geokit::default_formula = :sphere
+
+# This is the timeout value in seconds to be used for calls to the geocoder web
+# services.  For no timeout at all, comment out the setting.  The timeout unit
+# is in seconds.
+Geokit::Geocoders::request_timeout = 3
+
+# This setting can be used if web service calls must be routed through a proxy.
+# These setting can be nil if not needed, otherwise, a valid URI must be
+# filled in at a minimum.  If the proxy requires authentication, the username
+# and password can be provided as well.
+# Geokit::Geocoders::proxy = 'https://user:password@host:port'
+
+# This is your yahoo application key for the Yahoo Geocoder.
+# See http://developer.yahoo.com/faq/index.html#appid
+# and http://developer.yahoo.com/maps/rest/V1/geocode.html
+# Geokit::Geocoders::YahooGeocoder.key = 'REPLACE_WITH_YOUR_YAHOO_KEY'
+# Geokit::Geocoders::YahooGeocoder.secret = 'REPLACE_WITH_YOUR_YAHOO_SECRET'
+
+# This is your Google Maps geocoder keys (all optional).
+# See http://www.google.com/apis/maps/signup.html
+# and http://www.google.com/apis/maps/documentation/#Geocoding_Examples
+# Geokit::Geocoders::GoogleGeocoder.client_id = ''
+# Geokit::Geocoders::GoogleGeocoder.cryptographic_key = ''
+# Geokit::Geocoders::GoogleGeocoder.channel = ''
+
+# You can also use the free API key instead of signed requests
+# See https://developers.google.com/maps/documentation/geocoding/#api_key
+# Geokit::Geocoders::GoogleGeocoder.api_key = ''
+
+# You can also set multiple API KEYS for different domains that may be directed
+# to this same application.
+# The domain from which the current user is being directed will automatically
+# be updated for Geokit via
+# the GeocoderControl class, which gets it's begin filter mixed
+# into the ActionController.
+# You define these keys with a Hash as follows:
+# Geokit::Geocoders::google = {
+# 'rubyonrails.org' => 'RUBY_ON_RAILS_API_KEY',
+# ' ruby-docs.org' => 'RUBY_DOCS_API_KEY' }
+
+# This is your username and password for geocoder.us.
+# To use the free service, the value can be set to nil or false.  For
+# usage tied to an account, the value should be set to username:password.
+# See http://geocoder.us
+# and http://geocoder.us/user/signup
+# Geokit::Geocoders::UsGeocoder.key = 'username:password'
+
+# This is your authorization key for geocoder.ca.
+# To use the free service, the value can be set to nil or false.  For
+# usage tied to an account, set the value to the key obtained from
+# Geocoder.ca.
+# See http://geocoder.ca
+# and http://geocoder.ca/?register=1
+# Geokit::Geocoders::CaGeocoder.key = 'KEY'
+
+# This is your username key for geonames.
+# To use this service either free or premium, you must register a key.
+# See http://www.geonames.org
+# Geokit::Geocoders::GeonamesGeocoder.key = 'KEY'
+
+# Most other geocoders need either no setup or a key
+# Geokit::Geocoders::BingGeocoder.key = ''
+# Geokit::Geocoders::MapQuestGeocoder.key = ''
+# Geokit::Geocoders::YandexGeocoder.key = ''
+# Geokit::Geocoders::MapboxGeocoder.key = 'ACCESS_TOKEN'
+# Geokit::Geocoders::OpencageGeocoder.key = 'some_api_key'
+
+# Geonames has a free service and a premium service, each using a different URL
+# GeonamesGeocoder.premium = true will use http://ws.geonames.net (premium)
+# GeonamesGeocoder.premium = false will use http://api.geonames.org (free)
+# Geokit::Geocoders::GeonamesGeocoder.premium = false
+
+# require "external_geocoder.rb"
+# Please see the section "writing your own geocoders" for more information.
+# Geokit::Geocoders::external_key = 'REPLACE_WITH_YOUR_API_KEY'
+
+# This is the order in which the geocoders are called in a failover scenario
+# If you only want to use a single geocoder, put a single symbol in the array.
+# Valid symbols are :google, :yahoo, :us, and :ca.
+# Be aware that there are Terms of Use restrictions on how you can use the
+# various geocoders.  Make sure you read up on relevant Terms of Use for each
+# geocoder you are going to use.
+# Geokit::Geocoders::provider_order = [:google,:us]
+
+# The IP provider order. Valid symbols are :ip,:geo_plugin.
+# As before, make sure you read up on relevant Terms of Use for each.
+# Geokit::Geocoders::ip_provider_order = [:external,:geo_plugin,:ip]
+
+# Disable HTTPS globally.  This option can also be set on individual
+# geocoder classes.
+# Geokit::Geocoders::secure = false
+
+# Control verification of the server certificate for geocoders using HTTPS
+# Geokit::Geocoders::ssl_verify_mode = OpenSSL::SSL::VERIFY_(PEER/NONE)
+# Setting this to VERIFY_NONE may be needed on systems that don't have
+# a complete or up to date root certificate store. Only applies to
+# the Net::HTTP adapter.

data/lib/geokit-rails.rb

@@ -3,7 +3,6 @@ require 'geokit'
 require 'geokit-rails/railtie'
 require 'geokit-rails/core_extensions'
 
-require 'geokit-rails/defaults'
 require 'geokit-rails/adapters/abstract'
 require 'geokit-rails/acts_as_mappable'
 require 'geokit-rails/geocoder_control'

data/lib/geokit-rails/acts_as_mappable.rb

@@ -91,10 +91,20 @@ module Geokit
     module ClassMethods
 
       # A proxy to an instance of a finder adapter, inferred from the connection's adapter.
-      def adapter
-        @adapter ||= begin
-          require File.join('geokit-rails', 'adapters', connection.adapter_name.downcase)
+      def geokit_finder_adapter
+        @geokit_finder_adapter ||= begin
+          unless Adapters.const_defined?(connection.adapter_name.camelcase)
+            filename = connection.adapter_name.downcase
+            require File.join("geokit-rails", "adapters", filename)
+          end
           klass = Adapters.const_get(connection.adapter_name.camelcase)
+          if klass.class == Module
+            # For some reason Mysql2 adapter was defined in Adapters.constants but was Module instead of a Class
+            filename = connection.adapter_name.downcase
+            require File.join("geokit-rails", "adapters", filename)
+            # Re-init the klass after require
+            klass = Adapters.const_get(connection.adapter_name.camelcase)
+          end
           klass.load(self) unless klass.loaded
           klass.new(self)
         rescue LoadError
@@ -104,8 +114,13 @@ module Geokit
 
       def within(distance, options = {})
         options[:within] = distance
-        #geo_scope(options)
-        where(distance_conditions(options))
+        # Add bounding box to speed up SQL request.
+        bounds = formulate_bounds_from_distance(
+          options,
+          normalize_point_to_lat_lng(options[:origin]), 
+          options[:units] || default_units)
+        with_latlng.where(bound_conditions(bounds)).
+          where(distance_conditions(options))
       end
       alias inside within
 
@@ -134,10 +149,12 @@ module Geokit
         origin  = extract_origin_from_options(options)
         units   = extract_units_from_options(options)
         formula = extract_formula_from_options(options)
-        bounds  = extract_bounds_from_options(options)
         distance_column_name = distance_sql(origin, units, formula)
-        #geo_scope(options).order("#{distance_column_name} asc")
-        order("#{distance_column_name} #{options[:reverse] ? 'DESC' : 'ASC'}")
+        with_latlng.order("#{distance_column_name} #{options[:reverse] ? 'DESC' : 'ASC'}")
+      end
+
+      def with_latlng
+        where("#{qualified_lat_column_name} IS NOT NULL AND #{qualified_lng_column_name} IS NOT NULL")
       end
 
       def closest(options = {})
@@ -214,7 +231,7 @@ module Geokit
         distance = options[:within] if options.has_key?(:within)
         distance = options[:range].last-(options[:range].exclude_end?? 1 : 0) if options.has_key?(:range)
         if distance
-          res=Geokit::Bounds.from_point_and_radius(origin,distance,:units=>units)
+          Geokit::Bounds.from_point_and_radius(origin,distance,:units=>units)
         else
           nil
         end
@@ -224,7 +241,6 @@ module Geokit
         origin  = extract_origin_from_options(options)
         units   = extract_units_from_options(options)
         formula = extract_formula_from_options(options)
-        bounds  = extract_bounds_from_options(options)
         distance_column_name = distance_sql(origin, units, formula)
 
         res = if options.has_key?(:within)
@@ -321,7 +337,7 @@ module Geokit
         lat = deg2rad(get_lat(origin))
         lng = deg2rad(get_lng(origin))
         multiplier = units_sphere_multiplier(units)
-        adapter.sphere_distance_sql(lat, lng, multiplier) if adapter
+        geokit_finder_adapter.sphere_distance_sql(lat, lng, multiplier) if geokit_finder_adapter
       end
 
       # Returns the distance SQL using the flat-world formula (Phythagorean Theory).  The SQL is tuned
@@ -329,7 +345,7 @@ module Geokit
       def flat_distance_sql(origin, units)
         lat_degree_units = units_per_latitude_degree(units)
         lng_degree_units = units_per_longitude_degree(get_lat(origin), units)
-        adapter.flat_distance_sql(origin, lat_degree_units, lng_degree_units)
+        geokit_finder_adapter.flat_distance_sql(origin, lat_degree_units, lng_degree_units)
       end
 
       def get_lat(origin)

data/lib/geokit-rails/geocoder_control.rb

@@ -5,7 +5,9 @@ module Geokit
     extend ActiveSupport::Concern
   
     included do
-      if self.respond_to? :before_filter
+      if self.respond_to? :before_action
+        self.send :before_action, :set_geokit_domain
+      elsif self.respond_to? :before_filter
         self.send :before_filter, :set_geokit_domain
       end
     end
@@ -15,4 +17,4 @@ module Geokit
       logger.debug("Geokit is using the domain: #{Geokit::Geocoders::domain}")
     end
   end
-end
+end

data/lib/geokit-rails/ip_geocode_lookup.rb

@@ -1,40 +1,44 @@
 require 'yaml'
 require 'active_support/concern'
 
-module Geokit 
+module Geokit
   # Contains a class method geocode_ip_address which can be used to enable automatic geocoding
-  # for request IP addresses.  The geocoded information is stored in a cookie and in the 
+  # for request IP addresses.  The geocoded information is stored in a cookie and in the
   # session to minimize web service calls.  The point of the helper is to enable location-based
   # websites to have a best-guess for new visitors.
   module IpGeocodeLookup
     extend ActiveSupport::Concern
-    
+
     # Class method to mix into active record.
     module ClassMethods # :nodoc:
       def geocode_ip_address(filter_options = {})
-        before_filter :store_ip_location, filter_options
+        if respond_to? :before_action
+          before_action :store_ip_location, filter_options
+        else
+          before_filter :store_ip_location, filter_options
+        end
       end
     end
- 
-    private   
-         
-    # Places the IP address' geocode location into the session if it 
+
+    private
+
+    # Places the IP address' geocode location into the session if it
     # can be found.  Otherwise, looks for a geo location cookie and
     # uses that value.  The last resort is to call the web service to
     # get the value.
     def store_ip_location
       session[:geo_location] ||= retrieve_location_from_cookie_or_service
       cookies[:geo_location] = { :value => session[:geo_location].to_yaml, :expires => 30.days.from_now } if session[:geo_location]
-    end    
-    
+    end
+
     # Uses the stored location value from the cookie if it exists.  If
-    # no cookie exists, calls out to the web service to get the location. 
+    # no cookie exists, calls out to the web service to get the location.
     def retrieve_location_from_cookie_or_service
-      return YAML.load(cookies[:geo_location]) if cookies[:geo_location]
+      return GeoLoc.new(YAML.load(cookies[:geo_location])) if cookies[:geo_location]
       location = Geocoders::MultiGeocoder.geocode(get_ip_address)
       return location.success ? location : nil
     end
-    
+
     # Returns the real ip address, though this could be the localhost ip
     # address.  No special handling here anymore.
     def get_ip_address

data/lib/geokit-rails/railtie.rb

@@ -1,4 +1,3 @@
-require 'geokit-rails'
 require 'rails'
 
 module Geokit

data/lib/geokit-rails/version.rb

@@ -1,3 +1,3 @@
 module GeokitRails
-  VERSION = "2.1.0"
+  VERSION = "2.2.0"
 end

data/test/acts_as_mappable_test.rb

@@ -241,28 +241,28 @@ class ActsAsMappableTest < GeokitTestCase
   end
 
   def test_ip_geocoded_find_with_distance_condition
-    Geokit::Geocoders::MultiGeocoder.expects(:geocode).with(LOCATION_A_IP).returns(@location_a)
+    Geokit::Geocoders::MultiGeocoder.expects(:geocode).with(LOCATION_A_IP).twice.returns(@location_a)
     locations = Location.within(3.97, :origin => LOCATION_A_IP)
     assert_equal 5, locations.to_a.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)
+    Geokit::Geocoders::MultiGeocoder.expects(:geocode).with(LOCATION_A_IP).twice.returns(@location_a)
     locations = Location.within(3.97, :origin => LOCATION_A_IP)
     assert_equal 5, locations.to_a.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)
+    Geokit::Geocoders::MultiGeocoder.expects(:geocode).with(LOCATION_A_IP).twice.returns(@location_a)
     locations = Location.within(5, :origin => LOCATION_A_IP).where("city = 'Coppell'")
     assert_equal 2, locations.to_a.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)
+    Geokit::Geocoders::MultiGeocoder.expects(:geocode).with(LOCATION_A_IP).twice.returns(@location_a)
     locations = Location.within(5, :origin => LOCATION_A_IP).where(["city = ?", 'Coppell'])
     assert_equal 2, locations.to_a.size
     assert_equal 2, locations.count
@@ -293,7 +293,7 @@ class ActsAsMappableTest < GeokitTestCase
   end
 
   def test_address_geocode
-    Geokit::Geocoders::MultiGeocoder.expects(:geocode).with('Irving, TX').returns(@location_a)
+    Geokit::Geocoders::MultiGeocoder.expects(:geocode).with('Irving, TX').twice.returns(@location_a)
     #locations = Location.geo_scope(:origin => 'Irving, TX').where(["distance < ? and city = ?", 5, 'Coppell'])
     locations = Location.within(5, :origin => 'Irving, TX').where(["city = ?", 'Coppell'])
     assert_equal 2, locations.to_a.size
@@ -449,7 +449,7 @@ class ActsAsMappableTest < GeokitTestCase
   end
 
   def test_sort_by_distance_from
-    locations = Location.all
+    locations = Location.with_latlng.all
     unsorted = [locations(:a), locations(:b), locations(:c), locations(:d), locations(:e), locations(:f)]
     sorted   = [locations(:a), locations(:b), locations(:c), locations(:f), locations(:d), locations(:e)]
     assert_equal sorted, locations.sort_by{|l| l.distance_to(locations(:a))}

data/test/boot.rb

@@ -4,7 +4,6 @@ require 'test/unit'
 require 'active_support/test_case'
 
 require 'active_record'
-require 'active_record/test_case'
 require 'active_record/fixtures'
 
 require 'action_controller'

data/test/fixtures/custom_locations.yml

@@ -51,4 +51,11 @@ f:
   state: TX
   postal_code: 75039
   latitude: 32.895155
-  longitude: -96.958444
+  longitude: -96.958444
+g:
+  id: 7
+  company_id: 2
+  street: 4711 N Macarthur Blvd # 160
+  city: Nowhere
+  state: TX
+  postal_code: 12345

data/test/fixtures/locations.yml

@@ -51,4 +51,11 @@ f:
   state: TX
   postal_code: 75039
   lat: 32.895155
-  lng: -96.958444
+  lng: -96.958444
+g:
+  id: 7
+  company_id: 2
+  street: 4711 N Macarthur Blvd # 160
+  city: Nowhere
+  state: TX
+  postal_code: 12345

data/test/test_helper.rb

@@ -3,11 +3,17 @@ require 'pathname'
 require 'boot'
 require 'mocha/setup'
 
-if ENV['COVERAGE']
-  COVERAGE_THRESHOLD = 49
+unless ENV['COVERAGE'] == 'off'
+  COVERAGE_THRESHOLD = 35
   require 'simplecov'
   require 'simplecov-rcov'
-  SimpleCov.formatter = SimpleCov::Formatter::RcovFormatter
+  require 'coveralls'
+  Coveralls.wear!
+
+  SimpleCov.formatters = [
+    SimpleCov::Formatter::RcovFormatter,
+    Coveralls::SimpleCov::Formatter
+  ]
   SimpleCov.start do
     add_filter '/test/'
     add_group 'lib', 'lib'
@@ -41,4 +47,4 @@ class GeokitTestCase < ActiveSupport::TestCase
   self.use_instantiated_fixtures  = false
   
   fixtures :all 
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: geokit-rails
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Michael Noack
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-11 00:00:00.000000000 Z
+date: 2016-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -97,6 +97,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
@@ -217,6 +231,8 @@ files:
 - gemfiles/rails3.gemfile
 - gemfiles/rails4.gemfile
 - geokit-rails.gemspec
+- lib/generators/geokit_rails/install_generator.rb
+- lib/generators/templates/geokit_config.rb
 - lib/geokit-rails.rb
 - lib/geokit-rails/acts_as_mappable.rb
 - lib/geokit-rails/adapters/abstract.rb
@@ -228,7 +244,6 @@ files:
 - lib/geokit-rails/adapters/sqlite.rb
 - lib/geokit-rails/adapters/sqlserver.rb
 - lib/geokit-rails/core_extensions.rb
-- lib/geokit-rails/defaults.rb
 - lib/geokit-rails/geocoder_control.rb
 - lib/geokit-rails/ip_geocode_lookup.rb
 - lib/geokit-rails/railtie.rb
@@ -278,7 +293,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Geokit helpers for rails apps.

data/lib/geokit-rails/defaults.rb

@@ -1,21 +0,0 @@
-module Geokit
-  # These defaults are used in Geokit::Mappable.distance_to and in acts_as_mappable
-  @@default_units = :miles
-  @@default_formula = :sphere
-
-  [:default_units, :default_formula].each do |sym|
-    class_eval <<-EOS, __FILE__, __LINE__
-      def self.#{sym}
-        if defined?(#{sym.to_s.upcase})
-          #{sym.to_s.upcase}
-        else
-          @@#{sym}
-        end
-      end
-
-      def self.#{sym}=(obj)
-        @@#{sym} = obj
-      end
-    EOS
-  end
-end