Merge pull request #14 from rtfd/auto-add-toc

Added the ability to auto-generate a TOCTree entry from AutoAPI.
pull/15/head
Anthony 9 years ago
commit f59203178c

@ -31,14 +31,13 @@ Contents
config
templates
design
.. toctree::
:caption: API
:glob:
:maxdepth: 2
autoapi/index
design
Basic Workflow
--------------
@ -77,13 +76,7 @@ Then add it to your Sphinx project's ``conf.py``:
autoapi_type = 'go'
autoapi_dir = 'path/to/go/files'
Then in your ``index.rst``, add autoapi to your TOC tree:
.. code:: rst
.. toctree::
autoapi/index
AutoAPI will automatically add itself to the last TOCTree in your top-level ``index.rst``.
This is needed because we will be outputting rst files into the ``autoapi`` directory.
This adds it into the global TOCTree for your project,

@ -4,25 +4,17 @@ Sphinx Auto-API Top-level Extension.
This extension allows you to automagically generate API documentation from your project.
"""
import os
import fnmatch
import shutil
from sphinx.util.console import darkgreen, bold
from sphinx.addnodes import toctree
from .mappers import DotNetSphinxMapper, PythonSphinxMapper, GoSphinxMapper, JavaScriptSphinxMapper
default_options = ['members', 'undoc-members', 'private-members', 'special-members']
def ignore_file(app, filename):
for pat in app.config.autoapi_ignore:
if fnmatch.fnmatch(filename, pat):
return True
return False
def run_autoapi(app):
"""
Load AutoAPI data from the filesystem.
@ -32,6 +24,14 @@ def run_autoapi(app):
print "You must configure an autodapi_dir setting."
return
# Make sure the paths are full
if os.path.isabs(app.config.autoapi_dir):
normalized_dir = app.config.autoapi_dir
else:
normalized_dir = os.path.normpath(os.path.join(app.confdir, app.config.autoapi_dir))
normalized_root = os.path.normpath(os.path.join(app.confdir, app.config.autoapi_root))
app.env.autoapi_data = []
mapping = {
@ -41,13 +41,25 @@ def run_autoapi(app):
'javascript': JavaScriptSphinxMapper,
}
default_file_mapping = {
'python': ['*.py'],
'dotnet': ['project.json', '*.csproj', '*.vbproj'],
'go': ['*.go'],
'javascript': ['*.js'],
}
domain = mapping[app.config.autoapi_type]
domain_obj = domain(app, template_dir=app.config.autoapi_template_dir)
if app.config.autoapi_file_patterns:
file_patterns = app.config.autoapi_file_pattern
else:
file_patterns = default_file_mapping[app.config.autoapi_type]
app.info(bold('[AutoAPI] ') + darkgreen('Loading Data'))
domain_obj.load(
pattern=app.config.autoapi_file_pattern,
dir=os.path.normpath(app.config.autoapi_dir),
patterns=file_patterns,
dir=normalized_dir,
ignore=app.config.autoapi_ignore,
)
@ -56,7 +68,7 @@ def run_autoapi(app):
app.info(bold('[AutoAPI] ') + darkgreen('Rendering Data'))
domain_obj.output_rst(
root=app.config.autoapi_root,
root=normalized_root,
# TODO: Better way to determine suffix?
source_suffix=app.config.source_suffix[0],
)
@ -64,20 +76,44 @@ def run_autoapi(app):
def build_finished(app, exception):
if not app.config.autoapi_keep_files:
normalized_root = os.path.normpath(os.path.join(app.confdir, app.config.autoapi_root))
if app.verbosity > 1:
app.info(bold('[AutoAPI] ') + darkgreen('Cleaning generated .rst files'))
shutil.rmtree(app.config.autoapi_root)
shutil.rmtree(normalized_root)
def doctree_read(app, doctree):
all_docs = set()
insert = True
if app.env.docname == 'index':
nodes = doctree.traverse(toctree)
if not nodes:
return
for node in nodes:
for entry in node['entries']:
all_docs.add(entry[1])
for doc in all_docs:
if doc.find(app.config.autoapi_root) != -1:
insert = False
if insert and app.config.autoapi_add_toctree_entry:
nodes[-1]['entries'].append(
(None, u'%s/index' % app.config.autoapi_root)
)
nodes[-1]['includefiles'].append(u'%s/index' % app.config.autoapi_root)
app.info(bold('[AutoAPI] ') + darkgreen('Adding AutoAPI TOCTree to index.rst'))
def setup(app):
app.connect('builder-inited', run_autoapi)
app.connect('build-finished', build_finished)
app.connect('doctree-read', doctree_read)
app.add_config_value('autoapi_type', 'python', 'html')
app.add_config_value('autoapi_root', 'autoapi', 'html')
app.add_config_value('autoapi_ignore', ['*migrations*'], 'html')
app.add_config_value('autoapi_options', default_options, 'html')
app.add_config_value('autoapi_file_pattern', '*', 'html')
app.add_config_value('autoapi_dir', '', 'html')
app.add_config_value('autoapi_file_patterns', None, 'html')
app.add_config_value('autoapi_dir', 'autoapi', 'html')
app.add_config_value('autoapi_keep_files', False, 'html')
app.add_config_value('autoapi_add_toctree_entry', True, 'html')
app.add_config_value('autoapi_template_dir', [], 'html')
app.add_stylesheet('autoapi.css')

