update example to v0.9.3

examples/packages/advanced-example/lektor_advanced.py

@@ -1,31 +1,35 @@
 # -*- coding: utf-8 -*-
 from lektor.pluginsystem import Plugin
-from lektor.utils import slugify
+from typing import Generator
 import re
+from lektor_groupby import GroupBy, GroupByCallbackArgs
 
 
 class AdvancedGroupByPlugin(Plugin):
-    def on_groupby_before_build_all(self, groupby, builder, **extra):
+    def on_groupby_before_build_all(self, groupby: GroupBy, builder, **extra):
         # load config
-        regex = self.get_config().get('match')
+        config = self.get_config()
+        regex = config.get('testC.pattern.match')
         try:
             regex = re.compile(regex)
         except Exception as e:
             print('inlinetags.regex not valid: ' + str(e))
             return
 
-        # since we load and use a config file, we need to track the dependency
-        @groupby.depends_on(self.config_filename)
-        @groupby.watch('/', 'testC', slug='advanced/{group}/',
-                       template='example-advanced.html')
-        def convert_replace_example(args):
+        watcher = groupby.add_watcher('testC', config)  # tracks dependency
+
+        @watcher.grouping()
+        def _replace(args: GroupByCallbackArgs) -> Generator[str, str, None]:
             # args.field assumed to be Markdown
             obj = args.field.source
+            slugify_map = {}  # type Dict[str, str]
             for match in regex.finditer(obj):
                 tag = match.group(1)
-                yield slugify(tag), tag
+                key = yield tag
+                print('[advanced] slugify:', tag, '->', key)
+                slugify_map[tag] = key
 
             def _fn(match: re.Match) -> str:
                 tag = match.group(1)
-                return f'<a href="/advanced/{slugify(tag)}/">{tag}</a>'
+                return f'<a href="/advanced/{slugify_map[tag]}/">{tag}</a>'
             args.field.source = regex.sub(_fn, obj)

examples/packages/simple-example/lektor_simple.py

@@ -1,17 +1,26 @@
 # -*- coding: utf-8 -*-
 from lektor.pluginsystem import Plugin
-from lektor.utils import slugify
+from typing import Iterator, Tuple
+from datetime import datetime
+from lektor_groupby import GroupBy, GroupByCallbackArgs
 
 
 class SimpleGroupByPlugin(Plugin):
-    def on_groupby_after_build_all(self, groupby, builder, **extra):
-        @groupby.watch('/blog', 'testB', slug='simple/{group}/index.html',
-                       template='example-simple.html', flatten=True)
-        def convert_simple_example(args):
+    def on_groupby_before_build_all(self, groupby: GroupBy, builder, **extra):
+        watcher = groupby.add_watcher('testB', {
+            'root': '/blog',
+            'slug': 'simple/{key}/index.html',
+            'template': 'example-simple.html',
+        })
+        watcher.config.set_key_map({'Foo': 'bar'})
+        watcher.config.set_fields({'date': datetime.now()})
+
+        @watcher.grouping(flatten=True)
+        def fn_simple(args: GroupByCallbackArgs) -> Iterator[Tuple[str, dict]]:
             # Yield groups
-            value = args.field  # list type since model is 'strings' type
+            value = args.field  # type: list # since model is 'strings' type
             for tag in value:
-                yield slugify(tag), {'val': tag, 'tags_in_page': len(value)}
+                yield tag, {'tags_in_page': value}
             # Everything below is just for documentation purposes
             page = args.record  # extract additional info from source
             fieldKey, flowIndex, flowKey = args.key  # or get field index
@@ -19,6 +28,6 @@ class SimpleGroupByPlugin(Plugin):
                 obj = page[fieldKey]
             else:
                 obj = page[fieldKey].blocks[flowIndex].get(flowKey)
-            print('page:', page)
-            print(' obj:', obj)
-            print()
+            print('[simple] page:', page)
+            print('[simple]  obj:', obj)
+            print('[simple] ')