geokit 1.10.0 → 1.11.0

data/test/test_bounds.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "helper")
+require File.join(File.dirname(__FILE__), 'helper')
 
 class BoundsTest < Test::Unit::TestCase #:nodoc: all
   def setup

data/test/test_ca_geocoder.rb

@@ -1,6 +1,4 @@
-require File.join(File.dirname(__FILE__), "helper")
-
-Geokit::Geocoders::CaGeocoder.key = "SOMEKEYVALUE"
+require File.join(File.dirname(__FILE__), 'helper')
 
 class CaGeocoderTest < BaseGeocoderTest #:nodoc: all
   CA_SUCCESS = <<-EOF
@@ -12,32 +10,34 @@ class CaGeocoderTest < BaseGeocoderTest #:nodoc: all
   EOF
 
   def setup
-    @ca_full_hash = { street_address: "2105 West 32nd Avenue",
-                      city: "Vancouver", province: "BC", state: "BC" }
-    @ca_full_txt = "2105 West 32nd Avenue Vancouver BC"
+    geocoder_class.key = 'SOMEKEYVALUE'
+    @ca_full_hash = { street_address: '2105 West 32nd Avenue',
+                      city: 'Vancouver', state: 'BC' }
+    @ca_full_txt = '2105 West 32nd Avenue Vancouver BC'
   end
 
   def test_geocoder_with_geo_loc_with_account
     response = MockSuccess.new
     response.expects(:body).returns(CA_SUCCESS)
-    url = "http://geocoder.ca/?locate=2105+West+32nd+Avenue+Vancouver+BC&auth=SOMEKEYVALUE&geoit=xml"
-    Geokit::Geocoders::CaGeocoder.expects(:call_geocoder_service).with(url).returns(response)
-    verify(Geokit::Geocoders::CaGeocoder.geocode(@ca_full_txt))
+    url = 'http://geocoder.ca/?locate=2105+West+32nd+Avenue+Vancouver+BC&auth=SOMEKEYVALUE&geoit=xml'
+    geocoder_class.expects(:call_geocoder_service).with(url).returns(response)
+    verify(geocode(@ca_full_txt))
   end
 
   def test_service_unavailable
     response = MockFailure.new
-    url = "http://geocoder.ca/?locate=2105+West+32nd+Avenue+Vancouver+BC&auth=SOMEKEYVALUE&geoit=xml"
-    Geokit::Geocoders::CaGeocoder.expects(:call_geocoder_service).with(url).returns(response)
-    assert !Geokit::Geocoders::CaGeocoder.geocode(@ca_full_txt).success
+    url = 'http://geocoder.ca/?locate=2105+West+32nd+Avenue+Vancouver+BC&auth=SOMEKEYVALUE&geoit=xml'
+    geocoder_class.expects(:call_geocoder_service).with(url).returns(response)
+    assert !geocode(@ca_full_txt).success
   end
 
   private
 
   def verify(location)
-    assert_equal "BC", location.province
-    assert_equal "Vancouver", location.city
-    assert_equal "49.243086,-123.153684", location.ll
+    assert_equal 'BC', location.state
+    assert_equal 'BC', location.province # alias
+    assert_equal 'Vancouver', location.city
+    assert_equal '49.243086,-123.153684', location.ll
     assert !location.is_us?
   end
 end

data/test/test_fcc_geocoder.rb

@@ -1,23 +1,22 @@
-require File.join(File.dirname(__FILE__), "helper")
+require File.join(File.dirname(__FILE__), 'helper')
 
 class FCCGeocoderTest < BaseGeocoderTest #:nodoc: all
   def setup
     super
     @la = Geokit::LatLng.new(34.05, -118.25)
+    @base_url = 'https://data.fcc.gov/api/block/find'
   end
 
   def assert_url(expected_url)
-    assert_equal expected_url, TestHelper.get_last_url.gsub(/&oauth_[a-z_]+=[a-zA-Z0-9\-. %]+/, "").gsub("%20", "+")
+    assert_equal expected_url, TestHelper.last_url.gsub(/&oauth_[a-z_]+=[a-zA-Z0-9\-. %]+/, '').gsub('%20', '+')
   end
 
   def test_fcc_reverse_geocode
-    VCR.use_cassette("fcc_reverse_geocode") do
-      url = "https://data.fcc.gov/api/block/find?format=json&latitude=34.05&longitude=-118.25"
-    res = Geokit::Geocoders::FCCGeocoder.reverse_geocode(@la)
+    url = "#{@base_url}?format=json&latitude=34.05&longitude=-118.25"
+    res = reverse_geocode(@la, :fcc_reverse_geocode)
     assert_url url
