geokit 1.10.0 → 1.11.0

data/test/test_inflector.rb

@@ -1,12 +1,12 @@
 # encoding: utf-8
-require File.join(File.dirname(__FILE__), "helper")
+require File.join(File.dirname(__FILE__), 'helper')
 
 class InflectorTest < Test::Unit::TestCase #:nodoc: all
   def test_titleize
-    assert_equal "Sugar Grove", Geokit::Inflector.titleize("Sugar Grove")
-    assert_equal "Sugar Grove", Geokit::Inflector.titleize("Sugar grove")
-    assert_equal "Sugar Grove", Geokit::Inflector.titleize("sugar Grove")
-    assert_equal "Sugar Grove", Geokit::Inflector.titleize("sugar grove")
+    assert_equal 'Sugar Grove', Geokit::Inflector.titleize('Sugar Grove')
+    assert_equal 'Sugar Grove', Geokit::Inflector.titleize('Sugar grove')
+    assert_equal 'Sugar Grove', Geokit::Inflector.titleize('sugar Grove')
+    assert_equal 'Sugar Grove', Geokit::Inflector.titleize('sugar grove')
   end
 
   def test_titleize_with_unicode
@@ -19,7 +19,7 @@ class InflectorTest < Test::Unit::TestCase #:nodoc: all
   end
 
   def test_url_escape
-    assert_equal "%E4%B8%8A%E6%B5%B7%E5%B8%82%E5%BE%90%E6%B1%87%E5%8C%BA%E6%BC%95%E6%BA%AA%E5%8C%97%E8%B7%AF1111%E5%8F%B7", Geokit::Inflector.url_escape("上海市徐汇区漕溪北路1111号")
-    assert_equal "%C3%BC%C3%B6%C3%A4", Geokit::Inflector.url_escape("üöä")
+    assert_equal '%E4%B8%8A%E6%B5%B7%E5%B8%82%E5%BE%90%E6%B1%87%E5%8C%BA%E6%BC%95%E6%BA%AA%E5%8C%97%E8%B7%AF1111%E5%8F%B7', Geokit::Inflector.url_escape("上海市徐汇区漕溪北路1111号")
+    assert_equal '%C3%BC%C3%B6%C3%A4', Geokit::Inflector.url_escape("üöä")
   end
 end

data/test/test_ipgeocoder.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-require File.join(File.dirname(__FILE__), "helper")
+require File.join(File.dirname(__FILE__), 'helper')
 
 class IpGeocoderTest < BaseGeocoderTest #:nodoc: all
   IP_FAILURE = <<-EOF
@@ -31,77 +31,78 @@ class IpGeocoderTest < BaseGeocoderTest #:nodoc: all
     EOF
 
   PRIVATE_IPS_TO_TEST = [
-    "10.10.10.10",
-    "172.16.1.3",
-    "172.22.3.42",
-    "172.30.254.164",
-    "192.168.1.1",
-    "0.0.0.0",
-    "127.0.0.1",
-    "240.3.4.5",
-    "225.1.6.55",
+    '10.10.10.10',
+    '172.16.1.3',
+    '172.22.3.42',
+    '172.30.254.164',
+    '192.168.1.1',
+    '0.0.0.0',
+    '127.0.0.1',
+    '240.3.4.5',
+    '225.1.6.55',
   ].freeze
 
   def setup
     super
-    @success.provider = "ip"
+    @success.provider = 'ip'
+    @base_url = 'http://api.hostip.info/get_html.php'
   end
 
   def test_successful_lookup
     success = MockSuccess.new
     success.expects(:body).returns(IP_SUCCESS)
-    url = "http://api.hostip.info/get_html.php?ip=12.215.42.19&position=true"
+    url = "#{@base_url}?ip=12.215.42.19&position=true"
     Geokit::Geocoders::IpGeocoder.expects(:call_geocoder_service).with(url).returns(success)
-    location = Geokit::Geocoders::IpGeocoder.geocode("12.215.42.19")
+    location = Geokit::Geocoders::IpGeocoder.geocode('12.215.42.19')
     assert_not_nil location
     assert_equal 41.7696, location.lat
     assert_equal(-88.4588, location.lng)
