geokit 1.8.5 → 1.9.0

data/test/{test_polygon_contains.rb → test_polygon.rb}

@@ -2,10 +2,8 @@
 require File.join(File.dirname(__FILE__), 'helper')
 
 class PolygonTest < Test::Unit::TestCase #:nodoc: all
-
   def setup
-
-    #Create a simple square-ish polygon for easy testing
+    # Create a simple square-ish polygon for easy testing
     @p1 = Geokit::LatLng.new(45.3142533036254, -93.47527313511819)
     @p2 = Geokit::LatLng.new(45.31232182518015, -93.34893036168069)
     @p3 = Geokit::LatLng.new(45.23694281999268, -93.35167694371194)
@@ -18,7 +16,7 @@ class PolygonTest < Test::Unit::TestCase #:nodoc: all
     @point_inside = Geokit::LatLng.new(45.27428243796789, -93.41648483416066)
     @point_outside = Geokit::LatLng.new(45.45411010558687, -93.78151703160256)
 
-    #Create a more complex polygon with overlapping lines.  Looks like a star of david
+    # Create a more complex polygon with overlapping lines.  Looks like a star of david
     @c1 = Geokit::LatLng.new(45.48661334374487, -93.74665833078325)
     @c2 = Geokit::LatLng.new(45.53521281284293, -93.32611083984375)
     @c3 = Geokit::LatLng.new(45.28648197278281, -93.3673095703125)
@@ -34,12 +32,12 @@ class PolygonTest < Test::Unit::TestCase #:nodoc: all
     @complex_points = [@c1, @c2, @c3, @c4, @c5, @c6, @c7, @c8, @c9, @c10, @c11]
     @complex_polygon = Geokit::Polygon.new(@complex_points)
 
-    #Test three points that should be "inside" this complex shape
+    # Test three points that should be "inside" this complex shape
     @complex_inside_one = Geokit::LatLng.new(45.52438983143154, -93.59818268101662)
     @complex_inside_two = Geokit::LatLng.new(45.50321887154943, -93.37845611851662)
     @complex_inside_three = Geokit::LatLng.new(45.28334174918666, -93.59543609898537)
 
-    #Test three points that should be "outside" this complex shape
+    # Test three points that should be "outside" this complex shape
     @complex_outside_one = Geokit::LatLng.new(45.45314676076135, -93.563850405626)
     @complex_outside_two = Geokit::LatLng.new(45.30435378077673, -93.6859130859375)
     @complex_outside_three = Geokit::LatLng.new(45.538820010517036, -93.486946108751)
@@ -52,34 +50,33 @@ class PolygonTest < Test::Unit::TestCase #:nodoc: all
 
     @open_points = [@op1, @op2, @op3, @op4]
     @open_polygon = Geokit::Polygon.new(@open_points)
-
   end
 
   def test_point_inside_poly
-    #puts "\n\nTesting point inside poly... {@polygon.contains?(@point_inside)}\n\n"
+    # puts "\n\nTesting point inside poly... {@polygon.contains?(@point_inside)}\n\n"
     assert @polygon.contains?(@point_inside)
   end
 
   def test_point_outside_poly
-    #puts "\n\nTesting point outside poly... {@polygon.contains?(@point_outside)}\n\n"
+    # puts "\n\nTesting point outside poly... {@polygon.contains?(@point_outside)}\n\n"
     assert !@polygon.contains?(@point_outside)
   end
 
   def test_points_inside_complex_poly
-    #puts "\n\nTesting points INSIDE complex poly..."
-    #puts "\tone: {@complex_polygon.contains?(@complex_inside_one)}"
-    #puts "\ttwo: {@complex_polygon.contains?(@complex_inside_two)}"
-    #puts "\tthree: {@complex_polygon.contains?(@complex_inside_three)}\n\n"
+    # puts "\n\nTesting points INSIDE complex poly..."
+    # puts "\tone: {@complex_polygon.contains?(@complex_inside_one)}"
+    # puts "\ttwo: {@complex_polygon.contains?(@complex_inside_two)}"
+    # puts "\tthree: {@complex_polygon.contains?(@complex_inside_three)}\n\n"
     assert @complex_polygon.contains?(@complex_inside_one)
     assert @complex_polygon.contains?(@complex_inside_two)
     assert @complex_polygon.contains?(@complex_inside_three)
   end
 
   def test_points_outside_complex_poly
