geocoder 1.2.5 → 1.2.6

data/test/fixtures/google_places_details_no_types

@@ -0,0 +1,66 @@
+{
+   "html_attributions" : [],
+   "result" : {
+      "address_components" : [
+         {
+            "long_name" : "6",
+            "short_name" : "6",
+            "types" : [ "street_number" ]
+         },
+         {
+            "long_name" : "Graniczna",
+            "short_name" : "Graniczna",
+            "types" : [ "route" ]
+         },
+         {
+            "long_name" : "Gdynia",
+            "short_name" : "Gdynia",
+            "types" : [ "locality", "political" ]
+         },
+         {
+            "long_name" : "Gdynia",
+            "short_name" : "Gdynia",
+            "types" : [ "administrative_area_level_3", "political" ]
+         },
+         {
+            "long_name" : "Gdynia",
+            "short_name" : "Gdynia",
+            "types" : [ "administrative_area_level_2", "political" ]
+         },
+         {
+            "long_name" : "Pomeranian Voivodeship",
+            "short_name" : "Pomeranian Voivodeship",
+            "types" : [ "administrative_area_level_1", "political" ]
+         },
+         {
+            "long_name" : "Poland",
+            "short_name" : "PL",
+            "types" : [ "country", "political" ]
+         },
+         {
+            "long_name" : "81-626",
+            "short_name" : "81-626",
+            "types" : [ "postal_code" ]
+         }
+      ],
+      "adr_address" : "\u003cspan class=\"street-address\"\u003eGraniczna 6\u003c/span\u003e, \u003cspan class=\"postal-code\"\u003e81-626\u003c/span\u003e \u003cspan class=\"locality\"\u003eGdynia\u003c/span\u003e, \u003cspan class=\"country-name\"\u003ePoland\u003c/span\u003e",
+      "formatted_address" : "Graniczna 6, Gdynia, Poland",
+      "formatted_phone_number" : "795 085 050",
+      "geometry" : {
+         "location" : {
+            "lat" : 54.493608,
+            "lng" : 18.508983
+         }
+      },
+      "id" : "aed47c412bce35bb385c86edef64f8f7860b1cf8",
+      "international_phone_number" : "+48 795 085 050",
+      "name" : "Taxi Gdynia",
+      "place_id" : "ChIJgT2H0tig_UYRD9iM2NSOo4Y",
+      "reference" : "CnRlAAAA6bzgakKCXzwjtLBSMLvj0fvv3OSwGp2WsA54VwQELEupFzqtFuUmxMyMSNYt745EukJR0Ui6Ih9WX3AdL--HXjQprE8xHSb_6qQh2eauKWFIoHzIvbMrkjDIcUPxPDMdJc2XkwpOr_EUimZplCy-gBIQb_UHtRVaswAMjdHHtDqzURoU3tGbILe-zhN3oISBAvc3AyoyznE",
+      "scope" : "GOOGLE",
+      "url" : "https://plus.google.com/100174651414421384172/about?hl=en-US",
+      "utc_offset" : 120,
+      "vicinity" : "Graniczna 6, Gdynia"
+   },
+   "status" : "OK"
+}

data/test/fixtures/okf_kirstinmaki

