Merge pull request #263 from gratipay/startapp

Upgrading Aspen to 0.37+

.travis.yml

@@ -6,8 +6,13 @@ python:
 install:
   - make env
 
+before_script:
+  - make run&
+  - sleep 3  # Give webserver some time to start
+
 # Dummy command until we have real tests
-script: true
+script:
+  - curl http://localhost:8536/
 
 branches:
   only:

Makefile

@@ -22,5 +22,5 @@ clean:
 	find . -name \*.pyc -delete
 
 run: env
-	./$(env_bin)/honcho -e defaults.env,local.env run ./env/bin/aspen \
-		--network_address :8536 --www_root=./www/ --project_root=./
+	./$(env_bin)/honcho -e defaults.env,local.env run ./env/bin/python \
+		./startapp.py --port=8536

Procfile

@@ -1 +1 @@
-web: aspen --network_address :$PORT --www_root=./www/ --project_root=./
+web: python startapp.py --port=$PORT

README.md

@@ -2,6 +2,18 @@
 
 [![Build Status](https://travis-ci.org/gratipay/inside.gratipay.com.svg)](https://travis-ci.org/gratipay/inside.gratipay.com)
 
+**NOTE**: The quickstart may not work until vendorized
+`virtualenv` + `pip` are upgraded to latest versions
+that can handle wheels. So, for now you can create
+virtualenv, install dependencies and run manually with:
+
+```
+virtualenv env
+./env/bin/pip install -f vendor -r requirements.txt
+./env/bin/python startapp.py
+```
+
+
 Quickstart:
 
 ```

configure-aspen.py

@@ -26,15 +26,14 @@
 def add_nav_to_website(website):
     website.nav = NavItem(website, None, website.www_root, '')
 
-def add_nav_current_to_context(request, website):
-    fs = request.fs
-    if basename(request.fs) in website.indices:
-        fs = dirname(fs)
-    request.context['nav_current'] = website.nav.by_fs.get(fs, website.nav)
-
-def add_nav_next_to_context(request, website):
-    nav_current = request.context['nav_current']
-    request.context['nav_next'] = nav_current.next_child
+def add_nav_current_to_context(dispatch_result, website):
+    path = dispatch_result.match
+    if basename(path) in website.indices:
+        path = dirname(path)
+    return {'nav_current': website.nav.by_fs.get(path, website.nav)}
+
+def add_nav_next_to_context(nav_current, website):
+    return {'nav_next': nav_current.next_child}
 
 add_nav_to_website(website)
 

nav.py

@@ -11,10 +11,7 @@
 
 
 def get_simplate_context(website, fs):
-    request = Request()
-    request.fs = fs
-    request.website = website
-    resource = resources.get(request)
+    resource = resources.get(website, fs)
     return {} if isinstance(resource, StaticResource) else resource.pages[0]
 
 

requirements.txt

@@ -1,10 +1,10 @@
 
-Cheroot==4.0.0beta
+aspen==0.37
+  filesystem_tree==1.0.1
+  first==2.0.1
 mimeparse==0.1.3
-first==2.0.0
 dependency_injection==1.1.0
 algorithm==1.0.0
-aspen==0.28.3
 
 MarkupSafe==0.18
 Jinja2==2.7.1

startapp.py

@@ -0,0 +1,32 @@
+#!/usr/bin/env python
+"""
+The main script to start website for development,
+which also exports WSGI application for production.
+"""
+
+HOST = ''    # by default run on all interfaces
+PORT = 8537  # default/devserver port
+
+import sys
+from aspen.website import Website
+
+aspen_config = [
+    '--www_root=www/',
+    '--project_root=.'
+]
+
+for param in sys.argv:
+    if param.startswith('--port'):
+        _, PORT = param.split('=')
+        PORT = int(PORT)
+
+
+# by WSGI convention, we need to create webapp object
+# and by default most WSGI servers look for 'application'
+application = Website(aspen_config)
+
+if __name__ == '__main__':
+    from wsgiref.simple_server import make_server
+    print("* Running development server on http://%s:%s" % (HOST, PORT))
+    make_server(HOST, PORT, application).serve_forever()
+

www/howto/index.spt

@@ -1,8 +1,10 @@
 import os
 
 nav_title = 'How To'
-nav_children = [ name.rsplit('.', 1)[0] for name in os.listdir('howto')
-                 if name.endswith('.spt') and name not in ('.', '..', 'index.spt')]
+nav_children = []
+for entry in os.listdir(os.path.join(website.www_root, 'howto')):
+   if entry.endswith('.spt') and entry not in ('.', '..', 'index.spt'):
+       nav_children.append(entry.rsplit('.', 1)[0])
 nav_children.sort()
 [---]
 [---] text/html