diff --git a/lib/geocoder/lookups/telize.rb b/lib/geocoder/lookups/telize.rb index c3befae5dfba182614d7f85f797bb8ea13ed852a..4c284a65bbdeac28b1126c7ef764581f38e1cc21 100644 --- a/lib/geocoder/lookups/telize.rb +++ b/lib/geocoder/lookups/telize.rb @@ -15,15 +15,12 @@ module Geocoder::Lookup private # --------------------------------------------------------------- - def parse_raw_data(raw_data) - raw_data.match(/^<html><title>404/) ? nil : super(raw_data) - end - def results(query) # don't look up a loopback address, just return the stored result return [reserved_result(query.text)] if query.loopback_ip_address? - # note: Freegeoip.net returns plain text "Not Found" on bad request - (doc = fetch_data(query)) ? [doc] : [] + # note: Telize returns json with a code attribute of 401 on bad request + doc = fetch_data(query) + (doc && doc['code'] == 401) ? [] : [doc] end def reserved_result(ip) diff --git a/test/fixtures/telize_10_10_10_10 b/test/fixtures/telize_10_10_10_10 new file mode 100644 index 0000000000000000000000000000000000000000..b85a5590334e3afd7ebe5d3e9ccb6eb0d5493c8b --- /dev/null +++ b/test/fixtures/telize_10_10_10_10 @@ -0,0 +1,4 @@ +{ +"message": "Input string is not a valid IP address", +"code": 401 +} diff --git a/test/fixtures/telize_no_results b/test/fixtures/telize_no_results index 2ac0915dd0c91079a1b0d2eb3fd3c21194e0a77a..b85a5590334e3afd7ebe5d3e9ccb6eb0d5493c8b 100644 --- a/test/fixtures/telize_no_results +++ b/test/fixtures/telize_no_results @@ -1 +1,4 @@ -<html><title>404: Not Found</title><body>404: Not Found</body></html> +{ +"message": "Input string is not a valid IP address", +"code": 401 +} diff --git a/test/test_helper.rb b/test/test_helper.rb index b618b65e3d12eabc7af38ab66534a885a8f68a2e..06c1a8b4caf15299de97a1f4cc26b58d5c8d4009 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -145,6 +145,10 @@ module Geocoder class Telize private + def fixture_prefix + "telize" + end + def default_fixture_filename "telize_74_200_247_59" end diff --git a/test/unit/lookups/telize_test.rb b/test/unit/lookups/telize_test.rb index 449ee1e2743423e3f6d524887b99bc25bfa97387..aa112b2091b29a1bfb90f82fcf12f7ed7bb5b317 100644 --- a/test/unit/lookups/telize_test.rb +++ b/test/unit/lookups/telize_test.rb @@ -17,4 +17,9 @@ class TelizeTest < GeocoderTestCase result = Geocoder.search("74.200.247.59").first assert_equal "Plano, TX 75093, United States", result.address end + + def test_no_results + results = Geocoder.search("10.10.10.10") + assert_equal 0, results.length + end end