Memoize vocabularies

.gitignore

@@ -5,6 +5,7 @@
 .coverage
 .installed.cfg
 .mr.developer.cfg
+local.cfg
 bin
 build
 develop-eggs

CHANGES.rst

@@ -5,6 +5,9 @@ Changes
 1.5.0 (unreleased)
 ------------------
 
+- memoize vocabulary lookup
+  [tomgross, petschki]
+
 - fix #53 when editing taxonomy data the first time
   [petschki]
 

MANIFEST.in

@@ -4,24 +4,5 @@ include .coveragerc
 include buildout.cfg
 include travis.cfg
 recursive-include images *.gif
-recursive-include src *.babelrc
-recursive-include src *.cfg
-recursive-include src *.css
-recursive-include src *.eot
-recursive-include src *.eslintignore
-recursive-include src *.eslintrc
-recursive-include src *.gitkeep
-recursive-include src *.html
-recursive-include src *.js
-recursive-include src *.json
-recursive-include src *.map
-recursive-include src *.po
-recursive-include src *.pot
-recursive-include src *.pt
-recursive-include src *.sh
-recursive-include src *.svg
-recursive-include src *.ttf
-recursive-include src *.txt
-recursive-include src *.woff
-recursive-include src *.xml
-recursive-include src *.zcml
+graft src
+global-exclude *.pyc

setup.py

@@ -18,6 +18,7 @@ def read(*pathnames):
     name='collective.taxonomy',
     version=version,
     description="Create, edit and use hierarchical taxonomies in Plone!",
+    url='http://pypi.python.org/pypi/collective.taxonomy',
     long_description='\n'.join([
         read('README.rst'),
         read('CHANGES.rst'),

src/collective/taxonomy/widget.py

@@ -1,17 +1,45 @@
-import zope.interface
+# -*- coding: utf-8 -*-
 import zope.component
+import zope.interface
 import zope.schema.interfaces
 
+from plone.memoize import ram
+
 from z3c.form import interfaces
 from z3c.form.browser.orderedselect import OrderedSelectWidget
 from z3c.form.widget import FieldWidget
 
 from interfaces import ITaxonomySelectWidget
 
 
+def _items_cachekey(fun, self):
+    key = '{0}-{1}'.format(
+        self.field.__name__,
+        # self.terms.terms contains the Taxonomy utility
+        self.terms.terms.data._p_mtime,
+    )
+    return key
+
+
+@zope.interface.implementer(ITaxonomySelectWidget,
+                            interfaces.IOrderedSelectWidget)
 class TaxonomySelectWidget(OrderedSelectWidget):
-    zope.interface.implements(ITaxonomySelectWidget,
-                              interfaces.IOrderedSelectWidget)
+
+    @ram.cache(_items_cachekey)
+    def _get_items(self):
+        return [
+            self.getItem(term, count)
+            for count, term in enumerate(self.terms)
+            ]
+
+    def update(self):
+        """See z3c.form.interfaces.IWidget."""
+        super(TaxonomySelectWidget, self).update()
+        self.items = self._get_items()
+        self.selectedItems = [
+            self.getItem(self.terms.getTermByToken(token), count)
+            for count, token in enumerate(self.value)]
+        self.notselectedItems = self.deselect()
 
 
 @zope.component.adapter(zope.schema.interfaces.ISequence,