-    assert_equal "Sugar Grove", location.city
-    assert_equal "IL", location.state
-    assert_equal "US", location.country_code
-    assert_equal "ip", location.provider
+    assert_equal 'Sugar Grove', location.city
+    assert_equal 'IL', location.state
+    assert_equal 'US', location.country_code
+    assert_equal 'ip', location.provider
     assert location.success?
   end
 
   def test_unicoded_lookup
     success = MockSuccess.new
     success.expects(:body).returns(IP_UNICODED)
-    url = "http://api.hostip.info/get_html.php?ip=12.215.42.19&position=true"
+    url = "#{@base_url}?ip=12.215.42.19&position=true"
     Geokit::Geocoders::IpGeocoder.expects(:call_geocoder_service).with(url).returns(success)
-    location = Geokit::Geocoders::IpGeocoder.geocode("12.215.42.19")
+    location = Geokit::Geocoders::IpGeocoder.geocode('12.215.42.19')
     assert_not_nil location
     assert_equal 57.7167, location.lat
     assert_equal 12.9167, location.lng
     assert_equal "Bor\303\245s", location.city
     assert_nil location.state
-    assert_equal "SE", location.country_code
-    assert_equal "ip", location.provider
+    assert_equal 'SE', location.country_code
+    assert_equal 'ip', location.provider
     assert location.success?
   end
 
   def test_non_unicoded_lookup
     success = MockSuccess.new
     success.stubs(:body).returns(IP_LATIN)
-    success.stubs(:[]).with("content-type").returns("text/plain; charset=iso-8859-1")
-    url = "http://api.hostip.info/get_html.php?ip=201.23.177.144&position=true"
+    success.stubs(:[]).with('content-type').returns('text/plain; charset=iso-8859-1')
+    url = "#{@base_url}?ip=201.23.177.144&position=true"
     Geokit::Geocoders::IpGeocoder.expects(:call_geocoder_service).with(url).returns(success)
-    location = Geokit::Geocoders::IpGeocoder.geocode("201.23.177.144")
+    location = Geokit::Geocoders::IpGeocoder.geocode('201.23.177.144')
     assert_not_nil location
     assert_equal(-20.8, location.lat)
     assert_equal(-49.3833, location.lng)
     assert_equal "São José Do Rio Prêto", location.city
     assert_nil location.state
-    assert_equal "BR", location.country_code
-    assert_equal "ip", location.provider
+    assert_equal 'BR', location.country_code
+    assert_equal 'ip', location.provider
     assert location.success?
   end
 
   def test_failed_lookup
     failure = MockSuccess.new
     failure.expects(:body).returns(IP_FAILURE)
-    url = "http://api.hostip.info/get_html.php?ip=128.178.0.0&position=true"
+    url = "#{@base_url}?ip=128.178.0.0&position=true"
     Geokit::Geocoders::IpGeocoder.expects(:call_geocoder_service).with(url).returns(failure)
-    location = Geokit::Geocoders::IpGeocoder.geocode("128.178.0.0")
+    location = Geokit::Geocoders::IpGeocoder.geocode('128.178.0.0')
     assert_not_nil location
     assert !location.success?
   end
@@ -117,16 +118,16 @@ class IpGeocoderTest < BaseGeocoderTest #:nodoc: all
 
   def test_invalid_ip
     Geokit::Geocoders::IpGeocoder.expects(:call_geocoder_service).never
-    location = Geokit::Geocoders::IpGeocoder.geocode("blah")
+    location = Geokit::Geocoders::IpGeocoder.geocode('blah')
     assert_not_nil location
     assert !location.success?
   end
 
   def test_service_unavailable
     failure = MockFailure.new
-    url = "http://api.hostip.info/get_html.php?ip=12.215.42.19&position=true"
+    url = "#{@base_url}?ip=12.215.42.19&position=true"
     Geokit::Geocoders::IpGeocoder.expects(:call_geocoder_service).with(url).returns(failure)
-    location = Geokit::Geocoders::IpGeocoder.geocode("12.215.42.19")
+    location = Geokit::Geocoders::IpGeocoder.geocode('12.215.42.19')
     assert_not_nil location
     assert !location.success?
   end

