Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Basic sphinx cleanup #32

Merged
merged 10 commits into from
Sep 14, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
74 changes: 74 additions & 0 deletions aspen/__init__.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,77 @@
"""
#########
Aspen
#########
Aspen is a filesystem dispatch library for Python web frameworks. Instead of
using regular expressions, decorators, or object traversal, Aspen dispatches
HTTP requests based on the natural symmetry of URL paths and filesystem paths.
In the `immortal words`_ of Jeff Lindsay, "so like. a web server." Exactly! ;-)
.. _immortal words: https://twitter.com/progrium/status/773694289033383937
This is the documentation for the development version of the core Aspen
library, describing its filesystem dispatch behavior regardless of the web
framework you're using it with. For instructions on configuring Aspen with a
specific web framework, see the docs for `django-aspen`_, `Flask-Aspen`_, or
`Pando`_. See the `project homepage`_ for an overview.
.. _django-aspen: http://django.aspen.io/
.. _Flask-aspen: http://flask.aspen.io/
.. _Pando: http://pando.aspen.io/
.. _project homepage: http://aspen.io/
This version of Aspen has been tested with Python 2.7, 3.4, and 3.5, on both
Ubuntu and Windows.
**************
Installation
**************
Aspen is available on `GitHub`_ and on `PyPI`_::
$ pip install aspen
.. _GitHub: https://github.com/AspenWeb/aspen.py
.. _PyPI: https://pypi.python.org/pypi/aspen
*******
Legal
*******
Aspen is distributed under the `MIT license`_.
.. _MIT license: https://github.com/AspenWeb/aspen.py/blob/master/COPYRIGHT
**********
See Also
**********
The `Keystone`_ web framework was inspired by Aspen.
.. _Keystone: http://keystone.readthedocs.org/
***********
Reference
***********
This is the API reference for the Aspen library.
.. automodule:: aspen.simplates
.. automodule:: aspen.http
.. automodule:: aspen.request_processor
.. automodule:: aspen.resources
.. automodule:: aspen.output
.. automodule:: aspen.configuration
.. automodule:: aspen.exceptions
.. automodule:: aspen.testing
.. automodule:: aspen.utils
"""
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
Expand Down
10 changes: 10 additions & 0 deletions aspen/configuration/__init__.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
"""

:mod:`configuration`
====================

Configuration.

.. automodule:: aspen.configuration.parse

"""
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
Expand Down
4 changes: 4 additions & 0 deletions aspen/configuration/parse.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
"""

:mod:`parse`
============

Define parser/validators for configuration system

Each of these is guaranteed to be passed a unicode object as read from the
Expand Down
6 changes: 6 additions & 0 deletions aspen/exceptions.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
"""
:mod:`exceptions`
=================

Exceptions.
"""
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
Expand Down
12 changes: 12 additions & 0 deletions aspen/http/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
"""
:mod:`http`
===========

Aspen doesn't implement all of HTTP, only things related to filesystem
dispatch.

.. automodule:: aspen.http.mapping
.. automodule:: aspen.http.request
.. automodule:: aspen.http.resource

"""
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe we should kill the http module altogether. We could move aspen.http.mapping and aspen.http.request into aspen.mappings. aspen.http.resource could go into the existing aspen.resources module.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, something like that seems right.

Copy link
Contributor Author

@chadwhitacre chadwhitacre Sep 12, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually, it looks like we can kill Querystring entirely, so we could have an aspen.urlpath module. Mapping could maybe be in there, or in aspen.mapping (does Pando use the same Mapping class, or its own?).

Copy link
Contributor Author

@chadwhitacre chadwhitacre Sep 12, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it looks like we can kill Querystring entirely

Hmm ... this may or may not be true, but even with Querystring, we could combine all three http modules into a single file, and it'd only be ~300 lines.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Querystring is still used by the JSONP renderer. We'll also need to import Method from pando to be able to implement the pure-python alternatives to simplates, because they use HTTP methods as function names.

16 changes: 11 additions & 5 deletions aspen/http/mapping.py
Original file line number Diff line number Diff line change
@@ -1,23 +1,29 @@
"""
:mod:`mapping`
--------------

This module implements a class to represent HTTP mappings.

"""
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
from __future__ import unicode_literals



NO_DEFAULT = object()


class Mapping(dict):
"""Base class for HTTP mappings: Path, Querystring, Headers, Cookie, Body.
"""Base class for HTTP mappings.

Mappings in HTTP differ from Python dictionaries in that they may have one
or more values. This dictionary subclass maintains a list of values for
each key. However, access semantics are asymetric: subscript assignment
clobbers to the list, while subscript access returns the last item. Think
each key. However, access semantics are asymmetric: subscript assignment
clobbers to list, while subscript access returns the last item. Think
about it.

WARNING: this isn't thread-safe
.. warning:: This isn't thread-safe.

"""

Expand Down
4 changes: 4 additions & 0 deletions aspen/http/request.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
"""
:mod:`request`
--------------
Aspen models the path and querystring parts of an HTTP request message.
"""
from __future__ import absolute_import
from __future__ import division
Expand Down
5 changes: 5 additions & 0 deletions aspen/http/resource.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
"""
:mod:`resource`
---------------

This module implements classes for modeling static and dynamic HTTP resources.
"""
import mimeparse

from ..exceptions import NegotiationFailure
Expand Down
8 changes: 8 additions & 0 deletions aspen/output.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
"""
:mod:`output`
=============

Implement a class for capturing request processing output.

"""

