Merge pull request #25 from maxmind/markf/demographics

Version 2.2.0

Author: oschwald

HISTORY.rst

@@ -3,6 +3,13 @@
 History
 -------
 
+2.2.0 (2015-06-29)
+++++++++++++++++++
+
+* The ``geoip2.records.Location` class has been updated to add attributes for
+  the ``average_income`` and ``population_density`` fields provided by the
+  Insights web service.
+
 2.1.0 (2014-12-09)
 ++++++++++++++++++
 

geoip2/__init__.py

@@ -1,7 +1,7 @@
 # pylint:disable=C0111
 
 __title__ = 'geoip2'
-__version__ = '2.1.0'
+__version__ = '2.2.0'
 __author__ = 'Gregory Oschwald'
 __license__ = 'Apache License, Version 2.0'
 __copyright__ = 'Copyright 2014 Maxmind, Inc.'

geoip2/records.py

@@ -255,6 +255,13 @@ class Location(Record):
 
     Attributes:
 
+    .. attribute:: average_income
+
+      The average income in US dollars associated with the requested IP address
+      This attribute is only available from the Insights end point.
+
+      :type: int
+
     .. attribute:: accuracy_radius
 
       The radius in kilometers around the
@@ -269,7 +276,6 @@ class Location(Record):
 
       :type: float
 
-
     .. attribute:: longitude
 
       The longitude of the location as a
@@ -286,6 +292,13 @@ class Location(Record):
 
       :type: int
 
+      .. attribute:: population_density
+
+      The estimated population per square kilometer associated with the IP
+      address. This attribute is only available from the Insights end point.
+
+      :type: int
+
     .. attribute:: time_zone
 
       The time zone associated with location, as
@@ -295,9 +308,9 @@ class Location(Record):
       :type: unicode
 
     """
-    _valid_attributes = set(['accuracy_radius', 'latitude', 'longitude',
-                             'metro_code', 'postal_code', 'postal_confidence',
-                             'time_zone'])
+    _valid_attributes = set(['average_income', 'accuracy_radius', 'latitude',
+                             'longitude', 'metro_code', 'population_density',
+                             'postal_code', 'postal_confidence', 'time_zone'])
 
 
 class MaxMind(Record):

tests/models_test.py

@@ -39,10 +39,12 @@ def test_insights_full(self):
                 'names': {'en': 'United States of America'},
             },
             'location': {
+                'average_income': 24626,
                 'accuracy_radius': 1500,
                 'latitude': 44.98,
                 'longitude': 93.2636,
                 'metro_code': 765,
+                'population_density': 1341,
                 'time_zone': 'America/Chicago',
             },
             'postal': {
@@ -127,12 +129,16 @@ def test_insights_full(self):
         self.assertEqual(model.represented_country.type,
                          'military',
                          'represented_country type is correct')
+        self.assertEqual(model.location.average_income, 24626,
+                         'correct average_income')
         self.assertEqual(model.location.latitude, 44.98,
                          'correct latitude')
         self.assertEqual(model.location.longitude, 93.2636,
                          'correct longitude')
         self.assertEqual(model.location.metro_code, 765,
                          'correct metro_code')
+        self.assertEqual(model.location.population_density, 1341,
+                         'correct population_density')
 
         self.assertRegex(
             str(