Upgrade to Wagtail 7

README.rst

@@ -83,3 +83,27 @@ Documentation is still in progress, but see the `tests`_ for more examples.
             body__0__carousel__items__1__image__image__title='Image Slide 2',
             body__0__carousel__items__2__label='Slide 3',
             body__0__carousel__items__2__image__image__title='Image Slide 3')
+
+Contributing
+============
+
+1. Clone the repo `git clone https://github.com/nhsuk/wagtail-streamfield-index.git`
+2. Install dependencies `pip install .[testing,linting]`
+
+If you are having issues in installing, it may be of use to use an environment tool 
+like [virtualenv](https://docs.python.org/3/library/venv.html)
+
+Formatting
+============
+
+`black .`
+
+Linting
+============
+
+`flake8 .`
+
+Tests
+============
+
+`pytest`

setup.py

@@ -3,62 +3,65 @@
 from setuptools import find_packages, setup
 
 install_requires = [
-    'factory-boy>=2.8.0',
-    'wagtail>=1.12',
+    "factory-boy>=2.8.0",
+    "wagtail>=7.0.0",
+    "flatdict>=3.0.1",
+    "Django>=5.2.7",
+    "wagtail-modeladmin>=2.2.0"
 ]
 
 docs_require = [
-    'sphinx>=1.4.0',
+    "sphinx>=1.4.0",
 ]
 
 tests_require = [
-    'pytest==3.0.6',
-    'pytest-django==3.1.2',
-    'pytest-cov==2.4.0',
-    'pytest-pythonpath==0.7.1',
-    'psycopg2>=2.3.1',
-    'coverage==4.3.4',
+    "pytest==6.2.2",
+    "pytest-django==4.1.0",
+    "pytest-cov==2.4.0",
+    "pytest-pythonpath==0.7.1",
+    "psycopg2>=2.3.1",
+    "coverage==4.3.4",
 
-    'isort==4.2.5',
-    'flake8==3.3.0',
-    'flake8-blind-except==0.1.1',
-    'flake8-debugger==1.4.0',
+    "isort==4.2.5",
+    "flake8==3.3.0",
+    "flake8-blind-except==0.1.1",
+    "flake8-debugger==1.4.0",
 ]
 
-with open('README.rst') as fh:
+with open("README.rst") as fh:
     long_description = re.sub(
-        '^.. start-no-pypi.*^.. end-no-pypi', '', fh.read(), flags=re.M | re.S)
+        "^.. start-no-pypi.*^.. end-no-pypi", "", fh.read(), flags=re.M | re.S)
 
 setup(
-    name='wagtail_factories',
-    version='1.0.0',
-    description='Factory boy classes for wagtail',
+    name="wagtail_factories",
+    version="1.0.1",
+    description="Factory boy classes for wagtail",
     long_description=long_description,
     author="Michael van Tellingen",
     author_email="[email protected]",
-    url='https://github.com/mvantellingen/wagtail-factories/',
+    url="https://github.com/mvantellingen/wagtail-factories/",
     install_requires=install_requires,
     tests_require=tests_require,
     extras_require={
-        'docs': docs_require,
-        'test': tests_require,
+        "docs": docs_require,
+        "test": tests_require,
     },
     entry_points={},
-    package_dir={'': 'src'},
-    packages=find_packages('src'),
+    package_dir={"": "src"},
+    packages=find_packages("src"),
     include_package_data=True,
-    license='MIT',
+    license="MIT",
     classifiers=[
-        'Development Status :: 5 - Production/Stable',
-        'License :: OSI Approved :: MIT License',
-        'Programming Language :: Python :: 2',
-        'Programming Language :: Python :: 2.7',
-        'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.4',
-        'Programming Language :: Python :: 3.5',
-        'Programming Language :: Python :: 3.6',
-        'Programming Language :: Python :: Implementation :: CPython',
-        'Programming Language :: Python :: Implementation :: PyPy',
+        "Development Status :: 5 - Production/Stable",
+        "License :: OSI Approved :: MIT License",
+        "Programming Language :: Python :: 2",
+        "Programming Language :: Python :: 2.7",
+        "Programming Language :: Python :: 3",
+        "Programming Language :: Python :: 3.4",
+        "Programming Language :: Python :: 3.5",
+        "Programming Language :: Python :: 3.6",
+        "Programming Language :: Python :: Implementation :: CPython",
+        "Programming Language :: Python :: Implementation :: PyPy",
     ],
     zip_safe=False,
 )

src/wagtail_factories/__init__.py

@@ -1,4 +1,5 @@
 from .blocks import *  # noqa
 from .factories import *  # noqa
+from .wrapper import *  # noqa
 
-__version__ = '1.0.0'
+__version__ = '1.0.1'

src/wagtail_factories/blocks.py