-    assert_equal res.country_code, "US"
-    assert_equal res.state, "CA"
-    assert_equal res.district, "Los Angeles"
-    end
+    assert_equal res.country_code, 'US'
+    assert_equal res.state, 'CA'
+    assert_equal res.district, 'Los Angeles'
   end
 end

data/test/test_free_geo_ip_geocoder.rb

@@ -1,23 +1,21 @@
-require File.join(File.dirname(__FILE__), "helper")
+require File.join(File.dirname(__FILE__), 'helper')
 
 class FreeGeoIpGeocoderTest < BaseGeocoderTest #:nodoc: all
   def setup
     super
-    @ip = "74.125.237.209"
+    @ip = '74.125.237.209'
   end
 
   def assert_url(expected_url)
-    assert_equal expected_url, TestHelper.get_last_url.gsub(/&oauth_[a-z_]+=[a-zA-Z0-9\-. %]+/, "").gsub("%20", "+")
+    assert_equal expected_url, TestHelper.last_url.gsub(/&oauth_[a-z_]+=[a-zA-Z0-9\-. %]+/, '').gsub('%20', '+')
   end
 
   def test_free_geo_ip_geocode
-    VCR.use_cassette("free_geo_ip_geocode") do
-      url = "http://freegeoip.net/xml/#{@ip}"
-    res = Geokit::Geocoders::FreeGeoIpGeocoder.geocode(@ip)
+    url = "http://freegeoip.net/xml/#{@ip}"
+    res = geocode(@ip, :free_geo_ip_geocode)
     assert_url url
-    assert_equal res.city, "Mountain View"
-    assert_equal res.state, "CA"
-    assert_equal res.country_code, "US"
-    end
+    assert_equal res.city, 'Mountain View'
+    assert_equal res.state, 'CA'
+    assert_equal res.country_code, 'US'
   end
 end

data/test/test_geo_plugin_geocoder.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "helper")
+require File.join(File.dirname(__FILE__), 'helper')
 
 class GeoPluginGeocoderTest < BaseGeocoderTest #:nodoc: all
   IP_SUCCESS = <<-EOF
@@ -21,52 +21,51 @@ class GeoPluginGeocoderTest < BaseGeocoderTest #:nodoc: all
 
   def setup
     super
-    @ip = "74.125.237.209"
-    @success.provider = "geo_plugin"
+    @ip = '74.125.237.209'
+    @success.provider = 'geo_plugin'
+    @base_url = 'http://www.geoplugin.net/xml.gp'
   end
 
   def assert_url(expected_url)
-    assert_equal expected_url, TestHelper.get_last_url.gsub(/&oauth_[a-z_]+=[a-zA-Z0-9\-. %]+/, "").gsub("%20", "+")
+    assert_equal expected_url, TestHelper.last_url.gsub(/&oauth_[a-z_]+=[a-zA-Z0-9\-. %]+/, '').gsub('%20', '+')
   end
 
   def test_geo_plugin_geocode
-    VCR.use_cassette("geo_plugin_geocode") do
-      url = "http://www.geoplugin.net/xml.gp?ip=#{@ip}"
-    res = Geokit::Geocoders::GeoPluginGeocoder.geocode(@ip)
+    url = "#{@base_url}?ip=#{@ip}"
+    res = geocode(@ip, :geo_plugin_geocode)
     assert_url url
-    assert_equal res.city, "Mountain View"
-    assert_equal res.state, "CA"
-    assert_equal res.country_code, "US"
-    end
+    assert_equal res.city, 'Mountain View'
+    assert_equal res.state, 'CA'
+    assert_equal res.country_code, 'US'
   end
 
   def test_successful_lookup
     success = MockSuccess.new
     success.expects(:body).returns(IP_SUCCESS)
-    url = "http://www.geoplugin.net/xml.gp?ip=200.150.38.66"
-    Geokit::Geocoders::GeoPluginGeocoder.expects(:call_geocoder_service).with(url).returns(success)
-    location = Geokit::Geocoders::GeoPluginGeocoder.geocode("200.150.38.66")
+    url = "#{@base_url}?ip=200.150.38.66"
+    geocoder_class.expects(:call_geocoder_service).with(url).returns(success)
+    location = geocode('200.150.38.66')
     assert_not_nil location
     assert_equal(-19.916700, location.lat)
     assert_equal(-43.933300, location.lng)
