Renamed ContentMod to ContentFilter to keep it consistent

andrewebdev · Apr 20, 2016 · 933a808 · 933a808
1 parent e8f5a9c
commit 933a808
Show file tree

Hide file tree

Showing 9 changed files with 23 additions and 24 deletions.
diff --git a/demo/demo/settings.py b/demo/demo/settings.py
@@ -41,7 +41,7 @@
 
     'ostinato',
     'ostinato.pages',
-    # 'ostinato.contentfilters',
+    'ostinato.contentfilters',
 
     # Other dependencies
     'mptt',

diff --git a/ostinato/contentfilters/__init__.py b/ostinato/contentfilters/__init__.py
@@ -1,2 +1,2 @@
-from templatetags.content_filters import ContentMod
+from templatetags.content_filters import ContentFilter
 
diff --git a/ostinato/contentfilters/templatetags/content_filters.py b/ostinato/contentfilters/templatetags/content_filters.py
@@ -5,8 +5,8 @@
 register = template.Library()
 
 
-## ContentModifiers and related examples
-class ContentMod(object):
+# ContentModifiers and related examples
+class ContentFilter(object):
     """
     Special class to register render functions that will manipulate
     text content in some way. These functions are accessed by the
@@ -57,7 +57,7 @@ def modify(content, mods=None):
         {{ content|modify:"!snip,youtube" }}
 
     """
-    cm = ContentMod()
+    cm = ContentFilter()
     if mods:
         if mods[0] == "!":
             # Exclusion List
@@ -106,6 +106,7 @@ def hide_snip(content):
     return content.replace('{{{snip}}}', '')
 
 
-ContentMod.register('youtube', youtube)
-ContentMod.register('snip', snip)
-ContentMod.register('hide_snip', hide_snip)
+ContentFilter.register('youtube', youtube)
+ContentFilter.register('snip', snip)
+ContentFilter.register('hide_snip', hide_snip)
+
diff --git a/ostinato/contentfilters/views.py b/ostinato/contentfilters/views.py
diff --git a/ostinato/tests/contentfilters/__init__.py b/ostinato/tests/contentfilters/__init__.py
diff --git a/ostinato/tests/contentfilters/models.py b/ostinato/tests/contentfilters/models.py
diff --git a/ostinato/contentfilters/tests.py → ostinato/tests/contentfilters/tests.py b/ostinato/contentfilters/tests.py → ostinato/tests/contentfilters/tests.py
@@ -1,6 +1,6 @@
 from django.test import TestCase
 
-from ostinato.contentfilters import ContentMod
+from ostinato.contentfilters import ContentFilter
 from ostinato.contentfilters.templatetags.content_filters import modify
 
 
@@ -21,47 +21,47 @@ class ContentModTestCase(TestCase):
     """ Tests for the Content Modifier Class """
 
     def clear_mods(self):
-        ContentMod._modifiers = []
+        ContentFilter._modifiers = []
 
     def add_test_func(self):
-        ContentMod.register('test_func', test_func)
-        ContentMod.register('test_func_2', test_func_2)
-        ContentMod.register('test_func_3', test_func_3)
+        ContentFilter.register('test_func', test_func)
+        ContentFilter.register('test_func_2', test_func_2)
+        ContentFilter.register('test_func_3', test_func_3)
 
     def test_class_exists(self):
-        ContentMod
+        ContentFilter
 
     def test_register_class_method(self):
         self.clear_mods()
-        self.assertEqual([], ContentMod._modifiers)
+        self.assertEqual([], ContentFilter._modifiers)
 
         self.add_test_func()
         self.assertEqual([
             {'func': test_func, 'name': 'test_func'},
             {'func': test_func_2, 'name': 'test_func_2'},
             {'func': test_func_3, 'name': 'test_func_3'},
-        ], ContentMod._modifiers)
+        ], ContentFilter._modifiers)
 
     def test_modifier(self):
         self.clear_mods()
         self.add_test_func()
 
-        cm = ContentMod()
+        cm = ContentFilter()
         self.assertEqual([test_func, test_func_2, test_func_3], cm.modifiers())
 
     def test_modifiers_exclude_list(self):
         self.clear_mods()
         self.add_test_func()
 
-        cm = ContentMod()
+        cm = ContentFilter()
         self.assertEqual([test_func_2, test_func_3],
             cm.modifiers(exclude='test_func'))
 
     def test_getitem(self):
         self.clear_mods()
         self.add_test_func()
 
-        cm = ContentMod()
+        cm = ContentFilter()
         self.assertEqual(test_func_2, cm['test_func_2'])
 
     def test_modify_function_exists(self):

diff --git a/ostinato/tests/test_settings.py b/ostinato/tests/test_settings.py
@@ -14,13 +14,11 @@
 
     'ostinato',
 
+    # Pages
     'ostinato.tests.pages',
     'ostinato.pages',
-
-    # Tests for the blog
     'ostinato.tests.blog',
-
-    # 'ostinato.contentfilters',
+    'ostinato.contentfilters',
     # 'ostinato.statemachine',
 
     # Other dependencies

diff --git a/runtests.py b/runtests.py
@@ -16,6 +16,7 @@
         'ostinato.tests.pages',
         'ostinato.tests.statemachine',
         'ostinato.tests.blog',
+        'ostinato.tests.contentfilters',
     ])
 
     sys.exit(bool(failures))