WuttaWeb 0.15.0__tar.gz → 0.16.1__tar.gz

{wuttaweb-0.15.0 → wuttaweb-0.16.1}/CHANGELOG.md

@@ -5,6 +5,25 @@ All notable changes to wuttaweb will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## v0.16.1 (2024-12-08)
+
+### Fix
+
+- refactor to reflect usage of proper UUID values
+
+## v0.16.0 (2024-12-05)
+
+### Feat
+
+- add `get_template_context()` method for master view
+
+### Fix
+
+- add option for People entry in the Admin menu
+- fix handling of `Upgrade.uuid`
+- improve support for random objects with grid, master view
+- hide CRUD header buttons if master view does not allow
+
 ## v0.15.0 (2024-11-24)
 
 ### Feat

{wuttaweb-0.15.0 → wuttaweb-0.16.1}/PKG-INFO

@@ -1,11 +1,12 @@
 Metadata-Version: 2.3
 Name: WuttaWeb
-Version: 0.15.0
+Version: 0.16.1
 Summary: Web App for Wutta Framework
 Project-URL: Homepage, https://wuttaproject.org/
 Project-URL: Repository, https://forgejo.wuttaproject.org/wutta/wuttaweb
+Project-URL: Issues, https://forgejo.wuttaproject.org/wutta/wuttaweb/issues
 Project-URL: Changelog, https://forgejo.wuttaproject.org/wutta/wuttaweb/src/branch/master/CHANGELOG.md
-Author-email: Lance Edgar <lance@edbob.org>
+Author-email: Lance Edgar <lance@wuttaproject.org>
 License: GNU GPL v3+
 Classifier: Development Status :: 4 - Beta
 Classifier: Environment :: Web Environment
@@ -35,7 +36,7 @@ Requires-Dist: pyramid-tm
 Requires-Dist: pyramid>=2
 Requires-Dist: waitress
 Requires-Dist: webhelpers2
-Requires-Dist: wuttjamaican[db]>=0.15.0
+Requires-Dist: wuttjamaican[db]>=0.17.1
 Requires-Dist: zope-sqlalchemy>=1.5
 Provides-Extra: continuum
 Requires-Dist: wutta-continuum; extra == 'continuum'

{wuttaweb-0.15.0 → wuttaweb-0.16.1}/pyproject.toml

@@ -6,10 +6,10 @@ build-backend = "hatchling.build"
 
 [project]
 name = "WuttaWeb"
-version = "0.15.0"
+version = "0.16.1"
 description = "Web App for Wutta Framework"
 readme = "README.md"
