Merge branch 'mcos-master'

Alex Schworer · Alex Schworer · commit 63c76033ab47 · 2013-04-04T17:24:57.000-07:00
Closes pull request #15
diff --git a/zencoder/core.py b/zencoder/core.py
@@ -1,6 +1,7 @@
 import os
 import httplib2
 from urllib import urlencode
+from datetime import datetime
 
 LIB_VERSION = '0.5.2'
 
@@ -64,7 +65,7 @@ def headers(self):
 
         headers = {
             'Content-Type': 'application/{0}'.format(content_type),
-            'Accepts': 'application/{0}'.format(content_type),
+            'Accept': 'application/{0}'.format(content_type),
             'Zencoder-Api-Key': self.api_key,
             'User-Agent': 'zencoder-py v{0}'.format(LIB_VERSION)
         }
@@ -208,6 +209,9 @@ def __init__(self, api_key=None, api_version=None, as_xml=False, timeout=None, t
         self.job = Job(*args, **kwargs)
         self.account = Account(*args, **kwargs)
         self.output = Output(*args, **kwargs)
+        self.report = None
+        if api_version == 'v2':
+            self.report = Report(*args, **kwargs)
 
 class Response(object):
     """
@@ -360,3 +364,43 @@ def delete(self, job_id):
         """
         return self.cancel(job_id)
 
+class Report(HTTPBackend):
+    def __init__(self, *args, **kwargs):
+        """
+        Contains all API methods relating to Reports.
+        """
+        kwargs['resource_name'] = 'reports'
+        super(Report, self).__init__(*args, **kwargs)
+
+    def minutes(self, start_date=None, end_date=None, grouping=None):
+        """
+        Gets a detailed Report of encoded minutes and billable minutes for a 
+        date range.
+
+        **Warning**: `start_date` and `end_date` must be `datetime.date` objects.
+
+        Example:
+            import datetime
+            start = datetime.date(2012, 12, 31)
+            end = datetime.today()
+            data = z.report.minutes(start, end)
+
+        @param start_date: Start date of report (If not submitted,
+            API defaults to 30 days ago)
+        @param end_date: End date of report (If not submitted, API defaults to
+            yesterday)
+        @param grouping: Minute usage for only one report grouping
+        """
+        data = {'api_key': self.api_key}
+        date_format = '%Y-%m-%d'
+        if start_date:
+            data['from'] = datetime.strftime(start_date, date_format)
+
+        if end_date:
+            data['to'] = datetime.strftime(end_date, date_format)
+
+        if grouping:
+            data['grouping'] = grouping
+
+        url = self.base_url + '/minutes'
+        return self.get(url, data=data)
