Merge lp:~cmiller/desktopcouch/abstract-wrappers into lp:desktopcouch

[Chad Miller]

The view wrapper that assists with reconnecting did not implement attributes that some clients (like Lernid) use. Now, catch any attribute access on the wrapper and pass it through to the proxied object. This should make the proxy object functionally identical to the destination object. (LP: #652095)

[lp:~cmiller/desktopcouch/abstract-wrappers]

180. By Chad Miller on 2010-09-30

Use wrapper instead of exact proxying.

[Vincenzo Di Somma (vds)]

review: Approve

[Eric Casteleijn (thisfred)]

Code looks good, tests pass.

review: Approve

=== modified file 'desktopcouch/records/server_base.py'
--- desktopcouch/records/server_base.py	2010-09-29 14:34:31 +0000
+++ desktopcouch/records/server_base.py	2010-09-30 15:43:36 +0000
@@ -466,6 +466,9 @@
                 return self.view_with_reconnects(wrapper.obj.__len__,
                                                  wrapper.obj)
 
+            def __getattr__(wrapper, key):
+                return self.with_reconnects(getattr, wrapper.obj, key)
+
             def __getitem__(wrapper, key):
                 return ReconnectingViewWrapper(wrapper.obj.__getitem__, key)
 

=== modified file 'desktopcouch/records/tests/test_server.py'
--- desktopcouch/records/tests/test_server.py	2010-09-29 14:48:41 +0000
+++ desktopcouch/records/tests/test_server.py	2010-09-30 15:43:36 +0000
@@ -286,6 +286,9 @@
 
         results = self.database.get_records(create_view=True)
 
+        self.assertTrue(8 <= len(results.rows))  # our 8, plus callers' data
+        self.assertIn("record_type", results.rows[0].value)
+
         for row in results[good_record_type]:  # index notation
             self.assertTrue(row.id in record_ids_we_care_about)
             record_ids_we_care_about.remove(row.id)
@@ -389,6 +392,19 @@
         # Ensure position different.
         self.assertEqual(saved_position + 1, self.database._changes_since)
 
+    def test_view_wrapper_has_all_attributes(self):
+        design_doc = "test_view_wrapper_has_all_attributes"
+        view1_name = "unit_tests_are_great_yeah"
+
+        map_js = """function(doc) { emit(doc._id, null) }"""
+
+        self.database.add_view(view1_name, map_js, None, design_doc)
+        view = self.database.execute_view(view1_name, design_doc)
+        
+        for attr_name in dir(view.obj):
+            # This works because hasattr actually calls getattr.
+            self.assertTrue(hasattr(view, attr_name))
+
     def test_report_changes_all_ops_give_known_keys(self):
         def rep(**kwargs):
             self.failUnless("changes" in kwargs)