geokit 1.8.5 → 1.9.0

data/lib/geokit/version.rb

@@ -1,3 +1,3 @@
 module Geokit
-  VERSION = '1.8.5'
+  VERSION = '1.9.0'
 end

data/test/helper.rb

@@ -17,7 +17,10 @@ if ENV['COVERAGE']
   require 'coveralls'
   Coveralls.wear!
 
-  SimpleCov.formatter = Coveralls::SimpleCov::Formatter
+  SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
+    SimpleCov::Formatter::RcovFormatter,
+    Coveralls::SimpleCov::Formatter
+  ]
   SimpleCov.start do
     add_filter '/test/'
     add_group 'lib', 'lib'
@@ -26,7 +29,7 @@ if ENV['COVERAGE']
     SimpleCov.result.format!
     percent = SimpleCov.result.covered_percent
     unless percent >= COVERAGE_THRESHOLD
-      puts "Coverage must be above #{COVERAGE_THRESHOLD}%. It is #{"%.2f" % percent}%"
+      puts "Coverage must be above #{COVERAGE_THRESHOLD}%. It is #{'%.2f' % percent}%"
       Kernel.exit(1)
     end
   end
@@ -36,7 +39,7 @@ require 'test/unit'
 require 'mocha/setup'
 require 'net/http'
 
-require File.join(File.dirname(__FILE__), "../lib/geokit.rb")
+require File.join(File.dirname(__FILE__), '../lib/geokit.rb')
 
 class MockSuccess < Net::HTTPSuccess #:nodoc: all
   def initialize
@@ -75,7 +78,7 @@ Geokit::Geocoders::Geocoder.class_eval do
   end
 end
 
