From ae9a5040144e4d92b4422189326666bfeafdcd29 Mon Sep 17 00:00:00 2001
From: Oliver Marks <oly@digitaloctave.com>
Date: Thu, 6 Dec 2018 07:22:32 +0000
Subject: [PATCH] Working on source block tests.

---
 .drone.yml         | 34 ++++++++++++++++++----------------
 eorg/generate.py   | 15 ++++++++++++++-
 tests/test_html.py | 14 ++++++++++++++
 3 files changed, 46 insertions(+), 17 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index bd8bf8d..4bbabe2 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -10,28 +10,30 @@ steps:
 # Auto build to pypi test
 - name: deploy-test
   image: olymk2/drone-pypi
-  environment:
-    PYPI_USERNAME:
-      from_secret: PYPI_USERNAME
-    PYPI_PASSWORD:
-      from_secret: PYPI_PASSWORD
-    PYPI_REPOSITORY:
-      from_secret: PYPI_REPOSITORY
-  commands:
+  settings:
+    environment:
+      PYPI_USERNAME:
+        from_secret: PYPI_TEST_USERNAME
+      PYPI_PASSWORD:
+        from_secret: PYPI_TEST_PASSWORD
+      PYPI_REPOSITORY:
+        from_secret: PYPI_TEST_REPOSITORY
+    commands:
     - env
     - echo "__version__=$(date +'%y%m%d.%H%M')" > elcato/version.py
 
 
 - name: deploy
   image: olymk2/drone-pypi
-  environment:
-    PYPI_USERNAME:
-      from_secret: PYPI_USERNAME
-    PYPI_PASSWORD:
-      from_secret: PYPI_PASSWORD
-    PYPI_REPOSITORY:
-      from_secret: PYPI_REPOSITORY
-  commands:
+  settings:
+    environment:
+      PYPI_USERNAME:
+        from_secret: PYPI_LIVE_USERNAME
+      PYPI_PASSWORD:
+        from_secret: PYPI_LIVE_PASSWORD
+      PYPI_REPOSITORY:
+        from_secret: PYPI_LIVE_REPOSITORY
+    commands:
     - env
     - echo "__version__=${DRONE_TAG}"
     - echo "__version__=${DRONE_TAG}" > eorg/version.py
diff --git a/eorg/generate.py b/eorg/generate.py
index aab607f..83e110b 100644
--- a/eorg/generate.py
+++ b/eorg/generate.py
@@ -68,6 +68,19 @@ def parse_text_html(doc, token, cls="", root=True):
     return f"{token.value}"
 
 
+def results(doc, token, cls="", root=True):
+    if token.value.startswith('file:'):
+        return "<img%s src=\"%s\"/>\n" % (
+        cls,
+        escape(token.value).replace("\n", "<br />"),
+    )
+
+    return "<blockquote%s>%s</blockquote>\n" % (
+        cls,
+        escape(token.value).replace("\n", "<br />"),
+    )
+
+
 def blockquote(doc, token, cls="", root=True):
     return "<blockquote%s>%s</blockquote>\n" % (
         cls,
@@ -117,7 +130,7 @@ builddoc = {
     tokens.TEXT: (parse_text_html, "flow-text"),
     tokens.BULLET: (parse_bullets_html, "browser-default"),
     tokens.SOURCE: (src, None),
-    tokens.EXAMPLE: (blockquote, None),
+    tokens.EXAMPLE: (results, None),
     tokens.RESULTS: (blockquote, None),
     tokens.TABLE: (table, "responsive-table striped"),
 }
diff --git a/tests/test_html.py b/tests/test_html.py
index 4eaebec..f851b31 100644
--- a/tests/test_html.py
+++ b/tests/test_html.py
@@ -13,3 +13,17 @@ def test_bullet_block():
     expected = """<ul class="browser-default"><li class="collection-item">Bullet 1</li><li class="collection-item">Bullet 2</li></ul>"""
     result = html(parse(snippets.bullet_plus_snippet).doc)
     assert result.read() == expected
+
+
+def test_render_results():
+    text = StringIO("""
+#+RESULTS:
+[[file:test.png]]
+""")
+    doc = parse(text).doc
+    assert doc[0].token == tokens.BLANK
+    assert doc[1].value == ''
+    assert doc[1].token == tokens.RESULTS
+
+    htmlbody = html(doc).read()
+    assert htmlbody == '<img class="materialboxed center-align responsive-img" style="margin:auto;" src="file:test.png" alt="" />'