data/test/test_latlng.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "helper")
+require File.join(File.dirname(__FILE__), 'helper')
 
 class LatLngTest < Test::Unit::TestCase #:nodoc: all
   def setup
@@ -9,19 +9,19 @@ class LatLngTest < Test::Unit::TestCase #:nodoc: all
 
   def valid_reverse_geocoding_result
     location = Geokit::GeoLoc.new(
-      city: "Essen",
-      country_code: "DE",
+      city: 'Essen',
+      country_code: 'DE',
       lat: 51.4578329,
       lng: 7.0166848,
-      provider: "google",
-      state: "Nordrhein-Westfalen",
-      street_address: "Porscheplatz 1",
-      zip: "45127",
+      provider: 'google',
+      state: 'Nordrhein-Westfalen',
+      street_address: 'Porscheplatz 1',
+      zip: '45127',
     )
 
-    location.full_address = "Porscheplatz 1, 45127 Essen, Deutschland"
-    location.precision = "address"
-    location.provider = "google"
+    location.full_address = 'Porscheplatz 1, 45127 Essen, Deutschland'
+    location.precision = 'address'
+    location.provider = 'google'
     location.success = true
     location
   end
@@ -201,12 +201,12 @@ class LatLngTest < Test::Unit::TestCase #:nodoc: all
     Geokit::Geocoders::MultiGeocoder.expects(:reverse_geocode).with(point).returns(valid_reverse_geocoding_result)
     res = point.reverse_geocode
 
-    assert_equal "Nordrhein-Westfalen", res.state
-    assert_equal "Essen", res.city
-    assert_equal "45127", res.zip
-    assert_equal "51.4578329,7.0166848", res.ll # slightly dif from yahoo
+    assert_equal 'Nordrhein-Westfalen', res.state
+    assert_equal 'Essen', res.city
+    assert_equal '45127', res.zip
+    assert_equal '51.4578329,7.0166848', res.ll # slightly dif from yahoo
     assert res.is_us? == false
-    assert_equal "Porscheplatz 1, 45127 Essen, Deutschland", res.full_address # slightly different from yahoo
+    assert_equal 'Porscheplatz 1, 45127 Essen, Deutschland', res.full_address # slightly different from yahoo
   end
 
   def test_reverse_geocoding_using_specific_geocoder
@@ -214,13 +214,13 @@ class LatLngTest < Test::Unit::TestCase #:nodoc: all
     Geokit::Geocoders::GoogleGeocoder.expects(:reverse_geocode).with(point).returns(valid_reverse_geocoding_result)
     res = point.reverse_geocode(using: Geokit::Geocoders::GoogleGeocoder)
 
-    assert_equal "Nordrhein-Westfalen", res.state
-    assert_equal "Essen", res.city
-    assert_equal "45127", res.zip
-    assert_equal "51.4578329,7.0166848", res.ll # slightly dif from yahoo
+    assert_equal 'Nordrhein-Westfalen', res.state
+    assert_equal 'Essen', res.city
+    assert_equal '45127', res.zip
+    assert_equal '51.4578329,7.0166848', res.ll # slightly dif from yahoo
     assert res.is_us? == false
-    assert_equal "Porscheplatz 1, 45127 Essen, Deutschland", res.full_address # slightly different from yahoo
-    assert_equal "google", res.provider
+    assert_equal 'Porscheplatz 1, 45127 Essen, Deutschland', res.full_address # slightly different from yahoo
+    assert_equal 'google', res.provider
   end
 
   def test_reverse_geocoding_using_specific_geocoder_short_syntax
@@ -228,13 +228,13 @@ class LatLngTest < Test::Unit::TestCase #:nodoc: all
     Geokit::Geocoders::GoogleGeocoder.expects(:reverse_geocode).with(point).returns(valid_reverse_geocoding_result)
     res = point.reverse_geocode(using: :google)
 