-    #puts "\n\nTesting points OUTSIDE complex poly..."
-    #puts "\tone: {@complex_polygon.contains?(@complex_outside_one)}"
-    #puts "\ttwo: {@complex_polygon.contains?(@complex_outside_two)}"
-    #puts "\tthree: {@complex_polygon.contains?(@complex_outside_three)}\n\n"
+    # puts "\n\nTesting points OUTSIDE complex poly..."
+    # puts "\tone: {@complex_polygon.contains?(@complex_outside_one)}"
+    # puts "\ttwo: {@complex_polygon.contains?(@complex_outside_two)}"
+    # puts "\tthree: {@complex_polygon.contains?(@complex_outside_three)}\n\n"
     assert !@complex_polygon.contains?(@complex_outside_one)
     assert !@complex_polygon.contains?(@complex_outside_two)
     assert !@complex_polygon.contains?(@complex_outside_three)
@@ -89,13 +86,26 @@ class PolygonTest < Test::Unit::TestCase #:nodoc: all
     # A polygon can only exist of the last point is equal to the first
     # Otherwise, it would just be a line of points.
 
-    #puts "\n\nTesting intialize function to close an open polygon..."
-    #puts "\t Does poly_x[0] (#{@open_polygon.poly_x[0]}) == poly_x[-1] (#{@open_polygon.poly_x[-1]}) ?"
-    #puts "\t Does poly_y[0] (#{@open_polygon.poly_y[0]}) == poly_y[-1] (#{@open_polygon.poly_y[-1]}) ?"
+    # puts "\n\nTesting intialize function to close an open polygon..."
+    # puts "\t Does poly_x[0] (#{@open_polygon.poly_x[0]}) == poly_x[-1] (#{@open_polygon.poly_x[-1]}) ?"
+    # puts "\t Does poly_y[0] (#{@open_polygon.poly_y[0]}) == poly_y[-1] (#{@open_polygon.poly_y[-1]}) ?"
 
     assert @open_polygon.points[0].lng == @open_polygon.points[-1].lng
     assert @open_polygon.points[0].lat == @open_polygon.points[-1].lat
+  end
 
+  def test_centroid_for_simple_poly
+    @polygon_centroid = Geokit::LatLng.new(45.27463866133501, -93.41400121829719)
+    assert_equal(@polygon.centroid, @polygon_centroid)
   end
 
+  def test_centroid_for_complex_poly
+    @complex_polygon_centroid = Geokit::LatLng.new(45.43622702936517, -93.5352210389731)
+    assert_equal(@complex_polygon.centroid, @complex_polygon_centroid)
+  end
+
+  def test_centroid_for_open_poly
+    @open_polygon_centroid = Geokit::LatLng.new(44.95912726688109, -92.7068888186181)
+    assert_equal(@open_polygon.centroid, @open_polygon_centroid)
+  end
 end

data/test/test_ripe_geocoder.rb

@@ -25,6 +25,7 @@ class RipeGeocoderTest < BaseGeocoderTest #:nodoc: all
       assert_url url
       assert_equal res.city, 'Mountain View'
       assert_equal res.state, 'CA'
+      assert_equal res.state_code, 'CA'
       assert_equal res.country_code, 'US'
     end
   end
@@ -36,6 +37,7 @@ class RipeGeocoderTest < BaseGeocoderTest #:nodoc: all
       assert_url url
       assert_equal res.city, 'Adelaide'
       assert_equal res.state, nil
+      assert_equal res.state_code, nil
       assert_equal res.country_code, 'AU'
     end
   end

data/test/test_us_geocoder.rb

@@ -3,12 +3,11 @@ require File.join(File.dirname(__FILE__), 'helper')
 Geokit::Geocoders::UsGeocoder.key = nil
 
 class UsGeocoderTest < BaseGeocoderTest #:nodoc: all
-
-  GEOCODER_US_FULL='37.792528,-122.393981,100 Spear St,San Francisco,CA,94105'
+  GEOCODER_US_FULL = '37.792528,-122.393981,100 Spear St,San Francisco,CA,94105'
 
   def setup
     super
