Merge pull request #3 from tomgross/master

Fixed location of temporary blobs

CHANGES.txt

@@ -16,6 +16,9 @@ Changelog
 - check for unicode filename first in index_html
   [vangheem]
 
+- create a transaction savepoint in BlobField to have a correct temporary
+  path (eg for indexing in the same transaction)
+  [tomgross]
 
 1.5.2 (2012-05-25)
 ------------------

src/plone/app/blob/field.py

@@ -242,6 +242,7 @@ def set(self, instance, value, **kwargs):
             blob.setContentType(kwargs.get('mimetype', blobbable.mimetype()))
             blob.setFilename(kwargs.get('filename', blobbable.filename()))
         super(BlobField, self).set(instance, blob, **kwargs)
+        savepoint(optimistic=True)
 
     security.declarePrivate('fixAutoId')
     def fixAutoId(self, instance):

src/plone/app/blob/tests/test_replacements.py

@@ -17,7 +17,7 @@
 from plone.app.blob.field import BlobField
 from plone.app.blob.content import ATBlob
 from plone.app.blob.tests.utils import getImage, getData
-
+from ZODB.blob import SAVEPOINT_SUFFIX
 
 def permissionsFor(name, product):
     from Products import meta_types
@@ -142,6 +142,15 @@ def testSearchableText(self):
         self.assertTrue('Plone' in data, 'pdftohtml not installed?')
         self.assertFalse('PDF' in data)
 
+    def testBlobPath(self):
+        foo = self.folder[self.folder.invokeFactory('File', 'foo',
+            title='foo', file=getData('plone.pdf'))]
+        field = foo.getField('file')
+        blobfile = field.get(foo).blob._p_blob_committed
+        tempdir = self.app._p_jar._storage.temporaryDirectory()
+        self.assertTrue(blobfile.endswith(SAVEPOINT_SUFFIX))
+        self.assertTrue(blobfile.startswith(tempdir))
+
 
 class ImageReplacementTests(ReplacementTestCase):