-    assert_equal "Nordrhein-Westfalen", res.state
-    assert_equal "Essen", res.city
-    assert_equal "45127", res.zip
-    assert_equal "51.4578329,7.0166848", res.ll # slightly dif from yahoo
+    assert_equal 'Nordrhein-Westfalen', res.state
+    assert_equal 'Essen', res.city
+    assert_equal '45127', res.zip
+    assert_equal '51.4578329,7.0166848', res.ll # slightly dif from yahoo
     assert res.is_us? == false
-    assert_equal "Porscheplatz 1, 45127 Essen, Deutschland", res.full_address # slightly different from yahoo
-    assert_equal "google", res.provider
+    assert_equal 'Porscheplatz 1, 45127 Essen, Deutschland', res.full_address # slightly different from yahoo
+    assert_equal 'google', res.provider
   end
 
   def test_to_dms
@@ -256,7 +256,7 @@ class LatLngTest < Test::Unit::TestCase #:nodoc: all
   end
 
   def test_invalid_units
-    expected_exception_message = "feet is an unsupported unit of length."
+    expected_exception_message = 'feet is an unsupported unit of length.'
 
     exception = assert_raise(ArgumentError) do
       @loc_a.distance_to(@loc_e, units: :feet)

data/test/test_map_quest.rb

@@ -1,53 +1,49 @@
-require File.join(File.dirname(__FILE__), "helper")
+require File.join(File.dirname(__FILE__), 'helper')
 
 class MapQuestGeocoderTest < BaseGeocoderTest #:nodoc: all
   def setup
     super
-    @full_address = "100 Spear St Apt. 5, San Francisco, CA, 94105-1522, US"
-    @google_full_hash = {street_address: "100 Spear St Apt. 5", city: "San Francisco", state: "CA", zip: "94105", country_code: "US"}
-    @google_city_hash = {city: "San Francisco", state: "CA"}
+    @full_address = '100 Spear St Apt. 5, San Francisco, CA, 94105-1522, US'
+    @google_full_hash = {street_address: '100 Spear St Apt. 5', city: 'San Francisco', state: 'CA', zip: '94105', country_code: 'US'}
+    @google_city_hash = {city: 'San Francisco', state: 'CA'}
 
     @google_full_loc = Geokit::GeoLoc.new(@google_full_hash)
     @google_city_loc = Geokit::GeoLoc.new(@google_city_hash)
+
+    @key = @keys['map_quest']['key']
+    geocoder_class.key = @key
+    @base_url = 'https://www.mapquestapi.com/geocoding/v1'
   end
 
   def test_map_quest_full_address_with_geo_loc
-    VCR.use_cassette("map_quest_full") do
-      key = "Fmjtd%7Cluur2d0125%2C2s%3Do5-9a8lhz"
-    Geokit::Geocoders::MapQuestGeocoder.key = key
-    url = "https://www.mapquestapi.com/geocoding/v1/address?key=#{key}&location=100+Spear+St+Apt.+5%2C+San+Francisco%2C+CA%2C+94105%2C+US"
+    url = "#{@base_url}/address?key=#{@key}&location=100+Spear+St+Apt.+5%2C+San+Francisco%2C+CA%2C+94105%2C+US"
     TestHelper.expects(:last_url).with(url)
-    res = Geokit::Geocoders::MapQuestGeocoder.geocode(@google_full_loc)
-    assert_equal "CA", res.state
-    assert_equal "San Francisco", res.city
+    res = geocode(@google_full_loc, :map_quest_full)
+    assert_equal 'CA', res.state
+    assert_equal 'San Francisco', res.city
     assert_array_in_delta [37.7921509, -122.394], res.to_a # slightly dif from yahoo
     assert res.is_us?
-    assert_equal "100 Spear St, Apt 5, San Francisco, CA, 94105-1500, US", res.full_address # slightly different from yahoo
-    assert_equal "map_quest", res.provider
-    end
+    assert_equal '100 Spear St, Apt 5, San Francisco, CA, 94105-1500, US', res.full_address # slightly different from yahoo
+    assert_equal 'map_quest', res.provider
   end
 
   def test_reverse_geocode
-    VCR.use_cassette("map_quest_reverse_madrid") do
-      madrid = Geokit::GeoLoc.new
-    madrid.lat, madrid.lng = "40.4167413", "-3.7032498"
-    key = "Fmjtd%7Cluur2d0125%2C2s%3Do5-9a8lhz"
-    Geokit::Geocoders::MapQuestGeocoder.key = key
-    url = "https://www.mapquestapi.com/geocoding/v1/reverse?key=#{key}&location=#{madrid.lat},#{madrid.lng}"
+    madrid = Geokit::GeoLoc.new
+    madrid.lat, madrid.lng = '40.4167413', '-3.7032498'
+    url = "#{@base_url}/reverse?key=#{@key}&location=#{madrid.lat},#{madrid.lng}"
     TestHelper.expects(:last_url).with(url)
-    res = Geokit::Geocoders::MapQuestGeocoder.do_reverse_geocode(madrid.ll)
+    res = reverse_geocode(madrid.ll, :map_quest_reverse_madrid)
 
     assert_equal madrid.lat.to_s.slice(1..5), res.lat.to_s.slice(1..5)
     assert_equal madrid.lng.to_s.slice(1..5), res.lng.to_s.slice(1..5)
-    assert_equal "ES", res.country_code
-    assert_equal "map_quest", res.provider
+    assert_equal 'ES', res.country_code
+    assert_equal 'map_quest', res.provider
 
-    assert_equal "Madrid", res.city
-    assert_equal "Comunidad de Madrid", res.state
+    assert_equal 'Madrid', res.city
+    assert_equal 'Comunidad de Madrid', res.state
 
     assert_equal nil, res.country
-    assert_equal "28014", res.zip
+    assert_equal '28014', res.zip
     assert_equal true, res.success
-    end
   end
 end

data/test/test_mapbox_geocoder.rb

@@ -1,44 +1,54 @@
-require File.join(File.dirname(__FILE__), "helper")
-
-Geokit::Geocoders::MapboxGeocoder.key = ""
+require File.join(File.dirname(__FILE__), 'helper')
 
 class MapboxGeocoderTest < BaseGeocoderTest #:nodoc: all
   def setup
+    geocoder_class.key = ''
     super
-    @address = "1714 14th Street NW, Washington, DC"
+    @address = '1714 14th Street NW, Washington, DC'
     @latlng = Geokit::LatLng.new(38.913175, -77.032458)
-    @city = "Washington, DC"
+    @city = 'Washington, DC'
+    @state = 'District of Columbia'
+
+    geocoder_class.key = @keys['mapbox']['key']
   end
 
   def test_forward_geocode
-    VCR.use_cassette("mapbox_forward_geocode") do
-      res = Geokit::Geocoders::MapboxGeocoder.geocode(@address)
-      assert_equal 38.913184, res.lat
-      assert_equal(-77.031952, res.lng)
-      assert_equal "United States", res.country
-      assert_equal "District of Columbia", res.state
-      assert_equal "20009", res.zip
-    end
+    res = geocode(@address, :mapbox_forward_geocode)
+    assert_equal 38.913184, res.lat
+    assert_equal(-77.031952, res.lng)
+    assert_equal 'United States', res.country
+    assert_equal 'District of Columbia', res.state
+    assert_equal '20009', res.zip
+    assert_equal 'zip', res.precision
   end
 
   def test_reverse_geocode
-    VCR.use_cassette("mapbox_reverse_geocode") do
-      res = Geokit::Geocoders::MapboxGeocoder.reverse_geocode(@latlng)
-      assert_equal "United States", res.country
-      assert_equal "District of Columbia", res.state
-      assert_equal "20009", res.zip
-    end
+    res = reverse_geocode(@latlng, :mapbox_reverse_geocode)
+    assert_equal 'United States', res.country
+    assert_equal 'District of Columbia', res.state
+    assert_equal '20009', res.zip
+    assert_equal 'zip', res.precision
   end
 
   def test_city_only
