Merge branch 'release/0.20.0'

Author: felliott

CHANGELOG

@@ -2,6 +2,20 @@
 ChangeLog
 *********
 
+0.20.0 (2017-03-01)
+===================
+- The "(thanks, @johnetordoff!)" release
+- Feature: The tabular spreadsheet renderer now recognizes date fields as dates and will format
+them as such. (thanks, @johnetordoff!)
+- Feature: Don't even try to render tabular files larger than 100Mb. Neither the server nor the
+browser wants that. (thanks, @johnetordoff!)
+- Feature: Render a better error message when encountering a csv file with a single field larger
+than ~128kb.  The underlying library can't handle that, so it's polite to let the user know.
+(thanks, @johnetordoff!)
+- Feature: MFR will now render .m4v files using the <video> tag. (thanks, @johnetordoff!)
+- Fix: Improve tooltip language on 3d object-renderer. (thanks, @johnetordoff!)
+- Code: Start depending on upstream xlrd instead of our own fork. (thanks, @johnetordoff!)
+
 0.19.1 (2017-02-21)
 ===================
 - Fix: explicitly depend on IPython to fix ipynb rendering.  nbconvert and nbformat have an

README.md

@@ -87,7 +87,7 @@ invoke test
 - Running `invoke install -d` with setuptools v31 or greater can break MFR.  The symptom error message is: `"AttributeError: module 'mfr' has no attribute '__version__'".`  If you encounter this, you will need to remove the file
 `mfr-nspkg.pth` from your virtualenv directory, run `pip install setuptools==30.4.0`, then re-run `invoke install -d`.
 
-- The error `def create_default_context(purpose=ssl.Purpose.SERVER_AUTH, *, cafile=None, capath=None, cadata=None): SyntaxError: invalid syntax` can be fixed by restarting your virtual environment. The problem should not reoccur.
+- The error `def create_default_context(purpose=ssl.Purpose.SERVER_AUTH, *, cafile=None, capath=None, cadata=None): SyntaxError: invalid syntax` is caused by inadvertently running the wrong version of Python. This can be caused by hashing the alias `inv`. To fix this run the command `hash -d inv` then run `inv server`.
 
 - `invoke $command` results in `'$command' did not receive all required positional arguments!`: this error message occurs when trying to run MFR v0.19.0+ with `invoke<0.13.0`.  Run `pip install invoke==0.13.0`, then retry your command.
 

docs/conf.py

@@ -45,7 +45,7 @@
 
 # General information about the project.
 project = u'mfr'
-copyright = u'2017'
+copyright = u'2017, Center For Open Science'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the

docs/license.rst

@@ -1,4 +1,4 @@
-Licence
+License
 =======
 
 .. include:: ../LICENSE

mfr/__init__.py

@@ -1,2 +1,2 @@
-__version__ = '0.19.1'
+__version__ = '0.20.0'
 __import__('pkg_resources').declare_namespace(__name__)

mfr/core/exceptions.py

@@ -145,6 +145,23 @@ def __init__(self, message, *args, metadata_url: str='', response: str='', **kwa
             'response': self.response
         }])
 
+class TooBigToRenderError(ProviderError):
+    """If the user tries to render a file larger than a server specified maximum, throw a
+    TooBigToRenderError.
+    """
+
+    __TYPE = 'too_big_to_render'
+
+    def __init__(self, message, *args, requested_size: int=None, maximum_size: int=None,
+                 code: int=400, **kwargs):
+        super().__init__(message, *args, code=code, **kwargs)
+        self.requested_size = requested_size
+        self.maximum_size = maximum_size
+        self.attr_stack.append([self.__TYPE, {
+            'requested_size': self.requested_size,
+            'maximum_size': self.maximum_size,
+        }])
+
 
 class DriverManagerError(PluginError):
 

mfr/core/utils.py

@@ -96,3 +96,10 @@ def make_renderer(name, metadata, file_path, url, assets_url, export_url):
                 'export_url': export_url,
             }
         )
+
+def sizeof_fmt(num, suffix='B'):
+    for unit in ['', 'K', 'M', 'G', 'T', 'P', 'E', 'Z']:
+        if abs(num) < 1000.0:
+            return '%3.1f%s%s' % (num, unit, suffix)
+        num /= 1000.0
+    return '%.1f%s%s' % (num, 'Y', suffix)

mfr/extensions/jsc3d/templates/viewer.mako

@@ -10,7 +10,9 @@
 <canvas id="mfrViewer" tabindex="-1"></canvas>
 <a style="position: absolute; top: 10px; right: 10px; cursor: pointer;"
    data-toggle="popover" data-trigger="hover" data-placement="left" data-html="true"
-   data-content="Drag mouse to rotate<br>Drag mouse with ctrl pressed to pan<br>Drag mouse with shift pressed to zoom">
+   data-content="<p><b> Rotate:</b> Click and drag</p>
+                 <p><b> Pan:</b> Ctrl + click and drag</p>
+                 <p><b> Zoom:</b> Shift + click and drag up/down</p>">
    <img src="${base}/images/question-circle.png">
 </a>
 

mfr/extensions/tabular/libs/stdlib_tools.py

@@ -1,7 +1,7 @@
 import re
 import csv
 
-from mfr.extensions.tabular.exceptions import EmptyTableError
+from mfr.extensions.tabular.exceptions import EmptyTableError, TabularRendererError
 from mfr.extensions.tabular import utilities
 
 
@@ -36,7 +36,19 @@ def csv_stdlib(fp):
             'name': fieldname,
             'sortable': True,
         })
-    rows = [row for row in reader]
+
+    try:
+        rows = [row for row in reader]
+    except csv.Error as e:
+        if any("field larger than field limit" in errorMsg for errorMsg in e.args):
+            raise TabularRendererError(
+                'This file contains a field too large to render. '
+                'Please download and view it locally.',
+                code=400,
+                extension='csv',
+            ) from e
+        else:
+            raise TabularRendererError('csv.Error: {}'.format(e), extension='csv') from e
 
     if not columns and not rows:
         raise EmptyTableError('Table empty or corrupt.', extension='csv')

mfr/extensions/tabular/libs/xlrd_tools.py

@@ -34,10 +34,16 @@ def xlsx_xlrd(fp):
             for index, value in enumerate(fields)
         ]
 
-        data = [
-            dict(zip(fields, sheet.row_values(row_index)))
-            for row_index in range(1, sheet.nrows)
-        ]
+        data = []
+        for i in range(1, sheet.nrows):
+            row = []
+            for cell in sheet.row(i):
+                if cell.ctype == xlrd.XL_CELL_DATE:
+                    value = xlrd.xldate.xldate_as_datetime(cell.value, wb.datemode).isoformat()
+                else:
+                    value = cell.value
+                row.append(value)
+            data.append(dict(zip(fields, row)))
 
         header = header_population(fields)
         sheets[sheet.name] = (header, data)