Fix for issue 77 (index and contains methods on list proxy objects).

cmlenz · cmlenz · commit dddaf8f801e5 · 2009-06-29T12:31:19.000Z
--HG--
extra : convert_revision : svn%3A7a298fb0-333a-0410-83e7-658617cd9cf3/trunk%40153
diff --git a/ChangeLog.txt b/ChangeLog.txt
@@ -10,6 +10,8 @@ http://couchdb-python.googlecode.com/svn/tags/0.6.0
  * Changed the `update()` method of the `client.Database` class to simplify
    the handling of errors. The method now returns a list of `(success, docid,
    rev_or_exc)` tuples. See the docstring of that method for the details.
+ * `schema.ListField` proxy objects now support the `__contains__()` and
+   `index()` methods (issue 77).
 
 
 Version 0.5
diff --git a/couchdb/schema.py b/couchdb/schema.py
@@ -683,6 +683,12 @@ def __getitem__(self, index):
         def __setitem__(self, index, value):
             self.list[index] = self.field._to_json(item)
 
+        def __contains__(self, value):
+            for item in self.list:
+                if self.field._to_python(item) == value:
+                    return True
+            return False
+
         def __iter__(self):
             for index in range(len(self)):
                 yield self[index]
@@ -705,3 +711,9 @@ def append(self, *args, **kwargs):
         def extend(self, list):
             for item in list:
                 self.append(item)
+
+        def index(self, value):
+            for idx, item in enumerate(self.list):
+                if self.field._to_python(item) == value:
+                    return idx
+            raise ValueError('x not in list')
diff --git a/couchdb/tests/schema.py b/couchdb/tests/schema.py
@@ -6,6 +6,7 @@
 # This software is licensed as described in the file COPYING, which
 # you should have received as part of this distribution.
 
+from decimal import Decimal
 import doctest
 import os
 import unittest
@@ -91,6 +92,22 @@ class Post(schema.Document):
         self.assertEqual([{'content': 'Bla bla', 'author': 'myself'}],
                          post.comments)
 
+    def test_proxy_contains(self):
+        class Thing(schema.Document):
+            numbers = schema.ListField(schema.DecimalField)
+        thing = Thing(numbers=[Decimal('1.0'), Decimal('2.0')])
+        assert isinstance(thing.numbers, schema.ListField.Proxy)
+        assert '1.0' not in thing.numbers
+        assert Decimal('1.0') in thing.numbers
+
+    def test_proxy_index(self):
+        class Thing(schema.Document):
+            numbers = schema.ListField(schema.DecimalField)
+        thing = Thing(numbers=[Decimal('1.0'), Decimal('2.0')])
+        assert isinstance(thing.numbers, schema.ListField.Proxy)
+        self.assertEqual(0, thing.numbers.index(Decimal('1.0')))
+        self.assertRaises(ValueError, thing.numbers.index, '3.0')
+
 
 def suite():
     suite = unittest.TestSuite()
