Merge pull request #55 from plone/no-zcml

No more zcml in core

ZOPE_FUTURE.rst

@@ -0,0 +1,22 @@
+Throwing this out there...
+
+Zope has connotations and cognitive overhead for people to think about.
+
+Long term, we'd like to fork/simply all zope dependencies.
+
+The component architecture, interfaces and security is amazing software; however,
+for simplification and longterm success of project, we'd like to pull whatever we can out.
+
+
+Package candidates:
+
+- zope.component
+- zope.configuration
+- zope.interface
+- zope.lifecycleevent
+- zope.schema
+- zope.event
+
+
+Basically... anything where a user would be make imports for packages,
+we want those imports to be part of THIS package.

docs/source/applicationconfiguration.md

@@ -66,6 +66,15 @@ to those decorators.
 * _provides_: Interface this adapter provides--must be used along with factory
 
 
+## utility
+
+*`@configure.utility`*
+
+* _provides_: Interface this utility provides
+* _name_: Name of utility
+* _factory_: A factory used to create the subscriber instance
+
+
 ## permission
 
 *`configure.permission`*

src/plone.server/CHANGELOG.rst

@@ -7,6 +7,9 @@ New features:
   with decorators, not zcml
   [vangheem]
 
+- No more zcml in core
+  [vangheem]
+
 
 1.0a9 (2017-01-18)
 ------------------

src/plone.server/plone/server/api/content.py

@@ -54,7 +54,7 @@ class DefaultPOST(Service):
 
     async def __call__(self):
         """To create a content."""
-        data = await self.request.json()
+        data = await self.get_data()
         type_ = data.get('@type', None)
         id_ = data.get('id', None)
         behaviors = data.get('@behaviors', None)
@@ -142,7 +142,7 @@ class DefaultPUT(Service):
 @configure.service(context=IResource, method='PATCH', permission='plone.ModifyContent')
 class DefaultPATCH(Service):
     async def __call__(self):
-        data = await self.request.json()
+        data = await self.get_data()
         behaviors = data.get('@behaviors', None)
         for behavior in behaviors or ():
             self.context.add_behavior(behavior)

src/plone.server/plone/server/api/service.py

@@ -9,7 +9,8 @@
 
 
 class Service(View):
-    pass
+    async def get_data(self):
+        return await self.request.json()
 
 
 class DownloadService(View):

src/plone.server/plone/server/auth/participation.py

@@ -1,11 +1,11 @@
 # -*- coding: utf-8 -*-
+from plone.server import configure
 from plone.server.auth import authenticate_request
 from plone.server.auth.groups import PloneGroup
 from plone.server.auth.users import AnonymousUser
 from plone.server.interfaces import IRequest
 from plone.server.transactions import get_current_request
-from zope.component import adapter
-from zope.interface import implementer
+from zope.authentication.interfaces import IAuthentication
 from zope.security.interfaces import IParticipation
 
 
@@ -17,8 +17,7 @@ def __init__(self, request):
         self.interaction = None
 
 
-@adapter(IRequest)
-@implementer(IParticipation)
+@configure.adapter(for_=IRequest, provides=IParticipation)
 class PloneParticipation(object):
     principal = None
 
@@ -40,6 +39,7 @@ async def __call__(self):
         self.interaction = None
 
 
+@configure.utility(provides=IAuthentication)
 class ZopeAuthentication(object):
     """ Class used to get groups. """
 

src/plone.server/plone/server/auth/principalrole.py

@@ -1,11 +1,15 @@
 """Mappings between principals and roles, stored in an object locally."""
-from zope.interface import implementer
+from plone.server import configure
+from plone.server.interfaces import IResource
 from zope.securitypolicy.interfaces import IPrincipalRoleManager
 from zope.securitypolicy.principalrole import AnnotationPrincipalRoleManager
 from zope.securitypolicy.securitymap import AnnotationSecurityMap
 
 
-@implementer(IPrincipalRoleManager)
+@configure.adapter(
+    for_=IResource,
+    provides=IPrincipalRoleManager,
+    trusted=True)
 class AnnotationPlonePrincipalRoleManager(AnnotationPrincipalRoleManager):
     """Mappings between principals and roles with global."""
 

src/plone.server/plone/server/browser.py

@@ -1,8 +1,9 @@
 # -*- coding: utf-8 -*-
+from plone.server import configure
 from plone.server.interfaces import IAbsoluteURL
-from plone.server.interfaces import ISerializableException
 from plone.server.interfaces import IRequest
 from plone.server.interfaces import IResource
+from plone.server.interfaces import ISerializableException
 from plone.server.interfaces import IView
 from plone.server.transactions import get_current_request
 from zope.component import adapter
@@ -48,8 +49,9 @@ async def __call__(self):
         }
 
 