-    @us_full_hash = {:city=>"San Francisco", :state=>"CA"}
+    @us_full_hash = {city: 'San Francisco', state: 'CA'}
     @us_full_loc = Geokit::GeoLoc.new(@us_full_hash)
   end
 
@@ -40,17 +39,17 @@ class UsGeocoderTest < BaseGeocoderTest #:nodoc: all
     response.expects(:body).returns(GEOCODER_US_FULL)
     url = "http://geocoder.us/service/csv/geocode?address=#{Geokit::Inflector.url_escape(@address)}"
     Geokit::Geocoders::UsGeocoder.expects(:call_geocoder_service).with(url).returns(response)
-    res=Geokit::Geocoders::UsGeocoder.geocode(@address)
+    res = Geokit::Geocoders::UsGeocoder.geocode(@address)
     assert_equal 1, res.all.size
   end
 
   private
 
   def verify(location)
-    assert_equal "CA", location.state
-    assert_equal "San Francisco", location.city
-    assert_equal "37.792528,-122.393981", location.ll
+    assert_equal 'CA', location.state
+    assert_equal 'San Francisco', location.city
+    assert_equal '37.792528,-122.393981', location.ll
     assert location.is_us?
-    assert_equal "100 Spear St, San Francisco, CA, 94105, US", location.full_address  #slightly different from yahoo
+    assert_equal '100 Spear St, San Francisco, CA, 94105, US', location.full_address  # slightly different from yahoo
   end
 end

data/test/test_yahoo_geocoder.rb

@@ -6,8 +6,8 @@ Geokit::Geocoders::YahooGeocoder.secret = 'SECRET'
 class YahooGeocoderTest < BaseGeocoderTest #:nodoc: all
   def setup
     super
-    @yahoo_full_hash = {:street_address=>"100 Spear St", :city=>"San Francisco", :state=>"CA", :zip=>"94105-1522", :country_code=>"US"}
-    @yahoo_city_hash = {:city=>"San Francisco", :state=>"CA"}
+    @yahoo_full_hash = {street_address: '100 Spear St', city: 'San Francisco', state: 'CA', zip: '94105-1522', country_code: 'US'}
+    @yahoo_city_hash = {city: 'San Francisco', state: 'CA'}
     @yahoo_full_loc = Geokit::GeoLoc.new(@yahoo_full_hash)
     @yahoo_city_loc = Geokit::GeoLoc.new(@yahoo_city_hash)
   end
@@ -19,7 +19,7 @@ class YahooGeocoderTest < BaseGeocoderTest #:nodoc: all
   # the testing methods themselves
   def test_yahoo_full_address
     VCR.use_cassette('yahoo_full') do
-    url = "https://yboss.yahooapis.com/geo/placefinder?flags=J&q=#{Geokit::Inflector.url_escape(@full_address)}"
+      url = "https://yboss.yahooapis.com/geo/placefinder?flags=J&q=#{Geokit::Inflector.url_escape(@full_address)}"
     do_full_address_assertions(Geokit::Geocoders::YahooGeocoder.geocode(@full_address))
     assert_yahoo_url url
     end
@@ -27,7 +27,7 @@ class YahooGeocoderTest < BaseGeocoderTest #:nodoc: all
 
   def test_yahoo_full_address_accuracy
     VCR.use_cassette('yahoo_full') do
-    url = "https://yboss.yahooapis.com/geo/placefinder?flags=J&q=#{Geokit::Inflector.url_escape(@full_address)}"
+      url = "https://yboss.yahooapis.com/geo/placefinder?flags=J&q=#{Geokit::Inflector.url_escape(@full_address)}"
     res = Geokit::Geocoders::YahooGeocoder.geocode(@full_address)
     assert_yahoo_url url
     assert_equal 8, res.accuracy
@@ -36,7 +36,7 @@ class YahooGeocoderTest < BaseGeocoderTest #:nodoc: all
 
   def test_yahoo_full_address_with_geo_loc
     VCR.use_cassette('yahoo_full') do
