Slots

src/plone/restapi/configure.zcml

@@ -1,101 +1,118 @@
 <configure
     xmlns="http://namespaces.zope.org/zope"
     xmlns:five="http://namespaces.zope.org/five"
+    xmlns:genericsetup="http://namespaces.zope.org/genericsetup"
     xmlns:i18n="http://namespaces.zope.org/i18n"
     xmlns:plone="http://namespaces.plone.org/plone"
-    xmlns:genericsetup="http://namespaces.zope.org/genericsetup"
     xmlns:zcml="http://namespaces.zope.org/zcml"
-    i18n_domain="plone.restapi">
+    i18n_domain="plone.restapi"
+    >
 
   <i18n:registerTranslations directory="locales" />
 
-  <include package="plone.behavior" file="meta.zcml"/>
-  <include package="plone.rest" file="meta.zcml"/>
+  <include
+      package="plone.behavior"
+      file="meta.zcml"
+      />
+  <include
+      package="plone.rest"
+      file="meta.zcml"
+      />
 
   <include package="plone.behavior" />
   <include package="plone.rest" />
   <include package="plone.schema" />
   <include file="indexers.zcml" />
 
-  <five:registerPackage package="." initialize=".initialize" />
+  <five:registerPackage
+      package="."
+      initialize=".initialize"
+      />
 
   <include file="permissions.zcml" />
 
   <genericsetup:registerProfile
       name="default"
       title="plone.restapi"
-      directory="profiles/default"
       description="RESTful hypermedia API for Plone."
       provides="Products.GenericSetup.interfaces.EXTENSION"
+      directory="profiles/default"
       />
 
   <genericsetup:registerProfile
       name="testing"
       title="plone.restapi testing"
-      directory="profiles/testing"
       description="Adds sample content types for testing"
       provides="Products.GenericSetup.interfaces.EXTENSION"
       for="Products.CMFPlone.interfaces.ITestCasePloneSiteRoot"
+      directory="profiles/testing"
       />
 
   <genericsetup:registerProfile
       name="performance"
       title="plone.restapi performance testing"
-      directory="profiles/performance"
       description="Adds sample content for performance testing"
       provides="Products.GenericSetup.interfaces.EXTENSION"
+      directory="profiles/performance"
       />
 
   <genericsetup:registerProfile
       name="blocks"
       title="Volto Blocks"
-      directory="profiles/blocks"
       description="Enables blocks on the Document content type"
       provides="Products.GenericSetup.interfaces.EXTENSION"
+      directory="profiles/blocks"
       />
 
   <!-- Register "various" import step -->
   <genericsetup:importStep
-    name="plone.restapi"
-    title="plone.restapi special import handlers"
-    description=""
-    handler="plone.restapi.setuphandlers.import_various"
-    />
+      name="plone.restapi"
+      title="plone.restapi special import handlers"
+      description=""
+      handler="plone.restapi.setuphandlers.import_various"
+      />
 
   <genericsetup:registerProfile
       name="uninstall"
       title="plone.restapi"
-      directory="profiles/uninstall"
       description="RESTful hypermedia API for Plone - Uninstall"
       provides="Products.GenericSetup.interfaces.EXTENSION"
+      directory="profiles/uninstall"
       />
 
-  <include package="plone.rest" file="configure.zcml" />
+  <include
+      package="plone.rest"
+      file="configure.zcml"
+      />
   <include package=".services" />
   <include package=".serializer" />
   <include package=".deserializer" />
   <include package=".types" />
   <include package=".search" />
+  <include package=".slots" />
 
   <include package=".upgrades" />
 
   <configure zcml:condition="installed plone.app.dexterity">
 
-    <include package="plone.behavior" file="meta.zcml"/>
+    <include
+        package="plone.behavior"
+        file="meta.zcml"
+        />
 
     <plone:behavior
         name="volto.blocks"
         title="Blocks"
         description="Enables Volto Blocks support"
         provides=".behaviors.IBlocks"
-      />
+        />
 
   </configure>
 
   <utility
       factory=".setuphandlers.HiddenProfiles"
-      name="plone.restapi"
       provides="Products.CMFPlone.interfaces.INonInstallable"
+      name="plone.restapi"
       />
 
 </configure>

src/plone/restapi/controlpanels/registry.py

@@ -1,6 +1,5 @@
 # -*- coding: utf-8 -*-
-from zope.component import adapter
-from zope.interface import Interface
+from plone.restapi.controlpanels import RegistryConfigletPanel
 from Products.CMFPlone.interfaces.controlpanel import IDateAndTimeSchema
 from Products.CMFPlone.interfaces.controlpanel import IEditingSchema
 from Products.CMFPlone.interfaces.controlpanel import IImagingSchema
@@ -11,7 +10,9 @@
 from Products.CMFPlone.interfaces.controlpanel import ISecuritySchema
 from Products.CMFPlone.interfaces.controlpanel import ISiteSchema
 from Products.CMFPlone.interfaces.controlpanel import ISocialMediaSchema
-from plone.restapi.controlpanels import RegistryConfigletPanel
+from zope.component import adapter
+from zope.interface import Interface
+
 
 try:
     from plone.i18n.interfaces import ILanguageSchema

src/plone/restapi/deserializer/blocks.py

@@ -35,7 +35,7 @@ def path2uid(context, link):
     context_url = context.absolute_url()
     relative_up = len(context_url.split("/")) - len(portal_url.split("/"))
     if path.startswith(portal_url):
