Merge lp:~bac/charmworld/bug-1240576 into lp:~juju-jitsu/charmworld/trunk

[Brad Crittenden]

Parse charms with hyphens properly.

https://codereview.appspot.com/15580047/

[Brad Crittenden (bac)]

Reviewers: mp+192074_code.launchpad.net,

Message:
Please take a look.

Description:
Parse charms with hyphens properly.

https://code.launchpad.net/~bac/charmworld/bug-1240576/+merge/192074

(do not edit description out of merge proposal)

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

Affected files (+23, -1 lines):
   A [revision details]
   M charmworld/views/api.py
   M charmworld/views/tests/test_api.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/views/api.py
=== modified file 'charmworld/views/api.py'
--- charmworld/views/api.py 2013-10-17 18:38:21 +0000
+++ charmworld/views/api.py 2013-10-22 00:33:12 +0000
@@ -407,7 +407,7 @@
          if len(elements) < 2:
              raise ValueError('charm ID does not contain enough elements')
          # If the charm ID includes a revision number, parse it out.
- if '-' in elements[-1]:
+ if re.search('-\d+$', elements[-1]):
              name, revision = elements[-1].rsplit('-', 1)
          else:
              name = elements[-1]

Index: charmworld/views/tests/test_api.py
=== modified file 'charmworld/views/tests/test_api.py'
--- charmworld/views/tests/test_api.py 2013-10-18 18:53:19 +0000
+++ charmworld/views/tests/test_api.py 2013-10-22 00:36:55 +0000
@@ -1729,6 +1729,9 @@
      return names

+# XXX: Rick Harding 2013-10-21:
+# Odd bug requires these tests to be run last, hence the Z in the name to
+# force it to be last.
  class TestZAPI3(TestAPI, API3Mixin):
      """Test API 3."""

@@ -1809,6 +1812,20 @@
          self.assertEqual(200, response.status_code)
          self.assertEqual(response.json_body, new_charm)

+ def test_charm_no_revision_with_hyphen(self):
+ """Retrieving a charm with no revision results in the latest
one."""
+ self.use_index_client()
+ # Make a charm.
+ old_charm = self.make_charm(
+ owner='owner', series='series', name='a-name',
store_revision=1)[1]
+ # Make a newer revision of the same charm.
+ new_charm = self.make_charm(
+ owner='owner', series='series', name='a-name',
store_revision=2)[1]
+ revisionless_charm_id = self.get_id(old_charm).rsplit('-', 1)[0]
+ response = self.get_response('charm',
remainder=revisionless_charm_id)
+ self.assertEqual(200, response.status_code)
+ self.assertEqual(response.json_body, new_charm)
+
      def test_search_interesting_contains_charms_and_bundles(self):
          self.use_index_client()
          bundle = self.make_indexed_bundle(name='bat')
@@ -1825,6 +1842,9 @@
          self.assertItemsEqual(expected, list_names(result['featured']))

+# XXX: Rick Harding 2013-10-21:
+# Odd bug requires these tests to be run last, hence the Z in the name to
+# force it to be last.
  class TestZAPI2(TestAPI, API2Mixin):
      """Test API 2."""

[lp:~bac/charmworld/bug-1240576]

427. By Brad Crittenden on 2013-10-22

Add new test, clean up comments.

[Brad Crittenden (bac)]

*** Submitted:

Parse charms with hyphens properly.

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

https://codereview.appspot.com/15580047/

=== modified file 'charmworld/views/api.py'
--- charmworld/views/api.py	2013-10-17 18:38:21 +0000
+++ charmworld/views/api.py	2013-10-22 00:55:31 +0000
@@ -407,7 +407,7 @@
         if len(elements) < 2:
             raise ValueError('charm ID does not contain enough elements')
         # If the charm ID includes a revision number, parse it out.
-        if '-' in elements[-1]:
+        if re.search('-\d+$', elements[-1]):
             name, revision = elements[-1].rsplit('-', 1)
         else:
             name = elements[-1]

=== modified file 'charmworld/views/tests/test_api.py'
--- charmworld/views/tests/test_api.py	2013-10-18 18:53:19 +0000
+++ charmworld/views/tests/test_api.py	2013-10-22 00:55:31 +0000
@@ -1729,6 +1729,9 @@
     return names
 
 
+# XXX: Rick Harding 2013-10-21:
+# Odd bug requires these tests to be run last, hence the Z in the name to
+# force it to be last.
 class TestZAPI3(TestAPI, API3Mixin):
     """Test API 3."""
 
@@ -1782,7 +1785,7 @@
         )
 
     def test_charm_wrong_revision(self):
-        """Retrieving a charm does not work if the revision is wrong."""
+        # Retrieving a charm does not work if the revision is wrong.
         self.use_index_client()
         charm = self.make_charm()[1]
         stale_charm_id = self.get_id(charm) + '37'
@@ -1796,7 +1799,7 @@
             })
 
     def test_charm_no_revision(self):
-        """Retrieving a charm with no revision results in the latest one."""
+        # Retrieving a charm with no revision results in the latest one.
         self.use_index_client()
         # Make a charm.
         old_charm = self.make_charm(
@@ -1809,6 +1812,31 @@
         self.assertEqual(200, response.status_code)
         self.assertEqual(response.json_body, new_charm)
 
+    def test_charm_no_revision_with_hyphen(self):
+        # Retrieving a charm with a hyphen works.
+        self.use_index_client()
+        # Make a charm.
+        old_charm = self.make_charm(
+            owner='owner', series='series', name='a-name', store_revision=1)[1]
+        # Make a newer revision of the same charm.
+        new_charm = self.make_charm(
+            owner='owner', series='series', name='a-name', store_revision=2)[1]
+        revisionless_charm_id = self.get_id(old_charm).rsplit('-', 1)[0]
+        response = self.get_response('charm', remainder=revisionless_charm_id)
+        self.assertEqual(200, response.status_code)
+        self.assertEqual(response.json_body, new_charm)
+
+    def test_charm_with_hyphen_and_revision(self):
+        # Retrieving a charm with a hyphen works.
+        self.use_index_client()
+        # Make a charm.
+        charm = self.make_charm(
+            owner='owner', series='series', name='a-name', store_revision=1)[1]
+        charm_id = self.get_id(charm)
+        response = self.get_response('charm', remainder=charm_id)
+        self.assertEqual(200, response.status_code)
+        self.assertEqual(response.json_body, charm)
+
     def test_search_interesting_contains_charms_and_bundles(self):
         self.use_index_client()
         bundle = self.make_indexed_bundle(name='bat')
@@ -1825,6 +1853,9 @@
         self.assertItemsEqual(expected, list_names(result['featured']))
 
 
+# XXX: Rick Harding 2013-10-21:
+# Odd bug requires these tests to be run last, hence the Z in the name to
+# force it to be last.
 class TestZAPI2(TestAPI, API2Mixin):
     """Test API 2."""