address #33

also get rid of useless tests that only mock stuff.

Author: UmanShahzad

ipinfo/handler.py

@@ -55,9 +55,33 @@ def __init__(self, access_token=None, **kwargs):
 
     def getDetails(self, ip_address=None):
         """Get details for specified IP address as a Details object."""
-        raw_details = self._requestDetails(ip_address)
-        handler_utils.format_details(raw_details, self.countries)
-        return Details(raw_details)
+        # If the supplied IP address uses the objects defined in the built-in
+        # module ipaddress extract the appropriate string notation before
+        # formatting the URL.
+        if isinstance(ip_address, IPv4Address) or isinstance(
+            ip_address, IPv6Address
+        ):
+            ip_address = ip_address.exploded
+
+        if ip_address in self.cache:
+            return Details(self.cache[ip_address])
+
+        # not in cache; do http req
+        url = handler_utils.API_URL
+        if ip_address:
+            url += "/" + ip_address
+        headers = handler_utils.get_headers(self.access_token)
+        response = requests.get(url, headers=headers, **self.request_options)
+        if response.status_code == 429:
+            raise RequestQuotaExceededError()
+        response.raise_for_status()
+        details = response.json()
+
+        # format & cache
+        handler_utils.format_details(details, self.countries)
+        self.cache[ip_address] = details
+
+        return Details(details)
 
     def getBatchDetails(self, ip_addresses):
         """Get details for a batch of IP addresses at once."""
@@ -105,31 +129,3 @@ def getBatchDetails(self, ip_addresses):
                 handler_utils.format_details(detail, self.countries)
 
         return result
-
-    def _requestDetails(self, ip_address=None):
-        """Get IP address data by sending request to IPinfo API."""
-
-        # If the supplied IP address uses the objects defined in the built-in
-        # module ipaddress extract the appropriate string notation before
-        # formatting the URL.
-        if isinstance(ip_address, IPv4Address) or isinstance(
-            ip_address, IPv6Address
-        ):
-            ip_address = ip_address.exploded
-
-        if ip_address not in self.cache:
-            url = handler_utils.API_URL
-            if ip_address:
-                url += "/" + ip_address
-
-            response = requests.get(
-                url,
-                headers=handler_utils.get_headers(self.access_token),
-                **self.request_options
-            )
-            if response.status_code == 429:
-                raise RequestQuotaExceededError()
-            response.raise_for_status()
-            self.cache[ip_address] = response.json()
-
-        return self.cache[ip_address]

ipinfo/handler_async.py

@@ -104,13 +104,13 @@ async def getDetails(self, ip_address=None):
             if resp.status == 429:
                 raise RequestQuotaExceededError()
             resp.raise_for_status()
-            raw_details = await resp.json()
+            details = await resp.json()
 
         # format & cache
-        handler_utils.format_details(raw_details, self.countries)
-        self.cache[ip_address] = raw_details
+        handler_utils.format_details(details, self.countries)
+        self.cache[ip_address] = details
 
-        return Details(raw_details)
+        return Details(details)
 
     async def getBatchDetails(self, ip_addresses):
         """Get details for a batch of IP addresses at once."""

tests/handler_test.py

@@ -102,54 +102,3 @@ def test_get_batch_details(n):
             assert "privacy" in d
             assert "abuse" in d
             assert "domains" in d
-
-
-def test_builtin_ip_types():
-    handler = Handler()
-    fake_details = {"country": "US", "ip": "127.0.0.1", "loc": "12.34,56.78"}
-
-    handler._requestDetails = lambda x: fake_details
-
-    details = handler.getDetails(IPv4Address(fake_details["ip"]))
-    assert isinstance(details, Details)
-    assert details.country == fake_details["country"]
-    assert details.country_name == "United States"
-    assert details.ip == fake_details["ip"]
-    assert details.loc == fake_details["loc"]
-    assert details.longitude == "56.78"
-    assert details.latitude == "12.34"
-
-
-def test_json_serialization():
-    handler = Handler()
-    fake_details = {
-        "asn": {
-            "asn": "AS20001",
-            "domain": "twcable.com",
-            "name": "Time Warner Cable Internet LLC",
-            "route": "104.172.0.0/14",
-            "type": "isp",
-        },
-        "city": "Los Angeles",
-        "company": {
-            "domain": "twcable.com",
-            "name": "Time Warner Cable Internet LLC",
-            "type": "isp",
-        },
-        "country": "US",
-        "country_name": "United States",
-        "hostname": "cpe-104-175-221-247.socal.res.rr.com",
-        "ip": "104.175.221.247",
-        "loc": "34.0293,-118.3570",
-        "latitude": "34.0293",
-        "longitude": "-118.3570",
-        "phone": "323",
-        "postal": "90016",
-        "region": "California",
-    }
-
-    handler._requestDetails = lambda x: fake_details
-
-    details = handler.getDetails(fake_details["ip"])
-    assert isinstance(details, Details)
-    assert json.dumps(details.all)