Merge lp:~statik/desktopcouch/urllibquote into lp:desktopcouch

[Elliot Murphy]

Don't create a view per record-type; instead, call the standard return-all-records-keyed-by-record-type and use slice notation on the viewresults to only get back the records with that type, which does the same thing but more elegantly.

[Elliot Murphy (statik)]

I am hijacking https://code.edge.launchpad.net/~sil/desktopcouch/urllibquote/+merge/9778 to fix a merge conflict and get it landed already!

[lp:~statik/desktopcouch/urllibquote]

33. By Elliot Murphy on 2009-08-10

Merged from trunk, resolved a conflict, and deleted a commented line.

=== modified file 'desktopcouch/records/server.py'
--- desktopcouch/records/server.py	2009-08-10 19:46:09 +0000
+++ desktopcouch/records/server.py	2009-08-10 21:32:52 +0000
@@ -21,6 +21,7 @@
 
 """The Desktop Couch Records API."""
 
+import urllib
 from couchdb import Server
 from couchdb.client import ResourceNotFound, ResourceConflict
 from couchdb.design import ViewDefinition
@@ -232,12 +233,8 @@
         =>> results = get_records()
         =>> people = results[['Person']:['Person','ZZZZ']]
         """
-        if record_type == None:
-            view_name = "get_records_and_type"
-            view_map_js = """function(doc) { emit(doc.record_type, doc) }"""
-        else:
-            view_name = "get_" + record_type            
-            view_map_js = """function(doc) {if(doc.record_type == '%s') { emit(doc._id, doc); }}""" %record_type
+        view_name = "get_records_and_type"
+        view_map_js = """function(doc) { emit(doc.record_type, doc) }"""
 
         if design_doc is None:
             design_doc = view_name
@@ -253,5 +250,10 @@
 
         if not exists:
             self.add_view(view_name, view_map_js, None, design_doc)
+        
+        viewdata = self.execute_view(view_name, design_doc)
+        if record_type is None:
+            return viewdata
+        else:
+            return viewdata[record_type]
 
-        return self.execute_view(view_name, design_doc)
 
=== modified file 'desktopcouch/records/tests/test_server.py' (properties changed: -x to +x)
--- desktopcouch/records/tests/test_server.py	2009-08-10 20:55:48 +0000
+++ desktopcouch/records/tests/test_server.py	2009-08-10 21:32:52 +0000
@@ -41,10 +41,21 @@
         self.dbname = self._testMethodName
         self.database = CouchDatabase(self.dbname, create=True)
 
+        #create some records to pull out and test
+        self.database.put_record(Record({"key1_1":"val1_1","key1_2":"val1_2","key1_3":"val1_3","record_type":"test.com"}))
+        self.database.put_record(Record({"key2_1":"val2_1","key2_2":"val2_2","key2_3":"val2_3","record_type":"test.com"}))
+        self.database.put_record(Record({"key13_1":"va31_1","key3_2":"val3_2","key3_3":"val3_3","record_type":"test.com"}))
+
     def tearDown(self):
         """tear down each test"""
         del self.database._server[self.dbname]
 
+    def test_get_records_by_record_type_save_view(self):
+        """Test getting mutliple records by type"""
+        records = self.database.get_records(record_type="test.com",create_view=True)
+        self.assertEqual(3,len(records))
+
+
     def test_get_record(self):
         """Test getting a record."""
         record = Record({'record_number': 0}, record_type="http://example.com/")