static/sha1.js templates/addurl.html templates/base.html templates/checkurl.html templates/tools.html @@ -5,7 +5,7 @@ import urllib, httplib2, unittest class WebTests(unittest.TestCase): def setUp(self): - self.http = httplib2.Http() + self._init_http() self.url = 'http://localhost:8080' self.headers = {'Content-type': 'application/x-www-form-urlencoded'} self.body = { @@ -13,7 +13,16 @@ class WebTests(unittest.TestCase): 'status': '200', } - + def _init_http(self): + self.http = httplib2.Http() + + def _post(self): + return self.http.request( + self.url, 'POST', + headers=self.headers, + body=urllib.urlencode(self.body) + ) + def testHome(self): response, content = self.http.request(self.url, 'GET') self.assert_( response['status'] == '200' ) @@ -24,18 +33,9 @@ class WebTests(unittest.TestCase): response, content = self.http.request("%s/test1234" % self.url, 'GET') self.assert_(response['status'] == '404') - def _post(self): - return self.http.request( - self.url, 'POST', - headers=self.headers, - body=urllib.urlencode(self.body) - ) def test303(self): - """ - test the direct response to a POST, without following - the redirect - """ + # test the direct response to a POST, without following the redirect self.http.follow_redirects = False response, content = self._post() self.assert_( response['status'] == '303' ) @@ -62,12 +62,14 @@ class WebTests(unittest.TestCase): self.assert_( response['status'] == '200' ) self.assert_( self.body['uri'] in content ) self.assert_( '["abc", "xyz"]' in content ) - + def testDELETE(self): self.body['uri'] = 'http://foobar.com/deleteme.html' response, content = self._post() self.assert_( response['status'] == '200' ) self.assert_( self.body['uri'] in content ) + + self._init_http() response, content = self.http.request( response['content-location'], 'DELETE' ) dammit/webtests.py @@ -9,11 +9,15 @@ from dammit.lrucache import LRUCache from couchdb import Database from dammit.http import status from dammit.request import unpack_tags, unpack_pairs, pack_response +import view +from view import render urls = ( '/', 'urldammit', '/_tools', 'tools', - '/(.*)', 'urldammit', + '/_tools/addurl', 'tools_addurl', + '/_tools/checkurl', 'tools_checkurl', + '/([0-9a-f]{40})', 'urldammit', ) db = Database('http://localhost:5984/urldammit') @@ -37,7 +41,7 @@ class urldammit: if not uri: print "where's my url dammit?" return - + r = self._locate(uri) if not r: return @@ -84,45 +88,55 @@ class urldammit: r = register_uri(db, uri = uri, status = int(status),\ tags = tags, pairs = pairs ) - if r: known[id] = r - web.http.seeother("%s/%s" % ( web.ctx.home, urllib2.quote(i.uri)) ) + + id = uri_to_id(i.uri) + if r: + known[id] = r + web.http.seeother( + "%s/%s" % ( web.ctx.home, id) + ) self._render(r) - def DELETE(self): - i = web.input() - uri = self._reqd(i, 'uri') - if not uri: return + def DELETE(self, uri): + """ + TODO: take the uri as a param + currently very broken... + """ + logging.debug("got a delete request") - delete(db, id) + try: + delete(db, uri) + except Exception, e: + logging.error(e) + web.ctx.status = status[204] def _locate(self, uri): """ See what we know about this uri... + uri is in fact a SHA-1 hash of the uri """ - id = uri_to_id(uri) - def ithas(key, cache): if key in cache: return cache[key] return None - u = ithas(id, unknown) + u = ithas(uri, unknown) if u: web.notfound() return None - r = ithas(id, known) + r = ithas(uri, known) if not r: - r = URI.load(db, id) + r = URI.load(db, uri) if not r: - unknown[id] = True + unknown[uri] = True web.notfound() return None - known[id] = r + known[uri] = r return r @@ -138,7 +152,10 @@ class urldammit: if 300 <= r.status < 400: if r.status in status: web.ctx.status = status[r.status] - web.header('Location', r.location) + web.header( + 'Location', + "%s/%s" % ( web.ctx.home, uri_to_id(r.location) ) + ) return True return False @@ -176,13 +193,15 @@ class urldammit: class tools: def GET(self): - print '<form action="/" method="POST">' - print '<label for="uri">uri:</label><input name="uri" type="text"><br>' - print '<label for="status">status:</label><input name="status" type="text"><br>' - print '<label for="tags">tags:</label><input name="tags" type="text"><br>' - print '<label for="pairs">pairs:</label><input name="pairs" type="text"><br>' - print '<input type="submit" value="submit">' - print '</form>' + print render.base(view.tools()) + +class tools_addurl: + def GET(self): + print render.base(view.addurl()) + +class tools_checkurl: + def GET(self): + print render.base(view.checkurl()) if __name__ == '__main__': import logging, sys urldammit.py 7cab6165fda30184f642acefbbb02435674f969a Harry Fuecks hfuecks@gmail.com http://github.com/harryf/urldammit/commit/a0580895e5c68201a3cca72f4abb1e8cb6272181 a0580895e5c68201a3cca72f4abb1e8cb6272181 2008-06-06T14:22:22-07:00 2008-06-06T14:22:22-07:00 Switch to use sha-1 hash of url as id, start on web.py templates for _tools, add javascript sha1 implementation 4e30540d85721a0b4f090b13e680ae2132cc2981 Harry Fuecks hfuecks@gmail.com