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

Extend attachment shortcode rendering

Browse Source 
The previous implementation only supported rendering
attachments within the context of a node or project document.
Now it also supports node.properties. This is a temporary
solution, as noted in the TODO comments.
This commit is contained in:
Francesco Siddi 2018-09-15 19:01:58 +02:00
parent 263d68071e
commit f8d992400e
2 changed files with 51 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pillar/shortcodes.py
View File

@ -225,12 +225,25 @@ class Attachment:
return self.render(file_doc, pargs, kwargs) return self.render(file_doc, pargs, kwargs)
def sdk_file(self, slug: str, node_properties: dict) -> pillarsdk.File: def sdk_file(self, slug: str, document: dict) -> pillarsdk.File:
"""Return the file document for the attachment with this slug.""" """Return the file document for the attachment with this slug."""
from pillar.web import system_util from pillar.web import system_util
attachments = node_properties.get('properties', {}).get('attachments', {}) # TODO (fsiddi) Make explicit what 'document' is.
# In some cases we pass the entire node or project documents, in other cases
# we pass node.properties. This should be unified at the level of do_markdown.
# For now we do a quick hack and first look for 'properties' in the doc,
# then we look for 'attachments'.
doc_properties = document.get('properties')
if doc_properties:
# We passed an entire document (all nodes must have 'properties')
attachments = doc_properties.get('attachments', {})
else:
# The value of document could have been defined as 'node.properties'
attachments = document.get('attachments', {})
attachment = attachments.get(slug) attachment = attachments.get(slug)
if not attachment: if not attachment:
raise self.NoSuchSlug(slug) raise self.NoSuchSlug(slug)

61
tests/test_shortcodes.py
View File

@ -187,37 +187,48 @@ class AttachmentTest(AbstractPillarTest):
], ],
'filename': 'cute_kitten.jpg', 'filename': 'cute_kitten.jpg',
}) })
node_doc = {'properties': {
'attachments': { node_properties = {'attachments': {
'img': {'oid': oid}, 'img': {'oid': oid},
}
}} }}
node_doc = {'properties': node_properties}
# Collect the two possible context that can be provided for attachemt
# rendering. See pillar.shortcodes.sdk_file for more info.
possible_contexts = [node_properties, node_doc]
# We have to get the file document again, because retrieving it via the # We have to get the file document again, because retrieving it via the
# API (which is what the shortcode rendering is doing) will change its # API (which is what the shortcode rendering is doing) will change its
# link URL. # link URL.
db_file = self.get(f'/api/files/{oid}').get_json() db_file = self.get(f'/api/files/{oid}').get_json()
link = db_file['variations'][0]['link'] link = db_file['variations'][0]['link']
with self.app.test_request_context(): def do_render(context, link):
self_linked = f'<a class="expand-image-links" href="{link}">' \ """Utility to run attachment rendering in different contexts."""
f'<img src="{link}" alt="cute_kitten.jpg"/></a>' with self.app.test_request_context():
self.assertEqual( self_linked = f'<a class="expand-image-links" href="{link}">' \
self_linked, f'<img src="{link}" alt="cute_kitten.jpg"/></a>'
render('{attachment img link}', context=node_doc).strip() self.assertEqual(
) self_linked,
self.assertEqual( render('{attachment img link}', context=context).strip()
self_linked, )
render('{attachment img link=self}', context=node_doc).strip() self.assertEqual(
) self_linked,
self.assertEqual( render('{attachment img link=self}', context=context).strip()
f'<img src="{link}" alt="cute_kitten.jpg"/>', )
render('{attachment img}', context=node_doc).strip() self.assertEqual(
) f'<img src="{link}" alt="cute_kitten.jpg"/>',
render('{attachment img}', context=context).strip()
)
tag_link = 'https://i.imgur.com/FmbuPNe.jpg' tag_link = 'https://i.imgur.com/FmbuPNe.jpg'
self.assertEqual( self.assertEqual(
f'<a href="{tag_link}" target="_blank">' f'<a href="{tag_link}" target="_blank">'
f'<img src="{link}" alt="cute_kitten.jpg"/></a>', f'<img src="{link}" alt="cute_kitten.jpg"/></a>',
render('{attachment img link=%r}' % tag_link, context=node_doc).strip() render('{attachment img link=%r}' % tag_link, context=context).strip()
) )
# Test both possible contexts for rendering attachments
for context in possible_contexts:
do_render(context, link)