Changeset 6408

Timestamp:

08/19/08 15:26:01 (5 months ago)

Author:

cdent

Message:

tiddlyweb - Implement deletion of bags in the StorageInterface?
and urls.map.

If you delete a bag all the tiddlers in it are _gone_.

This presents some interesting notions with regard to
how search indexes are built and handled. For now we are
just ignoring those issues.

In order for a bag to be delete the delete constraint on
the bag's policy must pass.

We need to handle the situation where a store doesn't support
deletings bags (or whatever else), so a soon commit will
implement some StoreMethodNotImplemented? exceptions, or something
like that. The current hack for bag_delete is to recognize
when a pass has happened, which doesn't map to the style of
the rest of the system.

Location:

Trunk/contributors/ChrisDent/experimental/TiddlyWeb

Files:

• test/test_web_bag.py (modified) (1 diff)
• tiddlyweb/stores/__init__.py (modified) (1 diff)
• tiddlyweb/stores/text.py (modified) (1 diff)
• tiddlyweb/web/bag.py (modified) (1 diff)
• urls.map (modified) (1 diff)

Trunk/contributors/ChrisDent/experimental/TiddlyWeb/test/test_web_bag.py

@@ -209 +209 @@
     assert info['policy']['delete'] == policy_dict['delete']
 
+def test_delete_bag():
+    """
+    PUT a new bag to the server and then DELETE it.
+    """
+    json_string = simplejson.dumps(dict(policy={}))
+
+    http = httplib2.Http()
+    response, content = http.request('http://our_test_domain:8001/bags/deleteme',
+            method='PUT', headers={'Content-Type': 'application/json'}, body=json_string)
+    location = response['location']
+
+    assert response['status'] == '204'
+    assert location == 'http://our_test_domain:8001/bags/deleteme'
+
+    response, content = http.request(location, method='DELETE')
+    print content
+    assert response['status'] == '204'
+
+    response, content = http.request(location, method='GET', headers={'Accept':'application/json'})
+    assert response['status'] == '404'
+
 def test_put_bag_wrong_type():
     """

Trunk/contributors/ChrisDent/experimental/TiddlyWeb/tiddlyweb/stores/__init__.py

@@ -27 +27 @@
 
     def recipe_put(self, recipe):
+        pass
+
+    def bag_delete(self, bag):
         pass
 

Trunk/contributors/ChrisDent/experimental/TiddlyWeb/tiddlyweb/stores/text.py

@@ -44 +44 @@
 
         recipe_file.close()
+
+    def bag_delete(self, bag):
+        bag_path = self._bag_path(bag.name)
+
+        try:
+            if not os.path.exists(bag_path):
+                raise NoBagError, '%s not present' % tiddler_base_filename
+            print 'bag_path to delete %s' % bag_path
+            shutil.rmtree(bag_path)
+            # XXX: We need to return a value so the caller knows
+            # that we did something otherwise it will choose
+            # to raise a 415. Not satisfied with this solution
+            # as it doesn't map to how the rest of the system behaves.
+            # Probably need to raise exceptions from the interface. 
+            return 1
+        except NoBagError:
+            raise
+        except Exception, e:
+            raise IOError, 'unable to delete bag %s: %s' % (bag.name, e)
 
     def bag_get(self, bag):

Trunk/contributors/ChrisDent/experimental/TiddlyWeb/tiddlyweb/web/bag.py

@@ -17 +17 @@
 from tiddlyweb.web.tiddlers import send_tiddlers
 from tiddlyweb.web.http import HTTP400, HTTP404, HTTP415
+
+def delete(environ, start_response):
+    # XXX refactor out a _determine_bag or _determine_bag_name
+    # lots of duplication going on here.
+    bag_name = environ['wsgiorg.routing_args'][1]['bag_name']
+    bag_name = urllib.unquote(bag_name)
+    bag_name = unicode(bag_name, 'utf-8')
+    bag_name = web.handle_extension(environ, bag_name)
+
+    usersign = environ['tiddlyweb.usersign']
+
+    bag = _get_bag(environ, bag_name)
+    bag.policy.allows(usersign, 'delete')
+    # reuse the store attribute that was set on the 
+    # bag when we "got" it.
+    # we don't need to check for existence here because
+    # the above get already did
+    if bag.store.delete(bag) is not None:
+        start_response("204 No Content", [])
+        return []
+
+    raise HTTP415, 'DELETE not supported'
 
 def get(environ, start_response):

Trunk/contributors/ChrisDent/experimental/TiddlyWeb/urls.map

@@ -80 +80 @@
     GET tiddlyweb.web.bag:get
     PUT tiddlyweb.web.bag:put
+    DELETE tiddlyweb.web.bag:delete
 
 # tiddlers in a bag, with option filter string in the query string