Merge lp:~bac/charmworld/show-bundle-changes into lp:~juju-jitsu/charmworld/trunk

[Brad Crittenden]

Add changelog to bundle page.

https://codereview.appspot.com/16690043/

[Brad Crittenden (bac)]

Reviewers: mp+192563_code.launchpad.net,

Message:
Please take a look.

Description:
Add changelog to bundle page.

https://code.launchpad.net/~bac/charmworld/show-bundle-changes/+merge/192563

(do not edit description out of merge proposal)

Please review this at https://codereview.appspot.com/16690043/

Affected files (+69, -23 lines):
   A [revision details]
   M charmworld/jobs/ingest.py
   M charmworld/jobs/tests/test_ingest.py
   M charmworld/jobs/tests/test_lp.py
   M charmworld/migrations/versions/tests/test_migrations.py
   M charmworld/models.py
   M charmworld/templates/bundle.pt
   M charmworld/templates/charm.pt
   M charmworld/templates/recent.pt
   M charmworld/testing/factory.py
   M charmworld/tests/test_models.py
   M charmworld/tests/test_search.py
   M charmworld/views/bundles.py
   M charmworld/views/helpers.py
   M charmworld/views/tests/test_api.py
   M charmworld/views/tests/test_feeds.py

Index: [revision details]
=== added file '[revision details]'
--- [revision details] 2012-01-01 00:00:00 +0000
+++ [revision details] 2012-01-01 00:00:00 +0000
@@ -0,0 +1,2 @@
+Old revision: <email address hidden>
+New revision: <email address hidden>

Index: charmworld/models.py
=== modified file 'charmworld/models.py'
--- charmworld/models.py 2013-10-23 18:52:03 +0000
+++ charmworld/models.py 2013-10-24 17:24:43 +0000
@@ -1298,6 +1298,10 @@
          'data': dict(),
          'promulgated': False,
          'branch_deleted': False,
+ 'first_change': None,
+ 'last_change': None,
+ 'changes': None,
+ 'branch_spec': None,
      }

      def __init__(self, data):