class Output(object):
body = media_type = charset = None

Expand Down
1 change: 0 additions & 1 deletion aspen/renderers.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

# for backwards compatibility with aspen-renderer modules
from .simplates.renderers import Factory, Renderer

Expand Down
14 changes: 14 additions & 0 deletions aspen/request_processor/__init__.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,17 @@
"""
:mod:`request_processor`
========================

The request processor dispatches requests to the filesystem (typecasting URL
path variables), loads the resource from the filesystem, and then renders and
encodes the resource. This algorithm is defined in the :mod:`algorithm` module,
with dispatching and typecasting in additional modules.

.. automodule:: aspen.request_processor.algorithm
.. automodule:: aspen.request_processor.dispatcher
.. automodule:: aspen.request_processor.typecasting

"""
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
Expand Down
3 changes: 3 additions & 0 deletions aspen/request_processor/algorithm.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
"""
:mod:`algorithm`
----------------

These functions comprise the request processing functionality of Aspen.

The order of functions in this module defines Aspen algorithm for request
Expand Down
3 changes: 3 additions & 0 deletions aspen/request_processor/dispatcher.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
"""
:mod:`dispatcher`
-----------------

Implement Aspen's filesystem dispatch algorithm.
"""
from __future__ import absolute_import
Expand Down
6 changes: 5 additions & 1 deletion aspen/request_processor/typecasting.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
"""
Pluggable typecasting of virtual path values
:mod:`typecasting`
------------------
This module implements pluggable typecasting of URL path variables.
"""
from __future__ import absolute_import
from __future__ import division
Expand Down
3 changes: 3 additions & 0 deletions aspen/resources.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
"""
:mod:`resources`
================

This is a registry of filesystem paths to objects representing HTTP resources.

Use :py:func:`get` to use the cache, use :py:func:`load` to circumvent it.
Expand Down
36 changes: 36 additions & 0 deletions aspen/simplates/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
"""
:mod:`simplates`
================

The simplates module implements Aspen's file format, simplates (*.spt).
Simplates combine request processing logic (think: Rails controller, or Django
view) with template code in one file. Here's an example::

# Python syntax. Runs once on startup.
import random

[----]
# Python syntax. Runs once per request..
program = request.qs['program']
excitement = '!' * random.randint(1, 10)

# One of the following is used on each request, based on content type
# negotiation. The syntax depends on the renderer.

[----] text/html via jinja2
<h1>Greetings, {{ program }}{{ excitement }}</h1>

[----] text/plain via stdlib_format
Greetings, {program}{excitement}

[----] application/json via json_dump
{ "program": program
, "excitement": excitement
}


.. automodule:: aspen.simplates.renderers
.. automodule:: aspen.simplates.pagination
.. automodule:: aspen.simplates.json_

"""
4 changes: 4 additions & 0 deletions aspen/simplates/json_.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
"""
:mod:`json_`
------------
"""
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
Expand Down
4 changes: 4 additions & 0 deletions aspen/simplates/pagination.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
"""
:mod:`pagination`
-----------------
"""
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
Expand Down
9 changes: 9 additions & 0 deletions aspen/simplates/renderers/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
"""
:mod:`renderers`
----------------

This module implements pluggable content rendering.

Negotiated and rendered resources have content pages the bytes for which are
Expand Down Expand Up @@ -68,6 +71,12 @@ class CheeseFactory(Factory):
machinery is inadequate for some reason let's evolve the machinery so all
renderers behave consistently for users. Thanks.

.. automodule:: aspen.simplates.renderers.jsonp_dump
.. automodule:: aspen.simplates.renderers.json_dump
.. automodule:: aspen.simplates.renderers.stdlib_format
.. automodule:: aspen.simplates.renderers.stdlib_percent
.. automodule:: aspen.simplates.renderers.stdlib_template

"""
from __future__ import absolute_import
from __future__ import division
Expand Down
4 changes: 4 additions & 0 deletions aspen/simplates/renderers/json_dump.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
"""
:mod:`json_dump`
^^^^^^^^^^^^^^^^
"""
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
Expand Down
4 changes: 4 additions & 0 deletions aspen/simplates/renderers/jsonp_dump.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
"""
:mod:`jsonp_dump`
^^^^^^^^^^^^^^^^^^
"""
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
Expand Down
4 changes: 4 additions & 0 deletions aspen/simplates/renderers/stdlib_format.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
"""
:mod:`stdlib_format`
^^^^^^^^^^^^^^^^^^^^
"""
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
Expand Down
4 changes: 4 additions & 0 deletions aspen/simplates/renderers/stdlib_percent.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
"""
:mod:`stdlib_percent`
^^^^^^^^^^^^^^^^^^^^^
"""
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
Expand Down
4 changes: 4 additions & 0 deletions aspen/simplates/renderers/stdlib_template.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
"""
:mod:`stdlib_template`
^^^^^^^^^^^^^^^^^^^^^^
"""
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
Expand Down
4 changes: 4 additions & 0 deletions aspen/simplates/simplate.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
"""
:mod:`simplate`
---------------
"""
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
Expand Down
7 changes: 7 additions & 0 deletions aspen/testing.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
"""
:mod:`testing`
==============

This module provides helpers for testing applications that use Aspen.

"""
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
Expand Down
8 changes: 8 additions & 0 deletions aspen/utils.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
"""
:mod:`utils`
============
This module collects a few random bits that should be placed somewhere that
makes more sense.
"""
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
Expand Down
Loading