@@ -0,0 +1,67 @@
+{
+   "status" : "OK",
+   "results" : [
+      {
+         "formatted_address" : "Kirstinmäki 1, 02760 Espoo, Suomi",
+         "sources" : [
+            {
+               "name" : "National Land Survey of Finland - Topographic Dataset (2013-03-08)",
+               "terms_of_use" : "National Land Survey open data licence - version 1.0 - 1 May 2012\nhttp://www.maanmittauslaitos.fi/en/NLS_open_data_licence_version1_20120501"
+            },
+            {
+               "name" : "Itella perusosoitteisto (2014-02-01)",
+               "terms_of_use" : "http://www.itella.fi/liitteet/palvelutjatuotteet/yhteystietopalvelut/Postinumeropalvelut-Palvelukuvausjakayttoehdot.pdf"
+            }
+         ],
+         "types" : [
+            "street_address"
+         ],
+         "address_components" : [
+            {
+               "types" : [
+                  "street_number"
+               ],
+               "short_name" : "1",
+               "long_name" : "1"
+            },
+            {
+               "types" : [
+                  "route"
+               ],
+               "short_name" : "Kirstinmäki",
+               "long_name" : "Kirstinmäki"
+            },
+            {
+               "types" : [
+                  "administrative_area_level_3",
+                  "political"
+               ],
+               "short_name" : "Espoo",
+               "long_name" : "Espoo"
+            },
+            {
+               "types" : [
+                  "postal_code"
+               ],
+               "short_name" : "02760",
+               "long_name" : "02760"
+            },
+            {
+               "types" : [
+                  "country",
+                  "political"
+               ],
+               "short_name" : "FI",
+               "long_name" : "Suomi"
+            }
+         ],
+         "geometry" : {
+            "location" : {
+               "lat" : 60.2015185792087,
+               "lng" : 24.6667520050026
+            },
+            "location_type" : "RANGE_INTERPOLATED"
+         }
+      }
+   ]
+}

data/test/fixtures/okf_no_results

@@ -0,0 +1,4 @@
+{
+   "status" : "ZERO_RESULTS",
+   "results" : []
+}

data/test/fixtures/postcode_anywhere_uk_geocode_v2_00_WR26NJ

@@ -0,0 +1 @@
+[{"Location":"Moseley Road, Hallow, Worcester","Easting":"381676","Northing":"259425","Latitude":"52.2327","Longitude":"-2.2697","OsGrid":"SO 81676 59425","Accuracy":"Standard"}]

data/test/fixtures/postcode_anywhere_uk_geocode_v2_00_generic_error

@@ -0,0 +1 @@
+[{"Error":"9999","Description":"A generic error","Cause":"A generic error occured.","Resolution":"Fix the unknown error."}]

data/test/fixtures/postcode_anywhere_uk_geocode_v2_00_hampshire

@@ -0,0 +1 @@
+[{"Location":"Hampshire","Easting":"448701","Northing":"126642","Latitude":"51.037","Longitude":"-1.3068","OsGrid":"SU 48701 26642","Accuracy":"Standard"}]

data/test/fixtures/postcode_anywhere_uk_geocode_v2_00_key_limit_exceeded

@@ -0,0 +1 @@
+[{"Error":"8","Description":"Key daily limit exceeded","Cause":"The daily limit on the key has been exceeded.","Resolution":"Alter the daily limit on the key. Check the usage details first to see if usage is normal."}]

data/test/fixtures/postcode_anywhere_uk_geocode_v2_00_no_results

@@ -0,0 +1 @@
+[]

data/test/fixtures/postcode_anywhere_uk_geocode_v2_00_romsey

@@ -0,0 +1 @@
+[{"Location":"Romsey, Hampshire","Easting":"435270","Northing":"121182","Latitude":"50.9889","Longitude":"-1.4989","OsGrid":"SU 35270 21182","Accuracy":"Standard"}]

data/test/fixtures/postcode_anywhere_uk_geocode_v2_00_unknown_key

@@ -0,0 +1 @@
+[{"Error":"2","Description":"Unknown key","Cause":"The key you are using to access the service was not found.","Resolution":"Please check that the key is correct. It should be in the form AA11-AA11-AA11-AA11."}]

data/test/test_helper.rb

@@ -122,6 +122,13 @@ module Geocoder
       end
     end
 
+    class GooglePlacesDetails
+      private
+      def fixture_prefix
+        "google_places_details"
+      end
+    end
+
     class Dstk
       private
       def fixture_prefix
@@ -143,6 +150,25 @@ module Geocoder
       end
     end
 