@@ -1744,7 +1748,7 @@

  def make_bundle_doc(data, owner, basket_id, bundle_name, first_change,
- last_change, changes):
+ last_change, changes, branch_spec):
      basket_name, basket_revision = basket_id.split('/')
      _id = Bundle.construct_id(owner, basket_name, bundle_name,
basket_revision)
      return {
@@ -1757,11 +1761,12 @@
          'first_change': first_change,
          'last_change': last_change,
          'changes': changes,
+ 'branch_spec': branch_spec,
      }

  def store_bundles(collection, deployer_config, owner, basket_id,
first_change,
- last_change, changes, index_client=None):
+ last_change, changes, branch_spec, index_client=None):
      """Store a basket of bundles into MongoDB and/or ElasticSearch.

      :param: collection: A db bundles collection. If None the bundles are
not
@@ -1785,7 +1790,7 @@
          data = get_flattened_deployment(deployer_config, bundle_name)
          index_data[bundle_name] = make_bundle_doc(
              data, owner, basket_id, bundle_name, first_change, last_change,
- changes)
+ changes, branch_spec)
          if collection is not None:
              collection.save(index_data[bundle_name])

Index: charmworld/jobs/ingest.py
=== modified file 'charmworld/jobs/ingest.py'
--- charmworld/jobs/ingest.py 2013-10-23 18:07:20 +0000
+++ charmworld/jobs/ingest.py 2013-10-24 17:24:43 +0000
@@ -310,10 +310,10 @@
          super(Update...

[lp:~bac/charmworld/show-bundle-changes]

432. By Brad Crittenden on 2013-10-24

Remove broken RSS link for bundles.

[Brad Crittenden (bac)]

Please take a look.

https://codereview.appspot.com/16690043/

[Brad Crittenden (bac)]

*** Submitted:

Add changelog to bundle page.

R=benji
CC=
https://codereview.appspot.com/16690043

https://codereview.appspot.com/16690043/

=== modified file 'charmworld/jobs/ingest.py'
--- charmworld/jobs/ingest.py	2013-10-23 18:07:20 +0000
+++ charmworld/jobs/ingest.py	2013-10-24 19:26:47 +0000
@@ -310,10 +310,10 @@
         super(UpdateBundleJob, self).__init__()
 
     def store_bundles(self, deployer_config, owner, basket_id, first_change,
-                      last_change, changes):
+                      last_change, changes, branch_spec):
         store_bundles(
             self.db.bundles, deployer_config, owner, basket_id, first_change,
-            last_change, changes)
+            last_change, changes, branch_spec)
 
     @staticmethod
     def set_basket_info(data, revno):
@@ -347,7 +347,8 @@
         deployer_config = self.get_deployer_config(fs, basket_data)
         self.store_bundles(
             deployer_config, basket_data['owner'], basket_data['name_revno'],
-            None, None, None)
+            basket_data['first_change'], basket_data['last_change'],
+            basket_data['changes'], basket_data['branch_spec'])
 
 
 def _rev_info(r, branch):
 
=== modified file 'charmworld/jobs/tests/test_ingest.py'
--- charmworld/jobs/tests/test_ingest.py	2013-10-23 17:37:08 +0000
+++ charmworld/jobs/tests/test_ingest.py	2013-10-24 19:26:47 +0000
@@ -534,12 +534,16 @@
         fs.put(deployer_config, _id=DEPLOYER_CONFIG_HASH)
         job.store_bundles(
             yaml.safe_load(deployer_config), basket_data['owner'],
-            basket_data['name_revno'], None, None, None)
+            basket_data['name_revno'], None, None, None, None)
         self.assertIsNotNone(self.db.bundles.find_one(bundle_id))
 
     def test_job_run_stores_bundles_in_the_db(self):
         basket_data = factory.get_payload_json(name='wordpress')
         basket_data['name_revno'] = 'dummy'
+        basket_data['first_change'] = None
+        basket_data['last_change'] = None
+        basket_data['changes'] = None
+        basket_data['branch_spec'] = None
         job = UpdateBundleJob()
         job.setup(self.db)
         with patch.object(job, 'get_deployer_config'):
@@ -551,6 +555,10 @@
     def test_job_run_does_not_alter_bundle_data(self):
         basket_data = factory.get_payload_json(name='wordpress')
         basket_data['name_revno'] = 'dummy'
+        basket_data['first_change'] = None
+        basket_data['last_change'] = None
+        basket_data['changes'] = None
+        basket_data['branch_spec'] = None
         job = UpdateBundleJob()
         job.setup(self.db)
         with patch.object(job, 'get_deployer_config',
@@ -559,7 +567,8 @@
                 with patch.object(job, 'store_bundles') as store_bundles:
                     job.run(basket_data)
                     store_bundles.assert_called_with(
-                        {'foo': {}}, 'charmers', 'dummy', None, None, None)
+                        {'foo': {}}, 'charmers', 'dummy', None, None, None,
+                        None)
 
 
 class TestUpdateCharm(MongoTestBase):
 
=== modified file 'charmworld/jobs/tests/test_lp.py'
--- charmworld/jobs/tests/test_lp.py	2013-10-23 21:53:17 +0000
+++ charmworld/jobs/tests/test_lp.py	2013-10-24 19:26:47 +0000
@@ -288,7 +288,7 @@
         'store_data': {
             'errors': ['entry not found'],
             'revision': 0,
-            'store_checked': 'lambada'
+            'store_checked': 'lambada',
         },
         'store_url': 'cs:~baz/qux/quxx-0',
     }
 
=== modified file 'charmworld/migrations/versions/tests/test_migrations.py'
--- charmworld/migrations/versions/tests/test_migrations.py	2013-10-23 17:37:08 +0000
+++ charmworld/migrations/versions/tests/test_migrations.py	2013-10-24 19:26:47 +0000
@@ -60,7 +60,7 @@
             owner, basket_name, bundle_name)
         store_bundles(
             self.db.bundles, parsed, owner, basket_id,
-            None, None, None,
+            None, None, None, None,
             index_client=self.index_client)
 
     def test_bundles_are_removed_from_elastic_search(self):
 
=== modified file 'charmworld/models.py'
--- charmworld/models.py	2013-10-23 18:52:03 +0000
+++ charmworld/models.py	2013-10-24 19:26:47 +0000
@@ -1298,6 +1298,10 @@
         'data': dict(),
         'promulgated': False,
         'branch_deleted': False,
+        'first_change': None,
+        'last_change': None,
+        'changes': None,
+        'branch_spec': None,
     }
 
     def __init__(self, data):
@@ -1744,7 +1748,7 @@
 
 
 def make_bundle_doc(data, owner, basket_id, bundle_name, first_change,
-                    last_change, changes):
+                    last_change, changes, branch_spec):
     basket_name, basket_revision = basket_id.split('/')
     _id = Bundle.construct_id(owner, basket_name, bundle_name, basket_revision)
     return {
@@ -1757,11 +1761,12 @@
         'first_change': first_change,
         'last_change': last_change,
         'changes': changes,
+        'branch_spec': branch_spec,
     }
 
 
 def store_bundles(collection, deployer_config, owner, basket_id, first_change,
-                  last_change, changes, index_client=None):
+                  last_change, changes, branch_spec, index_client=None):
     """Store a basket of bundles into MongoDB and/or ElasticSearch.
 
     :param: collection: A db bundles collection.  If None the bundles are not
