Add support for NamedBlobFile images.

docs/source/_json/collection.json

@@ -7,9 +7,9 @@
     "test_user_1_"
   ], 
   "description": "This is a collection with two documents", 
-  "effective": "1969-12-31T00:00:00+01:00", 
+  "effective": "1969-12-31T00:00:00+02:00", 
   "exclude_from_nav": "False", 
-  "expires": "2499-12-31T00:00:00+01:00", 
+  "expires": "2499-12-31T00:00:00+02:00", 
   "icon": "++resource++plone.dexterity.item.gif", 
   "isPrincipiaFolderish": "0", 
   "item_count": "30", 

docs/source/_json/document.json

@@ -7,9 +7,9 @@
     "test_user_1_"
   ], 
   "description": "Congratulations! You have successfully installed Plone.", 
-  "effective": "1969-12-31T00:00:00+01:00", 
+  "effective": "1969-12-31T00:00:00+02:00", 
   "exclude_from_nav": "False", 
-  "expires": "2499-12-31T00:00:00+01:00", 
+  "expires": "2499-12-31T00:00:00+02:00", 
   "icon": "++resource++plone.dexterity.item.gif", 
   "isPrincipiaFolderish": "0", 
   "language": "", 

docs/source/_json/folder.json

@@ -7,9 +7,9 @@
     "test_user_1_"
   ], 
   "description": "This is a folder with two documents", 
-  "effective": "1969-12-31T00:00:00+01:00", 
+  "effective": "1969-12-31T00:00:00+02:00", 
   "exclude_from_nav": "False", 
-  "expires": "2499-12-31T00:00:00+01:00", 
+  "expires": "2499-12-31T00:00:00+02:00", 
   "icon": "++resource++plone.dexterity.item.gif", 
   "isAnObjectManager": "1", 
   "isPrincipiaFolderish": "1", 

docs/source/_json/link.json

@@ -7,9 +7,9 @@
     "test_user_1_"
   ], 
   "description": "This is a link", 
-  "effective": "1969-12-31T00:00:00+01:00", 
+  "effective": "1969-12-31T00:00:00+02:00", 
   "exclude_from_nav": "False", 
-  "expires": "2499-12-31T00:00:00+01:00", 
+  "expires": "2499-12-31T00:00:00+02:00", 
   "icon": "++resource++plone.dexterity.item.gif", 
   "isPrincipiaFolderish": "0", 
   "language": "", 

docs/source/_json/newsitem.json

@@ -7,10 +7,12 @@
     "test_user_1_"
   ], 
   "description": "This is a news item", 
-  "effective": "1969-12-31T00:00:00+01:00", 
+  "effective": "1969-12-31T00:00:00+02:00", 
   "exclude_from_nav": "False", 
-  "expires": "2499-12-31T00:00:00+01:00", 
+  "expires": "2499-12-31T00:00:00+02:00", 
   "icon": "++resource++plone.dexterity.item.gif", 
+  "image": "http://localhost:55001/plone/newsitem/image.png", 
+  "image_caption": "This is an image caption.", 
   "isPrincipiaFolderish": "0", 
   "language": "", 
   "meta_type": "Dexterity Item", 

src/plone/restapi/adapter.py

@@ -10,6 +10,7 @@
 from plone.app.contenttypes.interfaces import ICollection
 from plone.app.contenttypes.interfaces import IFile
 from plone.app.contenttypes.interfaces import IImage
+from plone.namedfile.file import NamedBlobImage
 from plone.restapi.utils import append_json_to_links
 from plone.restapi.utils import get_object_schema
 from plone.restapi.interfaces import ISerializeToJson
@@ -111,6 +112,12 @@ def SerializeToJson(context):
             # Unicode
             elif isinstance(value, unicode):
                 result[title] = value