-        path = path[len(portal_url) + 1 :]
+        path = path[len(portal_url) + 1:]
     if not path.startswith(portal_path):
         path = "{portal_path}/{path}".format(
             portal_path=portal_path, path=path.lstrip("/")
@@ -180,6 +180,27 @@ def __call__(self, block):
         return block
 
 
+@adapter(IBlocks, IBrowserRequest)
+@implementer(IBlockFieldDeserializationTransformer)
+class VolatileSmartField(object):
+    """ When deserializing block values, delete all block fields that start with `_v_`
+    """
+
+    order = float('inf')
+    block_type = None
+
+    def __init__(self, context, request):
+        self.context = context
+        self.request = request
+
+    def __call__(self, block):
+        for k, v in block.items():
+            if k.startswith('_v_'):
+                del v[k]
+
+        return block
+
+
 @adapter(IBlocks, IBrowserRequest)
 @implementer(IBlockFieldDeserializationTransformer)
 class ResolveUIDDeserializer(ResolveUIDDeserializerBase):

src/plone/restapi/deserializer/configure.zcml

@@ -1,7 +1,8 @@
 <configure
     xmlns="http://namespaces.zope.org/zope"
     xmlns:zcml="http://namespaces.zope.org/zcml"
-    i18n_domain="plone.restapi">
+    i18n_domain="plone.restapi"
+    >
 
   <adapter factory=".site.DeserializeSiteRootFromJson" />
   <adapter factory=".dxcontent.DeserializeFromJson" />
@@ -19,25 +20,55 @@
   <adapter factory=".dxfields.RichTextFieldDeserializer" />
   <adapter factory=".blocks.BlocksJSONFieldDeserializer" />
 
-  <subscriber factory=".blocks.TextBlockDeserializer"
-    provides="plone.restapi.interfaces.IBlockFieldDeserializationTransformer"/>
-  <subscriber factory=".blocks.HTMLBlockDeserializer"
-    provides="plone.restapi.interfaces.IBlockFieldDeserializationTransformer"/>
-  <subscriber factory=".blocks.ImageBlockDeserializer"
-    provides="plone.restapi.interfaces.IBlockFieldDeserializationTransformer"/>
-  <subscriber factory=".blocks.ResolveUIDDeserializer"
-    provides="plone.restapi.interfaces.IBlockFieldDeserializationTransformer"/>
-  <subscriber factory=".blocks.TextBlockDeserializerRoot"
-    provides="plone.restapi.interfaces.IBlockFieldDeserializationTransformer"/>
-  <subscriber factory=".blocks.HTMLBlockDeserializerRoot"
-    provides="plone.restapi.interfaces.IBlockFieldDeserializationTransformer"/>
-  <subscriber factory=".blocks.ImageBlockDeserializerRoot"
-    provides="plone.restapi.interfaces.IBlockFieldDeserializationTransformer"/>
-  <subscriber factory=".blocks.ResolveUIDDeserializerRoot"
-    provides="plone.restapi.interfaces.IBlockFieldDeserializationTransformer"/>
-
-  <adapter factory=".local_roles.DeserializeFromJson"
-           name="local_roles"/>
+  <adapter factory=".slots.SlotDeserializer" />
+  <adapter factory=".slots.SlotDeserializerRoot" />
+  <adapter factory=".slots.SlotsDeserializer" />
+  <adapter
+      factory=".slots.SlotsDeserializerRoot"
+      provides="plone.restapi.interfaces.IDeserializeFromJson"
+      />
+
+  <subscriber
+      factory=".blocks.TextBlockDeserializer"
+      provides="plone.restapi.interfaces.IBlockFieldDeserializationTransformer"
+      />
+  <subscriber
+      factory=".blocks.HTMLBlockDeserializer"
+      provides="plone.restapi.interfaces.IBlockFieldDeserializationTransformer"
+      />
+  <subscriber
+      factory=".blocks.ImageBlockDeserializer"
+      provides="plone.restapi.interfaces.IBlockFieldDeserializationTransformer"
+      />
+  <subscriber
+      factory=".blocks.ResolveUIDDeserializer"
+      provides="plone.restapi.interfaces.IBlockFieldDeserializationTransformer"
+      />
+  <subscriber
+      factory=".blocks.TextBlockDeserializerRoot"
+      provides="plone.restapi.interfaces.IBlockFieldDeserializationTransformer"
+      />
+  <subscriber
+      factory=".blocks.HTMLBlockDeserializerRoot"
+      provides="plone.restapi.interfaces.IBlockFieldDeserializationTransformer"
+      />
+  <subscriber
+      factory=".blocks.ImageBlockDeserializerRoot"
+      provides="plone.restapi.interfaces.IBlockFieldDeserializationTransformer"
+      />
+  <subscriber
+      factory=".blocks.ResolveUIDDeserializerRoot"
+      provides="plone.restapi.interfaces.IBlockFieldDeserializationTransformer"
+      />
+  <subscriber
+      factory=".blocks.VolatileSmartField"
+      provides="plone.restapi.interfaces.IBlockFieldDeserializationTransformer"
+      />
+
+  <adapter
+      factory=".local_roles.DeserializeFromJson"
+      name="local_roles"
+      />
 
   <configure zcml:condition="installed z3c.relationfield">
     <adapter factory=".relationfield.RelationChoiceFieldDeserializer" />
@@ -51,7 +82,7 @@
   <configure zcml:condition="installed Products.Archetypes.atapi">
     <adapter factory=".atcontent.DeserializeFromJson" />
     <configure zcml:condition="installed plone.app.blob">
-        <adapter factory=".atfields.BlobFieldDeserializer" />
+      <adapter factory=".atfields.BlobFieldDeserializer" />
     </configure>
     <adapter factory=".atfields.DefaultFieldDeserializer" />
     <adapter factory=".atfields.FileFieldDeserializer" />