Merge remote branch 'remotes/gullydwarf-cfdv/f360_tagging' into mergetags

Conflicts:
	mediagoblin/tests/test_submission.py

mediagoblin/tests/test_mgoblin_app.ini

@@ -7,6 +7,11 @@ email_sender_address = "notice@mediagoblin.example.org"
 email_debug_mode = true
 db_name = __mediagoblin_tests__
 
+# tag parsing
+tags_delimiter = ","
+tags_case_sensitive = False
+tags_max_length = 50
+
 # Celery shouldn't be set up by the application as it's setup via
 # mediagoblin.init.celery.from_celery
 celery_setup_elsewhere = true

mediagoblin/tests/test_submission.py

@@ -35,6 +35,9 @@ EVIL_JPG = pkg_resources.resource_filename(
 EVIL_PNG = pkg_resources.resource_filename(
   'mediagoblin.tests', 'test_submission/evil.png')
 
+GOOD_TAG_STRING = 'yin,yang'
+BAD_TAG_STRING = 'rage,' + 'f' * 26 + 'u' * 26
+
 
 class TestSubmission:
     def setUp(self):
@@ -110,6 +113,42 @@ class TestSubmission:
         assert util.TEMPLATE_TEST_CONTEXT.has_key(
             'mediagoblin/user_pages/user.html')
 
+    def test_tags(self):
+        # Good tag string
+        # --------
+        util.clear_test_template_context()
+        response = self.test_app.post(
+            '/submit/', {
+                'title': 'Balanced Goblin',
+                'tags': GOOD_TAG_STRING
+                }, upload_files=[(
+                    'file', GOOD_JPG)])
+
+        # New media entry with correct tags should be created
+        response.follow()
+        context = util.TEMPLATE_TEST_CONTEXT['mediagoblin/user_pages/user.html']
+        request = context['request']
+        media = request.db.MediaEntry.find({'title': 'Balanced Goblin'})[0]
+        assert_equal(media['tags'],
+                     [{'name': u'yin', 'slug': u'yin'},
+                                            {'name': u'yang', 'slug': u'yang'}])
+
+        # Test tags that are too long
+        # ---------------
+        util.clear_test_template_context()
+        response = self.test_app.post(
+            '/submit/', {
+                'title': 'Balanced Goblin',
+                'tags': BAD_TAG_STRING
+                }, upload_files=[(
+                    'file', GOOD_JPG)])
+
+        # Too long error should be raised
+        context = util.TEMPLATE_TEST_CONTEXT['mediagoblin/submit/start.html']
+        form = context['submit_form']
+        assert form.tags.errors == [
+            u'Tags must be shorter than 50 characters.  Tags that are too long'\
+             ': ffffffffffffffffffffffffffuuuuuuuuuuuuuuuuuuuuuuuuuu']
 
     def test_malicious_uploads(self):
         # Test non-suppoerted file with non-supported extension

mediagoblin/tests/test_tags.py

@@ -0,0 +1,57 @@
+# GNU MediaGoblin -- federated, autonomous media hosting
+# Copyright (C) 2011 Free Software Foundation, Inc
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+from mediagoblin.tests.tools import setup_fresh_app
+from mediagoblin import util
+from mediagoblin import mg_globals
+
+
+@setup_fresh_app
+def test_list_of_dicts_conversion(test_app):
+    """
+    When the user adds tags to a media entry, the string from the form is
+    converted into a list of tags, where each tag is stored in the database
+    as a dict. Each tag dict should contain the tag's name and slug. Another
+    function performs the reverse operation when populating a form to edit tags.
+    """
+    # Leading, trailing, and internal whitespace should be removed and slugified
+    assert util.convert_to_tag_list_of_dicts('sleep , 6    AM, chainsaw! ') == [
+                              {'name': u'sleep', 'slug': u'sleep'},
+                              {'name': u'6 am', 'slug': u'6-am'},
+                              {'name': u'chainsaw!', 'slug': u'chainsaw'}]
+
+    # Make sure case-sensitivity is retained when desired
+    mg_globals.app_config['tags_case_sensitive'] = True
+    assert util.convert_to_tag_list_of_dicts('sleep , 6    AM, chainsaw! ') == [
+                              {'name': u'sleep', 'slug': u'sleep'},
+                              {'name': u'6 AM', 'slug': u'6-am'},
+                              {'name': u'chainsaw!', 'slug': u'chainsaw'}]
+
+    # If the user enters two identical tags, record only one of them
+    assert util.convert_to_tag_list_of_dicts('echo,echo') == [{'name': u'echo',
+                                                               'slug': u'echo'}]
+
+    # Make sure converting the list of dicts to a string works
+    assert util.media_tags_as_string([{'name': u'yin', 'slug': u'yin'},
+                                      {'name': u'yang', 'slug': u'yang'}]) == \
+                                      u'yin,yang'
+
+    # If the tag delimiter is a space then we expect different results
+    mg_globals.app_config['tags_delimiter'] = u' '
+    assert util.convert_to_tag_list_of_dicts('unicorn ceramic nazi') == [
+                                       {'name': u'unicorn', 'slug': u'unicorn'},
+                                       {'name': u'ceramic', 'slug': u'ceramic'},
+                                       {'name': u'nazi', 'slug': u'nazi'}]