-@adapter(IResource, IRequest)
-@implementer(IAbsoluteURL)
+@configure.adapter(
+    for_=(IResource, IRequest),
+    provides=IAbsoluteURL)
 class Absolute_URL(object):
 
     def __init__(self, context, request):
@@ -81,8 +83,9 @@ def __call__(self, relative=False, site_url=False):
                 self.request._db_id + path
 
 
-@adapter(IResource)
-@implementer(IAbsoluteURL)
+@configure.adapter(
+    for_=IResource,
+    provides=IAbsoluteURL)
 class Absolute_URL_ObtainRequest(Absolute_URL):
 
     def __init__(self, context):

src/plone.server/plone/server/catalog/catalog.py

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+from plone.server import configure
 from plone.server.catalog import NoIndexField
 from plone.server.content import iter_schemata_for_type
 from plone.server.directives import index
@@ -7,6 +8,7 @@
 from plone.server.directives import metadata
 from plone.server.interfaces import ICatalogDataAdapter
 from plone.server.interfaces import ICatalogUtility
+from plone.server.interfaces import IResource
 from plone.server.json.serialize_value import json_compatible
 from zope.component import queryAdapter
 from zope.interface import implementer
@@ -74,7 +76,9 @@ def get_data(self, content):
         return data
 
 
-@implementer(ICatalogDataAdapter)
+@configure.adapter(
+    for_=IResource,
+    provides=ICatalogDataAdapter)
 class DefaultCatalogDataAdapter(object):
 
     def __init__(self, content):

src/plone.server/plone/server/catalog/index.py

@@ -1,10 +1,17 @@
 # -*- coding: utf-8 -*-
+from plone.server import configure
 from plone.server.interfaces import ICatalogUtility
+from plone.server.interfaces import IObjectFinallyCreatedEvent
+from plone.server.interfaces import IObjectFinallyDeletedEvent
+from plone.server.interfaces import IObjectFinallyModifiedEvent
+from plone.server.interfaces import IResource
 from plone.server.interfaces import ISite
 from plone.server.transactions import get_current_request
 from plone.server.transactions import RequestNotFound
 from plone.server.transactions import tm
 from zope.component import queryUtility
+from zope.lifecycleevent.interfaces import IObjectAddedEvent
+from zope.lifecycleevent.interfaces import IObjectRemovedEvent
 
 import transaction
 
@@ -57,6 +64,7 @@ def get_hook():
     return hook
 
 
+@configure.subscriber(for_=(IResource, IObjectFinallyDeletedEvent))
 def remove_object(obj, event):
     uid = getattr(obj, 'uuid', None)
     if uid is None:
@@ -73,6 +81,8 @@ def remove_object(obj, event):
         del hook.index[uid]
 
 
+@configure.subscriber(for_=(IResource, IObjectFinallyCreatedEvent))
+@configure.subscriber(for_=(IResource, IObjectFinallyModifiedEvent))
 def add_object(obj, event):
     uid = getattr(obj, 'uuid', None)
     if uid is None:
@@ -89,12 +99,14 @@ def add_object(obj, event):
         hook.index[uid] = search.get_data(obj)
 
 
+@configure.subscriber(for_=(ISite, IObjectAddedEvent))
 async def initialize_catalog(site, event):
     search = queryUtility(ICatalogUtility)
     if search:
         await search.initialize_catalog(site)
 
 
+@configure.subscriber(for_=(ISite, IObjectRemovedEvent))
 async def remove_catalog(site, event):
     search = queryUtility(ICatalogUtility)
     if search:

src/plone.server/plone/server/commands/migrate.py

@@ -1,10 +1,11 @@
 from plone.server import app_settings
 from plone.server import migrate
 from plone.server.commands import Command
+from plone.server.interfaces import IApplication
 from plone.server.interfaces import IDatabase
+from plone.server.interfaces import MIGRATION_DATA_REGISTRY_KEY
 from plone.server.testing import TESTING_SETTINGS
 from zope.component import getUtility
-from plone.server.interfaces import IApplication
 
 
 def traverse_to_path(app, path):
@@ -39,7 +40,7 @@ def report(self, arguments, sites, apps):
             db, site = data
             registry = site['_registry']
             try:
-                installed_versions = registry['_migrations_info']
+                installed_versions = registry[MIGRATION_DATA_REGISTRY_KEY]
             except KeyError:
                 installed_versions = {}
             title = '{} Migrations'.format(site_path)
@@ -111,7 +112,7 @@ def run(self, arguments, settings, app):
                 for app in apps:
                     registry = site['_registry']
                     try:
-                        installed_versions = registry['_migrations_info']
+                        installed_versions = registry[MIGRATION_DATA_REGISTRY_KEY]
                     except KeyError:
                         installed_versions = {}
                     _migrations = migrate.get_migrations(