Commit 4b8ee224 authored by Martin Aspeli's avatar Martin Aspeli

Merge c108040 from 2.12 branch (OFS File/Image lifecycle events)

parent 9a317161
...@@ -46,6 +46,10 @@ from OFS.Cache import Cacheable ...@@ -46,6 +46,10 @@ from OFS.Cache import Cacheable
from OFS.PropertyManager import PropertyManager from OFS.PropertyManager import PropertyManager
from OFS.SimpleItem import Item_w__name__ from OFS.SimpleItem import Item_w__name__
from zope.event import notify
from zope.lifecycleevent import ObjectModifiedEvent
from zope.lifecycleevent import ObjectCreatedEvent
manage_addFileForm = DTMLFile('dtml/imageAdd', manage_addFileForm = DTMLFile('dtml/imageAdd',
globals(), globals(),
Kind='File', Kind='File',
...@@ -63,19 +67,23 @@ def manage_addFile(self, id, file='', title='', precondition='', ...@@ -63,19 +67,23 @@ def manage_addFile(self, id, file='', title='', precondition='',
precondition = str(precondition) precondition = str(precondition)
id, title = cookId(id, title, file) id, title = cookId(id, title, file)
self=self.this() self=self.this()
# First, we create the file without data: # First, we create the file without data:
self._setObject(id, File(id,title,'',content_type, precondition)) self._setObject(id, File(id,title,'',content_type, precondition))
newFile = self._getOb(id)
# Now we "upload" the data. By doing this in two steps, we # Now we "upload" the data. By doing this in two steps, we
# can use a database trick to make the upload more efficient. # can use a database trick to make the upload more efficient.
if file: if file:
self._getOb(id).manage_upload(file) newFile.manage_upload(file)
if content_type: if content_type:
self._getOb(id).content_type=content_type newFile.content_type=content_type
notify(ObjectCreatedEvent(newFile))
if REQUEST is not None: if REQUEST is not None:
REQUEST['RESPONSE'].redirect(self.absolute_url()+'/manage_main') REQUEST['RESPONSE'].redirect(self.absolute_url()+'/manage_main')
...@@ -469,6 +477,9 @@ class File(Persistent, Implicit, PropertyManager, ...@@ -469,6 +477,9 @@ class File(Persistent, Implicit, PropertyManager,
self.update_data(filedata, content_type, len(filedata)) self.update_data(filedata, content_type, len(filedata))
else: else:
self.ZCacheable_invalidate() self.ZCacheable_invalidate()
notify(ObjectModifiedEvent(self))
if REQUEST: if REQUEST:
message="Saved changes." message="Saved changes."
return self.manage_main(self,REQUEST,manage_tabs_message=message) return self.manage_main(self,REQUEST,manage_tabs_message=message)
...@@ -487,7 +498,9 @@ class File(Persistent, Implicit, PropertyManager, ...@@ -487,7 +498,9 @@ class File(Persistent, Implicit, PropertyManager,
content_type=self._get_content_type(file, data, self.__name__, content_type=self._get_content_type(file, data, self.__name__,
'application/octet-stream') 'application/octet-stream')
self.update_data(data, content_type, size) self.update_data(data, content_type, size)
notify(ObjectModifiedEvent(self))
if REQUEST: if REQUEST:
message="Saved changes." message="Saved changes."
return self.manage_main(self,REQUEST,manage_tabs_message=message) return self.manage_main(self,REQUEST,manage_tabs_message=message)
...@@ -665,14 +678,18 @@ def manage_addImage(self, id, file, title='', precondition='', content_type='', ...@@ -665,14 +678,18 @@ def manage_addImage(self, id, file, title='', precondition='', content_type='',
# First, we create the image without data: # First, we create the image without data:
self._setObject(id, Image(id,title,'',content_type, precondition)) self._setObject(id, Image(id,title,'',content_type, precondition))
newFile = self._getOb(id)
# Now we "upload" the data. By doing this in two steps, we # Now we "upload" the data. By doing this in two steps, we
# can use a database trick to make the upload more efficient. # can use a database trick to make the upload more efficient.
if file: if file:
self._getOb(id).manage_upload(file) newFile.manage_upload(file)
if content_type: if content_type:
self._getOb(id).content_type=content_type newFile.content_type=content_type
notify(ObjectCreatedEvent(newFile))
if REQUEST is not None: if REQUEST is not None:
try: url=self.DestinationURL() try: url=self.DestinationURL()
except: url=REQUEST['URL1'] except: url=REQUEST['URL1']
......
...@@ -8,6 +8,8 @@ import os, sys ...@@ -8,6 +8,8 @@ import os, sys
import time import time
from cStringIO import StringIO from cStringIO import StringIO
from Acquisition import aq_base
from OFS.Application import Application from OFS.Application import Application
from OFS.SimpleItem import SimpleItem from OFS.SimpleItem import SimpleItem
from OFS.Cache import ZCM_MANAGERS from OFS.Cache import ZCM_MANAGERS
...@@ -19,6 +21,12 @@ from Testing.makerequest import makerequest ...@@ -19,6 +21,12 @@ from Testing.makerequest import makerequest
from zExceptions import Redirect from zExceptions import Redirect
import transaction import transaction
import OFS.Image
from zope.component import adapter
from zope.lifecycleevent.interfaces import IObjectModifiedEvent
from zope.lifecycleevent.interfaces import IObjectCreatedEvent
try: try:
here = os.path.dirname(os.path.abspath(__file__)) here = os.path.dirname(os.path.abspath(__file__))
except: except:
...@@ -57,7 +65,7 @@ class DummyCache: ...@@ -57,7 +65,7 @@ class DummyCache:
mtime_func=None): mtime_func=None):
self.get = ob self.get = ob
if self.si: if self.si:
return si return self.si
def ZCache_invalidate(self, ob): def ZCache_invalidate(self, ob):
self.invalidated = ob self.invalidated = ob
...@@ -78,6 +86,38 @@ class DummyCacheManager(SimpleItem): ...@@ -78,6 +86,38 @@ class DummyCacheManager(SimpleItem):
def ZCacheManager_getCache(self): def ZCacheManager_getCache(self):
return ADummyCache return ADummyCache
class EventCatcher(object):
def __init__(self):
self.created = []
self.modified = []
self.setUp()
def setUp(self):
from zope.component import provideHandler
provideHandler(self.handleCreated)
provideHandler(self.handleModified)
def tearDown(self):
from zope.component import getSiteManager
getSiteManager().unregisterHandler(self.handleCreated)
getSiteManager().unregisterHandler(self.handleModified)
def reset(self):
self.created = []
self.modified = []
@adapter(IObjectCreatedEvent)
def handleCreated(self, event):
if isinstance(event.object, OFS.Image.File):
self.created.append(event)
@adapter(IObjectModifiedEvent)
def handleModified(self, event):
if isinstance(event.object, OFS.Image.File):
self.modified.append(event)
class FileTests(unittest.TestCase): class FileTests(unittest.TestCase):
data = open(filedata, 'rb').read() data = open(filedata, 'rb').read()
content_type = 'application/octet-stream' content_type = 'application/octet-stream'
...@@ -85,6 +125,8 @@ class FileTests(unittest.TestCase): ...@@ -85,6 +125,8 @@ class FileTests(unittest.TestCase):
def setUp( self ): def setUp( self ):
self.connection = makeConnection() self.connection = makeConnection()
self.eventCatcher = EventCatcher()
try: try:
r = self.connection.root() r = self.connection.root()
a = Application() a = Application()
...@@ -107,7 +149,16 @@ class FileTests(unittest.TestCase): ...@@ -107,7 +149,16 @@ class FileTests(unittest.TestCase):
raise raise
transaction.begin() transaction.begin()
self.file = getattr( self.app, 'file' ) self.file = getattr( self.app, 'file' )
# Since we do the create here, let's test the events here too
self.assertEquals(1, len(self.eventCatcher.created))
self.failUnless(aq_base(self.eventCatcher.created[0].object) is aq_base(self.file))
self.assertEquals(1, len(self.eventCatcher.modified))
self.failUnless(aq_base(self.eventCatcher.created[0].object) is aq_base(self.file))
self.eventCatcher.reset()
def tearDown( self ): def tearDown( self ):
del self.file del self.file
transaction.abort() transaction.abort()
...@@ -117,6 +168,8 @@ class FileTests(unittest.TestCase): ...@@ -117,6 +168,8 @@ class FileTests(unittest.TestCase):
del self.root del self.root
del self.connection del self.connection
ADummyCache.clear() ADummyCache.clear()
self.eventCatcher.tearDown()
def testViewImageOrFile(self): def testViewImageOrFile(self):
self.assertRaises(Redirect, self.file.view_image_or_file, 'foo') self.assertRaises(Redirect, self.file.view_image_or_file, 'foo')
...@@ -153,18 +206,24 @@ class FileTests(unittest.TestCase): ...@@ -153,18 +206,24 @@ class FileTests(unittest.TestCase):
self.assertEqual(self.file.content_type, 'text/plain') self.assertEqual(self.file.content_type, 'text/plain')
self.failUnless(ADummyCache.invalidated) self.failUnless(ADummyCache.invalidated)
self.failUnless(ADummyCache.set) self.failUnless(ADummyCache.set)
self.assertEquals(1, len(self.eventCatcher.modified))
self.failUnless(self.eventCatcher.modified[0].object is self.file)
def testManageEditWithoutFileData(self): def testManageEditWithoutFileData(self):
self.file.manage_edit('foobar', 'text/plain') self.file.manage_edit('foobar', 'text/plain')
self.assertEqual(self.file.title, 'foobar') self.assertEqual(self.file.title, 'foobar')
self.assertEqual(self.file.content_type, 'text/plain') self.assertEqual(self.file.content_type, 'text/plain')
self.failUnless(ADummyCache.invalidated) self.failUnless(ADummyCache.invalidated)
self.assertEquals(1, len(self.eventCatcher.modified))
self.failUnless(self.eventCatcher.modified[0].object is self.file)
def testManageUpload(self): def testManageUpload(self):
f = StringIO('jammyjohnson') f = StringIO('jammyjohnson')
self.file.manage_upload(f) self.file.manage_upload(f)
self.assertEqual(self.file.data, 'jammyjohnson') self.assertEqual(self.file.data, 'jammyjohnson')
self.assertEqual(self.file.content_type, 'application/octet-stream') self.assertEqual(self.file.content_type, 'application/octet-stream')
self.assertEquals(1, len(self.eventCatcher.modified))
self.failUnless(self.eventCatcher.modified[0].object is self.file)
def testIfModSince(self): def testIfModSince(self):
now = time.time() now = time.time()
...@@ -302,3 +361,4 @@ def test_suite(): ...@@ -302,3 +361,4 @@ def test_suite():
if __name__ == '__main__': if __name__ == '__main__':
unittest.main(defaultTest='test_suite') unittest.main(defaultTest='test_suite')
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment