Commits

psviderski committed 29b3ded

Refactor Item.modify method, now it accepts extra keyword args to update the meta.

Comments (0)

Files changed (2)

MoinMoin/items/__init__.py

             # just destroy this revision
             self.rev.item.destroy_revision(self.rev.revid)
 
-    def modify(self, meta, data, comment=u'', contenttype_guessed=None, contenttype_qs=None):
-        if contenttype_qs:
-            # we use querystring param to FORCE content type
-            meta[CONTENTTYPE] = contenttype_qs
-
+    def modify(self, meta, data, comment=u'', contenttype_guessed=None, **update_meta):
+        meta = dict(meta)  # we may get a read-only dict-like, copy it
+        meta.update(update_meta)
         return self._save(meta, data, contenttype_guessed=contenttype_guessed, comment=comment)
 
     class _ModifyForm(BaseModifyForm):
                 meta, data, contenttype_guessed, comment = form._dump(self)
                 contenttype_qs = request.values.get('contenttype')
                 try:
-                    self.modify(meta, data, comment, contenttype_guessed, contenttype_qs)
+                    self.modify(meta, data, comment, contenttype_guessed, **{CONTENTTYPE: contenttype_qs})
                 except AccessDenied:
                     abort(403)
                 else:

MoinMoin/items/_tests/test_Item.py

             item.meta['test_key']
         assert item.meta['another_test_key'] == another_meta['another_test_key']
         assert item.content.data == another_data
+        # add/update meta
+        another_meta = {
+            'test_key': 'test_value',
+            'another_test_key': 'another_test_value',
+        }
+        item.modify(another_meta, another_data)
+        item = Item.create(name)
+        update_meta = {
+            'another_test_key': 'updated_test_value',
+            'new_test_key': 'new_test_value',
+        }
+        item.modify(another_meta, another_data, **update_meta)
+        item = Item.create(name)
+        assert item.name == u'Test_Item'
+        assert item.meta['test_key'] == another_meta['test_key']
+        assert item.meta['another_test_key'] == update_meta['another_test_key']
+        assert item.meta['new_test_key'] == update_meta['new_test_key']
 
 
 coverage_modules = ['MoinMoin.items']
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.