-    url = "https://yboss.yahooapis.com/geo/placefinder?flags=J&q=#{Geokit::Inflector.url_escape(@full_address)}"
+      url = "https://yboss.yahooapis.com/geo/placefinder?flags=J&q=#{Geokit::Inflector.url_escape(@full_address)}"
     do_full_address_assertions(Geokit::Geocoders::YahooGeocoder.geocode(@yahoo_full_loc))
     assert_yahoo_url url
     end
@@ -44,7 +44,7 @@ class YahooGeocoderTest < BaseGeocoderTest #:nodoc: all
 
   def test_yahoo_city
     VCR.use_cassette('yahoo_city') do
-    url = "https://yboss.yahooapis.com/geo/placefinder?flags=J&q=#{Geokit::Inflector.url_escape(@address)}"
+      url = "https://yboss.yahooapis.com/geo/placefinder?flags=J&q=#{Geokit::Inflector.url_escape(@address)}"
     do_city_assertions(Geokit::Geocoders::YahooGeocoder.geocode(@address))
     assert_yahoo_url url
     end
@@ -52,7 +52,7 @@ class YahooGeocoderTest < BaseGeocoderTest #:nodoc: all
 
   def test_yahoo_city_accuracy
     VCR.use_cassette('yahoo_city') do
-    url = "https://yboss.yahooapis.com/geo/placefinder?flags=J&q=#{Geokit::Inflector.url_escape(@address)}"
+      url = "https://yboss.yahooapis.com/geo/placefinder?flags=J&q=#{Geokit::Inflector.url_escape(@address)}"
     res = Geokit::Geocoders::YahooGeocoder.geocode(@address)
     assert_yahoo_url url
     assert_equal 4, res.accuracy
@@ -61,22 +61,22 @@ class YahooGeocoderTest < BaseGeocoderTest #:nodoc: all
 
   def test_yahoo_city_with_geo_loc
     VCR.use_cassette('yahoo_city') do
-    url = "https://yboss.yahooapis.com/geo/placefinder?flags=J&q=#{Geokit::Inflector.url_escape(@address)}"
+      url = "https://yboss.yahooapis.com/geo/placefinder?flags=J&q=#{Geokit::Inflector.url_escape(@address)}"
     do_city_assertions(Geokit::Geocoders::YahooGeocoder.geocode(@yahoo_city_loc))
     assert_yahoo_url url
     end
   end
 
   def test_no_results
-    no_results_address = "ZZ, ZZ, ZZ"
-    no_results_full_hash = {:street_address=>"ZZ", :city=>"ZZ", :state=>"ZZ"}
+    no_results_address = 'ZZ, ZZ, ZZ'
+    no_results_full_hash = {street_address: 'ZZ', city: 'ZZ', state: 'ZZ'}
     no_results_full_loc = Geokit::GeoLoc.new(no_results_full_hash)
 
     VCR.use_cassette('yahoo_no_results') do
-    url = "https://yboss.yahooapis.com/geo/placefinder?flags=J&q=#{Geokit::Inflector.url_escape(no_results_address)}"
+      url = "https://yboss.yahooapis.com/geo/placefinder?flags=J&q=#{Geokit::Inflector.url_escape(no_results_address)}"
     result = Geokit::Geocoders::YahooGeocoder.geocode(no_results_address)
     assert_yahoo_url url
-    assert_equal ",", result.ll
+    assert_equal ',', result.ll
     end
   end
 
@@ -90,22 +90,21 @@ class YahooGeocoderTest < BaseGeocoderTest #:nodoc: all
 
   # next two methods do the assertions for both address-level and city-level lookups
   def do_full_address_assertions(res)
-
-    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.is_us?
-    assert_equal "100 Spear St, San Francisco, CA, 94105-1578, US", res.full_address
-    assert_equal "yahoo", res.provider
+    assert_equal '100 Spear St, San Francisco, CA, 94105-1578, US', res.full_address
+    assert_equal 'yahoo', res.provider
   end
 
   def do_city_assertions(res)
-    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.77713, -122.41964], res.to_a
     assert res.is_us?
-    assert_equal "San Francisco, CA, US", res.full_address
+    assert_equal 'San Francisco, CA, US', res.full_address
     assert_nil res.street_address
-    assert_equal "yahoo", res.provider
+    assert_equal 'yahoo', res.provider
   end
 end

data/test/test_yandex_geocoder.rb