@@ -3,14 +3,11 @@
 import factory
 from factory.declarations import ParameteredAttribute
 
-try:
-    from wagtail.wagtailcore import blocks
-    from wagtail.wagtailimages.blocks import ImageChooserBlock
-except ImportError:
-    from wagtail.core import blocks
-    from wagtail.images.blocks import ImageChooserBlock
+from wagtail import blocks
+from wagtail.images.blocks import ImageChooserBlock
 
 from wagtail_factories.factories import ImageFactory
+from wagtail_factories.builders import ListBlockStepBuilder
 
 __all__ = [
     'CharBlockFactory',
@@ -19,13 +16,17 @@
     'ListBlockFactory',
     'StructBlockFactory',
     'ImageChooserBlockFactory',
+    'StreamBlockFactory',
+    'StreamBlockSubFactory',
 ]
 
 
 class StreamFieldFactory(ParameteredAttribute):
     """
         Syntax:
             <streamfield>__<index>__<block_name>__<key>='foo',
+            or
+            <streamfield>__<index>__<block_name>='foo',
 
     """
     def __init__(self, factories, **kwargs):
@@ -37,14 +38,20 @@ def generate(self, step, params):
         result = defaultdict(lambda: defaultdict(lambda: defaultdict()))
 
         for key, value in params.items():
-            try:
-                index, block_name, param = key.split('__', 2)
-            except ValueError:
-                continue
-            if not index.isdigit():
+            parts = key.split('__', 2)
+            index = parts[0]
+            if index.isdigit():
+                index = int(index)
+            else:
                 continue
 
-            index = int(index)
+            block_name = parts[1]
+
+            if len(parts) == 2:
+                param = 'value'
+            if len(parts) == 3:
+                param = parts[2]
+
             result[index][block_name][param] = value
 
         retval = []
@@ -62,28 +69,85 @@ def generate(self, step, params):
 
 
 class ListBlockFactory(factory.SubFactory):
+    _builder_class = ListBlockStepBuilder
+
+    def __call__(self, **kwargs):
+        return self.evaluate(None, None, kwargs)
+
+    def evaluate(self, instance, step, extra):
+        result = defaultdict(dict)
+        for key, value in extra.items():
+            if key.isdigit():
+                result[int(key)]["value"] = value
+            else:
+                prefix, label = key.split("__", maxsplit=1)
+                if prefix and prefix.isdigit():
+                    result[int(prefix)][label] = value
+
+        subfactory = self.get_factory()
+        force_sequence = step.sequence if self.FORCE_SEQUENCE else None
+        values = [
+            step.recurse(subfactory, params, force_sequence=force_sequence)
+            for _, params in sorted(result.items())
+        ]
+
+        list_block_def = blocks.list_block.ListBlock(subfactory._meta.model())
+        return blocks.list_block.ListValue(list_block_def, values)
+
+
+class StreamBlockSubFactory(factory.SubFactory):
+
     def __call__(self, **kwargs):
         return self.generate(None, kwargs)
 
     def generate(self, step, params):
+        result = defaultdict(lambda: defaultdict(lambda: defaultdict()))
         subfactory = self.get_factory()
 
-        result = defaultdict(dict)
         for key, value in params.items():
-            if key.isdigit():
-                result[int(key)]['value'] = value
+            parts = key.split('__', 2)
+            index = parts[0]
+            if index.isdigit():
+                index = int(index)
             else:
-                prefix, label = key.split('__', 2)
-                if prefix and prefix.isdigit():
-                    result[int(prefix)][label] = value
+                continue
+
+            block_name = parts[1]
+
+            if len(parts) == 2:
+                result[index][block_name][block_name] = value
+            if len(parts) == 3:
+                param = parts[2]
+                result[index][block_name][block_name + "__" + param] = value
 
         retval = []
-        for index, index_params in sorted(result.items()):
-            item = subfactory(**index_params)
-            retval.append(item)
-        return retval
+        for index, block_items in sorted(result.items()):
+            for block_name, block_params in block_items.items():
+                block_params['_block_name'] = block_name
+                step_builder = factory.builder.StepBuilder(
+                    subfactory._meta,
+                    block_params,
+                    "build"
+                )
+                built = step_builder.build()
+                retval.append((block_name, built))
+
+        return blocks.StreamValue(subfactory._meta.model(), retval)
 
 
+class StreamBlockFactory(factory.Factory):
+
+    @classmethod
+    def _build(cls, model_class, *args, **kwargs):
+        block = model_class()
+        block_name = kwargs['_block_name']
+        block_params = kwargs.get(block_name, None)
+        return block.to_python([{"type": block_name, "value": block_params}])[0].value
+
+    @classmethod
+    def _create(cls, model_class, *args, **kwargs):
+        return cls._build(model_class, *args, **kwargs)
+
 class BlockFactory(factory.Factory):
     class Meta:
         abstract = True