CR update - minor - addtional tests

[#SVCS-86]

Author: TomBaxter

mfr/core/utils.py

@@ -1,3 +1,6 @@
+from time import time
+from os.path import getctime
+
 from stevedore import driver
 
 from mfr.core import exceptions
@@ -106,3 +109,8 @@ def sizeof_fmt(num, suffix='B'):
             return '%3.1f%s%s' % (num, unit, suffix)
         num /= 1000.0
     return '%.1f%s%s' % (num, 'Y', suffix)
+
+def file_expired(path: str, ttl: int) -> bool:
+    if (time() - getctime(path)) >= ttl:
+        return True
+    return False

mfr/extensions/papaya/render.py

@@ -1,9 +1,9 @@
 import os
-import time
 import shutil
 
 from mako.lookup import TemplateLookup
 
+from mfr.core import utils
 from mfr.core import extension
 from mfr.extensions import settings as ext_settings
 from mfr.extensions.papaya import settings
@@ -12,7 +12,7 @@
 class PapayaRenderer(extension.BaseRenderer):
 
     data_dir = settings.DATA_DIR
-    data_old = settings.DATA_OLD
+    data_ttl = settings.DATA_TTL
     comp_ext = ext_settings.COMPRESSED_EXT
 
     TEMPLATE = TemplateLookup(
@@ -34,9 +34,7 @@ def render(self):
     def remove_old_files(self):
 
         for data_file in os.listdir(self.data_dir):
-            if data_file == '.gitignore':
-                continue
-            if (time.time() - os.path.getctime(self.data_dir + data_file)) >= self.data_old:
+            if utils.file_expired(self.data_dir + data_file, self.data_ttl):
                 os.unlink(self.data_dir + data_file)
 
     @property

mfr/extensions/papaya/settings.py

@@ -5,4 +5,4 @@
 # Directory to temporarily store papaya image files
 DATA_DIR = 'mfr/extensions/papaya/static/data/'
 # Files older then this many seconds will be deleted from DATA_DIR at the beggining of each render.
-DATA_OLD = 300
+DATA_TTL = 300

mfr/extensions/papaya/static/papaya.js

@@ -1,45 +1,57 @@
 import pytest
 
 from mfr.core.provider import ProviderMetadata
-
 from mfr.extensions.papaya import PapayaRenderer
 
-
 @pytest.fixture
-def metadata():
-    return ProviderMetadata('test.nii', '.gz', 'text/plain', '1234', 'http://wb.osf.io/file/test.nii.gz?token=1234')
+def assets_url():
+    return 'http://mfr.osf.io/assets'
 
 
 @pytest.fixture
-def file_path():
-    return './tests/extensions/papaya/files/507643e2-c0fb-45e4-805e-96231c8251de'
+def export_url():
+    return 'http://mfr.osf.io/export?url='
 
 
 @pytest.fixture
-def url():
-    return 'http://osf.io/file/test.nii.gz'
+def test_file_dir():
+    return './tests/extensions/papaya/files/'
 
 
 @pytest.fixture
-def assets_url():
-    return 'http://mfr.osf.io/assets'
+def url():
+    return 'http://osf.io/file/test'
 
 
-@pytest.fixture
-def export_url():
-    return 'http://mfr.osf.io/export?url=' + url()
+valid_render_data = [(ProviderMetadata('test.nii', '.gz', 'text/plain', '1234',
+                                       'http://wb.osf.io/file/test.nii.gz?token=1234'),
+                      '507643e2-c0fb-45e4-805e-96231c8251de',
+                      '.nii.gz'
+                     ),
+                     (ProviderMetadata('test', '.nii', 'text/plain', '1234',
+                                       'http://wb.osf.io/file/test.nii?to  ken=1234'),
+                      '298783da-64b0-44e0-bab6-5716ecb9535d',
+                      '.nii'
+                     ),
+                     (ProviderMetadata('test', '.dcm', 'text/plain', '1234',
+                                       'http://wb.osf.io/file/test.dcm?to  ken=1234'),
+                      'b24a0d9f-c38a-42bd-a2e7-5448d3ce0060',
+                      '.dcm'
+                     )]
 
 
-@pytest.fixture
-def renderer(metadata, file_path, url, assets_url, export_url):
-    return PapayaRenderer(metadata, file_path, url, assets_url, export_url)
+@pytest.fixture(params=valid_render_data)
+def valid_renderer(request, assets_url, export_url, test_file_dir, url):
+    metadata, file_name, file_ext = request.param
+    return PapayaRenderer(metadata, test_file_dir + file_name, url, assets_url,
+            export_url + url + file_ext), file_name, file_ext
 
 
 class TestPapayaRenderer:
 
-    def test_render_papaya(self, renderer, metadata, assets_url):
+    def test_render_papaya_valid(self, valid_renderer):
+        renderer, file_name, file_ext = valid_renderer
         body = renderer.render()
-        print(body)
         assert '<script type="text/javascript" src="http://mfr.osf.io/assets/papaya/papaya.js"></script>' in body
-        assert 'params["images"] = ["http://mfr.osf.io/assets/papaya/data/507643e2-c0fb-45e4-805e-96231c8251de.nii.gz"]' in body
+        assert 'params["images"] = ["http://mfr.osf.io/assets/papaya/data/{}{}"]'.format(file_name, file_ext) in body
         assert '<div class="papaya" data-params="params"></div>' in body