archive/pillar
0
0
Fork 0
Code Issues 42 Pull Requests Projects Releases Wiki Activity

Markdown validator now also updates the doc with post_internal

Browse Source 
The post_internal function does `document = validator.document`, replacing
the to-be-posted document by the copy that Cerberus made (and which we
cannot add keys to because it iterates over the keys and the dict size thus
isn't allowed to change).

I hope this doesn't break other validators who expect to be able to write
to `self.document`.
This commit is contained in:
Sybren A. Stüvel 2018-08-28 17:29:29 +02:00
parent 469f24d113
commit 6737aa1123
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pillar/api/custom_field_validation.py
View File

@ -21,7 +21,13 @@ class ValidateCustomFields(Validator):
def validate(self, document, *args, **kwargs): def validate(self, document, *args, **kwargs):
# Keep a reference to the actual document, because Cerberus validates copies. # Keep a reference to the actual document, because Cerberus validates copies.
self.__real_document = document self.__real_document = document
return super().validate(document, *args, **kwargs) result = super().validate(document, *args, **kwargs)
# Store the in-place modified document as self.document, so that Eve's post_internal
# can actually pick it up as the validated document.
self.document = document
return result
def _get_child_validator(self, *args, **kwargs): def _get_child_validator(self, *args, **kwargs):
child = super()._get_child_validator(*args, **kwargs) child = super()._get_child_validator(*args, **kwargs)
@ -178,14 +184,18 @@ class ValidateCustomFields(Validator):
def _validator_markdown(self, field, value): def _validator_markdown(self, field, value):
"""Convert MarkDown. """Convert MarkDown.
""" """
my_log = log.getChild('_validator_markdown')
# Find this field inside the original document # Find this field inside the original document
my_subdoc = self._subdoc_in_real_document() my_subdoc = self._subdoc_in_real_document()
if my_subdoc is None: if my_subdoc is None:
self._error(field, f'unable to find sub-document for path {self.document_path}') self._error(field, f'unable to find sub-document for path {self.document_path}')
return return
my_log.debug('validating field %r with value %r', field, value)
save_to = pillar.markdown.cache_field_name(field) save_to = pillar.markdown.cache_field_name(field)
html = pillar.markdown.markdown(value) html = pillar.markdown.markdown(value)
my_log.debug('saving result to %r in doc with id %s', save_to, id(my_subdoc))
my_subdoc[save_to] = html my_subdoc[save_to] = html
def _subdoc_in_real_document(self): def _subdoc_in_real_document(self):