-def assert_array_in_delta(expected_array, actual_array, delta = 0.001, message='')
+def assert_array_in_delta(expected_array, actual_array, delta = 0.001, message = '')
   full_message = build_message(message, "<?> and\n<?> expected to be within\n<?> of each other.\n", expected_array, actual_array, delta)
   assert_block(full_message) do
     expected_array.zip(actual_array).all?{|expected_item, actual_item|
@@ -91,7 +94,7 @@ VCR.configure do |c|
   c.hook_into :webmock # or :fakeweb
   # Yahoo BOSS Ignore changing params
   c.default_cassette_options = {
-    :match_requests_on => [:method,
+    match_requests_on: [:method,
       VCR.request_matchers.uri_without_params(
         :oauth_nonce, :oauth_timestamp, :oauth_signature
       )
@@ -101,7 +104,6 @@ end
 
 # Base class for testing geocoders.
 class BaseGeocoderTest < Test::Unit::TestCase #:nodoc: all
-
   class Geokit::Geocoders::TestGeocoder < Geokit::Geocoders::Geocoder
     def self.do_get(url)
       sleep(2)
@@ -110,25 +112,25 @@ class BaseGeocoderTest < Test::Unit::TestCase #:nodoc: all
 
   # Defines common test fixtures.
   def setup
-    Geokit::Geocoders::request_timeout = 10
+    Geokit::Geocoders.request_timeout = 10
     @address = 'San Francisco, CA'
     @full_address = '100 Spear St, San Francisco, CA, 94105-1522, US'
     @full_address_short_zip = '100 Spear St, San Francisco, CA, 94105, US'
 
     @latlng = Geokit::LatLng.new(37.7742, -122.417068)
-    @success = Geokit::GeoLoc.new({:city=>"SAN FRANCISCO", :state=>"CA", :country_code=>"US", :lat=>@latlng.lat, :lng=>@latlng.lng})
+    @success = Geokit::GeoLoc.new({city: 'SAN FRANCISCO', state: 'CA', country_code: 'US', lat: @latlng.lat, lng: @latlng.lng})
     @success.success = true
   end
 
   def test_timeout_call_web_service
-    url = "http://www.anything.com"
-    Geokit::Geocoders::request_timeout = 1
+    url = 'http://www.anything.com'
+    Geokit::Geocoders.request_timeout = 1
     assert_nil Geokit::Geocoders::TestGeocoder.call_geocoder_service(url)
   end
 
   def test_successful_call_web_service
-    url = "http://www.anything.com"
-    Geokit::Geocoders::Geocoder.expects(:do_get).with(url).returns("SUCCESS")
-    assert_equal "SUCCESS", Geokit::Geocoders::Geocoder.call_geocoder_service(url)
+    url = 'http://www.anything.com'
+    Geokit::Geocoders::Geocoder.expects(:do_get).with(url).returns('SUCCESS')
+    assert_equal 'SUCCESS', Geokit::Geocoders::Geocoder.call_geocoder_service(url)
   end
 end

data/test/test_base_geocoder.rb

@@ -2,7 +2,6 @@ require File.join(File.dirname(__FILE__), 'helper')
 
 # Base class for testing geocoders.
 class BaseGeocoderTest < Test::Unit::TestCase #:nodoc: all
-
   class Geokit::Geocoders::TestGeocoder < Geokit::Geocoders::Geocoder
     def self.do_get(url)
       sleep(2)
@@ -16,19 +15,19 @@ class BaseGeocoderTest < Test::Unit::TestCase #:nodoc: all
     @full_address_short_zip = '100 Spear St, San Francisco, CA, 94105, US'
 
     @latlng = Geokit::LatLng.new(37.7742, -122.417068)
-    @success = Geokit::GeoLoc.new({:city=>"SAN FRANCISCO", :state=>"CA", :country_code=>"US", :lat=>@latlng.lat, :lng=>@latlng.lng})
+    @success = Geokit::GeoLoc.new({city: 'SAN FRANCISCO', state: 'CA', country_code: 'US', lat: @latlng.lat, lng: @latlng.lng})
     @success.success = true
   end
 
   def test_timeout_call_web_service
-    url = "http://www.anything.com"
-    Geokit::Geocoders::request_timeout = 1
+    url = 'http://www.anything.com'
+    Geokit::Geocoders.request_timeout = 1
     assert_nil Geokit::Geocoders::TestGeocoder.call_geocoder_service(url)
   end
 
   def test_successful_call_web_service
-    url = "http://www.anything.com"
-    Geokit::Geocoders::Geocoder.expects(:do_get).with(url).returns("SUCCESS")
-    assert_equal "SUCCESS", Geokit::Geocoders::Geocoder.call_geocoder_service(url)
+    url = 'http://www.anything.com'
+    Geokit::Geocoders::Geocoder.expects(:do_get).with(url).returns('SUCCESS')
+    assert_equal 'SUCCESS', Geokit::Geocoders::Geocoder.call_geocoder_service(url)
   end
 end

data/test/test_bing_geocoder.rb

@@ -3,7 +3,6 @@ require File.join(File.dirname(__FILE__), 'helper')
 Geokit::Geocoders::BingGeocoder.key = 'AuWcmtBIoPeOubm9BtcN44hTmWw_wNoJ5NEO2L0RaKrGAUE_nlwciKAqwapdq7k7'
 
 class BingGeocoderTest < BaseGeocoderTest #:nodoc: all
-
   def setup
     super
   end
@@ -15,15 +14,15 @@ class BingGeocoderTest < BaseGeocoderTest #:nodoc: all
   # the testing methods themselves
   def test_bing_full_address
     VCR.use_cassette('bing_full') do
-    key = Geokit::Geocoders::BingGeocoder.key
+      key = Geokit::Geocoders::BingGeocoder.key
     url = "https://dev.virtualearth.net/REST/v1/Locations/#{URI.escape(@full_address)}?key=#{key}&o=xml"
     res = Geokit::Geocoders::BingGeocoder.geocode(@full_address)
-    assert_equal "CA", res.state
-    assert_equal "San Francisco", res.city
+    assert_equal 'CA', res.state
+    assert_equal 'San Francisco', res.city
     assert_array_in_delta [37.792332, -122.393791], res.to_a
     assert res.country == 'United States'
-    assert_equal "100 Spear St, San Francisco, CA 94105", res.full_address
-    assert_equal "bing", res.provider
+    assert_equal '100 Spear St, San Francisco, CA 94105', res.full_address
+    assert_equal 'bing', res.provider
     assert_url url
     end
   end
@@ -31,32 +30,32 @@ class BingGeocoderTest < BaseGeocoderTest #:nodoc: all
   def test_bing_full_address_au
     address = '440 King William Street, Adelaide, Australia'
     VCR.use_cassette('bing_full_au') do
-    key = Geokit::Geocoders::BingGeocoder.key
+      key = Geokit::Geocoders::BingGeocoder.key
     url = "https://dev.virtualearth.net/REST/v1/Locations/#{URI.escape(address)}?key=#{key}&o=xml"
     res = Geokit::Geocoders::BingGeocoder.geocode(address)
-    assert_equal "SA", res.state
-    assert_equal "Adelaide", res.city
+    assert_equal 'SA', res.state
+    assert_equal 'Adelaide', res.city
     assert_array_in_delta [-34.934582, 138.600784], res.to_a
     assert res.country == 'Australia'
-    assert_equal "402-440 King William St, Adelaide, SA 5000", res.full_address
-    assert_equal "Australia", res.country
-    assert_equal "bing", res.provider
+    assert_equal '402-440 King William St, Adelaide, SA 5000', res.full_address
+    assert_equal 'Australia', res.country
+    assert_equal 'bing', res.provider
     assert_url url
     end
   end
 
   def test_bing_full_address_de
-    address = "Platz der Republik 1, 11011 Berlin, Germany"
+    address = 'Platz der Republik 1, 11011 Berlin, Germany'
     VCR.use_cassette('bing_full_de') do
-    key = Geokit::Geocoders::BingGeocoder.key
+      key = Geokit::Geocoders::BingGeocoder.key
     url = "https://dev.virtualearth.net/REST/v1/Locations/#{URI.escape(address)}?key=#{key}&o=xml"
     res = Geokit::Geocoders::BingGeocoder.geocode(address)
-    assert_equal "BE", res.state
-    assert_equal "Berlin", res.city
+    assert_equal 'BE', res.state
+    assert_equal 'Berlin', res.city
     assert_array_in_delta [52.518596, 13.375502], res.to_a
     assert res.country == 'Germany'
-    assert_equal "Platz der Republik 1, 10557 Berlin", res.full_address
-    assert_equal "bing", res.provider
+    assert_equal 'Platz der Republik 1, 10557 Berlin', res.full_address
+    assert_equal 'bing', res.provider
     assert_equal 'address', res.precision
     assert_equal 8, res.accuracy
     assert_url url
@@ -64,9 +63,9 @@ class BingGeocoderTest < BaseGeocoderTest #:nodoc: all
   end
 
   def test_bing_country
-    address = "Australia"
+    address = 'Australia'
     VCR.use_cassette('bing_au') do
-    key = Geokit::Geocoders::BingGeocoder.key
+      key = Geokit::Geocoders::BingGeocoder.key
     url = "https://dev.virtualearth.net/REST/v1/Locations/#{URI.escape(address)}?key=#{key}&o=xml"
     res = Geokit::Geocoders::BingGeocoder.geocode(address)
     assert_equal nil, res.state
@@ -74,7 +73,7 @@ class BingGeocoderTest < BaseGeocoderTest #:nodoc: all
     assert_array_in_delta [-25.585, 134.504], res.to_a
     assert res.country == 'Australia'
     assert_equal 'Australia', res.full_address
-    assert_equal "bing", res.provider
+    assert_equal 'bing', res.provider
     assert_equal 'country', res.precision
     assert_equal 8, res.accuracy
     assert_url url

data/test/test_bounds.rb

@@ -1,37 +1,35 @@
 require File.join(File.dirname(__FILE__), 'helper')
 
 class BoundsTest < Test::Unit::TestCase #:nodoc: all
-
   def setup
     # This is the area in Texas
-    @sw = Geokit::LatLng.new(32.91663,-96.982841)
-    @ne = Geokit::LatLng.new(32.96302,-96.919495)
-    @bounds=Geokit::Bounds.new(@sw,@ne)
-    @loc_a=Geokit::LatLng.new(32.918593,-96.958444) # inside bounds
-    @loc_b=Geokit::LatLng.new(32.914144,-96.958444) # outside bouds
+    @sw = Geokit::LatLng.new(32.91663, -96.982841)
+    @ne = Geokit::LatLng.new(32.96302, -96.919495)
+    @bounds = Geokit::Bounds.new(@sw, @ne)
+    @loc_a = Geokit::LatLng.new(32.918593, -96.958444) # inside bounds
+    @loc_b = Geokit::LatLng.new(32.914144, -96.958444) # outside bouds
 
     # this is a cross-meridan area
-    @cross_meridian=Geokit::Bounds.normalize([30,170],[40,-170])
-    @inside_cm=Geokit::LatLng.new(35,175)
-    @inside_cm_2=Geokit::LatLng.new(35,-175)
-    @east_of_cm=Geokit::LatLng.new(35,-165)
-    @west_of_cm=Geokit::LatLng.new(35,165)
-
+    @cross_meridian = Geokit::Bounds.normalize([30, 170], [40, -170])
+    @inside_cm = Geokit::LatLng.new(35, 175)
+    @inside_cm_2 = Geokit::LatLng.new(35, -175)
+    @east_of_cm = Geokit::LatLng.new(35, -165)
+    @west_of_cm = Geokit::LatLng.new(35, 165)
   end
 
   def test_equality
-    assert_equal Geokit::Bounds.new(@sw,@ne), Geokit::Bounds.new(@sw,@ne)
+    assert_equal Geokit::Bounds.new(@sw, @ne), Geokit::Bounds.new(@sw, @ne)
   end
 
   def test_normalize
-    res=Geokit::Bounds.normalize(@sw,@ne)
-    assert_equal res,Geokit::Bounds.new(@sw,@ne)
-    res=Geokit::Bounds.normalize([@sw,@ne])
-    assert_equal res,Geokit::Bounds.new(@sw,@ne)
-    res=Geokit::Bounds.normalize([@sw.lat,@sw.lng],[@ne.lat,@ne.lng])
-    assert_equal res,Geokit::Bounds.new(@sw,@ne)
-    res=Geokit::Bounds.normalize([[@sw.lat,@sw.lng],[@ne.lat,@ne.lng]])
-    assert_equal res,Geokit::Bounds.new(@sw,@ne)
+    res = Geokit::Bounds.normalize(@sw, @ne)
+    assert_equal res, Geokit::Bounds.new(@sw, @ne)
+    res = Geokit::Bounds.normalize([@sw, @ne])
+    assert_equal res, Geokit::Bounds.new(@sw, @ne)
+    res = Geokit::Bounds.normalize([@sw.lat, @sw.lng], [@ne.lat, @ne.lng])
+    assert_equal res, Geokit::Bounds.new(@sw, @ne)
+    res = Geokit::Bounds.normalize([[@sw.lat, @sw.lng], [@ne.lat, @ne.lng]])
+    assert_equal res, Geokit::Bounds.new(@sw, @ne)
   end
 
   def test_point_inside_bounds
@@ -53,19 +51,19 @@ class BoundsTest < Test::Unit::TestCase #:nodoc: all
   end
 
   def test_center
-    assert_in_delta 32.939828,@bounds.center.lat,0.00005
-    assert_in_delta(-96.9511763,@bounds.center.lng,0.00005)
+    assert_in_delta 32.939828, @bounds.center.lat, 0.00005
+    assert_in_delta(-96.9511763, @bounds.center.lng, 0.00005)
   end
 
   def test_center_cross_meridian
-    assert_in_delta 35.41160, @cross_meridian.center.lat,0.00005
-    assert_in_delta 179.38112, @cross_meridian.center.lng,0.00005
+    assert_in_delta 35.41160, @cross_meridian.center.lat, 0.00005
+    assert_in_delta 179.38112, @cross_meridian.center.lng, 0.00005
   end
 
   def test_creation_from_circle
-    bounds=Geokit::Bounds.from_point_and_radius([32.939829, -96.951176],2.5)
-    inside=Geokit::LatLng.new 32.9695270000,-96.9901590000
-    outside=Geokit::LatLng.new 32.8951550000,-96.9584440000
+    bounds = Geokit::Bounds.from_point_and_radius([32.939829, -96.951176], 2.5)
+    inside = Geokit::LatLng.new 32.9695270000, -96.9901590000
+    outside = Geokit::LatLng.new 32.8951550000, -96.9584440000
     assert bounds.contains?(inside)
     assert !bounds.contains?(outside)
   end

data/test/test_ca_geocoder.rb

@@ -1,31 +1,30 @@
 require File.join(File.dirname(__FILE__), 'helper')
 
-Geokit::Geocoders::CaGeocoder::key = "SOMEKEYVALUE"
+Geokit::Geocoders::CaGeocoder.key = 'SOMEKEYVALUE'
 
 class CaGeocoderTest < BaseGeocoderTest #:nodoc: all
-
-  CA_SUCCESS=<<-EOF
+  CA_SUCCESS = <<-EOF
   <?xml version="1.0" encoding="UTF-8" ?>
   <geodata><latt>49.243086</latt><longt>-123.153684</longt></geodata>
   EOF
 
   def setup
-    @ca_full_hash = {:street_address=>"2105 West 32nd Avenue",:city=>"Vancouver", :state=>"BC"}
+    @ca_full_hash = {street_address: '2105 West 32nd Avenue', city: 'Vancouver', state: 'BC'}
     @ca_full_loc = Geokit::GeoLoc.new(@ca_full_hash)
   end
 
   def test_geocoder_with_geo_loc_with_account
     response = MockSuccess.new
     response.expects(:body).returns(CA_SUCCESS)
-    url = "http://geocoder.ca/?stno=2105&addresst=West+32nd+Avenue&city=Vancouver&prov=BC&auth=SOMEKEYVALUE&geoit=xml"
+    url = 'http://geocoder.ca/?stno=2105&addresst=West+32nd+Avenue&city=Vancouver&prov=BC&auth=SOMEKEYVALUE&geoit=xml'
     Geokit::Geocoders::CaGeocoder.expects(:call_geocoder_service).with(url).returns(response)
     verify(Geokit::Geocoders::CaGeocoder.geocode(@ca_full_loc))
   end
 
   def test_service_unavailable
     response = MockFailure.new
-    #Net::HTTP.expects(:get_response).with(URI.parse("http://geocoder.ca/?stno=2105&addresst=West+32nd+Avenue&city=Vancouver&prov=BC&auth=SOMEKEYVALUE&geoit=xml")).returns(response)
-    url = "http://geocoder.ca/?stno=2105&addresst=West+32nd+Avenue&city=Vancouver&prov=BC&auth=SOMEKEYVALUE&geoit=xml"
+    # Net::HTTP.expects(:get_response).with(URI.parse("http://geocoder.ca/?stno=2105&addresst=West+32nd+Avenue&city=Vancouver&prov=BC&auth=SOMEKEYVALUE&geoit=xml")).returns(response)
+    url = 'http://geocoder.ca/?stno=2105&addresst=West+32nd+Avenue&city=Vancouver&prov=BC&auth=SOMEKEYVALUE&geoit=xml'
     Geokit::Geocoders::CaGeocoder.expects(:call_geocoder_service).with(url).returns(response)
     assert !Geokit::Geocoders::CaGeocoder.geocode(@ca_full_loc).success
   end
@@ -33,9 +32,9 @@ class CaGeocoderTest < BaseGeocoderTest #:nodoc: all
   private
 
   def verify(location)
-    assert_equal "BC", location.state
-    assert_equal "Vancouver", location.city
-    assert_equal "49.243086,-123.153684", location.ll
+    assert_equal 'BC', location.state
+    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

@@ -12,7 +12,7 @@ class FCCGeocoderTest < BaseGeocoderTest #:nodoc: all
 
   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"
+      url = 'https://data.fcc.gov/api/block/find?format=json&latitude=34.05&longitude=-118.25'
     res = Geokit::Geocoders::FCCGeocoder.reverse_geocode(@la)
     assert_url url
     assert_equal res.country_code, 'US'

data/test/test_free_geo_ip_geocoder.rb

@@ -12,7 +12,7 @@ class FreeGeoIpGeocoderTest < BaseGeocoderTest #:nodoc: all
 
   def test_free_geo_ip_geocode
     VCR.use_cassette('free_geo_ip_geocode') do
-    url = "http://freegeoip.net/xml/#{@ip}"
+      url = "http://freegeoip.net/xml/#{@ip}"
     res = Geokit::Geocoders::FreeGeoIpGeocoder.geocode(@ip)
     assert_url url
     assert_equal res.city, 'Mountain View'

data/test/test_geo_plugin_geocoder.rb

@@ -1,7 +1,7 @@
 require File.join(File.dirname(__FILE__), 'helper')
 
 class GeoPluginGeocoderTest < BaseGeocoderTest #:nodoc: all
-  IP_SUCCESS=<<-EOF
+  IP_SUCCESS = <<-EOF
 <?xml version="1.0" encoding="UTF-8"?>
 <geoPlugin>
     <geoplugin_city>Belo Horizonte</geoplugin_city>
@@ -22,7 +22,7 @@ class GeoPluginGeocoderTest < BaseGeocoderTest #:nodoc: all
   def setup
     super
     @ip = '74.125.237.209'
-    @success.provider = "geo_plugin"
+    @success.provider = 'geo_plugin'
   end
 
   def assert_url(expected_url)
@@ -31,7 +31,7 @@ class GeoPluginGeocoderTest < BaseGeocoderTest #:nodoc: all
 
   def test_geo_plugin_geocode
     VCR.use_cassette('geo_plugin_geocode') do
-    url = "http://www.geoplugin.net/xml.gp?ip=#{@ip}"
+      url = "http://www.geoplugin.net/xml.gp?ip=#{@ip}"
     res = Geokit::Geocoders::GeoPluginGeocoder.geocode(@ip)
     assert_url url
     assert_equal res.city, 'Mountain View'
@@ -49,15 +49,15 @@ class GeoPluginGeocoderTest < BaseGeocoderTest #:nodoc: all
     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 = Geokit::Geocoders::GeoPluginGeocoder.geocode('pixrum')
     assert_not_nil location
     assert !location.success?
   end
@@ -66,7 +66,7 @@ class GeoPluginGeocoderTest < BaseGeocoderTest #:nodoc: all
     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")
+    location = Geokit::Geocoders::GeoPluginGeocoder.geocode('69.10.10.10')
     assert_not_nil location
     assert !location.success?
   end

data/test/test_geoloc.rb

@@ -1,7 +1,6 @@
 require File.join(File.dirname(__FILE__), 'helper')
 
 class GeoLocTest < Test::Unit::TestCase #:nodoc: all
-
   def setup
     @loc = Geokit::GeoLoc.new
   end
@@ -31,7 +30,7 @@ class GeoLocTest < Test::Unit::TestCase #:nodoc: all
   end
 
   def test_city
-    @loc.city = "san francisco"
+    @loc.city = 'san francisco'
     assert_equal 'San Francisco', @loc.city
   end
 
@@ -60,11 +59,11 @@ class GeoLocTest < Test::Unit::TestCase #:nodoc: all
 
   def test_to_yaml
     @loc.city = 'San Francisco'
-    @loc.state = 'CA'
+    @loc.state_code = 'CA'
     @loc.zip = '94105'
     @loc.country_code = 'US'
 
-    yaml = YAML::parse(@loc.to_yaml)
+    yaml = YAML.parse(@loc.to_yaml)
     case yaml.class.to_s
     when 'YAML::Syck::Map', 'Syck::Map'
       tag = yaml.type_id
@@ -85,7 +84,9 @@ class GeoLocTest < Test::Unit::TestCase #:nodoc: all
       'lng', '',
       'precision', 'unknown',
       'province', '',
-      'state', 'CA',
+      'state', '',
+      'state_code', 'CA',
+      'state_name', '',
       'street_address', '',
       'street_name', '',
       'street_number', '',
@@ -96,7 +97,7 @@ class GeoLocTest < Test::Unit::TestCase #:nodoc: all
   end
 
   def test_neighborhood
-    @loc.neighborhood = "SoMa"
+    @loc.neighborhood = 'SoMa'
     assert_equal @loc.neighborhood, 'SoMa'
   end
 end