tests for telize error handling

3a1c3244 · Luke Roberts · 631c7670 · 3a1c3244 · 3a1c3244 · 3a1c3244
Commit 3a1c3244 authored 10 years ago by Luke Roberts
--- 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
+      # note: Telize returns json with a code attribute of 401 on bad request
-      (doc = fetch_data(query)) ? [doc] : []
+      doc = fetch_data(query)
+      (doc && doc['code'] == 401) ? [] : [doc]
    end
    def reserved_result(ip)

--- a/test/fixtures/telize_10_10_10_10
+++ b/test/fixtures/telize_10_10_10_10
+{
+"message": "Input string is not a valid IP address",
+"code": 401
+}
--- a/test/fixtures/telize_no_results
+++ b/test/fixtures/telize_no_results
-<html><title>404: Not Found</title><body>404: Not Found</body></html>
+{
+"message": "Input string is not a valid IP address",
+"code": 401
+}
--- 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

--- 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