rename server to web

demo/config.py

@@ -3,7 +3,7 @@
 from dotenv import load_dotenv
 import logging
 from os import getenv
-from scopes.server.app import zope_app_factory
+from scopes.web.app import zope_app_factory
 
 load_dotenv()
 

demo/demo_server.py

@@ -1,6 +1,6 @@
 # py-scopes/demo/demo_server.py
 
-from scopes.server import auth
+from scopes.web.auth import oidc
 from scopes.storage import topic
 
 import logging

demo/shell.py

@@ -3,7 +3,7 @@
 # use: `python -i shell.py`
 
 import config
-from scopes.server import auth
+from scopes.web.auth import oidc
 from scopes.storage.folder import Root
 from scopes.storage import topic
 

scopes/server/__init__.py

@@ -1 +0,0 @@
-"""package scopes.server"""

scopes/server/auth/__init__.py

@@ -1 +0,0 @@
-"""package scopes.server.auth"""

scopes/tests/config.py

@@ -3,7 +3,7 @@
 import logging
 from os import getenv
 
-#from scopes.server.app import demo_app, zope_app
+#from scopes.web.app import demo_app, zope_app
 
 log_file = 'scopes/tests/log/scopes-test.log'
 log_level = logging.INFO

scopes/tests/test_standard.py

@@ -6,7 +6,7 @@ import os, sys
 sys.path = [os.path.dirname(__file__)] + sys.path
 
 import unittest
-from scopes.tests import tlib_server, tlib_storage
+from scopes.tests import tlib_web, tlib_storage
 
 from scopes.storage.common import StorageFactory
 import config
@@ -30,8 +30,8 @@ class Test(unittest.TestCase):
     def test_004_topic(self):
         tlib_storage.test_topic(self, config)
 
-    def test_013_server(self):
+    def test_013_web(self):
-        tlib_server.test_app(self, config)
+        tlib_web.test_app(self, config)
 
 
 def suite():

scopes/tests/tlib_web.py

@@ -1,13 +1,13 @@
-# tests/tlib_server.py
+# tests/tlib_web.py
 
-"""Test implementation for the `scopes.server` package."""
+"""Test implementation for the `scopes.web` package."""
 
 import json
 import logging
 from zope.publisher.browser import TestRequest
 from zope.publisher.publish import publish
 
-from scopes.server.app import Publication
+from scopes.web.app import Publication
 from scopes.storage.folder import Root
 
 
@@ -20,7 +20,7 @@ def publishRequest(config, storage, path):
 
 
 def test_app(self, config):
-    logger = logging.getLogger('tlib_server')
+    logger = logging.getLogger('tlib_web')
     logger.info('test_app')
     storage = config.storageFactory(config.dbschema)
     response = publishRequest(config, storage, '/top')

scopes/web/__init__.py

@@ -0,0 +1 @@
+"""package scopes.web"""

scopes/web/app.py

@@ -1,4 +1,4 @@
-# scopes.server.app
+# scopes.web.app
 
 import logging
 from zope.i18n.interfaces import IUserPreferredCharsets
@@ -9,7 +9,7 @@ from zope.publisher.interfaces import NotFound
 from zope.publisher.publish import publish
 
 from scopes.interfaces import ITraversable, IView
-from scopes.server.browser import getView
+from scopes.web.browser import getView
 import scopes.storage.concept # register container classes
 from scopes.storage.folder import Root
 
@@ -38,7 +38,7 @@ class Publication(DefaultPublication):
 
     def beforeTraversal(self, request):
         super(Publication, self).beforeTraversal(request)
-        from scopes.server.auth.oidc import authentication
+        from scopes.web.auth.oidc import authentication
         prc = authentication.authenticate(request)
         request.setPrincipal(prc)
 

scopes/web/auth/__init__.py

@@ -0,0 +1 @@
+"""package scopes.web.auth"""

scopes/web/auth/oidc.py

@@ -1,4 +1,4 @@
-# scopes.server.auth
+# scopes.web.auth.uidc
 
 from cryptography.fernet import Fernet
 from email.utils import formatdate
@@ -12,13 +12,13 @@ from zope.interface import implementer
 from zope.publisher.interfaces import Unauthorized
 from zope.security.interfaces import IGroupAwarePrincipal
 
-from scopes.server.browser import DefaultView, register
+from scopes.web.browser import DefaultView, register
 from scopes.storage.folder import DummyFolder, Root
 from scopes import util
 
 import config
 
-logger = logging.getLogger('server.auth')
+logger = logging.getLogger('web.auth.oidc')
 
 
 @implementer(IAuthentication)

scopes/web/browser.py

@@ -1,11 +1,11 @@
-# scopes.server.browser
+# scopes.web.browser
 
 import json
 import logging
 from zope.interface import implementer
 from scopes.interfaces import IContainer, IReference, IView
 
-logger = logging.getLogger('server.browser')
+logger = logging.getLogger('web.browser')
 
 views = {} # registry for all views: {name: {prefix: viewClass, ...}, ...}