From 91337940d3e0ea1700b361210957d867cd199b2c Mon Sep 17 00:00:00 2001
From: Rogdham <contact@rogdham.net>
Date: Sun, 14 Apr 2013 18:13:32 +0100
Subject: [PATCH] Make tags and cats case insensitive. Fixes #704.

More precisely, group tags or categories without considering the case.
This fixes the bug where two categories with just the case as difference were
considered as distinct, but generate the same file: one overwriting the other.

Thanks to @Avaris for helping with the tests.
---
 pelican/tests/test_generators.py | 35 ++++++++++++++++++++++++++------
 pelican/urlwrappers.py           | 24 +++++++++++++++++-----
 2 files changed, 48 insertions(+), 11 deletions(-)

diff --git a/pelican/tests/test_generators.py b/pelican/tests/test_generators.py
index c2a5cc67..13156d3b 100644
--- a/pelican/tests/test_generators.py
+++ b/pelican/tests/test_generators.py
@@ -89,17 +89,29 @@ class TestArticlesGenerator(unittest.TestCase):
             ['This is an article without category !', 'published',
              'TestCategory', 'article'],
             ['This is a super article !', 'published', 'yeah', 'article'],
-            ['マックOS X 10.8でパイソンとVirtualenvをインストールと設定', 'published', '指導書', 'article']
+            ['マックOS X 10.8でパイソンとVirtualenvをインストールと設定',
+             'published', '指導書', 'article']
         ]
         self.assertEqual(sorted(articles_expected), sorted(articles))
 
     def test_generate_categories(self):
 
         generator = self.get_populated_generator()
+        # test for name
+        # categories are grouped by slug; if two categories have the same slug
+        # but different names they will be grouped together, the first one in
+        # terms of process order will define the name for that category
         categories = [cat.name for cat, _ in generator.categories]
-        categories_expected = ['Default', 'TestCategory', 'Yeah', 'test',
-                               'yeah', '指導書']
-        self.assertEqual(categories, categories_expected)
+        categories_alternatives = (
+            sorted(['Default', 'TestCategory', 'Yeah', 'test', '指導書']),
+            sorted(['Default', 'TestCategory', 'yeah', 'test', '指導書']),
+        )
+        self.assertTrue(sorted(categories) in categories_alternatives)
+        # test for slug
+        categories = [cat.slug for cat, _ in generator.categories]
+        categories_expected = ['default', 'testcategory', 'yeah', 'test',
+                               'zhi-dao-shu']
+        self.assertEqual(sorted(categories), sorted(categories_expected))
 
     def test_do_not_use_folder_as_category(self):
 
@@ -113,9 +125,20 @@ class TestArticlesGenerator(unittest.TestCase):
                             CUR_DIR, _DEFAULT_CONFIG['THEME'], None,
                             _DEFAULT_CONFIG['MARKUP'])
         generator.generate_context()
-
+        # test for name
+        # categories are grouped by slug; if two categories have the same slug
+        # but different names they will be grouped together, the first one in
+        # terms of process order will define the name for that category
         categories = [cat.name for cat, _ in generator.categories]
-        self.assertEqual(categories, ['Default', 'Yeah', 'test', 'yeah', '指導書'])
+        categories_alternatives = (
+            sorted(['Default', 'Yeah', 'test', '指導書']),
+            sorted(['Default', 'yeah', 'test', '指導書']),
+        )
+        self.assertTrue(sorted(categories) in categories_alternatives)
+        # test for slug
+        categories = [cat.slug for cat, _ in generator.categories]
+        categories_expected = ['default', 'yeah', 'test', 'zhi-dao-shu']
+        self.assertEqual(sorted(categories), sorted(categories_expected))
 
     def test_direct_templates_save_as_default(self):
 
diff --git a/pelican/urlwrappers.py b/pelican/urlwrappers.py
index 393d4c87..b0df61ad 100644
--- a/pelican/urlwrappers.py
+++ b/pelican/urlwrappers.py
@@ -13,21 +13,35 @@ logger = logging.getLogger(__name__)
 @functools.total_ordering
 class URLWrapper(object):
     def __init__(self, name, settings):
+        # next 2 lines are redundant with the setter of the name property
+        # but are here for clarity
+        self._name = name
+        self.slug = slugify(name)
         self.name = name
-        self.slug = slugify(self.name)
         self.settings = settings
 
+    @property
+    def name(self):
+        return self._name
+
+    @name.setter
+    def name(self, name):
+        self._name = name
+        self.slug = slugify(name)
+
     def as_dict(self):
-        return self.__dict__
+        d = self.__dict__
+        d['name'] = self.name
+        return d
 
     def __hash__(self):
-        return hash(self.name)
+        return hash(self.slug)
 
     def _key(self):
-        return self.name
+        return self.slug
 
     def _normalize_key(self, key):
-        return six.text_type(key)
+        return six.text_type(slugify(key))
 
     def __eq__(self, other):
         return self._key() == self._normalize_key(other)