-    assert_equal "Belo Horizonte", location.city
-    assert_equal "Minas Gerais", location.state
-    assert_equal "BR", location.country_code
-    assert_equal "geo_plugin", location.provider
+    assert_equal 'Belo Horizonte', location.city
+    assert_equal 'Minas Gerais', location.state
+    assert_equal 'BR', location.country_code
+    assert_equal 'geo_plugin', location.provider
     assert location.success?
   end
 
   def test_invalid_ip
-    location = Geokit::Geocoders::GeoPluginGeocoder.geocode("pixrum")
+    location = geocode('pixrum')
     assert_not_nil location
     assert !location.success?
   end
 
   def test_service_unavailable
     failure = MockFailure.new
-    url = "http://www.geoplugin.net/xml.gp?ip=69.10.10.10"
-    Geokit::Geocoders::GeoPluginGeocoder.expects(:call_geocoder_service).with(url).returns(failure)
-    location = Geokit::Geocoders::GeoPluginGeocoder.geocode("69.10.10.10")
+    url = "#{@base_url}?ip=69.10.10.10"
+    geocoder_class.expects(:call_geocoder_service).with(url).returns(failure)
+    location = geocode('69.10.10.10')
     assert_not_nil location
     assert !location.success?
   end

data/test/test_geobytes_geocoder.rb

@@ -1,22 +1,20 @@
-require File.join(File.dirname(__FILE__), "helper")
+require File.join(File.dirname(__FILE__), 'helper')
 class GeobytesGeocoderTest < BaseGeocoderTest #:nodoc: all
   def setup
     super
-    @ip = "12.12.12.12"
+    @ip = '12.12.12.12'
   end
 
   def assert_url(expected_url)
-    assert_equal expected_url, TestHelper.get_last_url.gsub(/&oauth_[a-z_]+=[a-zA-Z0-9\-. %]+/, "").gsub("%20", "+")
+    assert_equal expected_url, TestHelper.last_url.gsub(/&oauth_[a-z_]+=[a-zA-Z0-9\-. %]+/, '').gsub('%20', '+')
   end
 
   def test_geobytes_geocoder
-    VCR.use_cassette("geobytes_geocode") do
-      url = "http://getcitydetails.geobytes.com/GetCityDetails?fqcn=#{@ip}"
-      res = Geokit::Geocoders::GeobytesGeocoder.geocode(@ip)
-      assert_url url
-      assert_equal res.city, "New York"
-      assert_equal res.state, "NY"
-      assert_equal res.country_code, "US"
-    end
+    url = "http://getcitydetails.geobytes.com/GetCityDetails?fqcn=#{@ip}"
+    res = geocode(@ip, :geobytes_geocode)
+    assert_url url
+    assert_equal res.city, 'New York'
+    assert_equal res.state, 'NY'
+    assert_equal res.country_code, 'US'
   end
 end

data/test/test_geocodio_geocoder.rb

@@ -1,32 +1,30 @@
-require File.join(File.dirname(__FILE__), "helper")
-
-Geokit::Geocoders::GeocodioGeocoder.key = "723d41115152d224fd74727df34727c444537f7"
+require File.join(File.dirname(__FILE__), 'helper')
 
 class GeocodioGeocoderTest < BaseGeocoderTest #:nodoc: all
   def setup
     super
-    @full_address = "1 Infinite Loop, Cupertino, CA 95014"
-    @second_address = "300 Brannan St, San Francisco, CA 94107"
+    @full_address = '1 Infinite Loop, Cupertino, CA 95014'
+    @second_address = '300 Brannan St, San Francisco, CA 94107'
+
+    geocoder_class.key = @keys['geocodio']['key']
   end
 
   def assert_url(expected_url)
-    assert_equal expected_url, TestHelper.get_last_url.gsub(/&oauth_[a-z_]+=[a-zA-Z0-9\-. %]+/, "").gsub("%20", "+")
+    assert_equal expected_url, TestHelper.last_url.gsub(/&oauth_[a-z_]+=[a-zA-Z0-9\-. %]+/, '').gsub('%20', '+')
   end
 
   def test_geocodio_geocode
-    VCR.use_cassette("geocodio_geocode") do
-      res = Geokit::Geocoders::GeocodioGeocoder.geocode(@full_address)
-      url = "http://api.geocod.io/v1/geocode?q=#{Geokit::Inflector.url_escape(@full_address)}&api_key=723d41115152d224fd74727df34727c444537f7"
+    res = geocode(@full_address, :geocodio_geocode)
+    url = "http://api.geocod.io/v1/geocode?q=#{escape(@full_address)}&api_key=723d41115152d224fd74727df34727c444537f7"
 
