geokit 1.13.1 → 1.14.0

data/lib/geokit/geocoders/yandex.rb

@@ -15,7 +15,7 @@ module Geokit
       def self.submit_url(address)
         address_str = address.is_a?(GeoLoc) ? address.to_geocodeable_s : address
         url = "https://geocode-maps.yandex.ru/1.x/?geocode=#{Geokit::Inflector.url_escape(address_str)}&format=json"
-        url += "&key=#{key}" if key
+        url += "&apikey=#{key}" if key
         url
       end
 

data/lib/geokit/geocoders.rb

@@ -5,7 +5,6 @@ require 'json'
 require 'logger'
 require 'net/http'
 require 'openssl'
-require 'rexml/document'
 require 'timeout'
 require 'yaml'
 
@@ -76,6 +75,7 @@ module Geokit
     class GeocodeError < StandardError; end
     class TooManyQueriesError < StandardError; end
     class AccessDeniedError < StandardError; end
+    class NoSuchGeocoderError < StandardError; end
 
     # -------------------------------------------------------------------------------------------
     # Geocoder Base class -- every geocoder should inherit from this
@@ -90,7 +90,7 @@ module Geokit
       def self.geocode(address, *args)
         logger.debug "#{provider_name} geocoding. address: #{address}, args #{args}"
         do_geocode(address, *args) || GeoLoc.new
-      rescue TooManyQueriesError, GeocodeError, AccessDeniedError
+      rescue TooManyQueriesError, GeocodeError, AccessDeniedError, NoSuchGeocoderError
         raise
       rescue => e
         logger.error "Caught an error during #{provider_name} geocoding call: #{$!}"
@@ -175,6 +175,16 @@ module Geokit
 
       def self.parse(format, body, *args)
         logger.debug "#{provider_name} geocoding. Result: #{CGI.escape(body)}"
+
+        if format == :xml
+          begin
+            require 'rexml/document'
+          rescue LoadError
+            logger.error "REXML load error, if using Ruby 3.0 add 'rexml' to your Gemfile"
+            raise
+          end
+        end
+
         case format
         when :json then parse_json(JSON.load(body), *args)
         when :xml  then parse_xml(REXML::Document.new(body), *args)

data/lib/geokit/mappable.rb

@@ -26,12 +26,19 @@ module Geokit
       EARTH_RADIUS = {}
       PER_LATITUDE_DEGREE = {}
 
-      # Returns the distance between two points.  The from and to parameters are
-      # required to have lat and lng attributes.  Valid options are:
-      # :units - valid values are :miles, :kms, :nms
-      # (Geokit::default_units is the default)
-      # :formula - valid values are :flat or :sphere
-      # (Geokit::default_formula is the default)
+      # Returns the distance between two points.
+      # @param from [String, Array, LatLng] +required+ -
+      #   +Geokit::LatLng+ compatible value
+      # @param to [String, Array, LatLng] +required+ -
+      #   +Geokit::LatLng+ compatible value
+      # @option options [String, Symbol] :units
+      #   valid values are :miles, :kms, :nms.
+      #   Default to Geokit::default_units
+      # @option options [String, Symbol] :formula
+      #   valid values are :flat or :sphere.
+      #   Default to Geokit::default_formula
+      # @example
+      #   Geokit::GeoLoc.distance_between("43.8374249,4.3600687", "44.1253665,4.0852818")
       def distance_between(from, to, options = {})
         units = get_units!(options)
         from  = Geokit::LatLng.normalize(from)

data/lib/geokit/multi_geocoder.rb

@@ -64,6 +64,7 @@ module Geokit
 
       def self.geocoder(provider)
         class_name = "#{Geokit::Inflector.camelize(provider.to_s)}Geocoder"
+        raise Geokit::Geocoders::NoSuchGeocoderError unless Geokit::Geocoders.const_defined? class_name
         Geokit::Geocoders.const_get class_name
       end
 

data/lib/geokit/version.rb

@@ -1,3 +1,3 @@
 module Geokit
-  VERSION = '1.13.1'
+  VERSION = '1.14.0'
 end