@@ -2,90 +2,89 @@
 require File.join(File.dirname(__FILE__), 'helper')
 
 class YandexGeocoderTest < BaseGeocoderTest #:nodoc: all
-    YANDEX_FULL=<<-EOF.strip
-      {"response":{"GeoObjectCollection":{"metaDataProperty":{"GeocoderResponseMetaData":{"request":"Москва, улица Новый Арбат, дом 24","found":"1","results":"10"}},"featureMember":[{"GeoObject":{"metaDataProperty":{"GeocoderMetaData":{"kind":"house","text":"Россия, Москва, улица Новый Арбат, 24","precision":"exact","AddressDetails":{"Country":{"AddressLine":"Москва, улица Новый Арбат, 24","CountryNameCode":"RU","CountryName":"Россия","Locality":{"LocalityName":"Москва","Thoroughfare":{"ThoroughfareName":"улица Новый Арбат","Premise":{"PremiseNumber":"24"}}}}}}},"description":"Москва, Россия","name":"улица Новый Арбат, 24","boundedBy":{"Envelope":{"lowerCorner":"37.585565 55.751928","upperCorner":"37.589662 55.754238"}},"Point":{"pos":"37.587614 55.753083"}}}]}}}
-    EOF
+  YANDEX_FULL = <<-EOF.strip
+    {"response":{"GeoObjectCollection":{"metaDataProperty":{"GeocoderResponseMetaData":{"request":"Москва, улица Новый Арбат, дом 24","found":"1","results":"10"}},"featureMember":[{"GeoObject":{"metaDataProperty":{"GeocoderMetaData":{"kind":"house","text":"Россия, Москва, улица Новый Арбат, 24","precision":"exact","AddressDetails":{"Country":{"AddressLine":"Москва, улица Новый Арбат, 24","CountryNameCode":"RU","CountryName":"Россия","Locality":{"LocalityName":"Москва","Thoroughfare":{"ThoroughfareName":"улица Новый Арбат","Premise":{"PremiseNumber":"24"}}}}}}},"description":"Москва, Россия","name":"улица Новый Арбат, 24","boundedBy":{"Envelope":{"lowerCorner":"37.585565 55.751928","upperCorner":"37.589662 55.754238"}},"Point":{"pos":"37.587614 55.753083"}}}]}}}
+  EOF
 
-    YANDEX_REGION=<<-EOF.strip
-      {"response":{"GeoObjectCollection":{"metaDataProperty":{"GeocoderResponseMetaData":{"request":"Ростов-на-Дону, ул. Станиславского, д.21","found":"1","results":"10"}},"featureMember":[{"GeoObject":{"metaDataProperty":{"GeocoderMetaData":{"kind":"house","text":"Россия, Ростовская область, город Ростов-на-Дону, улица Станиславского, 21","precision":"exact","AddressDetails":{"Country":{"AddressLine":"Ростовская область, город Ростов-на-Дону, улица Станиславского, 21","CountryNameCode":"RU","CountryName":"Россия","AdministrativeArea":{"AdministrativeAreaName":"Ростовская область","Locality":{"LocalityName":"город Ростов-на-Дону","Thoroughfare":{"ThoroughfareName":"улица Станиславского","Premise":{"PremiseNumber":"21"}}}}}}}},"description":"город Ростов-на-Дону, Ростовская область, Россия","name":"улица Станиславского, 21","boundedBy":{"Envelope":{"lowerCorner":"39.701349 47.214507","upperCorner":"39.705446 47.217298"}},"Point":{"pos":"39.703398 47.215903"}}}]}}}
-    EOF
+  YANDEX_REGION = <<-EOF.strip
+    {"response":{"GeoObjectCollection":{"metaDataProperty":{"GeocoderResponseMetaData":{"request":"Ростов-на-Дону, ул. Станиславского, д.21","found":"1","results":"10"}},"featureMember":[{"GeoObject":{"metaDataProperty":{"GeocoderMetaData":{"kind":"house","text":"Россия, Ростовская область, город Ростов-на-Дону, улица Станиславского, 21","precision":"exact","AddressDetails":{"Country":{"AddressLine":"Ростовская область, город Ростов-на-Дону, улица Станиславского, 21","CountryNameCode":"RU","CountryName":"Россия","AdministrativeArea":{"AdministrativeAreaName":"Ростовская область","Locality":{"LocalityName":"город Ростов-на-Дону","Thoroughfare":{"ThoroughfareName":"улица Станиславского","Premise":{"PremiseNumber":"21"}}}}}}}},"description":"город Ростов-на-Дону, Ростовская область, Россия","name":"улица Станиславского, 21","boundedBy":{"Envelope":{"lowerCorner":"39.701349 47.214507","upperCorner":"39.705446 47.217298"}},"Point":{"pos":"39.703398 47.215903"}}}]}}}
+  EOF
 
