Merge pull request #2 from mjkallen/master

Fixed typo in file name and added function to retrieve countries

Author: jamescw

activtyinfo_client.py renamed to activityinfo_client.py

@@ -20,11 +20,12 @@ class ActivityInfoClient(object):
         Retrieve all sites in activity 33: /sites?activity=33
         Retrieve all sites in activity 33 in GeoJSON format: /sites/points?activity=33
 
+        List all countries: /countries
         List all administrative levels in Lebanon (country code LB): /country/LB/adminLevels
         List all administrative entities in level 1370: /adminLevel/1370/entities
         List all administrative entities in level 1370 in GeoJSON format: /adminLevel/1370/entities/features
         List all location types in Lebanon: /country/LB/locationTypes
-        List all locations of type 1370: /locations/type=1370
+        List all locations of type 1370: /locations?type=1370
 
     """
 
@@ -113,6 +114,9 @@ def get_cube(self, form_ids, month=None):
     def get_monthly_reports_for_site(self, site_id):
         return self.make_request('resources/sites/{}/monthlyReports'.format(site_id)).json()
 
+    def get_countries(self):
+        return self.make_request('resources/countries').json()
+
     def get_admin_levels(self, country):
         return self.make_request('resources/country/{}/adminLevels'.format(country)).json()
 

setup.py

@@ -2,7 +2,7 @@
 
 setup(
     name='activityinfo_python',
-    version='1.5.0',
+    version='1.6.0',
     author='James Cranwell-Ward',
     author_email='[email protected]',
     py_modules=['activityinfo_client'],