data/test/coverage_loader.rb

@@ -1,5 +1,5 @@
 unless ENV['COVERAGE'] == 'off'
-  COVERAGE_THRESHOLD = 96
+  COVERAGE_THRESHOLD = 95
   require 'simplecov'
   require 'simplecov-rcov'
   require 'coveralls'

data/test/helper.rb

@@ -13,7 +13,7 @@ require 'geoip'
 require 'coverage_loader'
 require 'vcr_loader'
 require 'test/unit'
-require 'mocha/setup'
+require 'mocha/test_unit'
 require 'net/http'
 
 require File.join(File.dirname(__FILE__), '../lib/geokit.rb')

data/test/test_bing_geocoder.rb

@@ -14,7 +14,7 @@ class BingGeocoderTest < BaseGeocoderTest #:nodoc: all
   # the testing methods themselves
   def test_bing_full_address
     key = geocoder_class.key
-    url = "#{@base_url}/#{URI.escape(@full_address)}?key=#{key}&o=xml"
+    url = "#{@base_url}/#{CGI.escape(@full_address)}?key=#{key}&o=xml"
     res = geocode(@full_address, :bing_full)
     assert_equal 'CA', res.state
     assert_equal 'San Francisco', res.city
@@ -28,7 +28,7 @@ class BingGeocoderTest < BaseGeocoderTest #:nodoc: all
   def test_bing_full_address_au
     address = '440 King William Street, Adelaide, Australia'
     key = geocoder_class.key
-    url = "#{@base_url}/#{URI.escape(address)}?key=#{key}&o=xml"
+    url = "#{@base_url}/#{CGI.escape(address)}?key=#{key}&o=xml"
     res = geocode(address, :bing_full_au)
     assert_equal 'SA', res.state
     assert_equal 'Adelaide', res.city
@@ -43,7 +43,7 @@ class BingGeocoderTest < BaseGeocoderTest #:nodoc: all
   def test_bing_full_address_de
     address = 'Platz der Republik 1, 11011 Berlin, Germany'
     key = geocoder_class.key
-    url = "#{@base_url}/#{URI.escape(address)}?key=#{key}&o=xml"
+    url = "#{@base_url}/#{CGI.escape(address)}?key=#{key}&o=xml"
     res = geocode(address, :bing_full_de)
     assert_equal 'BE', res.state
     assert_equal 'Berlin', res.city
@@ -59,7 +59,7 @@ class BingGeocoderTest < BaseGeocoderTest #:nodoc: all
   def test_bing_country
     address = 'Australia'
     key = geocoder_class.key
-    url = "#{@base_url}/#{URI.escape(address)}?key=#{key}&o=xml"
+    url = "#{@base_url}/#{CGI.escape(address)}?key=#{key}&o=xml"
     res = geocode(address, :bing_au)
     assert_equal nil, res.state
     assert_equal nil, res.city

data/test/test_ca_geocoder.rb

@@ -31,6 +31,14 @@ class CaGeocoderTest < BaseGeocoderTest #:nodoc: all
     assert !geocode(@ca_full_txt).success
   end
 
+  def test_geocoder_with_geo_loc_object
+    response = MockSuccess.new
+    response.expects(:body).returns(CA_SUCCESS)
+    url = 'http://geocoder.ca/?locate=2105+West+32nd+Avenue%2C+Vancouver%2C+BC&auth=SOMEKEYVALUE&geoit=xml'
+    geocoder_class.expects(:call_geocoder_service).with(url).returns(response)
+    verify(geocode(Geokit::GeoLoc.new(@ca_full_hash)))
+  end
+
   private
 
   def verify(location)

data/test/test_fcc_geocoder.rb

@@ -17,6 +17,7 @@ class FCCGeocoderTest < BaseGeocoderTest #:nodoc: all
     assert_url url
     assert_equal res.country_code, 'US'
     assert_equal res.state, 'CA'
+    assert_equal res.county, 'Los Angeles'
     assert_equal res.district, 'Los Angeles'
   end
 end

data/test/{test_geoloc.rb → test_geo_loc.rb}

