1
=== modified file 'bin/desktopcouch-stop' (properties changed: +x to -x)
2
=== modified file 'desktopcouch/records/record.py'
3
--- desktopcouch/records/record.py	2010-01-22 20:52:35 +0000
4
+++ desktopcouch/records/record.py	2010-02-25 22:39:13 +0000
5
@@ -198,6 +198,11 @@
6
198
    def __contains__(self, key):
198
    def __contains__(self, key):
7
199
        return key in self._data
199
        return key in self._data
8
200
200
9
201
    def __cmp__(self, value):
10
202
        if isinstance(value, RecordDict):
11
203
            return cmp(self._data, value._data)
12
204
        return -1
13
205
        
14
201
    def get(self, key, default=None):
206
    def get(self, key, default=None):
15
202
        """Override get method."""
207
        """Override get method."""
16
203
        if not key in self._data:
208
        if not key in self._data:
17
@@ -271,6 +276,24 @@
18
271
            value = value._data
276
            value = value._data
19
272
        return value in self._data.values()
277
        return value in self._data.values()
20
273
278
21
279
    def __cmp__(self, value):
22
280
        """
23
281
        Implement the compare to be able to compare with other mergeable
24
282
        lists, tuples and lists.
25
283
        """
26
284
        if (hasattr(value, "__iter__") 
27
285
            and hasattr(value, "__getitem__")
28
286
            and hasattr(value, "__len__")):
29
287
            # we should have the same value in the same order
30
288
            length  = len(value)
31
289
            if len(self) == length:
32
290
                for index, current_value in enumerate(self):
33
291
                    cmp_value = cmp(self[index], value[index])
34
292
                    if cmp_value != 0:
35
293
                        return cmp_value
36
294
                return 0
37
295
        return -1
38
296
        
39
274
    def _get_ordered_keys(self):
297
    def _get_ordered_keys(self):
40
275
        """Get list of uuid keys ordered by 'order' property or uuid key."""
298
        """Get list of uuid keys ordered by 'order' property or uuid key."""
41
276
        result = []
299
        result = []
42
@@ -299,6 +322,26 @@
43
299
            new_uuid)
322
            new_uuid)
44
300
        super(MergeableList, self).__setitem__(new_uuid, value)
323
        super(MergeableList, self).__setitem__(new_uuid, value)
45
301
324
46
325
    def remove(self, value):
47
326
        if len(self) == 1:
48
327
            raise ValueError("MergeableList cannot be empty.")
49
328
        index = 0
50
329
        for current_value in self:
51
330
            # important! use the data in self first 'cause mergeable lists
52
331
            # can be compared with list and tuples but no the other way around
53
332
            if cmp(current_value, value) == 0:
54
333
                del self[index]
55
334
                return
56
335
            index += 1
57
336
        raise ValueError("list.remove(x): x not in list")
58
337
        
59
338
    def pop(self, index):
60
339
        if len(self) == 1:
61
340
            raise ValueError("MergeableList cannot be empty.")
62
341
        value = self[index]
63
342
        del self[index]
64
343
        return value
65
344
        
66
302
    def index(self, key):
345
    def index(self, key):
67
303
        """Get value by index."""
346
        """Get value by index."""
68
304
        return self.__getitem__(key)
347
        return self.__getitem__(key)
69
305
348
70
=== modified file 'desktopcouch/records/tests/test_record.py'
71
--- desktopcouch/records/tests/test_record.py	2010-01-29 22:14:25 +0000
72
+++ desktopcouch/records/tests/test_record.py	2010-02-25 22:39:13 +0000
73
@@ -177,7 +177,69 @@
74
177
        self.record["subfield_uuid"].append(value)
177
        self.record["subfield_uuid"].append(value)
75
178
        self.assertEqual(3, len(self.record["subfield_uuid"]))
178
        self.assertEqual(3, len(self.record["subfield_uuid"]))
76
179
        self.assertEqual("value32", self.record["subfield_uuid"][-1]["field32"])
179
        self.assertEqual("value32", self.record["subfield_uuid"][-1]["field32"])
77
180
        
78
181
    def test_mergeable_list_remove(self):
79
182
        """Test remove a normal value"""
80
183
        value = "string"
81
184
        self.record["subfield_uuid"].append(value)
82
185
        self.record["subfield_uuid"].remove(value)
83
186
        self.assertFalse(value in self.record["subfield_uuid"])
84
187
        
85
188
    def test_mergeable_list_remove_record_dict(self):
86
189
        """Test remove a RecordDict value"""
87
190
        value = RecordDict({
88
191
            "field31": "value31",
89
192
            "field32": "value32"})
90
193
        self.record["subfield_uuid"].append(value)
91
194
        self.record["subfield_uuid"].remove(value)
92
195
        self.assertFalse(value in self.record["subfield_uuid"])
93
180
196
94
197
    def test_mergeable_list_remove_list(self):
95
198
        """Test list removal"""
96
199
        value = [1, 2, 3, 4, 5]
97
200
        self.record["subfield_uuid"].append(value)
98
201
        self.record["subfield_uuid"].remove(value)
99
202
        self.assertFalse(value in self.record["subfield_uuid"])
100
203
        
101
204
    def test_mergeable_list_remove_tuple(self):
102
205
        """Test tuple removal"""
103
206
        value = (1, 2, 3, 4, 5)
104
207
        self.record["subfield_uuid"].append(value)
105
208
        self.record["subfield_uuid"].remove(value)
106
209
        self.assertFalse(value in self.record["subfield_uuid"])
107
210
        
108
211
    def test_mergeable_list_remove_missing(self):
109
212
        """Test missing data rmeoval"""
110
213
        self.assertRaises(ValueError, self.record["subfield_uuid"].remove, 
111
214
            "missing_data")
112
215
    def test_mergeable_list_remove_last(self):
113
216
        """Test that exception is raised when removing last item."""
114
217
        self.record["subfield_uuid"] = [1]
115
218
        self.assertRaises(ValueError, self.record["subfield_uuid"].remove, 1)
116
219
        
117
220
    def test_mergeable_list_pop_correct_index(self):
118
221
        """Test the pop method when working with a correct index."""
119
222
        value = [1, 2, 3, 4, 5]
120
223
        self.record["subfield_uuid"] = value
121
224
        # test with negative index
122
225
        poped_value = self.record["subfield_uuid"].pop(-2)
123
226
        self.assertEqual(value[-2], poped_value)
124
227
        # test with positive index
125
228
        poped_value = self.record["subfield_uuid"].pop(1)
126
229
        self.assertEqual(value[1], poped_value)
127
230
        
128
231
    def test_mergeable_list_pop_wrong_index(self):
129
232
        """Test pop when index is out or range."""
130
233
        value = [1, 2, 3, 4, 5]
131
234
        self.record["subfield_uuid"] = value
132
235
        self.assertRaises(IndexError, self.record["subfield_uuid"].pop, 
133
236
            len(value)*2)
134
237
    
135
238
    def test_mergeable_list_pop_last(self):
136
239
        """Test that exception is raised when poping last item"""
137
240
        self.record["subfield_uuid"] = [1]
138
241
        self.assertRaises(ValueError, self.record["subfield_uuid"].pop, 0)
139
242
        
140
181
    def test_tuple(self):
243
    def test_tuple(self):
141
182
        """Test assigning tuples to a key results in mergeable lists."""
244
        """Test assigning tuples to a key results in mergeable lists."""
142
183
        rec = Record({'record_type': 'http://fnord.org/smorgasbord'})
245
        rec = Record({'record_type': 'http://fnord.org/smorgasbord'})
Reviewer	Date Requested	Status
John O'Brien (community)		Approve on 2010-02-15
Chad Miller (community)	2010-02-10	Approve on 2010-02-10
Review via email: mp+19018@code.launchpad.net