-      assert_url url
+    assert_url url
 
-      verify(res)
-    end
+    verify(res)
   end
 
   def verify(location)
-    assert_equal location.city, "Cupertino"
-    assert_equal location.zip, "95014"
+    assert_equal location.city, 'Cupertino'
+    assert_equal location.zip, '95014'
     assert_equal location.lat, 37.331669
     assert_equal location.lng, -122.03074
   end

data/test/test_geoloc.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "helper")
+require File.join(File.dirname(__FILE__), 'helper')
 
 class GeoLocTest < Test::Unit::TestCase #:nodoc: all
   def setup
@@ -7,7 +7,7 @@ class GeoLocTest < Test::Unit::TestCase #:nodoc: all
 
   def test_is_us
     assert !@loc.is_us?
-    @loc.country_code = "US"
+    @loc.country_code = 'US'
     assert @loc.is_us?
   end
 
@@ -20,44 +20,44 @@ class GeoLocTest < Test::Unit::TestCase #:nodoc: all
   end
 
   def test_street_number
-    @loc.street_address = "123 Spear St."
-    assert_equal "123", @loc.street_number
+    @loc.street_address = '123 Spear St.'
+    assert_equal '123', @loc.street_number
   end
 
   def test_street_name
-    @loc.street_address = "123 Spear St."
-    assert_equal "Spear St.", @loc.street_name
+    @loc.street_address = '123 Spear St.'
+    assert_equal 'Spear St.', @loc.street_name
   end
 
   def test_city
-    @loc.city = "san francisco"
-    assert_equal "San Francisco", @loc.city
+    @loc.city = 'san francisco'
+    assert_equal 'San Francisco', @loc.city
   end
 
   def test_full_address
-    @loc.city = "San Francisco"
-    @loc.state = "CA"
-    @loc.zip = "94105"
-    @loc.country_code = "US"
-    assert_equal "San Francisco, CA, 94105, US", @loc.full_address
-    @loc.full_address = "Irving, TX, 75063, US"
-    assert_equal "Irving, TX, 75063, US", @loc.full_address
+    @loc.city = 'San Francisco'
+    @loc.state = 'CA'
+    @loc.zip = '94105'
+    @loc.country_code = 'US'
+    assert_equal 'San Francisco, CA, 94105, US', @loc.full_address
+    @loc.full_address = 'Irving, TX, 75063, US'
+    assert_equal 'Irving, TX, 75063, US', @loc.full_address
   end
 
   def test_formatted_address
     @loc.formatted_address = nil
-    @loc.full_address = "Irving, TX, 75063, US"
-    assert_equal "Irving, TX, 75063, US", @loc.formatted_address
-    @loc.formatted_address = "San Francisco, CA, 94105, US"
-    @loc.full_address = "Irving, TX, 75063, US"
-    assert_equal "San Francisco, CA, 94105, US", @loc.formatted_address
+    @loc.full_address = 'Irving, TX, 75063, US'
+    assert_equal 'Irving, TX, 75063, US', @loc.formatted_address
+    @loc.formatted_address = 'San Francisco, CA, 94105, US'
+    @loc.full_address = 'Irving, TX, 75063, US'
+    assert_equal 'San Francisco, CA, 94105, US', @loc.formatted_address
   end
 
   def test_hash
-    @loc.city = "San Francisco"
-    @loc.state = "CA"
-    @loc.zip = "94105"
-    @loc.country_code = "US"
+    @loc.city = 'San Francisco'
+    @loc.state = 'CA'
+    @loc.zip = '94105'
+    @loc.country_code = 'US'
     @another = Geokit::GeoLoc.new @loc.to_hash
     assert_equal @loc, @another
   end
@@ -67,46 +67,45 @@ class GeoLocTest < Test::Unit::TestCase #:nodoc: all
   end
 
   def test_to_yaml
-    @loc.city = "San Francisco"
-    @loc.state_code = "CA"
-    @loc.zip = "94105"
-    @loc.country_code = "US"
+    @loc.city = 'San Francisco'
+    @loc.state_code = 'CA'
+    @loc.zip = '94105'
+    @loc.country_code = 'US'
 
     yaml = YAML.parse(@loc.to_yaml)
     case yaml.class.to_s
-    when "YAML::Syck::Map", "Syck::Map"
+    when 'YAML::Syck::Map', 'Syck::Map'
       tag = yaml.type_id
       children = yaml.value.sort_by { |k, _| k.value }.flatten.map(&:value)
-    when "Psych::Nodes::Mapping"
+    when 'Psych::Nodes::Mapping'
       tag = yaml.tag
       children = yaml.children.map(&:value)