@ -145,35 +145,36 @@ class SphinxMapperBase(object):
# Mapping of {namespace id -> Python Object}
self.top_level_objects = OrderedDict()
def load(self, pattern, dir, ignore=[]):
def load(self, patterns, dir, ignore=[]):
'''
Load objects from the filesystem into the ``paths`` dictionary.
'''
for path in self.find_files(pattern=pattern, dir=dir, ignore=ignore):
for path in self.find_files(patterns=patterns, dir=dir, ignore=ignore):
data = self.read_file(path=path)
if data:
self.paths[path] = data
def find_files(self, pattern, dir, ignore):
def find_files(self, patterns, dir, ignore):
files_to_read = []
for root, dirnames, filenames in os.walk(dir):
for filename in fnmatch.filter(filenames, pattern):
skip = False
# Skip ignored files
for ignore_pattern in ignore:
if fnmatch.fnmatch(filename, ignore_pattern):
self.app.info("Ignoring %s/%s" % (root, filename))
skip = True
if skip:
continue
# Make sure the path is full
if os.path.isabs(filename):
files_to_read.append(os.path.join(filename))
else:
files_to_read.append(os.path.join(root, filename))
for pattern in patterns:
for filename in fnmatch.filter(filenames, pattern):
skip = False
# Skip ignored files
for ignore_pattern in ignore:
if fnmatch.fnmatch(filename, ignore_pattern):
self.app.info("Ignoring %s/%s" % (root, filename))
skip = True
if skip:
continue
# Make sure the path is full
if os.path.isabs(filename):
files_to_read.append(filename)
else:
files_to_read.append(os.path.join(root, filename))
for _path in self.app.status_iterator(
files_to_read,

@ -20,15 +20,15 @@ class DotNetSphinxMapper(SphinxMapperBase):
top_namespaces = {}
def load(self, pattern, dir, ignore=[]):
def load(self, patterns, dir, ignore=[]):
'''
Load objects from the filesystem into the ``paths`` dictionary.
'''
for path in self.find_files(pattern='project.json', dir=dir, ignore=ignore):
for path in self.find_files(patterns=patterns, dir=dir, ignore=ignore):
subprocess.check_output(['BuildMeta', '/target:Build', path])
# We now have yaml files
for xdoc_path in self.find_files(pattern='*.yml', dir='xdoc', ignore=ignore):
for xdoc_path in self.find_files(patterns=['*.yml'], dir='xdoc', ignore=ignore):
data = self.read_file(path=xdoc_path)
if data:
self.paths[xdoc_path] = data

@ -13,7 +13,7 @@ class GoSphinxMapper(SphinxMapperBase):
:param app: Sphinx application passed in as part of the extension
'''
def load(self, pattern, dir, ignore=[]):
def load(self, patterns, dir, ignore=[]):
'''
Load objects from the filesystem into the ``paths`` dictionary.

@ -60,7 +60,7 @@ class JavaScriptSphinxMapper(SphinxMapperBase):
)
try:
cls = obj_map[data['kind']]
except KeyError:
except (KeyError, TypeError):
self.app.warn('Unknown Type: %s' % data)
else:
# Recurse for children

@ -29,6 +29,8 @@ class PythonSphinxMapper(SphinxMapperBase):
self.app.warn('Error reading file: {0}'.format(path))
except TypeError:
self.app.warn('Error reading file: {0}'.format(path))
except ImportError:
self.app.warn('Error reading file: {0}'.format(path))
return None
def create_class(self, data, options=None, **kwargs):

@ -24,6 +24,12 @@ Configuration Options
You can see the existing files in the `autoapi/templates`_ directory.
.. confval:: autoapi_file_patterns
Default: ``Varies by Language``
A list containing the file patterns to look for when generating documentation. Python for example is ``['*.py']``.
Customization Options
---------------------

@ -155,14 +155,3 @@ The .Net domain will not be able to depend on importing code from the users code
.. autodnclass:: System.String
:members:
Design
=======
Every object needs a unique identifier
* Loader
- Get a dict of {filename: dictionary of data}
* Mapper
- Transforms a list of all objects generated

