Merge lp:~abentley/charmworld/fix-commits-in-past-30-days into lp:~juju-jitsu/charmworld/trunk

[Aaron Bentley]

Fix commits_in_past_30_days.

This branch fixes the commits_in_past_30_days in the "related" API endpoint.

It had been providing the number of commits since now, which is always empty, of course. Now it subtracts 30 days, as promised.

[Curtis Hovey (sinzui)]

Thank you.

review: Approve (code)

[Charmworld Lander (charmworld-lander)]

The Jenkins job https://jenkins.qa.ubuntu.com/job/charmworld-merger-trunk/335/console reported an error when processing this lp:~abentley/charmworld/fix-commits-in-past-30-days branch.
Not merging it.

=== modified file 'charmworld/views/api.py'
--- charmworld/views/api.py	2013-06-18 15:11:00 +0000
+++ charmworld/views/api.py	2013-06-18 15:11:30 +0000
@@ -1,6 +1,9 @@
 __metaclass__ = type
 
-from datetime import datetime
+from datetime import (
+    datetime,
+    timedelta,
+)
 from email.utils import parseaddr
 from inspect import getargspec
 import json
@@ -217,6 +220,7 @@
             now = datetime.utcnow()
         else:
             now = _now
+        since = now - timedelta(30)
         charm = Charm(charm_data)
         result = {
             'id': cls._get_api_id(charm),
@@ -224,7 +228,7 @@
             'has_icon': 'icon.svg' in charm.files,
             'categories': charm.categories,
             'downloads_in_past_30_days': charm.downloads_in_past_30_days,
-            'commits_in_past_30_days': len(charm.changes_since(now)),
+            'commits_in_past_30_days': len(charm.changes_since(since)),
             'weight': weight,
             'is_approved': charm.promulgated,
         }

=== modified file 'charmworld/views/tests/test_api.py'
--- charmworld/views/tests/test_api.py	2013-06-18 15:11:00 +0000
+++ charmworld/views/tests/test_api.py	2013-06-18 15:11:30 +0000
@@ -984,8 +984,9 @@
         formatted = self.api_class._format_related(charm, 0, _now=now)
         self.assertEqual(27, formatted['commits_in_past_30_days'])
         charm = factory.get_charm_json(
-            changes=[factory.makeChange(created=now) for x in range(32)] +
-            [factory.makeChange(created=date(2013, 04, 17))])
+            changes=[factory.makeChange(created=date(2013, 05, 18))
+                     for x in range(32)] +
+                    [factory.makeChange(created=date(2013, 05, 17))])
         formatted = self.api_class._format_related(
             charm, 0, _now=now)
         self.assertEqual(32, formatted['commits_in_past_30_days'])