[Checkins] SVN: z3c.blobfile/trunk/ Enable optimized FileView for images.

[Dan Korostelev]

Log message for revision 90931:
  Enable optimized FileView for images.
  Register zope.app.wsgi.fileresult.FileResult adapter for ZODB BlobFiles.

Changed:
  U   z3c.blobfile/trunk/CHANGES.txt
  U   z3c.blobfile/trunk/src/z3c/blobfile/browser/configure.zcml
  A   z3c.blobfile/trunk/src/z3c/blobfile/browser/image.py

-=-
Modified: z3c.blobfile/trunk/CHANGES.txt
===================================================================
--- z3c.blobfile/trunk/CHANGES.txt	2008-09-08 07:56:42 UTC (rev 90930)
+++ z3c.blobfile/trunk/CHANGES.txt	2008-09-08 07:58:13 UTC (rev 90931)
@@ -5,8 +5,11 @@
 Version 0.1.1 (unreleased)
 --------------------------
 
+- Bug: Register zope.app.wsgi.fileresult.FileResult as an adapter for BlobFile,
+  making optimized file views really work.
+- Bug: Also use optimized file view for z3c.blobfile.image.Image.
 - Bug: Make blob versions of File and Image implement IBlobFile and
-  IBlobImage interfaces respectively.
+  IBlobImage interfaces respectively. This enables z3c.blobfile's views.
 - Bug: Use local ZopeMessageFactory. This fixes import error on Zope 2.10
 
 Version 0.1.0 (2008-02-27)

Modified: z3c.blobfile/trunk/src/z3c/blobfile/browser/configure.zcml
===================================================================
--- z3c.blobfile/trunk/src/z3c/blobfile/browser/configure.zcml	2008-09-08 07:56:42 UTC (rev 90930)
+++ z3c.blobfile/trunk/src/z3c/blobfile/browser/configure.zcml	2008-09-08 07:58:13 UTC (rev 90931)
@@ -1,8 +1,16 @@
 <configure
     xmlns="http://namespaces.zope.org/browser"
-    i18n_domain='zope'
+    xmlns:zope="http://namespaces.zope.org/zope"
+    i18n_domain="zope"
     >
 
+  <!-- IResult adapter for opened BlobFiles -->
+  <zope:adapter
+      for="ZODB.blob.BlobFile"
+      provides="zope.publisher.http.IResult"
+      factory="zope.app.wsgi.fileresult.FileResult"
+      />
+
   <!-- directives for File -->
   
   <form
@@ -12,15 +20,15 @@
       label="Change a file"
       permission="zope.ManageContent"
       class="zope.app.file.browser.file.FileEdit"
-      >
-  </form>
+      />
 
   <menuItem
       menu="zmi_views" title="Edit"
       for="z3c.blobfile.interfaces.IBlobFile"
       action="edit.html"
       filter="python:context.contentType.startswith('text/')"
-      permission="zope.ManageContent" />
+      permission="zope.ManageContent"
+      />
 
   <page
       name="upload.html"
@@ -36,9 +44,9 @@
       name="index.html"
       permission="zope.View"
       class="z3c.blobfile.browser.file.FileView"
-      attribute="show" />
+      attribute="show"
+      />
 
-
   <addMenuItem
       class="z3c.blobfile.file.File"
       title="File"
@@ -78,7 +86,7 @@
       for="z3c.blobfile.interfaces.IBlobImage"
       permission="zope.View"
       allowed_attributes="__call__ tag"
-      class="zope.app.file.browser.image.ImageData"
+      class=".image.ImageData"
       />
 
   <icon

Added: z3c.blobfile/trunk/src/z3c/blobfile/browser/image.py
===================================================================
--- z3c.blobfile/trunk/src/z3c/blobfile/browser/image.py	                        (rev 0)
+++ z3c.blobfile/trunk/src/z3c/blobfile/browser/image.py	2008-09-08 07:58:13 UTC (rev 90931)
@@ -0,0 +1,5 @@
+from z3c.blobfile.browser.file import FileView
+from zope.app.file.browser.image import ImageData
+
+class ImageData(FileView, ImageData):
+    '''Image view with zope.app.file's show method overriden by z3c.blobfile's one'''