[webservice] Moved app into a module

sbryant · Nov 26, 2010 · 48ce720 · 48ce720
1 parent c493cc6
commit 48ce720
Show file tree

Hide file tree

Showing 3 changed files with 60 additions and 53 deletions.
diff --git a/gogogo/server/__init__.py b/gogogo/server/__init__.py
@@ -5,59 +5,7 @@
 
 from gogogo.game import Game, GameError
 from gogogo.server.app import app
-from gogogo.server.filters import with_game
-
-routes = {
-    'root': {
-               'GET': [{'/': 'home'}]
-            },
-    'game': {
-               'GET': [{'/game/{game}/': 'Load game'}],
-               'POST': [{'/game/create/': 'Create a new game'}],
-            },
-}
-
-@app.post('/game/:game#[0-9a-f]+#/player/create/', name='game-player-create')
-@with_game
-def register_player(game):
-    try: data = json.loads(bottle.request.body.read())
-    except ValueError: raise bottle.HTTPResponse({'message': "JSON seems invalid"}, 400)
-    print "I got data:", data
-    print "For game:", game
-
-@app.get('/game/:game#[0-9a-f]+#/branch/', name='game-branch-index')
-@with_game
-def branches(game):
-    return {'message': '',
-            'data': game.branches()}
-
-@app.post('/game/:game#[0-9a-f]+#/branch/create/', name='game-branche-create')
-@with_game
-def create_branch(game):
-    pass
-
-@app.get('/game/:game#[0-9a-f]+#/branch/:branch/', name='game-branch')
-@with_game
-def game(game, branch):
-    pass
-
-@app.get('/game/:game#[0-9a-f]+#/', name='game-index')
-@with_game
-def game(game):
-    return {'message': '',
-            'turn': game.board.player_turn(),
-            'data': game.board.take_snapshot()}
-
-@app.post('/game/create/', name='game-create')
-def new_game():
-    game = Game(create=True)
-    bottle.redirect(app.get_url('game-index', name=game.name))
-
-@app.get('/', name='index')
-def index():
-    return {'message': '',
-            'data': routes}
-
+from gogogo.server.app import routes
 
 def run(addr='localhost', port=9090, **kwargs):
     bottle.debug(kwargs.pop('debug', False))

diff --git a/gogogo/server/app.py → gogogo/server/app/__init__.py b/gogogo/server/app.py → gogogo/server/app/__init__.py
diff --git a/gogogo/server/app/routes.py b/gogogo/server/app/routes.py
@@ -0,0 +1,59 @@
+import json
+
+import bottle
+
+from gogogo.game import Game, GameError
+from gogogo.server.app import app
+from gogogo.server.filters import with_game
+
+
+routes = {
+    'root': {
+               'GET': [{'/': 'home'}]
+            },
+    'game': {
+               'GET': [{'/game/{game}/': 'Load game'}],
+               'POST': [{'/game/create/': 'Create a new game'}],
+            },
+}
+
+@app.post('/game/:game#[0-9a-f]+#/player/create/', name='game-player-create')
+@with_game
+def register_player(game):
+    try: data = json.loads(bottle.request.body.read())
+    except ValueError: raise bottle.HTTPResponse({'message': "JSON seems invalid"}, 400)
+    print "I got data:", data
+    print "For game:", game
+
+@app.get('/game/:game#[0-9a-f]+#/branch/', name='game-branch-index')
+@with_game
+def branches(game):
+    return {'message': '',
+            'data': game.branches()}
+
+@app.post('/game/:game#[0-9a-f]+#/branch/create/', name='game-branche-create')
+@with_game
+def create_branch(game):
+    pass
+
+@app.get('/game/:game#[0-9a-f]+#/branch/:branch/', name='game-branch')
+@with_game
+def game(game, branch):
+    pass
+
+@app.get('/game/:game#[0-9a-f]+#/', name='game-index')
+@with_game
+def game(game):
+    return {'message': '',
+            'turn': game.board.player_turn(),
+            'data': game.board.take_snapshot()}
+
+@app.post('/game/create/', name='game-create')
+def new_game():
+    game = Game(create=True)
+    bottle.redirect(app.get_url('game-index', name=game.name))
+
+@app.get('/', name='index')
+def index():
+    return {'message': '',
+            'data': routes}