@ -71,7 +71,7 @@ class DomainTests(unittest.TestCase):
'''Test basic get objects'''
objs = []
def _mock_find(self, pattern, **kwargs):
def _mock_find(self, patterns, **kwargs):
return {'items': ['foo', 'bar']}
def _mock_read(self, path):

@ -73,7 +73,7 @@ class DotNetTests(LanguageIntegrationTests):
return json.load(open('../fixtures/dotnet.json'))
# Mock this because it's slow otherwise
def _dotnet_load(self, pattern, dir, ignore=[]):
def _dotnet_load(self, patterns, dir, ignore=[]):
data = self.read_file(path='inmem')
self.paths['inmem'] = data
@ -95,3 +95,13 @@ class IntegrationTests(LanguageIntegrationTests):
'_build/text/autoapi/example/index.txt',
'This is a fuction template override'
)
class TOCTreeTests(LanguageIntegrationTests):
def test_toctree_overrides(self):
self._run_test(
'toctreeexample',
'_build/text/index.txt',
'AutoAPI Index'
)

@ -0,0 +1,195 @@
# Makefile for Sphinx documentation
#
# You can set these variables from the command line.
SPHINXOPTS = -v -v
SPHINXBUILD = sphinx-build
PAPER =
BUILDDIR = _build
# User-friendly check for sphinx-build
ifeq ($(shell which $(SPHINXBUILD) >/dev/null 2>&1; echo $$?), 1)
$(error The '$(SPHINXBUILD)' command was not found. Make sure you have Sphinx installed, then set the SPHINXBUILD environment variable to point to the full path of the '$(SPHINXBUILD)' executable. Alternatively you can add the directory with the executable to your PATH. If you don't have Sphinx installed, grab it from http://sphinx-doc.org/)
endif
# Internal variables.
PAPEROPT_a4 = -D latex_paper_size=a4
PAPEROPT_letter = -D latex_paper_size=letter
ALLSPHINXOPTS = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
# the i18n builder cannot share the environment and doctrees with the others
I18NSPHINXOPTS = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
.PHONY: help clean html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf text man changes linkcheck doctest coverage gettext
help:
@echo "Please use \`make <target>' where <target> is one of"
@echo " html to make standalone HTML files"
@echo " dirhtml to make HTML files named index.html in directories"
@echo " singlehtml to make a single large HTML file"
@echo " pickle to make pickle files"
@echo " json to make JSON files"
@echo " htmlhelp to make HTML files and a HTML help project"
@echo " qthelp to make HTML files and a qthelp project"
@echo " applehelp to make an Apple Help Book"
@echo " devhelp to make HTML files and a Devhelp project"
@echo " epub to make an epub"
@echo " latex to make LaTeX files, you can set PAPER=a4 or PAPER=letter"
@echo " latexpdf to make LaTeX files and run them through pdflatex"
@echo " latexpdfja to make LaTeX files and run them through platex/dvipdfmx"
@echo " text to make text files"
@echo " man to make manual pages"
@echo " texinfo to make Texinfo files"
@echo " info to make Texinfo files and run them through makeinfo"
@echo " gettext to make PO message catalogs"
@echo " changes to make an overview of all changed/added/deprecated items"
@echo " xml to make Docutils-native XML files"
@echo " pseudoxml to make pseudoxml-XML files for display purposes"
@echo " linkcheck to check all external links for integrity"
@echo " doctest to run all doctests embedded in the documentation (if enabled)"
@echo " coverage to run coverage check of the documentation (if enabled)"
clean:
rm -rf $(BUILDDIR)/*
html:
$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
@echo
@echo "Build finished. The HTML pages are in $(BUILDDIR)/html."
dirhtml:
$(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml
@echo
@echo "Build finished. The HTML pages are in $(BUILDDIR)/dirhtml."
singlehtml:
$(SPHINXBUILD) -b singlehtml $(ALLSPHINXOPTS) $(BUILDDIR)/singlehtml
@echo
@echo "Build finished. The HTML page is in $(BUILDDIR)/singlehtml."
pickle:
$(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) $(BUILDDIR)/pickle
@echo
@echo "Build finished; now you can process the pickle files."
json:
$(SPHINXBUILD) -b json $(ALLSPHINXOPTS) $(BUILDDIR)/json
@echo
@echo "Build finished; now you can process the JSON files."
htmlhelp:
$(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $(BUILDDIR)/htmlhelp
@echo
@echo "Build finished; now you can run HTML Help Workshop with the" \
".hhp project file in $(BUILDDIR)/htmlhelp."
qthelp:
$(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) $(BUILDDIR)/qthelp
@echo
@echo "Build finished; now you can run "qcollectiongenerator" with the" \
".qhcp project file in $(BUILDDIR)/qthelp, like this:"
@echo "# qcollectiongenerator $(BUILDDIR)/qthelp/SphinxAutoAPI.qhcp"
@echo "To view the help file:"
@echo "# assistant -collectionFile $(BUILDDIR)/qthelp/SphinxAutoAPI.qhc"
applehelp:
$(SPHINXBUILD) -b applehelp $(ALLSPHINXOPTS) $(BUILDDIR)/applehelp
@echo
@echo "Build finished. The help book is in $(BUILDDIR)/applehelp."
@echo "N.B. You won't be able to view it unless you put it in" \
"~/Library/Documentation/Help or install it in your application" \
"bundle."
devhelp:
$(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(BUILDDIR)/devhelp
@echo
@echo "Build finished."
@echo "To view the help file:"
@echo "# mkdir -p $$HOME/.local/share/devhelp/SphinxAutoAPI"
@echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/SphinxAutoAPI"
@echo "# devhelp"
epub:
$(SPHINXBUILD) -b epub $(ALLSPHINXOPTS) $(BUILDDIR)/epub
@echo
@echo "Build finished. The epub file is in $(BUILDDIR)/epub."
latex:
$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
@echo
@echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex."
@echo "Run \`make' in that directory to run these through (pdf)latex" \
"(use \`make latexpdf' here to do that automatically)."
latexpdf:
$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
@echo "Running LaTeX files through pdflatex..."
$(MAKE) -C $(BUILDDIR)/latex all-pdf
@echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."
latexpdfja:
$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
@echo "Running LaTeX files through platex and dvipdfmx..."
$(MAKE) -C $(BUILDDIR)/latex all-pdf-ja
@echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."
text:
$(SPHINXBUILD) -b text $(ALLSPHINXOPTS) $(BUILDDIR)/text
@echo
@echo "Build finished. The text files are in $(BUILDDIR)/text."
man:
$(SPHINXBUILD) -b man $(ALLSPHINXOPTS) $(BUILDDIR)/man
@echo
@echo "Build finished. The manual pages are in $(BUILDDIR)/man."
texinfo:
$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo
@echo
@echo "Build finished. The Texinfo files are in $(BUILDDIR)/texinfo."
@echo "Run \`make' in that directory to run these through makeinfo" \
"(use \`make info' here to do that automatically)."
info:
$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo
@echo "Running Texinfo files through makeinfo..."
make -C $(BUILDDIR)/texinfo info
@echo "makeinfo finished; the Info files are in $(BUILDDIR)/texinfo."
gettext:
$(SPHINXBUILD) -b gettext $(I18NSPHINXOPTS) $(BUILDDIR)/locale
@echo
@echo "Build finished. The message catalogs are in $(BUILDDIR)/locale."
changes:
$(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) $(BUILDDIR)/changes
@echo
@echo "The overview file is in $(BUILDDIR)/changes."
linkcheck:
$(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) $(BUILDDIR)/linkcheck
@echo
@echo "Link check complete; look for any errors in the above output " \
"or in $(BUILDDIR)/linkcheck/output.txt."
doctest:
$(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) $(BUILDDIR)/doctest
@echo "Testing of doctests in the sources finished, look at the " \
"results in $(BUILDDIR)/doctest/output.txt."
coverage:
$(SPHINXBUILD) -b coverage $(ALLSPHINXOPTS) $(BUILDDIR)/coverage
@echo "Testing of coverage in the sources finished, look at the " \
"results in $(BUILDDIR)/coverage/python.txt."
xml:
$(SPHINXBUILD) -b xml $(ALLSPHINXOPTS) $(BUILDDIR)/xml
@echo
@echo "Build finished. The XML files are in $(BUILDDIR)/xml."
pseudoxml:
$(SPHINXBUILD) -b pseudoxml $(ALLSPHINXOPTS) $(BUILDDIR)/pseudoxml
@echo
@echo "Build finished. The pseudo-XML files are in $(BUILDDIR)/pseudoxml."
livehtml:
sphinx-autobuild -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html

@ -0,0 +1,21 @@
# -*- coding: utf-8 -*-
templates_path = ['_templates']
source_suffix = '.rst'
master_doc = 'index'
project = u'pyexample'
copyright = u'2015, rtfd'
author = u'rtfd'
version = '0.1'
release = '0.1'
language = None
exclude_patterns = ['_build']
pygments_style = 'sphinx'
todo_include_todos = False
html_theme = 'alabaster'
html_static_path = ['_static']
htmlhelp_basename = 'pyexampledoc'
extensions = ['autoapi.extension']
autoapi_type = 'python'
autoapi_dir = 'example'
autoapi_file_pattern = '*.py'

@ -0,0 +1,7 @@
__author__ = 'swenson'
import math
def example_function(x):
"""Compute the square root of x and return it."""
return math.sqrt(x)

@ -0,0 +1,7 @@
Welcome to pyexample's documentation!
=====================================
.. toctree::
Loading…
Cancel
Save