@@ -1785,7 +1790,7 @@
         data = get_flattened_deployment(deployer_config, bundle_name)
         index_data[bundle_name] = make_bundle_doc(
             data, owner, basket_id, bundle_name, first_change, last_change,
-            changes)
+            changes, branch_spec)
         if collection is not None:
             collection.save(index_data[bundle_name])
 
 
=== modified file 'charmworld/templates/bundle.pt'
--- charmworld/templates/bundle.pt	2013-10-22 22:37:03 +0000
+++ charmworld/templates/bundle.pt	2013-10-24 19:26:47 +0000
@@ -103,6 +103,16 @@
           </li>
         </ul>
       </div>
+      <div class="row no-border">
+        <h3>
+          Changes
+        </h3>
+        <ul class="list">
+            <li tal:repeat="change bundle.changes"
+                tal:content="structure: format_change(change, bundle.branch_spec)">
+            </li>
+        </ul>
+      </div>
     </metal:block>
   </body>
 </html>
 
=== modified file 'charmworld/templates/charm.pt'
--- charmworld/templates/charm.pt	2013-10-01 12:38:21 +0000
+++ charmworld/templates/charm.pt	2013-10-24 19:26:47 +0000
@@ -268,7 +268,7 @@
         </h3>
         <ul class="list">
             <li tal:repeat="change charm.changes"
-                tal:content="structure: format_change(change, charm)">
+                tal:content="structure: format_change(change, charm.branch_spec)">
             </li>
         </ul>
       </div>
 
=== modified file 'charmworld/templates/recent.pt'
--- charmworld/templates/recent.pt	2013-09-05 10:55:42 +0000
+++ charmworld/templates/recent.pt	2013-10-24 19:26:47 +0000
@@ -27,7 +27,7 @@
         <td>
           <a href="${charm.short_url}">${charm.store_url}</a></td>
         <td tal:content="charm.summary"></td>
-        <td tal:content="structure: format_change(charm.last_change, charm)"></td>
+        <td tal:content="structure: format_change(charm.last_change, charm.branch_spec)"></td>
       </tr>
     </table>
   </div>
 
=== modified file 'charmworld/testing/factory.py'
--- charmworld/testing/factory.py	2013-10-23 17:37:08 +0000
+++ charmworld/testing/factory.py	2013-10-24 19:26:47 +0000
@@ -332,7 +332,7 @@
                 relations=relations,
                 services=services)
     bundle_doc = make_bundle_doc(
-        data, owner, basket_with_rev, name, None, None, None)
+        data, owner, basket_with_rev, name, None, None, None, None)
     bundle_doc.update(dict(branch_deleted=branch_deleted,
                            data=data,
                            description=description,
 
=== modified file 'charmworld/tests/test_models.py'
--- charmworld/tests/test_models.py	2013-10-23 18:52:03 +0000
+++ charmworld/tests/test_models.py	2013-10-24 19:26:47 +0000
@@ -1595,7 +1595,7 @@
         basket_id = "%s/%d" % (basket_name, basket_rev)
         _id = Bundle.construct_id(owner, basket_name, bundle_name, basket_rev)
         store_bundles(
-            self.db.bundles, parsed, 'bac', basket_id, None, None, None)
+            self.db.bundles, parsed, 'bac', basket_id, None, None, None, None)
         self.assertEqual(
             {
                 '_id': _id,
@@ -1607,6 +1607,7 @@
                 'first_change': None,
                 'last_change': None,
                 'changes': None,
+                'branch_spec': None,
             },
             self.db.bundles.find_one(_id))
 
@@ -1643,7 +1644,7 @@
                    get_flattened_deployment):
             store_bundles(
                 self.db.bundles, parsed, 'bac', 'wordpress-basket/5', None,
-                None, None)
+                None, None, None)
         self.assertItemsEqual(['wordpress-stage', 'wordpress-prod'], keys)
 
     def test_storing_a_bundle_includes_indexing_it(self):
@@ -1663,7 +1664,7 @@
                 FauxElasticSearchClient):
             store_bundles(
                 self.db.bundles, {}, 'owner', 'wordpress-basket/5', None,
-                None, None)
+                None, None, None)
 
         self.assertTrue(FauxElasticSearchClient.index_bundles_called)
 
@@ -1703,6 +1704,9 @@
             'owner': 'sinzui',
             'basket_name': 'mysql',
             'basket_revision': 1,
+            'changes': None,
+            'first_change': None,
+            'last_change': None,
             'name': 'tiny',
             'title': 'Tiny bundle',
             'description': 'My Tiny Bundle',