-authors = [{name = "Lance Edgar", email = "lance@edbob.org"}]
+authors = [{name = "Lance Edgar", email = "lance@wuttaproject.org"}]
 license = {text = "GNU GPL v3+"}
 classifiers = [
         "Development Status :: 4 - Beta",
@@ -42,7 +42,7 @@ dependencies = [
         "pyramid_tm",
         "waitress",
         "WebHelpers2",
-        "WuttJamaican[db]>=0.15.0",
+        "WuttJamaican[db]>=0.17.1",
         "zope.sqlalchemy>=1.5",
 ]
 
@@ -68,6 +68,7 @@ wuttaweb = "wuttaweb.conf:WuttaWebConfigExtension"
 [project.urls]
 Homepage = "https://wuttaproject.org/"
 Repository = "https://forgejo.wuttaproject.org/wutta/wuttaweb"
+Issues = "https://forgejo.wuttaproject.org/wutta/wuttaweb/issues"
 Changelog = "https://forgejo.wuttaproject.org/wutta/wuttaweb/src/branch/master/CHANGELOG.md"
 
 

{wuttaweb-0.15.0 → wuttaweb-0.16.1}/src/wuttaweb/forms/schema.py

@@ -24,6 +24,8 @@
 Form schema types
 """
 
+import uuid as _uuid
+
 import colander
 
 from wuttaweb.db import Session
@@ -246,7 +248,14 @@ class ObjectRef(colander.SchemaType):
 
         # fetch object from DB
         model = self.app.model
-        obj = self.session.get(self.model_class, value)
+        obj = None
+        if isinstance(value, _uuid.UUID):
+            obj = self.session.get(self.model_class, value)
+        else:
+            try:
+                obj = self.session.get(self.model_class, _uuid.UUID(value))
+            except ValueError:
+                pass
 
         # raise error if not found
         if not obj:

{wuttaweb-0.15.0 → wuttaweb-0.16.1}/src/wuttaweb/grids/base.py

@@ -1940,6 +1940,15 @@ class Grid:
             })
         return filters
 
+    def object_to_dict(self, obj):
+        """ """
+        try:
+            dct = dict(obj)
+        except TypeError:
+            dct = dict(obj.__dict__)
+            dct.pop('_sa_instance_state', None)
+        return dct
+
     def get_vue_context(self):
         """
         Returns a dict of context for the grid, for use with the Vue
@@ -1976,7 +1985,7 @@ class Grid:
             original_record = record
 
             # convert record to new dict
-            record = dict(record)
+            record = self.object_to_dict(record)
 
             # make all values safe for json
             record = make_json_safe(record, warn=False)

{wuttaweb-0.15.0 → wuttaweb-0.16.1}/src/wuttaweb/menus.py

@@ -142,38 +142,54 @@ class MenuHandler(GenericHandler):
         The return value for this method should be a *single* dict,
         which will ultimately be one element of the final list of
         dicts as described in :class:`MenuHandler`.
+
+        :param include_people: You can pass this flag to indicate the
+           admin menu should contain an entry for the "People" view.
         """
+        items = []
+
+        if kwargs.get('include_people'):
+            items.extend([
+                {
+                    'title': "All People",
+                    'route': 'people',
+                    'perm': 'people.list',
+                },
+            ])
+
+        items.extend([
+            {
+                'title': "Users",
+                'route': 'users',
+                'perm': 'users.list',
+            },
+            {
+                'title': "Roles",
+                'route': 'roles',
+                'perm': 'roles.list',
+            },
+            {'type': 'sep'},
+            {
+                'title': "App Info",
+                'route': 'appinfo',
+                'perm': 'appinfo.list',
+            },
+            {
+                'title': "Raw Settings",
+                'route': 'settings',
+                'perm': 'settings.list',
+            },
+            {
+                'title': "Upgrades",
+                'route': 'upgrades',
+                'perm': 'upgrades.list',
+            },
+        ])
+
         return {
             'title': "Admin",
             'type': 'menu',
-            'items': [
-                {
-                    'title': "Users",
-                    'route': 'users',
-                    'perm': 'users.list',
-                },
-                {
-                    'title': "Roles",
-                    'route': 'roles',
-                    'perm': 'roles.list',
-                },
-                {'type': 'sep'},
-                {
-                    'title': "App Info",
-                    'route': 'appinfo',
-                    'perm': 'appinfo.list',
-                },
-                {
-                    'title': "Raw Settings",
-                    'route': 'settings',
-                    'perm': 'settings.list',
-                },
-                {
-                    'title': "Upgrades",
-                    'route': 'upgrades',
-                    'perm': 'upgrades.list',
-                },
-            ],
+            'items': items,
         }
 
     ##############################

{wuttaweb-0.15.0 → wuttaweb-0.16.1}/src/wuttaweb/templates/base.mako

@@ -563,7 +563,7 @@
 
     const WuttaFeedbackFormData = {
         referrer: null,
-        userUUID: ${json.dumps(request.user.uuid if request.user else None)|n},
+        userUUID: ${json.dumps(request.user.uuid.hex if request.user else None)|n},
         userName: ${json.dumps(str(request.user) if request.user else None)|n},
         showDialog: false,
         sendingFeedback: false,
@@ -682,13 +682,13 @@
 <%def name="render_crud_header_buttons()">
   % if master:
       % if master.viewing:
-          % if instance_editable and master.has_perm('edit'):
+          % if master.editable and instance_editable and master.has_perm('edit'):
               <wutta-button once
                             tag="a" href="${master.get_action_url('edit', instance)}"
                             icon-left="edit"
                             label="Edit This" />
           % endif
-          % if instance_deletable and master.has_perm('delete'):
+          % if master.deletable and instance_deletable and master.has_perm('delete'):
               <wutta-button once type="is-danger"
                             tag="a" href="${master.get_action_url('delete', instance)}"
                             icon-left="trash"
@@ -701,7 +701,7 @@
                             icon-left="eye"
                             label="View This" />
           % endif
-          % if instance_deletable and master.has_perm('delete'):
+          % if master.deletable and instance_deletable and master.has_perm('delete'):
               <wutta-button once type="is-danger"
                             tag="a" href="${master.get_action_url('delete', instance)}"
                             icon-left="trash"
@@ -714,7 +714,7 @@
                             icon-left="eye"
                             label="View This" />
           % endif
-          % if instance_editable and master.has_perm('edit'):
+          % if master.editable and instance_editable and master.has_perm('edit'):
               <wutta-button once
                             tag="a" href="${master.get_action_url('edit', instance)}"
                             icon-left="edit"

{wuttaweb-0.15.0 → wuttaweb-0.16.1}/src/wuttaweb/views/master.py

@@ -1629,6 +1629,9 @@ class MasterView(View):
             if 'instance_deletable' not in context:
                 context['instance_deletable'] = self.is_deletable(instance)
 
+        # supplement context further if needed
+        context = self.get_template_context(context)
+
         # first try the template path most specific to this view
         template_prefix = self.get_template_prefix()
         mako_path = f'{template_prefix}/{template}.mako'
@@ -1648,6 +1651,26 @@ class MasterView(View):
             # let that error raise on up
             return render_to_response(mako_path, context, request=self.request)
 
+    def get_template_context(self, context):
+        """
+        This method should return the "complete" context for rendering
+        the current view template.
+
+        Default logic for this method returns the given context
+        unchanged.
+
+        You may wish to override to pass extra context to the view
+        template.  Check :attr:`viewing` and similar, or
+        ``request.current_route_name`` etc. in order to add extra
+        context only for certain view templates.
+
+        :params: context: The context dict we have so far,
+           auto-provided by the master view logic.
+
+        :returns: Final context dict for the template.
+        """
+        return context
+
     def get_fallback_templates(self, template):
         """
         Returns a list of "fallback" template paths which may be
@@ -1995,8 +2018,12 @@ class MasterView(View):
         :param obj: Model instance object.
         """
         route_prefix = self.get_route_prefix()
-        kw = dict([(key, obj[key])
-                   for key in self.get_model_key()])
+        try:
+            kw = dict([(key, obj[key])
+                       for key in self.get_model_key()])
+        except TypeError:
+            kw = dict([(key, getattr(obj, key))
+                       for key in self.get_model_key()])
         kw.update(kwargs)
         return self.request.route_url(f'{route_prefix}.{action}', **kw)
 

{wuttaweb-0.15.0 → wuttaweb-0.16.1}/src/wuttaweb/views/upgrades.py

@@ -217,7 +217,7 @@ class UpgradeView(MasterView):
 
     def get_upgrade_filepath(self, upgrade, filename=None, create=True):
         """ """
-        uuid = upgrade.uuid
+        uuid = str(upgrade.uuid)
         path = self.app.get_appdir('data', 'upgrades', uuid[:2], uuid[2:],
                                    create=create)
         if filename:

{wuttaweb-0.15.0 → wuttaweb-0.16.1}/tests/forms/test_widgets.py

@@ -146,14 +146,14 @@ class TestRoleRefsWidget(WebTestCase):
 
         # editable values list *excludes* admin (by default)
         html = widget.serialize(field, {admin.uuid, blokes.uuid})
-        self.assertNotIn(admin.uuid, html)
-        self.assertIn(blokes.uuid, html)
+        self.assertNotIn(str(admin.uuid), html)
+        self.assertIn(str(blokes.uuid), html)
 
         # but admin is included for root user
         self.request.is_root = True
         html = widget.serialize(field, {admin.uuid, blokes.uuid})
-        self.assertIn(admin.uuid, html)
-        self.assertIn(blokes.uuid, html)
+        self.assertIn(str(admin.uuid), html)
+        self.assertIn(str(blokes.uuid), html)
 
 
 class TestUserRefsWidget(WebTestCase):

{wuttaweb-0.15.0 → wuttaweb-0.16.1}/tests/grids/test_base.py

@@ -1373,6 +1373,25 @@ class TestGrid(WebTestCase):
         filters = grid.get_vue_filters()
         self.assertEqual(len(filters), 2)
 
+    def test_object_to_dict(self):
+        grid = self.make_grid()
+        setting = {'name': 'foo', 'value': 'bar'}
+
+        # new dict but with same values
+        dct = grid.object_to_dict(setting)
+        self.assertIsInstance(dct, dict)
+        self.assertIsNot(dct, setting)
+        self.assertEqual(dct, setting)
+
+        # random object, not iterable
+        class MockSetting:
+            def __init__(self, **kw):
+                self.__dict__.update(kw)
+        mock = MockSetting(**setting)
+        dct = grid.object_to_dict(mock)
+        self.assertIsInstance(dct, dict)
+        self.assertEqual(dct, setting)
+
     def test_get_vue_context(self):
 
         # empty if no columns defined

{wuttaweb-0.15.0 → wuttaweb-0.16.1}/tests/test_auth.py

@@ -1,5 +1,6 @@
 # -*- coding: utf-8; -*-
 
+import uuid as _uuid
 from unittest import TestCase
 from unittest.mock import MagicMock
 
@@ -90,7 +91,7 @@ class TestWuttaSecurityPolicy(TestCase):
 
         # invalid identity yields no user
         self.policy = self.make_policy()
-        self.policy.remember(self.request, 'bogus-user-uuid')
+        self.policy.remember(self.request, _uuid.uuid4()) # random uuid
         user = self.policy.identity(self.request)
         self.assertIsNone(user)
 

{wuttaweb-0.15.0 → wuttaweb-0.16.1}/tests/test_menus.py

@@ -14,8 +14,17 @@ class TestMenuHandler(WebTestCase):
         self.handler = mod.MenuHandler(self.config)
 
     def test_make_admin_menu(self):
-        menus = self.handler.make_admin_menu(self.request)
-        self.assertIsInstance(menus, dict)
+
+        # no people entry by default
+        menu = self.handler.make_admin_menu(self.request)
+        self.assertIsInstance(menu, dict)
+        routes = [item.get('route') for item in menu['items']]
+        self.assertNotIn('people', routes)
+
+        # but we can request it
+        menu = self.handler.make_admin_menu(self.request, include_people=True)
+        routes = [item.get('route') for item in menu['items']]
+        self.assertIn('people', routes)
 
     def test_make_menus(self):
         menus = self.handler.make_menus(self.request)

{wuttaweb-0.15.0 → wuttaweb-0.16.1}/tests/views/test_common.py

@@ -88,7 +88,7 @@ class TestCommonView(WebTestCase):
 
             # basic send, with user
             self.request.user = user
-            self.request.POST['user_uuid'] = user.uuid
+            self.request.POST['user_uuid'] = str(user.uuid)
             with patch.object(mod, 'Session', return_value=self.session):
                 context = view.feedback()
             self.assertEqual(context, {'ok': True})

{wuttaweb-0.15.0 → wuttaweb-0.16.1}/tests/views/test_master.py

@@ -734,6 +734,41 @@ class TestMasterView(WebTestCase):
             self.request.matchdict = {'name': 'blarg'}
             self.assertRaises(HTTPNotFound, view.get_instance, session=self.session)
 
+    def test_get_action_url_for_dict(self):
+        model = self.app.model
+        setting = {'name': 'foo', 'value': 'bar'}
+        with patch.multiple(mod.MasterView, create=True,
+                            model_class=model.Setting):
+            mod.MasterView.defaults(self.pyramid_config)
+            view = self.make_view()
+            url = view.get_action_url_view(setting, 0)
+            self.assertEqual(url, self.request.route_url('settings.view', name='foo'))
+
+    def test_get_action_url_for_orm_object(self):
+        model = self.app.model
+        setting = model.Setting(name='foo', value='bar')
+        self.session.add(setting)
+        self.session.commit()
+        with patch.multiple(mod.MasterView, create=True,
+                            model_class=model.Setting):
+            mod.MasterView.defaults(self.pyramid_config)
+            view = self.make_view()
+            url = view.get_action_url_view(setting, 0)
+            self.assertEqual(url, self.request.route_url('settings.view', name='foo'))
+
+    def test_get_action_url_for_adhoc_object(self):
+        model = self.app.model
+        class MockSetting:
+            def __init__(self, **kw):
+                self.__dict__.update(kw)
+        setting = MockSetting(name='foo', value='bar')
+        with patch.multiple(mod.MasterView, create=True,
+                            model_class=model.Setting):
+            mod.MasterView.defaults(self.pyramid_config)
+            view = self.make_view()
+            url = view.get_action_url_view(setting, 0)
+            self.assertEqual(url, self.request.route_url('settings.view', name='foo'))
+
     def test_get_action_url_view(self):
         model = self.app.model
         setting = model.Setting(name='foo', value='bar')

{wuttaweb-0.15.0 → wuttaweb-0.16.1}/tests/views/test_upgrades.py

@@ -127,7 +127,7 @@ class TestUpgradeView(WebTestCase):
         self.session.commit()
 
         view = self.make_view()
-        uuid = upgrade.uuid
+        uuid = str(upgrade.uuid)
 
         # no filename
         path = view.download_path(upgrade, None)
@@ -153,7 +153,7 @@ class TestUpgradeView(WebTestCase):
         self.session.commit()
 
         view = self.make_view()
-        uuid = upgrade.uuid
+        uuid = str(upgrade.uuid)
 
         # no filename
         path = view.get_upgrade_filepath(upgrade)