Merge branch 'release/0.15.0'

CenterForOpenScience · Aug 25, 2016 · e95bbb7 · e95bbb7
2 parents 2e01df8 + b1151f3
commit e95bbb7
Show file tree

Hide file tree

Showing 40 changed files with 986 additions and 235 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -2,6 +2,14 @@
 ChangeLog
 *********
 
+0.15.0 (2016-08-25)
+===================
+- Feature: add analytics to MFR requests.  MFR now keeps track of requests, handlers, renderers,
+and exporters, with more to come!
+- Fix: Better error handling for a number of edge cases. (thanks, @TomBaxter!)
+- Docs: many fixes to doc build, layout, and formatting. (thanks, @TomBaxter!)
+- Docs: add overview of MFR architecture to docs
+
 0.14.0 (2016-06-24)
 ===================
 - Feature: The Dockerfile now sets up unoconv for you.

diff --git a/README.md b/README.md
@@ -28,7 +28,7 @@ After installing python3.5, create the virtual environment with the following co
 ```bash
 pip install virtualenv
 pip install virtualenvwrapper
-mkvirtualenv --python=`which python3` mfr
+mkvirtualenv --python=`which python3.5` mfr
 pip install invoke==0.11.1
 invoke install --develop
 invoke server

diff --git a/docs/api_reference.rst b/docs/api_reference.rst
diff --git a/docs/changelog.rst b/docs/changelog.rst
@@ -1 +1,5 @@
-.. include:: ../HISTORY.rst
+Change Log
+==========
+
+.. include:: ../CHANGELOG
+   :literal:
diff --git a/docs/code.rst b/docs/code.rst
@@ -0,0 +1,10 @@
+Code
+====
+
+.. toctree::
+    :maxdepth: 2
+
+    core
+    extensions
+    providers
+    server
diff --git a/docs/conf.py b/docs/conf.py
@@ -22,6 +22,8 @@
 
 # -- General configuration -----------------------------------------------------
 
+autodoc_default_flags = ['members', 'undoc-members', 'show-inheritance']
+
 # If your documentation needs a minimal Sphinx version, state it here.
 #needs_sphinx = '1.0'
 
@@ -123,7 +125,7 @@
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
 # so a file named "default.css" will overwrite the builtin "default.css".
-html_static_path = ['_static']
+# html_static_path = ['_static']
 
 # If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
 # using the given strftime format.

diff --git a/docs/core.rst b/docs/core.rst
@@ -0,0 +1,22 @@
+Core
+====
+
+mfr.core.exceptions
+-------------------
+
+.. automodule:: mfr.core.exceptions
+
+mfr.core.extension
+------------------
+
+.. automodule:: mfr.core.extension
+
+mfr.core.provider
+-----------------
+
+.. automodule:: mfr.core.provider
+
+mfr.core.utils
+-----------------
+
+.. automodule:: mfr.core.utils
diff --git a/docs/examples.rst b/docs/examples.rst
@@ -56,7 +56,7 @@ app.py
 
 view_file.html
 
-.. code-block:: html
+.. code-block:: none
 
     {% for stylesheet in render_result.assets.css %}
         <link rel="stylesheet" href={{ stylesheet }}/>
@@ -65,4 +65,4 @@ view_file.html
         <script type="text/javascript" src={{ javascript }}/>
     {%  endfor %}
 
-    {{ render_result.content|safe }}
+    {{ render_result.content|safe }}
diff --git a/docs/extensions.rst b/docs/extensions.rst
@@ -0,0 +1,58 @@
+Extensions
+==========
+
+AudioRenderer
+-------------
+
+.. autoclass:: mfr.extensions.audio.AudioRenderer
+
+CodePygmentsRenderer
+--------------------
+
+.. autoclass:: mfr.extensions.codepygments.CodePygmentsRenderer
+
+DocxRenderer
+------------
+
+.. autoclass:: mfr.extensions.docx.DocxRenderer
+
+ImageExporter
+-------------
+
+.. autoclass:: mfr.extensions.image.ImageExporter
+
+ImageRenderer
+-------------
+
+.. autoclass:: mfr.extensions.image.ImageRenderer
+
+IpynbRenderer
+-------------
+
+.. autoclass:: mfr.extensions.ipynb.IpynbRenderer
+
+PdbRenderer
+-----------
+**Note**: This module requires jquery on the page in which it is loaded.
+
+.. autoclass:: mfr.extensions.pdb.PdbRenderer
+
+PdfRenderer
+-----------
+
+.. autoclass:: mfr.extensions.pdf.PdfRenderer
+
+RstRenderer
+-----------
+
+.. autoclass:: mfr.extensions.rst.RstRenderer
+
+TabularRenderer
+---------------
+
+.. autoclass:: mfr.extensions.tabular.TabularRenderer
+
+VideoRenderer
+-------------
+
+.. autoclass:: mfr.extensions.video.VideoRenderer
diff --git a/docs/index.rst b/docs/index.rst
@@ -1,7 +1,4 @@
-.. mfr documentation master file, created by
-   sphinx-quickstart on Tue Jul  9 22:26:36 2013.
-   You can adapt this file completely to your liking, but it should at least
-   contain the root `toctree` directive.
+.. title:: Modular File Renderer
 
 mfr: HTML file renderer for Python
 ==================================
@@ -14,20 +11,21 @@ Release v\ |version|. (:ref:`Installation <install>`)
 Ready to dive in?
 -----------------
 
-Go on to the :ref:`Quickstart tutorial <quickstart>` or check out some :ref:`examples <examples>`.
+Go to the :ref:`Quickstart tutorial <quickstart>`, check out some :ref:`examples <examples>` for code, or see the :ref:`Overview <overview>` to understand its architecture.
+
 
 
 Guide
 -----
 
 .. toctree::
-   :maxdepth: 1
+   :maxdepth: 2
 
-   license
    install
    quickstart
    examples
-   api_reference
+   overview
+   code
 
 Project info
 ------------
@@ -38,3 +36,4 @@ Project info
    contributing
    authors
    changelog
+   license
diff --git a/docs/install.rst b/docs/install.rst
@@ -14,14 +14,41 @@ Or download one of the following:
 * tarball_
 * zipball_
 
-To install the base requirements, run:
+Make sure that you have installed R, are using python3.5, and have installed invoke for your current python3 version.
 
-    $ pip install -r requirements.txt
+Install the version of invoke found in the requirements.txt file. Currently 0.11.1
 
-Once you have the source and requirements, you can install it into your site-packages with ::
+Install ``invoke``:
 
-    $ python setup.py install
+.. code-block:: bash
+
+    pip install invoke==0.11.1
+
+Install requirements:
+
+.. code-block:: bash
+
+    invoke install
+
+Or for some nicities (like tests):
+
+.. code-block:: bash
+
+    invoke install --develop
+
+Start the server:
+
+.. note
+
+    The server is extremely tenacious thanks to stevedore and tornado
+    Syntax errors in the :mod:`mfr.providers` will not crash the server
+    In debug mode the server will automatically reload
+
+.. code-block:: bash
+
+    invoke server
 
 .. _Github: https://github.com/CenterForOpenScience/modular-file-renderer
 .. _tarball: https://github.com/CenterForOpenScience/modular-file-renderer/tarball/master
 .. _zipball: https://github.com/CenterForOpenScience/modular-file-renderer/zipball/master
+
diff --git a/docs/license.rst b/docs/license.rst
@@ -1 +1,5 @@
-.. include:: ../LICENSE.rst
+Licence
+=======
+
+.. include:: ../LICENSE
+   :literal: