Merge pull request Clever#37 from newsela/master

Adds bindings for DistrictAdmin and SchoolAdmin.

Author: Christopher Bradshaw

CHANGELOG.md

@@ -1,3 +1,6 @@
+## 2.2.0 (2016-02-03)
+ * Added bindings for DistrictAdmin and SchoolAdmin resources. [#37](https://github.com/Clever/clever-python/pull/37)
+
 ## 2.1.1 (2015-02-05)
  * Pagination using starting_after and ending_before parameters. [#33](https://github.com/Clever/clever-python/pull/33)
 

README.md

@@ -34,7 +34,9 @@ Get started by importing the `clever` module and setting your authentication met
 The `clever` module exposes classes corresponding to resources:
 
 * District
+* DistrictAdmin
 * School
+* SchoolAdmin
 * Section
 * Student
 * Teacher

bin/clever

@@ -103,9 +103,15 @@ class DeletableAPIResourceClient(APIResourceClient):
 class DistrictClient(ListableAPIResourceClient):
   client_for = clever.District
 
+class DistrictAdminClient(ListableAPIResourceClient):
+  client_for = clever.DistrictAdmin
+
 class SchoolClient(ListableAPIResourceClient):
   client_for = clever.School
 
+class SchoolAdminClient(ListableAPIResourceClient):
+  client_for = clever.SchoolAdmin
+
 class SectionClient(ListableAPIResourceClient):
   client_for = clever.Section
 
@@ -121,11 +127,13 @@ class EventClient(ListableAPIResourceClient):
 def main():
   klasses = {
     'district' : DistrictClient,
+    'district_admin' : DistrictAdminClient,
     'school' : SchoolClient,
+    'school_admin': SchoolAdminClient,
     'section' : SectionClient,
     'student' : StudentClient,
     'teacher' : TeacherClient,
-    'event' : EventClient
+    'event' : EventClient,
   }
   klasses_plural = { '{0}s'.format(key) : value for key, value in klasses.iteritems() }
   klasses = dict(klasses.items() + klasses_plural.items())
@@ -137,10 +145,18 @@ district
   all
   retrieve
 
+district_admin
+  all
+  retrieve
+
 school
   all
   retrieve
 
+school_admin
+  all
+  retrieve
+
 section
   all
   retrieve

clever/VERSION

@@ -1 +1 @@
-2.1.1
+2.2.0

clever/__init__.py

@@ -81,6 +81,7 @@
 
 # Use certs chain bundle including in the package for SSL verification
 CLEVER_CERTS = pkg_resources.resource_filename(__name__, 'data/clever.com_ca_bundle.crt')
+API_VERSION = "v1.1"
 
 # Configuration variables
 
@@ -266,7 +267,7 @@ def request_raw(self, meth, url, params={}):
 
     headers = {
         'X-Clever-Client-User-Agent': json.dumps(ua),
-        'User-Agent': 'Clever/v1.1 PythonBindings/%s' % (VERSION, )
+        'User-Agent': 'Clever/%s PythonBindings/%s' % (API_VERSION, VERSION)
     }
     if my_auth.get('api_key', None) != None:
       headers['Authorization'] = 'Basic {}'.format(base64.b64encode(my_auth['api_key'] + ':'))
@@ -679,7 +680,7 @@ def class_name(cls):
   @classmethod
   def class_url(cls):
     cls_name = cls.class_name()
-    return "/v1.1/%ss" % cls_name
+    return "/%s/%ss" % (API_VERSION, cls_name)
 
   def instance_url(self):
     id = self.get('id')
@@ -774,10 +775,22 @@ class District(ListableAPIResource):
   pass
 
 
+class DistrictAdmin(ListableAPIResource):
+  @classmethod
+  def class_url(cls):
+    return "/%s/district_admins" % API_VERSION
+
+
 class School(ListableAPIResource):
   pass
 
 
+class SchoolAdmin(ListableAPIResource):
+  @classmethod
+  def class_url(cls):
+    return "/%s/school_admins" % API_VERSION
+
+
 class Section(ListableAPIResource):
   pass