Merge lp:~vds/desktopcouch/add_record_type_version_field_to_record into lp:desktopcouch

[Vincenzo Di Somma]

Add record type version.

Add record type version.

[Manuel de la Peña (mandel)]

+1

review: Approve

[Eric Casteleijn (thisfred)]

+1

review: Approve

=== modified file 'desktopcouch/records/record.py'
--- desktopcouch/records/record.py	2010-07-02 15:32:25 +0000
+++ desktopcouch/records/record.py	2010-10-31 16:15:57 +0000
@@ -1,4 +1,4 @@
-# Copyright 2009 Canonical Ltd.
+# Copyright 2009-2010 Canonical Ltd.
 #
 # This file is part of desktopcouch.
 #
@@ -17,6 +17,7 @@
 # Authors: Eric Casteleijn <[e-mail]>
 #          Nicola Larosa <[e-mail]>
 #          Mark G. Saye <[e-mail]>
+#          Vincenzo Di Somma <[e-mail]>
 
 """A dictionary based record representation."""
 
@@ -85,15 +86,9 @@
         return "Record type must be specified and should be a URL"
 
 
-# XXX: the doc string for this class makes no sense at all.
-
 class Attachment(object):
     """This represents the value of the attachment.  The name is
-    stored as the key that points to this name, and the
-
-    We have a new BLOB to attach.  Attachment(file_object, str_mime_type)
-    We know the traits of a BLOB.  Attachment()
-    """
+    stored as the key that points to this name."""
     def __init__(self, content=None, content_type=None):
         super(Attachment, self).__init__()
         if content is not None:
@@ -352,7 +347,8 @@
 class Record(RecordDict):
     """An object that represents a Desktop CouchDB record."""
 
-    def __init__(self, data=None, record_type=None, record_id=None):
+    def __init__(self, data=None, record_type=None,
+                 record_id=None, record_type_version=None):
         if data is None:
             data = {}
         if record_type is None:
@@ -360,7 +356,6 @@
                 record_type = data['record_type']
             else:
                 raise NoRecordTypeSpecified
-
         super(Record, self).__init__(data)
         self._data['record_type'] = record_type
 
@@ -373,6 +368,8 @@
                 # _id already set.  Verify that the explicit value agrees.
                 if self._data['_id'] != record_id:
                     raise ValueError("record_id doesn't match value in data.")
+        if record_type_version:
+            self._record_type_version = record_type_version           
 
     def __getitem__(self, key):
         if is_internal(key):
@@ -441,3 +438,8 @@
     def record_revision(self):
         """Get the record revision."""
         return self._data.get('_rev', None)  # Retreive only; comes from DB.
+
+    @property
+    def record_type_version(self):
+        """Get the record type version if it's there."""
+        return getattr(self, '_record_type_version', None)

=== modified file 'desktopcouch/records/tests/test_record.py'
--- desktopcouch/records/tests/test_record.py	2010-02-10 16:09:49 +0000
+++ desktopcouch/records/tests/test_record.py	2010-10-31 16:15:57 +0000
@@ -308,6 +308,13 @@
         self.assertRaises(ValueError,
             Record, data, record_id=record_id, record_type="url")
 
+    def test_record_type_version(self):
+        data = {"_id":"recordid"}
+        record1 = Record(data, record_type="url")
+        self.assertIs(None, record1.record_type_version)
+        record2 = Record(data, record_type="url", record_type_version=1)
+        self.assertEqual(record2.record_type_version, 1)
+
 
 class TestRecordFactory(TestCase):
     """Test Record/Mergeable List factories."""