+    class Geoip2
+      private
+
+      remove_method(:results)
+
+      def results(query)
+        return [] if query.to_s == 'no results'
+        return [] if query.to_s == '127.0.0.1'
+        [{'city'=>{'names'=>{'en'=>'Mountain View'}},'country'=>{'iso_code'=>'US','names'=>
+        {'en'=>'United States'}},'location'=>{'latitude'=>37.41919999999999,
+        'longitude'=>-122.0574},'postal'=>{'code'=>'94043'},'subdivisions'=>[{
+        'iso_code'=>'CA','names'=>{'en'=>'California'}}]}]
+      end
+
+      def default_fixture_filename
+        'geoip2_74_200_247_59'
+      end
+    end
+
     class Telize
       private
       def default_fixture_filename
@@ -200,6 +226,24 @@ module Geocoder
         "geocodio_1101_pennsylvania_ave"
       end
     end
+
+    class Okf
+      private
+      def default_fixture_filename
+        "okf_kirstinmaki"
+      end
+    end
+
+    class PostcodeAnywhereUk
+      private
+      def fixture_prefix
+        'postcode_anywhere_uk_geocode_v2_00'
+      end
+
+      def default_fixture_filename
+        "#{fixture_prefix}_romsey"
+      end
+    end
   end
 end
 

data/test/unit/cache_test.rb

@@ -7,7 +7,7 @@ class CacheTest < GeocoderTestCase
   def test_second_occurrence_of_request_is_cache_hit
     Geocoder.configure(:cache => {})
     Geocoder::Lookup.all_services_except_test.each do |l|
-      next if l == :maxmind_local # local, does not use cache
+      next if l == :maxmind_local || l == :geoip2 # local, does not use cache
       Geocoder.configure(:lookup => l)
       set_api_key!(l)
       results = Geocoder.search("Madison Square Garden")

data/test/unit/error_handling_test.rb

@@ -21,7 +21,7 @@ class ErrorHandlingTest < GeocoderTestCase
   def test_always_raise_timeout_error
     Geocoder.configure(:always_raise => [TimeoutError])
     Geocoder::Lookup.all_services_except_test.each do |l|
-      next if l == :maxmind_local # local, does not raise timeout
+      next if l == :maxmind_local || l == :geoip2 # local, does not use cache
       lookup = Geocoder::Lookup.get(l)
       set_api_key!(l)
       assert_raises TimeoutError do
@@ -33,7 +33,7 @@ class ErrorHandlingTest < GeocoderTestCase
   def test_always_raise_socket_error
     Geocoder.configure(:always_raise => [SocketError])
     Geocoder::Lookup.all_services_except_test.each do |l|
-      next if l == :maxmind_local # local, does not raise timeout
+      next if l == :maxmind_local || l == :geoip2 # local, does not use cache
       lookup = Geocoder::Lookup.get(l)
       set_api_key!(l)
       assert_raises SocketError do
@@ -45,7 +45,7 @@ class ErrorHandlingTest < GeocoderTestCase
   def test_always_raise_connection_refused_error
     Geocoder.configure(:always_raise => [Errno::ECONNREFUSED])
     Geocoder::Lookup.all_services_except_test.each do |l|
-      next if l == :maxmind_local # local, does not raise timeout
+      next if l == :maxmind_local || l == :geoip2 # local, does not use cache
       lookup = Geocoder::Lookup.get(l)
       set_api_key!(l)
       assert_raises Errno::ECONNREFUSED do

data/test/unit/ip_address_test.rb

@@ -8,6 +8,8 @@ class IpAddressTest < GeocoderTestCase
     assert Geocoder::IpAddress.new("232.65.123.94").valid?
     assert Geocoder::IpAddress.new("666.65.123.94").valid? # technically invalid
     assert Geocoder::IpAddress.new("::ffff:12.34.56.78").valid?
+    assert Geocoder::IpAddress.new("3ffe:0b00:0000:0000:0001:0000:0000:000a").valid?
+    assert Geocoder::IpAddress.new("::1").valid?
     assert !Geocoder::IpAddress.new("232.65.123.94.43").valid?
     assert !Geocoder::IpAddress.new("232.65.123").valid?
     assert !Geocoder::IpAddress.new("::ffff:123.456.789").valid?
