Ticket #36: 0001-Patch-for-Feature-306.patch

mediagoblin/models.py

@@ -18 +18 @@
 
 from mongokit import Document, Set
 
+from mediagoblin import util
 from mediagoblin.auth import lib as auth_lib
 
 
@@ -66 +67 @@
     structure = {
         'uploader': User,
         'title': unicode,
+        'slug':unicode,
         'created': datetime.datetime,
         'description': unicode,
         'media_type': unicode,
@@ -98 +100 @@
     def main_mediafile(self):
         pass
 
+    def generate_slug(self):
+        self['slug'] = util.slugify(self['title'])
 
 REGISTER_MODELS = [MediaEntry, User]
 

mediagoblin/submit/views.py

@@ -46 +46 @@
             entry['media_type'] = u'image' # heh
             entry['uploader'] = request.user
 
+            # Generate a slug from the title
+            entry.generate_slug()
+
             # Save, just so we can get the entry id for the sake of using
             # it to generate the file path
             entry.save(validate=False)

mediagoblin/tests/test_util.py

@@ -69 +69 @@
     assert mbox_message.get_payload(decode=True) == """HAYYY GUYS!
 
 I hope you like unit tests JUST AS MUCH AS I DO!"""
+
+def test_slugify():
+    assert util.slugify('a walk in the park') == 'a-walk-in-the-park'
+    assert util.slugify('A Walk in the Park') == 'a-walk-in-the-park'
+    assert util.slugify('a  walk in the park') == 'a-walk-in-the-park'
+    assert util.slugify('a walk in-the-park') == 'a-walk-in-the-park'
+    assert util.slugify('a w@lk in the park?') == 'a-w-lk-in-the-park'

mediagoblin/util.py

@@ -17 +17 @@
 from email.MIMEText import MIMEText
 import smtplib
 import sys
-
+import re
 import jinja2
 import mongokit
+import translitcodec
 
 from mediagoblin import globals as mgoblin_globals
 
@@ -87 +88 @@
     func = getattr(module, func_name)
     return func
 
+_punct_re = re.compile(r'[\t !"#$%&\'()*\-/<=>?@\[\\\]^_`{|},.]+')
+
+def slugify(text, delim=u'-'):
+    """
+    Generates an ASCII-only slug. Taken from http://flask.pocoo.org/snippets/5/
+    """
+    result = []
+    for word in _punct_re.split(text.lower()):
+        word = word.encode('translit/long')
+        if word:
+            result.append(word)
+    return unicode(delim.join(result))
 
 ### ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 ### Special email test stuff begins HERE

setup.py

@@ -38 +38 @@
         'jinja2',
         'sphinx',
         'PIL',
+        'translitcodec',
         ],
     test_suite='nose.collector',