-    VCR.use_cassette("mapbox_forward_geocode_city_only") do
-      res = Geokit::Geocoders::MapboxGeocoder.geocode(@city)
-      assert_equal 38.8951, res.lat
-      assert_equal(-77.0364, res.lng)
-      assert_equal "United States", res.country
-      assert_equal "District of Columbia", res.state
-      assert_equal "Washington", res.city
-      assert_equal "20004", res.zip
-    end
+    res = geocode(@city, :mapbox_forward_geocode_city_only)
+    assert_equal 38.895, res.lat
+    assert_equal(-77.0366, res.lng)
+    assert_equal 'United States', res.country
+    assert_equal 'District of Columbia', res.state
+    assert_equal 'Washington', res.city
+    assert_equal '20004', res.zip
+    assert_equal 'zip', res.precision
+  end
+
+  def test_state_only
+    res = geocode(@state, :mapbox_forward_geocode_state_only)
+    assert_equal 38.89657, res.lat
+    assert_equal(-76.990661, res.lng)
+    assert_equal 'United States', res.country
+    assert_equal 'District of Columbia', res.state
+    assert_nil res.city
+    assert_nil res.zip
+    assert_equal 'state', res.precision
   end
 end

data/test/test_mappable.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "helper")
+require File.join(File.dirname(__FILE__), 'helper')
 
 # Test distances from http://www.csgnetwork.com/degreelenllavcalc.html
 class MappableTest < Test::Unit::TestCase #:nodoc: all
@@ -66,6 +66,6 @@ class MappableTest < Test::Unit::TestCase #:nodoc: all
     exception = assert_raise(ArgumentError) do
       TestMappable.get_units!(units: :feet)
     end
-    assert_equal "feet is an unsupported unit of length.", exception.message
+    assert_equal 'feet is an unsupported unit of length.', exception.message
   end
 end

data/test/test_maxmind_geocoder.rb

@@ -1,9 +1,9 @@
-require File.join(File.dirname(__FILE__), "helper")
+require File.join(File.dirname(__FILE__), 'helper')
 
 class MaxmindGeocoderTest < BaseGeocoderTest #:nodoc: all
   def setup
     super
-    @ip = "118.210.47.142"
+    @ip = '118.210.47.142'
   end
 
   def test_ip_from_autralia
@@ -13,14 +13,14 @@ class MaxmindGeocoderTest < BaseGeocoderTest #:nodoc: all
     location.expects(:city).with(@ip).returns(city)
     city.stubs(:latitude).returns(-34.9287)
     city.stubs(:longitude).returns(138.5986)
-    city.stubs(:city_name).returns("Adelaide")
-    city.stubs(:region_name).returns("Australia")
-    city.stubs(:postal_code).returns("")
-    city.stubs(:country_code2).returns("AU")
+    city.stubs(:city_name).returns('Adelaide')
+    city.stubs(:region_name).returns('Australia')
+    city.stubs(:postal_code).returns('')
+    city.stubs(:country_code2).returns('AU')
 
-    res = Geokit::Geocoders::MaxmindGeocoder.geocode(@ip)
-    assert_equal "Adelaide", res.city
-    assert_equal "AU", res.country_code
+    res = geocode(@ip)
+    assert_equal 'Adelaide', res.city
+    assert_equal 'AU', res.country_code
     assert_equal true, res.success
     assert res.city
   end
@@ -32,14 +32,14 @@ class MaxmindGeocoderTest < BaseGeocoderTest #:nodoc: all
     location.expects(:city).with(@ip).returns(city)
     city.stubs(:latitude).returns(-34)
     city.stubs(:longitude).returns(-56)
-    city.stubs(:city_name).returns("Canelones")
-    city.stubs(:region_name).returns("")
-    city.stubs(:postal_code).returns("")
-    city.stubs(:country_code2).returns("UR")
+    city.stubs(:city_name).returns('Canelones')
+    city.stubs(:region_name).returns('')
+    city.stubs(:postal_code).returns('')
+    city.stubs(:country_code2).returns('UR')
 
-    res = Geokit::Geocoders::MaxmindGeocoder.geocode(@ip)
-    assert_equal "Canelones", res.city
-    assert_equal "UR", res.country_code
+    res = geocode(@ip)
+    assert_equal 'Canelones', res.city
+    assert_equal 'UR', res.country_code
     assert_equal true, res.success
     assert res.city
   end