@@ -88,6 +88,7 @@ class GeoLocTest < Test::Unit::TestCase #:nodoc: all
     assert_equal [
       'city', 'San Francisco',
       'country_code', 'US',
+      'county', '',
       'full_address', '',
       'lat', '',
       'lng', '',

data/test/test_google_geocoder.rb

@@ -118,6 +118,7 @@ class GoogleGeocoderTest < BaseGeocoderTest #:nodoc: all
     res = geocode(@address, :google_city)
     assert_nil res.street_address
     assert_equal 'CA', res.state
+    assert_equal 'San Francisco County', res.county
     assert_equal 'San Francisco', res.city
     assert_equal '37.7749295,-122.4194155', res.ll
     assert res.is_us?
@@ -133,6 +134,7 @@ class GoogleGeocoderTest < BaseGeocoderTest #:nodoc: all
      res = geocode(@address, :google_sublocality)
      assert_equal '682 Prospect Place', res.street_address
      assert_equal 'NY', res.state
+     assert_equal 'Kings County', res.county
      assert_equal 'Brooklyn', res.city
      assert_equal '40.6745812,-73.9541582', res.ll
      assert res.is_us?
@@ -148,6 +150,7 @@ class GoogleGeocoderTest < BaseGeocoderTest #:nodoc: all
      res = geocode(@address, :google_administrative_area_level_3)
      assert_equal '8 Barkwood Lane', res.street_address
      assert_equal 'NY', res.state
+     assert_equal 'Saratoga County', res.county
      assert_equal 'Clifton Park', res.city
      assert_equal '42.829583,-73.788174', res.ll
      assert res.is_us?
@@ -175,6 +178,7 @@ class GoogleGeocoderTest < BaseGeocoderTest #:nodoc: all
     TestHelper.expects(:last_url).with(url)
     res = geocode(@google_city_loc, :google_city)
     assert_equal 'CA', res.state
+    assert_equal 'San Francisco County', res.county
     assert_equal 'San Francisco', res.city
     assert_equal '37.7749295,-122.4194155', res.ll
     assert res.is_us?
@@ -261,6 +265,7 @@ class GoogleGeocoderTest < BaseGeocoderTest #:nodoc: all
     assert_equal 'google', res.provider
 
     assert_equal 'Madrid', res.city
+    assert_equal 'Madrid', res.county
     assert_equal 'Community of Madrid', res.state
 
     assert_equal 'Spain', res.country
@@ -353,7 +358,7 @@ class GoogleGeocoderTest < BaseGeocoderTest #:nodoc: all
     assert_equal 'TX', filtered_result.state
     assert_equal 'Austin, TX, USA', filtered_result.full_address
 
-    url = 'https://maps.google.com/maps/api/geocode/json?sensor=false&address=austin&components=administrative_area:il%7Ccountry:us'
+    url = "https://maps.google.com/maps/api/geocode/json?sensor=false&address=austin&components=administrative_area%3Ail%7Ccountry%3Aus"
     TestHelper.expects(:last_url).with(url)
     filtered_result = geocode('austin',
       :test_component_filtering_on,
@@ -368,5 +373,14 @@ class GoogleGeocoderTest < BaseGeocoderTest #:nodoc: all
 
     assert_equal 'TX', filtered_result.state
     assert_equal 'Austin, TX, USA', filtered_result.full_address
+
+    url = "https://maps.google.com/maps/api/geocode/json?sensor=false&address=S%C3%A3o+Paulo&components=administrative_area%3As%C3%A3o+paulo%7Ccountry%3Abr"
+    TestHelper.expects(:last_url).with(url)
+    filtered_result = geocode("São Paulo",
+      :test_component_filtering_with_special_characters,
+      components: { administrative_area: "São Paulo", country: "BR" })
+
+    assert_equal "SP", filtered_result.state
+    assert_equal "São Paulo, State of São Paulo, Brazil", filtered_result.full_address
   end
 end

data/test/test_ip_api_geocoder.rb

@@ -10,7 +10,7 @@ class IpApiGeocoderTest < BaseGeocoderTest #:nodoc: all
     assert_equal expected_url, TestHelper.last_url
   end
 
-  def test_free_geo_ip_geocode
+  def test_ip_api_geocode
     url = "http://ip-api.com/json/#{@ip}"
     res = geocode(@ip, :ip_api_geocode)
     assert_url url

data/test/test_ipstack_geocoder.rb

@@ -11,7 +11,7 @@ class IpstackGeocoderTest < BaseGeocoderTest #:nodoc: all
     assert_equal expected_url, TestHelper.last_url
   end
 
-  def test_free_geo_ip_geocode
+  def test_ipstack_geocode
     url = "http://api.ipstack.com/#{@ip}?access_key=some_api_key"
     res = geocode(@ip, :ipstack_geocode)
 

data/test/test_multi_geocoder.rb

@@ -36,7 +36,9 @@ class MultiGeocoderTest < BaseGeocoderTest #:nodoc: all
   def test_invalid_provider
     temp = Geokit::Geocoders.provider_order
     Geokit::Geocoders.provider_order = [:bogus]
-    assert_equal @failure, Geokit::Geocoders::MultiGeocoder.geocode(@address)
+    assert_raise Geokit::Geocoders::NoSuchGeocoderError do
+      Geokit::Geocoders::MultiGeocoder.geocode(@address)
+    end
     Geokit::Geocoders.provider_order = temp
   end
 
@@ -78,7 +80,7 @@ class MultiGeocoderTest < BaseGeocoderTest #:nodoc: all
   def test_reverse_geocode_with_invalid_provider
     temp = Geokit::Geocoders.provider_order
     Geokit::Geocoders.provider_order = [:bogus]
-    assert_raise NameError do
+    assert_raise Geokit::Geocoders::NoSuchGeocoderError do
       Geokit::Geocoders::MultiGeocoder.reverse_geocode(@latlng)
     end
     Geokit::Geocoders.provider_order = temp
@@ -100,7 +102,8 @@ class MultiGeocoderTest < BaseGeocoderTest #:nodoc: all
   end
 
   def test_mapbox
-    Geokit::Geocoders::MultiGeocoder.geocode(@address, provider_order: [:mapbox])
-    Geokit::Geocoders::MultiGeocoder.reverse_geocode(@latlng, provider_order: [:mapbox])
+    # This has its own test file now, is this even necessary?
+    # Geokit::Geocoders::MultiGeocoder.geocode(@address, provider_order: [:mapbox])
+    # Geokit::Geocoders::MultiGeocoder.reverse_geocode(@latlng, provider_order: [:mapbox])
   end
 end

data/test/test_multi_ip_geocoder.rb

@@ -30,7 +30,9 @@ class MultiIpGeocoderTest < BaseGeocoderTest #:nodoc: all
   def test_invalid_provider
     temp = Geokit::Geocoders.ip_provider_order
     Geokit::Geocoders.ip_provider_order = [:bogus]
-    assert_equal @failure, Geokit::Geocoders::MultiGeocoder.geocode(@ip_address)
+    assert_raise Geokit::Geocoders::NoSuchGeocoderError do
+      Geokit::Geocoders::MultiGeocoder.geocode(@ip_address)
+    end
     Geokit::Geocoders.ip_provider_order = temp
   end
 end

data/test/test_opencage_geocoder.rb

@@ -22,6 +22,7 @@ class OpencageGeocoderTest < BaseGeocoderTest #:nodoc: all
     res = geocode(@opencage_full_loc, :opencage_full)
 
     assert_equal 'California', res.state
+    assert_equal 'San Francisco City and County', res.county
     assert_equal 'San Francisco', res.city
     assert_array_in_delta [37.7921509, -122.394], res.to_a
     assert res.is_us?
@@ -35,6 +36,7 @@ class OpencageGeocoderTest < BaseGeocoderTest #:nodoc: all
     res = geocode(@opencage_city_loc, :opencage_city)
 
     assert_equal 'California', res.state
+    assert_equal 'San Francisco City and County', res.county
     assert_equal 'San Francisco', res.city
     assert_array_in_delta [37.7792768, -122.4192704], res.to_a
     assert res.is_us?
@@ -53,13 +55,15 @@ class OpencageGeocoderTest < BaseGeocoderTest #:nodoc: all
     assert_equal 'ES', res.country_code
     assert_equal 'opencage', res.provider
 
+    assert_equal 'Chamberí', res.neighborhood
     assert_equal 'Madrid', res.city
+    assert_equal 'Área metropolitana de Madrid y Corredor del Henares', res.county
     assert_equal 'Community of Madrid', res.state
 
     assert_equal 'Spain', res.country
     assert_equal true, res.success
 
-    assert_equal "Calle De Zurbano, Chamberí, Madrid, Community of Madrid, 28036, ES", res.full_address
+    assert_equal 'Calle De Zurbano, Chamberí, Madrid, Community of Madrid, 28036, ES', res.full_address
     assert_equal 28_036, res.zip
     assert_equal 'Calle De Zurbano', res.street_address
   end
@@ -75,15 +79,42 @@ class OpencageGeocoderTest < BaseGeocoderTest #:nodoc: all
     assert_equal 'MK', res.country_code
     assert_equal 'opencage', res.provider
 
+    assert_equal 'Жабино Маало', res.neighborhood
     assert_equal 'Prilep', res.city
     assert_equal 'Pelagonia Region', res.state
+    assert_equal 'Municipality of Prilep', res.county
+    assert_equal 'Prilep', res.city
 
     assert_equal 'Macedonia', res.country
     assert_equal 10, res.precision
     assert_equal true, res.success
 
-    assert_equal "Прилепски Бранители, Prilep, Pelagonia Region, MK", res.full_address
-    assert_equal "Прилепски Бранители", res.street_address
+    assert_equal 'Прилепски бранители, Prilep, Pelagonia Region, MK', res.full_address
+    assert_equal 'Прилепски бранители', res.street_address
+  end
+
+  def test_opencage_cerdanyola
+    location = Geokit::GeoLoc.new
+    location.lat, location.lng = '41.493588', '2.141879'
+
+    url = "#{@base_url}?key=someopencageapikey&query=41.493588%2C2.141879&no_annotations=1"
+    TestHelper.expects(:last_url).with(url)
+    res = geocode(location.ll, :opencage_reverse_cerdanyola)
+
+    assert_equal 'ES', res.country_code
+    assert_equal 'opencage', res.provider
+
+    assert_equal 'Sant Martí', res.neighborhood
+    assert_equal 'Catalonia', res.state
+    assert_equal 'Vallès Occidental', res.county
+    assert_equal 'Cerdanyola Del Vallès', res.city
+
+    assert_equal 'Spain', res.country
+    assert_equal 9, res.precision
+    assert_equal true, res.success
+
+    assert_equal 'Passeig De La Riera, Cerdanyola Del Vallès, Catalonia, 08290, ES', res.full_address
+    assert_equal 'Passeig De La Riera', res.street_address
   end
 
   # check if the results are in Spanish if &language=es

data/test/test_openstreetmap_geocoder.rb

@@ -103,6 +103,7 @@ class OSMGeocoderTest < BaseGeocoderTest #:nodoc: all
       assert_equal 'osm', res.provider
 
       assert_equal 'Prilep', res.city
+      assert_equal nil, res.county
       assert_nil res.state
 
       assert_equal 'Macedonia', res.country
@@ -127,6 +128,7 @@ class OSMGeocoderTest < BaseGeocoderTest #:nodoc: all
     assert_equal 'osm', res.provider
 
     assert_equal 'Madrid', res.city
+    assert_equal 'Madrid', res.county
     assert_equal 'Madrid', res.state
 
     assert_equal 'Spain', res.country

data/test/test_yandex_geocoder.rb

@@ -34,7 +34,7 @@ class YandexGeocoderTest < BaseGeocoderTest #:nodoc: all
     res = geocode(@full_address)
 
     assert_equal 'yandex', res.provider
-    assert_equal "улица Новый Арбат, 24", res.street_address
+    assert_equal "Улица новый арбат, 24", res.street_address
     assert_equal "Москва", res.city
     assert_equal 55.753083, res.lat
     assert_equal 37.587614, res.lng
@@ -51,10 +51,10 @@ class YandexGeocoderTest < BaseGeocoderTest #:nodoc: all
     res = geocode(region_address)
 
     assert_equal 'yandex', res.provider
-    assert_equal "улица Станиславского, 21", res.street_address
-    assert_equal "Ростов на Дону", res.city
-    assert_equal "Ростовская область", res.state
-    assert_equal "городской округ Ростов-на-Дону", res.district
+    assert_equal 'Улица станиславского, 21', res.street_address
+    assert_equal 'Ростов на дону', res.city
+    assert_equal 'Ростовская область', res.state
+    assert_equal 'городской округ Ростов-на-Дону', res.district
     assert_equal 47.21589, res.lat
     assert_equal 39.703272, res.lng
     assert_equal 'RU', res.country_code

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: geokit
 version: !ruby/object:Gem::Version
-  version: 1.13.1
+  version: 1.14.0
 platform: ruby
 authors:
 - Michael Noack
@@ -11,24 +11,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-17 00:00:00.000000000 Z
+date: 2023-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: coveralls
+  name: coveralls_reborn
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -171,16 +171,16 @@ dependencies:
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '0'
 description: Geokit provides geocoding and distance calculation in an easy-to-use
   API
 email:
@@ -190,10 +190,10 @@ extensions: []
 extra_rdoc_files:
 - README.markdown
 files:
+- ".github/workflows/ci.yml"
 - ".gitignore"
 - ".hound.yml"
 - ".rubocop.yml"
-- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - MIT-LICENSE
@@ -205,7 +205,6 @@ files:
 - fixtures/vcr_cassettes/bing_full_au.yml
 - fixtures/vcr_cassettes/bing_full_de.yml
 - fixtures/vcr_cassettes/fcc_reverse_geocode.yml
-- fixtures/vcr_cassettes/free_geo_ip_geocode.yml
 - fixtures/vcr_cassettes/geo_plugin_geocode.yml
 - fixtures/vcr_cassettes/geobytes_geocode.yml
 - fixtures/vcr_cassettes/geocodio_geocode.yml
@@ -237,6 +236,7 @@ files:
 - fixtures/vcr_cassettes/opencage_city.yml
 - fixtures/vcr_cassettes/opencage_full.yml
 - fixtures/vcr_cassettes/opencage_language_response_es.yml
+- fixtures/vcr_cassettes/opencage_reverse_cerdanyola.yml
 - fixtures/vcr_cassettes/opencage_reverse_madrid.yml
 - fixtures/vcr_cassettes/opencage_reverse_prilep.yml
 - fixtures/vcr_cassettes/ripe_geocode.yml
@@ -245,6 +245,7 @@ files:
 - fixtures/vcr_cassettes/test_component_filtering_off.yml
 - fixtures/vcr_cassettes/test_component_filtering_on.yml
 - fixtures/vcr_cassettes/test_component_filtering_on_without_filter.yml
+- fixtures/vcr_cassettes/test_component_filtering_with_special_characters.yml
 - fixtures/vcr_cassettes/yahoo_city.yml
 - fixtures/vcr_cassettes/yahoo_full.yml
 - fixtures/vcr_cassettes/yahoo_no_results.yml
@@ -258,7 +259,6 @@ files:
 - lib/geokit/geocoders/bing.rb
 - lib/geokit/geocoders/ca_geocoder.rb
 - lib/geokit/geocoders/fcc.rb
-- lib/geokit/geocoders/free_geo_ip.rb
 - lib/geokit/geocoders/geo_plugin.rb
 - lib/geokit/geocoders/geobytes.rb
 - lib/geokit/geocoders/geocodio.rb
@@ -291,11 +291,10 @@ files:
 - test/test_bounds.rb
 - test/test_ca_geocoder.rb
 - test/test_fcc_geocoder.rb
-- test/test_free_geo_ip_geocoder.rb
+- test/test_geo_loc.rb
 - test/test_geo_plugin_geocoder.rb
 - test/test_geobytes_geocoder.rb
 - test/test_geocodio_geocoder.rb
-- test/test_geoloc.rb
 - test/test_geonames_geocoder.rb
 - test/test_google_geocoder.rb
 - test/test_inflector.rb
@@ -333,15 +332,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: 2.5.9
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 3.4.4
 signing_key: 
 specification_version: 4
 summary: 'Geokit: encoding and distance calculation gem'
@@ -353,11 +351,10 @@ test_files:
 - test/test_bounds.rb
 - test/test_ca_geocoder.rb
 - test/test_fcc_geocoder.rb
-- test/test_free_geo_ip_geocoder.rb
+- test/test_geo_loc.rb
 - test/test_geo_plugin_geocoder.rb
 - test/test_geobytes_geocoder.rb
 - test/test_geocodio_geocoder.rb
-- test/test_geoloc.rb
 - test/test_geonames_geocoder.rb
 - test/test_google_geocoder.rb
 - test/test_inflector.rb

data/.travis.yml

@@ -1,12 +0,0 @@
-language: ruby
-rvm:
-  - 2.0
-  - 2.1
-  - 2.2
-  - 2.3.0
-script: "bundle exec rake test"
-notifications:
-  email:
-    - michael+geokit@noack.com.au
-sudo: false
-cache: bundler

data/fixtures/vcr_cassettes/free_geo_ip_geocode.yml

@@ -1,36 +0,0 @@
----
-http_interactions:
-- request:
-    method: get
-    uri: http://freegeoip.net/xml/74.125.237.209
-    body:
-      encoding: US-ASCII
-      string: ''
-    headers:
-      Accept:
-      - ! '*/*'
-      User-Agent:
-      - Ruby
-  response:
-    status:
-      code: 200
-      message: OK
-    headers:
-      Access-Control-Allow-Origin:
-      - ! '*'
-      Content-Type:
-      - application/xml
-      Date:
-      - Fri, 13 Dec 2013 13:02:44 GMT
-      Content-Length:
-      - '398'
-    body:
-      encoding: US-ASCII
-      string: ! "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<Response>\n <Ip>74.125.237.209</Ip>\n
-        <CountryCode>US</CountryCode>\n <CountryName>United States</CountryName>\n
-        <RegionCode>CA</RegionCode>\n <RegionName>California</RegionName>\n <City>Mountain
-        View</City>\n <ZipCode>94043</ZipCode>\n <Latitude>37.4192</Latitude>\n <Longitude>-122.0574</Longitude>\n
-        <MetroCode>807</MetroCode>\n <AreaCode>650</AreaCode>\n</Response>\n"
-    http_version: 
-  recorded_at: Fri, 13 Dec 2013 13:03:38 GMT
-recorded_with: VCR 2.7.0

data/lib/geokit/geocoders/free_geo_ip.rb

@@ -1,36 +0,0 @@
-module Geokit
-  module Geocoders
-    # Provides geocoding based upon an IP address.  The underlying web service is freegeoip.net
-    class FreeGeoIpGeocoder < BaseIpGeocoder
-      private
-
-      def self.do_geocode(ip, _=nil)
-        warn '[DEPRECATION] `freegeoip` is deprecated. Please use `ipstack`'\
-             ' instead. You can find more at'\
-             ' https://github.com/apilayer/freegeoip#readme'
-
-        process :xml, ip
-      end
-
-      def self.submit_url(ip)
-        "http://freegeoip.net/xml/#{ip}"
-      end
-
-      XML_MAPPINGS = {
-        city:         'City',
-        state:        'RegionCode',
-        zip:          'ZipCode',
-        country_code: 'CountryCode',
-        lat:          'Latitude',
-        lng:          'Longitude',
-      }
-
-      def self.parse_xml(xml)
-        loc = new_loc
-        set_mappings(loc, xml.elements['Response'], XML_MAPPINGS)
-        loc.success = !!loc.city && !loc.city.empty?
-        loc
-      end
-    end
-  end
-end