@@ -1714,6 +1718,7 @@
             'promulgated': True,
             'branch_deleted': True,
             'is_featured': False,
+            'branch_spec': '~sinzui/fake/path',
         }
         bundle = Bundle(bundle_data)
         self.assertIs(bundle_data, bundle._raw_representation)
@@ -2010,7 +2015,8 @@
 
     def test_bundle_doc(self):
         doc = make_bundle_doc(
-            {'a': 'b'}, 'foo', 'bar/9', 'baz', None, None, None)
+            {'a': 'b'}, 'foo', 'bar/9', 'baz', None, None, None,
+            'fake/branch/spec')
         self.assertEqual({
             'owner': 'foo',
             'basket_name': 'bar',
@@ -2021,6 +2027,7 @@
             'first_change': None,
             'last_change': None,
             'changes': None,
+            'branch_spec': 'fake/branch/spec',
         }, doc)
 
 
 
=== modified file 'charmworld/tests/test_search.py'
--- charmworld/tests/test_search.py	2013-10-23 17:37:08 +0000
+++ charmworld/tests/test_search.py	2013-10-24 19:26:47 +0000
@@ -168,7 +168,7 @@
         parsed = yaml.safe_load(deployer_config)
         store_bundles(
             None, parsed, 'abentley', 'wordpress-basket/5', None, None, None,
-            index_client=self.index_client)
+            None, index_client=self.index_client)
         return _id
 
     def test_store_bundles_bundle_name_indexed(self):
 
=== modified file 'charmworld/views/bundles.py'
--- charmworld/views/bundles.py	2013-10-10 20:29:41 +0000
+++ charmworld/views/bundles.py	2013-10-24 19:26:47 +0000
@@ -9,6 +9,7 @@
 from charmworld.views.helpers import (
     find_bundle,
     found,
+    format_change,
 )
 
 
@@ -101,6 +102,7 @@
     readme, readme_ext = bundle.readme_info(request.db)
     return dict(
         bundle=bundle,
+        format_change=format_change,
         icon_path=bundle.icon_path(request),
         is_owner=is_owner,
         readme=readme,
 
=== modified file 'charmworld/views/helpers.py'
--- charmworld/views/helpers.py	2013-10-02 13:47:53 +0000
+++ charmworld/views/helpers.py	2013-10-24 19:26:47 +0000
@@ -14,23 +14,23 @@
 # View helpers used throughout various views
 
 
-def format_change(change, charm=None):
+def format_change(change, branch_spec=None):
     """Format a bzr commit."""
     parts = []
     date = change["created"]
     # bug 1199790: We may have a branch without any commits.
-    # In this case, class Charm returns dummy data for its attributes
+    # In this case, Charm and Bundle return dummy data for its attributes
     # first_change and last_change.
     if date is not None:
         date = datetime.utcfromtimestamp(date)
         parts.append(unicode(date.strftime("%Y/%m/%d")))
     parts.append(name_filter(change['committer']))
     parts.append(change["message"][:100])
-    if charm is not None:
+    if branch_spec is not None:
         parts.append(
             u'(<a href="'
             'https://bazaar.launchpad.net/%s/revision/%s">revno %s</a>)' % (
-                charm.branch_spec, change["revno"], change["revno"]))
+                branch_spec, change["revno"], change["revno"]))
     return u" ".join(parts)
 
 
 
=== modified file 'charmworld/views/tests/test_api.py'
--- charmworld/views/tests/test_api.py	2013-10-23 18:52:03 +0000
+++ charmworld/views/tests/test_api.py	2013-10-24 19:26:47 +0000
@@ -735,6 +735,7 @@
             first_change=None,
             last_change=None,
             changes=None,
+            branch_spec=None,
         )
         self.assertEqual(expected, bundle._representation)
 
@@ -821,6 +822,10 @@
                 },
                 u'description': u'',
                 u'files': [],
+                u'first_change': None,
+                u'last_change': None,
+                u'changes': None,
+                u'branch_spec': None,
                 u'id': u'~bac/byobu/4/bat',
                 u'name': u'bat',
                 u'owner': u'bac',
 
=== modified file 'charmworld/views/tests/test_feeds.py'
--- charmworld/views/tests/test_feeds.py	2013-09-05 09:47:11 +0000
+++ charmworld/views/tests/test_feeds.py	2013-10-24 19:26:47 +0000
@@ -107,5 +107,6 @@
         self.assertEqual(charm.short_url, anchor.attrib['href'])
         self.assertEqual(charm.summary, cells[1].text)
         self.assertEqual(
-            '<td>%s</td>' % format_change(charm.last_change, charm),
+            '<td>%s</td>' % format_change(
+                charm.last_change, charm.branch_spec),
             tostring(cells[2]).strip())