-    YANDEX_CITY=<<-EOF.strip
-      {"response":{"GeoObjectCollection":{"metaDataProperty":{"GeocoderResponseMetaData":{"request":"город Москва","found":"1","results":"10"}},"featureMember":[{"GeoObject":{"metaDataProperty":{"GeocoderMetaData":{"kind":"locality","text":"Россия, Москва","precision":"other","AddressDetails":{"Country":{"AddressLine":"Москва","CountryNameCode":"RU","CountryName":"Россия","Locality":{"LocalityName":"Москва"}}}}},"description":"Россия","name":"Москва","boundedBy":{"Envelope":{"lowerCorner":"37.182743 55.490667","upperCorner":"37.964969 56.01074"}},"Point":{"pos":"37.617761 55.755773"}}}]}}}
-    EOF
+  YANDEX_CITY = <<-EOF.strip
+    {"response":{"GeoObjectCollection":{"metaDataProperty":{"GeocoderResponseMetaData":{"request":"город Москва","found":"1","results":"10"}},"featureMember":[{"GeoObject":{"metaDataProperty":{"GeocoderMetaData":{"kind":"locality","text":"Россия, Москва","precision":"other","AddressDetails":{"Country":{"AddressLine":"Москва","CountryNameCode":"RU","CountryName":"Россия","Locality":{"LocalityName":"Москва"}}}}},"description":"Россия","name":"Москва","boundedBy":{"Envelope":{"lowerCorner":"37.182743 55.490667","upperCorner":"37.964969 56.01074"}},"Point":{"pos":"37.617761 55.755773"}}}]}}}
+  EOF
 
-    YANDEX_NO_RESULTS=<<-EOF.strip
-      {"response":{"GeoObjectCollection":{"metaDataProperty":{"GeocoderResponseMetaData":{"request":"ZZ, ZZ, ZZ","found":"0","results":"10"}},"featureMember":[]}}}
-    EOF
+  YANDEX_NO_RESULTS = <<-EOF.strip
+    {"response":{"GeoObjectCollection":{"metaDataProperty":{"GeocoderResponseMetaData":{"request":"ZZ, ZZ, ZZ","found":"0","results":"10"}},"featureMember":[]}}}
+  EOF
 
   def setup
     super
-    @full_address = "Москва, улица Новый Арбат, дом 24"
-    @address = "город Москва"
+    @full_address = 'Москва, улица Новый Арбат, дом 24'
+    @address = 'город Москва'
   end
 
   # the testing methods themselves
   def test_yandex_full_address
     response = MockSuccess.new
     response.expects(:body).returns(YANDEX_FULL)
-    url = "http://geocode-maps.yandex.ru/1.x/?geocode=#{Geokit::Inflector::url_escape(@full_address)}&format=json"
+    url = "http://geocode-maps.yandex.ru/1.x/?geocode=#{Geokit::Inflector.url_escape(@full_address)}&format=json"
     Geokit::Geocoders::YandexGeocoder.expects(:call_geocoder_service).with(url).returns(response)
     res = Geokit::Geocoders::YandexGeocoder.geocode(@full_address)
 
-    assert_equal "yandex", res.provider
-    assert_equal "улица Новый Арбат, 24", res.street_address
-    assert_equal "Москва", res.city
+    assert_equal 'yandex', res.provider
+    assert_equal 'улица Новый Арбат, 24', res.street_address
+    assert_equal 'Москва', res.city
     assert_equal 55.753083, res.lat
     assert_equal 37.587614, res.lng
-    assert_equal "RU", res.country_code
+    assert_equal 'RU', res.country_code
     assert res.success
   end
 
   def test_yandex_full_address_with_region
-    region_address = "Ростов-на-Дону, ул. Станиславского, д.21"
+    region_address = 'Ростов-на-Дону, ул. Станиславского, д.21'
     response = MockSuccess.new
     response.expects(:body).returns(YANDEX_REGION)
-    url = "http://geocode-maps.yandex.ru/1.x/?geocode=#{Geokit::Inflector::url_escape(region_address)}&format=json"
+    url = "http://geocode-maps.yandex.ru/1.x/?geocode=#{Geokit::Inflector.url_escape(region_address)}&format=json"
     Geokit::Geocoders::YandexGeocoder.expects(:call_geocoder_service).with(url).returns(response)
     res = Geokit::Geocoders::YandexGeocoder.geocode(region_address)
 
-    assert_equal "yandex", res.provider
-    assert_equal "улица Станиславского, 21", res.street_address
-    assert_equal "город Ростов на Дону", res.city
-    assert_equal "Ростовская область", res.state
+    assert_equal 'yandex', res.provider
+    assert_equal 'улица Станиславского, 21', res.street_address
+    assert_equal 'город Ростов на Дону', res.city
+    assert_equal 'Ростовская область', res.state
     assert_equal 47.215903, res.lat
     assert_equal 39.703398, res.lng
-    assert_equal "RU", res.country_code
+    assert_equal 'RU', res.country_code
     assert res.success
   end
 
   def test_yandex_city
     response = MockSuccess.new
     response.expects(:body).returns(YANDEX_CITY)
-    url = "http://geocode-maps.yandex.ru/1.x/?geocode=#{Geokit::Inflector::url_escape(@address)}&format=json"
+    url = "http://geocode-maps.yandex.ru/1.x/?geocode=#{Geokit::Inflector.url_escape(@address)}&format=json"
     Geokit::Geocoders::YandexGeocoder.expects(:call_geocoder_service).with(url).returns(response)
     res = Geokit::Geocoders::YandexGeocoder.geocode(@address)
 
-    assert_equal "yandex", res.provider
-    assert_equal "city", res.precision
-    assert_equal "Москва", res.city
+    assert_equal 'yandex', res.provider
+    assert_equal 'city', res.precision
+    assert_equal 'Москва', res.city
     assert_equal 55.755773, res.lat
     assert_equal 37.617761, res.lng
-    assert_equal "RU", res.country_code
+    assert_equal 'RU', res.country_code
     assert res.success
   end
 
-
   def test_no_results
-    no_results_address = "ZZ, ZZ, ZZ"
+    no_results_address = 'ZZ, ZZ, ZZ'
     # no_results_full_hash = {:street_address=>"ZZ", :city=>"ZZ", :state=>"ZZ"}
     # no_results_full_loc = Geokit::GeoLoc.new(no_results_full_hash)
 
     response = MockSuccess.new
     response.expects(:body).returns(YANDEX_NO_RESULTS)
-    url = "http://geocode-maps.yandex.ru/1.x/?geocode=#{Geokit::Inflector::url_escape(no_results_address)}&format=json"
+    url = "http://geocode-maps.yandex.ru/1.x/?geocode=#{Geokit::Inflector.url_escape(no_results_address)}&format=json"
     Geokit::Geocoders::YandexGeocoder.expects(:call_geocoder_service).with(url).returns(response)
     result = Geokit::Geocoders::YandexGeocoder.geocode(no_results_address)
-    assert_equal ",", result.ll
+    assert_equal ',', result.ll
   end
 end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: geokit
 version: !ruby/object:Gem::Version
-  version: 1.8.5
-  prerelease: 
+  version: 1.9.0
 platform: ruby
 authors:
 - Michael Noack
@@ -12,166 +11,174 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-03 00:00:00.000000000 Z
+date: 2014-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.3.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.3.2
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>'
+    - - ">"
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>'
+    - - ">"
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov-rcov
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  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: pre-commit
+  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: vcr
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: typhoeus
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Geokit provides geocoding and distance calculation in an easy-to-use
@@ -183,8 +190,8 @@ extensions: []
 extra_rdoc_files:
 - README.markdown
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - MIT-LICENSE
@@ -199,16 +206,27 @@ files:
 - fixtures/vcr_cassettes/geo_plugin_geocode.yml
 - fixtures/vcr_cassettes/geocodio_geocode.yml
 - fixtures/vcr_cassettes/geonames_geocode.yml
