Merge pull request #70 from oschwald/netspeed-cell

Add support for NetSpeedCell databases

pygeoip/__init__.py

@@ -168,6 +168,8 @@ class GeoIP(object):
                                             const.CITY_EDITION_REV1_V6,
                                             const.ORG_EDITION,
                                             const.ISP_EDITION,
+                                            const.NETSPEED_EDITION_REV1,
+                                            const.NETSPEED_EDITION_REV1_V6,
                                             const.ASNUM_EDITION,
                                             const.ASNUM_EDITION_V6):
                     self._databaseSegments = 0
@@ -455,7 +457,15 @@ class GeoIP(object):
 
         :arg addr: IP address (e.g. 203.0.113.30)
         """
+        if self._databaseType == const.NETSPEED_EDITION:
             return const.NETSPEED_NAMES[self.id_by_addr(addr)]
+        elif self._databaseType in (const.NETSPEED_EDITION_REV1,
+                                    const.NETSPEED_EDITION_REV1_V6):
+            ipnum = util.ip2long(addr)
+            return self._get_org(ipnum)
+
+        raise GeoIPError(
+            'Invalid database type, expected NetSpeed or NetSpeedCell')
 
     def netspeed_by_name(self, hostname):
         """
@@ -498,7 +508,8 @@ class GeoIP(object):
 
         :arg addr: IP address (e.g. 203.0.113.30)
         """
-        valid = (const.ORG_EDITION, const.ISP_EDITION, const.ASNUM_EDITION, const.ASNUM_EDITION_V6)
+        valid = (const.ORG_EDITION, const.ISP_EDITION,
+                 const.ASNUM_EDITION, const.ASNUM_EDITION_V6)
         if self._databaseType not in valid:
             message = 'Invalid database type, expected Org, ISP or ASNum'
             raise GeoIPError(message)

tests/test_netspeed_cell.py

+# -*- coding: utf-8 -*-
+import unittest
+
+import pygeoip
+from tests.config import NETSPEEDCELL_DB_PATH
+
+
+class TestGeoIPNetspeedCellFunctions(unittest.TestCase):
+
+    def setUp(self):
+        self.gi = pygeoip.GeoIP(NETSPEEDCELL_DB_PATH)
+
+    def testNetSpeedByAddrWrapper(self):
+        netspeed = self.gi.netspeed_by_addr('2.125.160.1')
+        self.assertEqual(netspeed, 'Dialup')