Merge cacheimp -> master

[osqa.git] / forum / models / tag.py

diff --git a/forum/models/tag.py b/forum/models/tag.py
index 93d235bf057a689966908f686634b013d186b8a9..5b6bef381474debedceab58b05575c29223b1563 100644 (file)
--- a/forum/models/tag.py
+++ b/forum/models/tag.py
@@ -5,7 +5,9 @@ from django.utils.translation import ugettext as _
 
 from forum import modules
 
-class ActiveTagManager(models.Manager):
+class ActiveTagManager(CachedManager):
+    use_for_related_fields = True
+
     def get_query_set(self):
         return super(ActiveTagManager, self).get_query_set().exclude(used_count__lt=1)
 
@@ -24,7 +26,7 @@ class Tag(BaseModel):
         app_label = 'forum'
 
     def __unicode__(self):
-        return u'%s' % self.name
+        return self.name
 
     def add_to_usage_count(self, value):
         if self.used_count + value < 0:
@@ -32,6 +34,24 @@ class Tag(BaseModel):
         else:
             self.used_count = models.F('used_count') + value
 
+    def cache_key(self):
+        return self._generate_cache_key(Tag.safe_cache_name(self.name))
+
+    @classmethod
+    def safe_cache_name(cls, name):
+        return "".join([str(ord(c)) for c in name])
+
+    @classmethod
+    def infer_cache_key(cls, querydict):
+        if 'name' in querydict:
+            return cls._generate_cache_key(cls.safe_cache_name(querydict['name']))
+
+        return None
+
+    @classmethod
+    def value_to_list_on_cache_query(cls):
+        return 'name'
+
     @models.permalink
     def get_absolute_url(self):
         return ('tag_questions', (), {'tag': self.name})