Merge lp:~leonardr/launchpadlib/find-length into lp:launchpadlib

[Leonard Richardson]

This branch fixes launchpadlib to start out with knowledge of all the special resource classes defined by lazr.restfulclient. The most recent launchpadlib release doesn't know about the ScalarValue resource class, because it wasn't specifically mentioned in Launchpad.RESOURCE_TYPE_CLASSES. Now Launchpad.R_T_C is always updated with whatever is in lazr.restful's ServiceRoot.R_T_C.

I added a unit test for this, and also an end-to-end pagetest (for ScalarValue in particular) that must be run in conjunction with Launchpad.

[Aaron Bentley (abentley)]

review: Approve

=== modified file 'src/launchpadlib/NEWS.txt'
--- src/launchpadlib/NEWS.txt	2010-08-17 20:21:12 +0000
+++ src/launchpadlib/NEWS.txt	2010-08-23 19:59:40 +0000
@@ -2,6 +2,11 @@
 NEWS for launchpadlib
 =====================
 
+1.6.5 (2010-08-23)
+==================
+
+- Make launchpadlib compatible with the latest lazr.restfulclient.
+
 1.6.4 (2010-08-18)
 ==================
 

=== modified file 'src/launchpadlib/__init__.py'
--- src/launchpadlib/__init__.py	2010-08-17 20:23:54 +0000
+++ src/launchpadlib/__init__.py	2010-08-23 19:59:40 +0000
@@ -14,4 +14,4 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with launchpadlib. If not, see <http://www.gnu.org/licenses/>.
 
-__version__ = '1.6.4'
+__version__ = '1.6.5'

=== added file 'src/launchpadlib/docs/operations.txt'
--- src/launchpadlib/docs/operations.txt	1970-01-01 00:00:00 +0000
+++ src/launchpadlib/docs/operations.txt	2010-08-23 19:59:40 +0000
@@ -0,0 +1,27 @@
+****************
+Named operations
+****************
+
+launchpadlib can transparently determine the size of the list even
+when the size is not directly provided, but is only available through
+a link.
+
+    >>> from launchpadlib.testing.helpers import salgado_with_full_permissions
+    >>> launchpad = salgado_with_full_permissions.login(version="devel")
+
+    >>> results = launchpad.people.find(text='s')
+    >>> 'total_size' in results._wadl_resource.representation.keys()
+    False
+    >>> 'total_size_link' in results._wadl_resource.representation.keys()
+    True
+    >>> len(results) > 1
+    True
+
+Of course, launchpadlib can also determine the size when the size _is_
+directly provided.
+
+    >>> results = launchpad.people.find(text='salgado')
+    >>> 'total_size' in results._wadl_resource.representation.keys()
+    True
+    >>> len(results) == 1
+    True

=== modified file 'src/launchpadlib/launchpad.py'
--- src/launchpadlib/launchpad.py	2010-07-14 12:23:11 +0000
+++ src/launchpadlib/launchpad.py	2010-08-23 19:59:40 +0000
@@ -27,7 +27,7 @@
 
 from lazr.uri import URI
 from lazr.restfulclient.resource import (
-    CollectionWithKeyBasedLookup, HostedFile, ServiceRoot)
+    CollectionWithKeyBasedLookup, HostedFile, ScalarValue, ServiceRoot)
 from launchpadlib.credentials import (
     AccessToken, AnonymousAccessToken, Credentials,
     AuthorizeRequestTokenWithBrowser)
@@ -108,11 +108,11 @@
     RESOURCE_TYPE_CLASSES = {
             'bugs': BugSet,
             'distributions': DistributionSet,
-            'HostedFile': HostedFile,
             'people': PersonSet,
             'project_groups': ProjectGroupSet,
             'projects': ProjectSet,
             }
+    RESOURCE_TYPE_CLASSES.update(ServiceRoot.RESOURCE_TYPE_CLASSES)
 
     def __init__(self, credentials, service_root=uris.STAGING_SERVICE_ROOT,
                  cache=None, timeout=None, proxy_info=None,

=== modified file 'src/launchpadlib/tests/test_launchpad.py'
--- src/launchpadlib/tests/test_launchpad.py	2010-07-20 15:56:32 +0000
+++ src/launchpadlib/tests/test_launchpad.py	2010-08-23 19:59:40 +0000
@@ -24,6 +24,8 @@
 import tempfile
 import unittest
 
+from lazr.restfulclient.resource import ServiceRoot
+
 from launchpadlib.credentials import (
     AccessToken, AuthorizeRequestTokenWithBrowser, Credentials)
 from launchpadlib.launchpad import Launchpad
@@ -58,6 +60,16 @@
         return launchpad
 
 
+class TestResourceTypeClasses(unittest.TestCase):
+    """launchpadlib must know about restfulclient's resource types."""
+
+    def test_resource_types(self):
+        # Make sure that Launchpad knows about every special resource
+        # class defined by lazr.restfulclient.
+        for name, cls in ServiceRoot.RESOURCE_TYPE_CLASSES.items():
+            self.assertEqual(Launchpad.RESOURCE_TYPE_CLASSES[name], cls)
+
+
 class TestNameLookups(unittest.TestCase):
     """Test the utility functions in the 'uris' module."""