+            # Image
+            elif isinstance(value, NamedBlobImage):
+                result[title] = '{0}/{1}'.format(
+                    context.absolute_url(),
+                    value.filename
+                )
             else:
                 result[title] = str(value)
     if getattr(context, 'request', False):

src/plone/restapi/tests/test_adapter_image.py

@@ -0,0 +1,57 @@
+# -*- coding: utf-8 -*-
+import unittest2 as unittest
+
+from plone.dexterity.interfaces import IDexterityContent
+from plone.dexterity.fti import DexterityFTI
+from plone.namedfile.field import NamedBlobImage as NamedBlobImageInterface
+from plone.namedfile.file import NamedBlobImage
+
+from plone.restapi.testing import \
+    PLONE_RESTAPI_INTEGRATION_TESTING
+from plone.restapi.interfaces import ISerializeToJson
+
+from Products.CMFCore.utils import getToolByName
+
+import json
+import os
+
+
+class IImageDocument(IDexterityContent):
+
+    image = NamedBlobImageInterface(
+        title=u"Please upload an image",
+        required=False,
+    )
+
+
+class TestSerializeToJsonAdapter(unittest.TestCase):
+
+    layer = PLONE_RESTAPI_INTEGRATION_TESTING
+
+    def setUp(self):
+        self.app = self.layer['app']
+        self.portal = self.layer['portal']
+        self.portal_url = self.portal.absolute_url()
+        fti = DexterityFTI('ImageDocument')
+        fti._updateProperty(
+            'schema',
+            'plone.restapi.tests.test_adapter_image.'
+            'IImageDocument'
+        )
+        types_tool = getToolByName(self.portal, "portal_types")
+        types_tool._setObject('ImageDocument', fti)
+
+    def test_image_adapter(self):
+        self.portal.invokeFactory('ImageDocument', 'imagedoc1')
+        image_file = os.path.join(os.path.dirname(__file__), u'image.png')
+        self.portal.imagedoc1.image = NamedBlobImage(
+            data=open(image_file, 'r').read(),
+            contentType='image/png',
+            filename=u'image.png'
+        )
+        self.portal.imagedoc1.image_caption = u'This is an image caption.'
+
+        self.assertEqual(
+            u'http://nohost/plone/imagedoc1/image.png',
+            json.loads(ISerializeToJson(self.portal.imagedoc1)).get('image')
+        )

src/plone/restapi/tests/test_browser_traversal.py

@@ -87,6 +87,13 @@ def test_document_traversal(self):
 
     def test_news_item_traversal(self):
         self.portal.invokeFactory('News Item', id='news1')
+        image_file = os.path.join(os.path.dirname(__file__), u'image.png')
+        self.portal.news1.image = NamedBlobImage(
+            data=open(image_file, 'r').read(),
+            contentType='image/png',
+            filename=u'image.png'
+        )
+        self.portal.news1.image_caption = u'This is an image caption.'
         transaction.commit()
         response = requests.get(
             self.portal.news1.absolute_url(),
@@ -104,6 +111,14 @@ def test_news_item_traversal(self):
             response.json()['@id'],
             self.portal.news1.absolute_url()
         )
+        self.assertEqual(
+            u'This is an image caption.',
+            response.json()['image_caption']
+        )
+        self.assertEqual(
+            u'http://localhost:55001/plone/news1/image.png',
+            response.json()['image']
+        )
 
     def test_folder_traversal(self):
         response = requests.get(

src/plone/restapi/tests/test_documentation.py

@@ -74,6 +74,13 @@ def test_documentation_news_item(self):
             'text/plain',
             'text/html'
         )
+        image_file = os.path.join(os.path.dirname(__file__), u'image.png')
+        self.portal.newsitem.image = NamedBlobImage(
+            data=open(image_file, 'r').read(),
+            contentType='image/png',
+            filename=u'image.png'
+        )
+        self.portal.newsitem.image_caption = u'This is an image caption.'
         import transaction
         transaction.commit()
         response = requests.get(