+- fixtures/vcr_cassettes/geonames_geocode_premium.yml
 - fixtures/vcr_cassettes/google_city.yml
-- fixtures/vcr_cassettes/google_country_code_biased_result.yml
+- fixtures/vcr_cassettes/google_country_code_biased_result_orly.yml
+- fixtures/vcr_cassettes/google_country_code_biased_result_toledo.yml
 - fixtures/vcr_cassettes/google_full.yml
 - fixtures/vcr_cassettes/google_full_short.yml
 - fixtures/vcr_cassettes/google_language_response_fr.yml
 - fixtures/vcr_cassettes/google_multi.yml
+- fixtures/vcr_cassettes/google_result_toledo_default_bias.yml
 - fixtures/vcr_cassettes/google_reverse_madrid.yml
 - fixtures/vcr_cassettes/google_reverse_madrid_es.yml
+- fixtures/vcr_cassettes/google_sublocality.yml
 - fixtures/vcr_cassettes/map_quest_full.yml
 - fixtures/vcr_cassettes/map_quest_reverse_madrid.yml
+- fixtures/vcr_cassettes/mapbox_forward_geocode.yml
+- fixtures/vcr_cassettes/mapbox_reverse_geocode.yml
+- 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_madrid.yml
+- fixtures/vcr_cassettes/opencage_reverse_prilep.yml
 - fixtures/vcr_cassettes/ripe_geocode.yml
 - fixtures/vcr_cassettes/ripe_geocode_45.yml
 - fixtures/vcr_cassettes/ripe_geocode_au.yml
@@ -231,8 +249,10 @@ files:
 - lib/geokit/geocoders/geonames.rb
 - lib/geokit/geocoders/google.rb
 - lib/geokit/geocoders/ip.rb
+- lib/geokit/geocoders/mapbox.rb
 - lib/geokit/geocoders/mapquest.rb
 - lib/geokit/geocoders/maxmind.rb
+- lib/geokit/geocoders/opencage.rb
 - lib/geokit/geocoders/openstreetmap.rb
 - lib/geokit/geocoders/ripe.rb
 - lib/geokit/geocoders/us_geocoder.rb
@@ -262,13 +282,15 @@ files:
 - test/test_ipgeocoder.rb
 - test/test_latlng.rb
 - test/test_map_quest.rb
+- test/test_mapbox_geocoder.rb
 - test/test_mappable.rb
 - test/test_maxmind_geocoder.rb
 - test/test_multi_geocoder.rb
 - test/test_multi_ip_geocoder.rb
 - test/test_net_adapter.rb
+- test/test_opencage_geocoder.rb
 - test/test_openstreetmap_geocoder.rb
-- test/test_polygon_contains.rb
+- test/test_polygon.rb
 - test/test_ripe_geocoder.rb
 - test/test_us_geocoder.rb
 - test/test_yahoo_geocoder.rb
@@ -276,30 +298,29 @@ files:
 homepage: http://github.com/geokit/geokit
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options:
-- --main
+- "--main"
 - README.markdown
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
-summary: ! 'Geokit: encoding and distance calculation gem'
+specification_version: 4
+summary: 'Geokit: encoding and distance calculation gem'
 test_files:
 - test/helper.rb
 - test/test_base_geocoder.rb
@@ -317,13 +338,15 @@ test_files:
 - test/test_ipgeocoder.rb
 - test/test_latlng.rb
 - test/test_map_quest.rb
+- test/test_mapbox_geocoder.rb
 - test/test_mappable.rb
 - test/test_maxmind_geocoder.rb
 - test/test_multi_geocoder.rb
 - test/test_multi_ip_geocoder.rb
 - test/test_net_adapter.rb
+- test/test_opencage_geocoder.rb
 - test/test_openstreetmap_geocoder.rb
-- test/test_polygon_contains.rb
+- test/test_polygon.rb
 - test/test_ripe_geocoder.rb
 - test/test_us_geocoder.rb
 - test/test_yahoo_geocoder.rb