-    when "Psych::Nodes::Document"
+    when 'Psych::Nodes::Document'
       tag = yaml.root.tag
       children = yaml.root.children.map(&:value)
     end
     assert_match(/.*object:Geokit::GeoLoc$/, tag)
     assert_equal [
-      "city", "San Francisco",
-      "country_code", "US",
-      "full_address", "",
-      "lat", "",
-      "lng", "",
-      "precision", "unknown",
-      "province", "",
-      "state", "",
-      "state_code", "CA",
-      "state_name", "",
-      "street_address", "",
-      "street_name", "",
-      "street_number", "",
-      "sub_premise", "",
-      "success", "false",
-      "zip", "94105"
+      'city', 'San Francisco',
+      'country_code', 'US',
+      'full_address', '',
+      'lat', '',
+      'lng', '',
+      'precision', 'unknown',
+      'state', '',
+      'state_code', 'CA',
+      'state_name', '',
+      'street_address', '',
+      'street_name', '',
+      'street_number', '',
+      'sub_premise', '',
+      'success', 'false',
+      'zip', '94105'
     ], children
   end
 
   def test_neighborhood
-    @loc.neighborhood = "SoMa"
-    assert_equal @loc.neighborhood, "SoMa"
+    @loc.neighborhood = 'SoMa'
+    assert_equal @loc.neighborhood, 'SoMa'
   end
 end

data/test/test_geonames_geocoder.rb

@@ -1,45 +1,41 @@
-require File.join(File.dirname(__FILE__), "helper")
+require File.join(File.dirname(__FILE__), 'helper')
 
 class GeonamesGeocoderTest < BaseGeocoderTest #:nodoc: all
   def setup
     super
-    @city = "Adelaide"
-    Geokit::Geocoders::GeonamesGeocoder.key = "demo"
+    @city = 'Adelaide'
+    geocoder_class.key = 'demo'
   end
 
   def assert_url(expected_url)
-    assert_equal expected_url, TestHelper.get_last_url.gsub(/&oauth_[a-z_]+=[a-zA-Z0-9\-. %]+/, "").gsub("%20", "+")
+    assert_equal expected_url, TestHelper.last_url.gsub(/&oauth_[a-z_]+=[a-zA-Z0-9\-. %]+/, '').gsub('%20', '+')
   end
 
   def test_geonames_missing_key
-    Geokit::Geocoders::GeonamesGeocoder.key = nil
+    geocoder_class.key = nil
     exception = assert_raise(Geokit::Geocoders::GeocodeError) do
-      Geokit::Geocoders::GeonamesGeocoder.geocode(@city)
+      geocode(@city)
     end
-    assert_equal("Geonames requires a key to use their service.", exception.message)
+    assert_equal('Geonames requires a key to use their service.', exception.message)
   end
 
   def test_geonames_geocode
-    VCR.use_cassette("geonames_geocode") do
-      url = "http://api.geonames.org/postalCodeSearch?placename=#{@city}&maxRows=10&username=demo"
-      res = Geokit::Geocoders::GeonamesGeocoder.geocode(@city)
-      assert_url url
-      assert_equal res.country_code, "AU"
-      assert_equal res.state, "SA"
-      assert_equal res.state_name, "South Australia"
-      assert_equal res.state_code, "SA"
-      assert_equal res.city, "Adelaide"
-    end
+    url = "http://api.geonames.org/postalCodeSearch?placename=#{@city}&maxRows=10&username=demo"
+    res = geocode(@city, :geonames_geocode)
+    assert_url url
+    assert_equal res.country_code, 'AU'
+    assert_equal res.state, 'SA'
+    assert_equal res.state_name, 'South Australia'
+    assert_equal res.state_code, 'SA'
+    assert_equal res.city, 'Adelaide'
   end
 
   def test_geonames_geocode_premium
     # note this test will not actually return results because a valid premium
     # username is required so we are just testing if the url is correct
-    Geokit::Geocoders::GeonamesGeocoder.premium = true
-    VCR.use_cassette("geonames_geocode_premium") do
-      url = "http://ws.geonames.net/postalCodeSearch?placename=#{@city}&maxRows=10&username=demo"
-      Geokit::Geocoders::GeonamesGeocoder.geocode(@city)
-      assert_url url
-    end
+    geocoder_class.premium = true
+    url = "http://ws.geonames.net/postalCodeSearch?placename=#{@city}&maxRows=10&username=demo"
+    geocode(@city, :geonames_geocode_premium)
+    assert_url url
   end
 end