Merge branch 'master' of github.com:wolbernd/plone.restapi

Author: wolbernd

.github/workflows/flake8.yml

@@ -28,7 +28,7 @@ jobs:
 
       # install flake8
       - name: install flake8
-        run: pip install flake8
+        run: pip install flake8==$(awk '/^flake8 =/{print $NF}' versions.cfg)
 
       # run black
       - name: run flake8

.github/workflows/tests.yml

@@ -64,11 +64,11 @@ jobs:
 
       # test no uncommited changes
       - name: test no uncommited changes
-        run: bin/test-no-uncommitted-doc-changes
+        run: ./test-no-uncommitted-doc-changes
         env:
           PYTHON_VERSION: ${{ matrix.python-version }}
           PLONE_VERSION: ${{ matrix.plone-version }}
 
       # test for broken links
       - name: linkcheck
-        run: if [ "${{ matrix.plone-version }}" == "6.0" ] && [ ${{ matrix.python-version }} == '3.9' ]; then make docs-linkcheckbroken; fi
+        run: if [ "${{ matrix.plone-version }}" == "6.0" ] && [ ${{ matrix.python-version }} == '3.9' ]; then make docs-linkcheckbroken; fi

base.cfg

@@ -5,8 +5,6 @@ parts =
     instance
     test
     test-coverage
-    test-no-uncommitted-doc-changes
-    test-no-sphinx-warnings
     code-analysis
     dependencychecker
     dependencies
@@ -87,18 +85,6 @@ input = inline:
 output = ${buildout:directory}/bin/test-coverage
 mode = 755
 
-[test-no-uncommitted-doc-changes]
-recipe = collective.recipe.template
-input = test-no-uncommitted-doc-changes.in
-output = bin/test-no-uncommitted-doc-changes
-mode = 755
-
-[test-no-sphinx-warnings]
-recipe = collective.recipe.template
-input = test-no-sphinx-warnings.in
-output = bin/test-no-sphinx-warnings
-mode = 755
-
 [code-analysis]
 recipe = plone.recipe.codeanalysis
 directory = ${buildout:directory}/src

news/1414.feature

@@ -0,0 +1,2 @@
+Move caching rulesets to the ZCML where the endpoints are defined.
+[jensens]

setup.py

@@ -3,7 +3,11 @@
 
 version = "8.22.1.dev0"
 
-assert sys.version_info >= (3, 6, 0), "plone.restapi 8 requires Python 3.6.0+. Please downgrade to plone.restapi 7 for Python 2 and Plone 4.3/5.1."
+assert sys.version_info >= (
+    3,
+    6,
+    0,
+), "plone.restapi 8 requires Python 3.6.0+. Please downgrade to plone.restapi 7 for Python 2 and Plone 4.3/5.1."
 
 
 def read(filename):
@@ -34,6 +38,7 @@ def read(filename):
 
 TEST_REQUIRES = [
     "collective.MockMailHost",
+    "plone.app.caching",
     "plone.app.contenttypes",
     "plone.app.robotframework",
     "plone.app.testing [robot] >= 4.2.2",  # ROBOT_TEST_LEVEL added
@@ -82,9 +87,9 @@ def read(filename):
         "setuptools",
         "importlib-metadata; python_version<'3.8'",
         "python-dateutil",
-        "plone.behavior>=1.1",  # adds name to behavior directive
-        "plone.rest >= 1.0a6",  # json renderer moved to plone.restapi
-        "plone.schema >= 1.2.1",  # new/fixed json field
+        "plone.rest",  # json renderer moved to plone.restapi
+        "plone.schema>=1.2.1",  # new/fixed json field
+        "Products.CMFPlone>=5.2",
         "PyJWT>=1.7.0",
         "pytz",
     ],

src/plone/restapi/configure.zcml

@@ -22,6 +22,12 @@
   <include package="plone.behavior" />
   <include package="plone.rest" />
   <include package="plone.schema" />
+
+  <include
+      package="plone.app.caching"
+      zcml:condition="installed plone.app.caching"
+      />
+
   <include file="indexers.zcml" />
 
   <five:registerPackage

src/plone/restapi/services/actions/configure.zcml

@@ -1,6 +1,8 @@
 <configure
     xmlns="http://namespaces.zope.org/zope"
+    xmlns:cache="http://namespaces.zope.org/cache"
     xmlns:plone="http://namespaces.plone.org/plone"
+    xmlns:zcml="http://namespaces.zope.org/zcml"
     >
 
   <adapter
@@ -15,5 +17,10 @@
       permission="zope2.View"
       name="@actions"
       />
+  <cache:ruleset
+      for=".get.ActionsGet"
+      ruleset="plone.content.dynamic"
+      zcml:condition="have plone-app-caching-3"
+      />
 
 </configure>

src/plone/restapi/services/breadcrumbs/configure.zcml

@@ -1,6 +1,8 @@
 <configure
     xmlns="http://namespaces.zope.org/zope"
+    xmlns:cache="http://namespaces.zope.org/cache"
     xmlns:plone="http://namespaces.plone.org/plone"
+    xmlns:zcml="http://namespaces.zope.org/zcml"
     >
 
   <adapter
@@ -15,5 +17,10 @@
       permission="zope2.View"
       name="@breadcrumbs"
       />
+  <cache:ruleset
+      for=".get.BreadcrumbsGet"
+      ruleset="plone.content.dynamic"
+      zcml:condition="have plone-app-caching-3"
+      />
 
 </configure>

src/plone/restapi/services/content/configure.zcml

@@ -1,5 +1,6 @@
 <configure
     xmlns="http://namespaces.zope.org/zope"
+    xmlns:cache="http://namespaces.zope.org/cache"
     xmlns:plone="http://namespaces.plone.org/plone"
     xmlns:zcml="http://namespaces.zope.org/zcml"
     >
@@ -17,6 +18,11 @@
       for="Products.CMFCore.interfaces.IContentish"
       permission="zope2.View"
       />
+  <cache:ruleset
+      for=".get.ContentGet"
+      ruleset="plone.content.dynamic"
+      zcml:condition="have plone-app-caching-3"
+      />
 
   <plone:service
       method="PATCH"

src/plone/restapi/services/discussion/configure.zcml

@@ -1,5 +1,6 @@
 <configure
     xmlns="http://namespaces.zope.org/zope"
+    xmlns:cache="http://namespaces.zope.org/cache"
     xmlns:plone="http://namespaces.plone.org/plone"
     xmlns:zcml="http://namespaces.zope.org/zcml"
     >
@@ -16,6 +17,11 @@
       permission="zope2.View"
       name="@comments"
       />
+  <cache:ruleset
+      for=".conversation.CommentsGet"
+      ruleset="plone.content.itemView"
+      zcml:condition="have plone-app-caching-3"
+      />
 
   <plone:service
       method="POST"