@@ -17,6 +19,7 @@ class IpAddressTest < GeocoderTestCase
   def test_loopback
     assert Geocoder::IpAddress.new("0.0.0.0").loopback?
     assert Geocoder::IpAddress.new("127.0.0.1").loopback?
+    assert Geocoder::IpAddress.new("::1").loopback?
     assert !Geocoder::IpAddress.new("232.65.123.234").loopback?
     assert !Geocoder::IpAddress.new("127 Main St.").loopback?
     assert !Geocoder::IpAddress.new("John Doe\n127 Main St.\nAnywhere, USA").loopback?

data/test/unit/lookup_test.rb

@@ -23,7 +23,7 @@ class LookupTest < GeocoderTestCase
 
   def test_query_url_contains_values_in_params_hash
     Geocoder::Lookup.all_services_except_test.each do |l|
-      next if [:freegeoip, :maxmind_local, :telize, :pointpin].include? l # does not use query string
+      next if [:freegeoip, :maxmind_local, :telize, :pointpin, :geoip2].include? l # does not use query string
       set_api_key!(l)
       url = Geocoder::Lookup.get(l).query_url(Geocoder::Query.new(
         "test", :params => {:one_in_the_hand => "two in the bush"}

data/test/unit/lookups/geoip2_test.rb

@@ -0,0 +1,27 @@
+# encoding: utf-8
+require 'test_helper'
+
+class Geoip2Test < GeocoderTestCase
+  def setup
+    Geocoder.configure(ip_lookup: :geoip2, file: 'test_file')
+  end
+
+  def test_result_attributes
+    result = Geocoder.search('8.8.8.8').first
+    assert_equal 'Mountain View, CA 94043, United States', result.address
+    assert_equal 'Mountain View', result.city
+    assert_equal 'CA', result.state_code
+    assert_equal 'California', result.state
+    assert_equal 'United States', result.country
+    assert_equal 'US', result.country_code
+    assert_equal '94043', result.postal_code
+    assert_equal 37.41919999999999, result.latitude
+    assert_equal -122.0574, result.longitude
+    assert_equal [37.41919999999999, -122.0574], result.coordinates
+  end
+
+  def test_loopback
+    results = Geocoder.search('127.0.0.1')
+    assert_equal [], results
+  end
+end

data/test/unit/lookups/google_places_details_test.rb

@@ -0,0 +1,122 @@
+# encoding: utf-8
+$: << File.join(File.dirname(__FILE__), "..", "..")
+require 'test_helper'
+
+class GooglePlacesDetailsTest < GeocoderTestCase
+
+  def setup
+    Geocoder.configure(lookup: :google_places_details)
+    set_api_key!(:google_places_details)
+  end
+
+  def test_google_places_details_result_components
+    assert_equal "Manhattan", madison_square_garden.address_components_of_type(:sublocality).first["long_name"]
+  end
+
+  def test_google_places_details_result_components_contains_route
+    assert_equal "Pennsylvania Plaza", madison_square_garden.address_components_of_type(:route).first["long_name"]
+  end
+
+  def test_google_places_details_result_components_contains_street_number
+    assert_equal "4", madison_square_garden.address_components_of_type(:street_number).first["long_name"]
+  end
+
+  def test_google_places_details_street_address_returns_formatted_street_address
+    assert_equal "4 Pennsylvania Plaza", madison_square_garden.street_address
+  end
+
+  def test_google_places_details_result_contains_place_id
+    assert_equal "ChIJhRwB-yFawokR5Phil-QQ3zM", madison_square_garden.place_id
+  end
+
+  def test_google_places_details_result_contains_latitude
+    assert_equal madison_square_garden.latitude, 40.750504
+  end
+
+  def test_google_places_details_result_contains_longitude
+    assert_equal madison_square_garden.longitude, -73.993439
+  end
+
+  def test_google_places_details_result_contains_rating
+    assert_equal 4.4, madison_square_garden.rating
+  end
+
+  def test_google_places_details_result_contains_rating_count
+    assert_equal 382, madison_square_garden.rating_count
+  end
+
+  def test_google_places_details_result_contains_reviews
+    reviews = madison_square_garden.reviews
+
+    assert_equal 2, reviews.size
+    assert_equal "John Smith", reviews.first["author_name"]
+    assert_equal 5, reviews.first["rating"]
+    assert_equal "It's nice.", reviews.first["text"]
+    assert_equal "en", reviews.first["language"]
+  end
+
+  def test_google_places_details_result_contains_types
+    assert_equal madison_square_garden.types, %w(stadium establishment)
+  end
+
+  def test_google_places_details_result_contains_website
+    assert_equal madison_square_garden.website, "http://www.thegarden.com/"
+  end
+
+  def test_google_places_details_result_contains_phone_number
+    assert_equal madison_square_garden.phone_number, "+1 212-465-6741"
+  end
+
+  def test_google_places_details_query_url_contains_placeid
+    url = lookup.query_url(Geocoder::Query.new("some-place-id"))
+    assert_match(/placeid=some-place-id/, url)
+  end
+
+  def test_google_places_details_query_url_contains_language
+    url = lookup.query_url(Geocoder::Query.new("some-place-id", language: "de"))
+    assert_match(/language=de/, url)
+  end
+
+  def test_google_places_details_query_url_always_uses_https
+    url = lookup.query_url(Geocoder::Query.new("some-place-id"))
+    assert_match(%r(^https://), url)
+  end
+
+  def test_google_places_details_result_with_no_reviews_shows_empty_reviews
+    assert_equal no_reviews_result.reviews, []
+  end
+
+  def test_google_places_details_result_with_no_types_shows_empty_types
+    assert_equal no_types_result.types, []
+  end
+
+  def test_google_places_details_result_with_invalid_place_id_empty
+    assert_equal Geocoder.search("invalid request"), []
+  end
+
+  def test_raises_exception_on_google_places_details_invalid_request
+    Geocoder.configure(always_raise: [Geocoder::InvalidRequest])
+    assert_raises Geocoder::InvalidRequest do
+      Geocoder.search("invalid request")
+    end
+  end
+
+  private
+
+  def lookup
+    Geocoder::Lookup::GooglePlacesDetails.new
+  end
+
+  def madison_square_garden
+    Geocoder.search("ChIJhRwB-yFawokR5Phil-QQ3zM").first
+  end
+
+  def no_reviews_result
+    Geocoder.search("no reviews").first
+  end
+
+  def no_types_result
+    Geocoder.search("no types").first
+  end
+
+end

data/test/unit/lookups/okf_test.rb

@@ -0,0 +1,38 @@
+# encoding: utf-8
+$: << File.join(File.dirname(__FILE__), "..", "..")
+require 'test_helper'
+
+class OkfTest < GeocoderTestCase
+
+  def setup
+    Geocoder.configure(lookup: :okf)
+  end
+
+  def test_okf_result_components
+    result = Geocoder.search("Kirstinmäki 11b28").first
+    assert_equal "Espoo",
+      result.address_components_of_type(:administrative_area_level_3).first['long_name']
+  end
+
+  def test_okf_result_components_contains_route
+    result = Geocoder.search("Kirstinmäki 11b28").first
+    assert_equal "Kirstinmäki",
+      result.address_components_of_type(:route).first['long_name']
+  end
+
+  def test_okf_result_components_contains_street_number
+    result = Geocoder.search("Kirstinmäki 11b28").first
+    assert_equal "1",
+      result.address_components_of_type(:street_number).first['long_name']
+  end
+
+  def test_okf_street_address_returns_formatted_street_address
+    result = Geocoder.search("Kirstinmäki 11b28").first
+    assert_equal "Kirstinmäki 1", result.street_address
+  end
+
+  def test_okf_precision
+    result = Geocoder.search("Kirstinmäki 11b28").first
+    assert_equal "RANGE_INTERPOLATED", result.precision
+  end
+end