Rename Spec to SpecItem and SpecList to SpecItem.

Signed-off-by: Raphaël Barrois <raphael.barrois@polyconseil.fr>

3 files changed, 38 insertions, 38 deletions

diff --git a/tests/django_test_app/models.py b/tests/django_test_app/models.py
index df654e2..8e1f2ce 100644
--- a/tests/django_test_app/models.py
+++ b/tests/django_test_app/models.py
@@ -7,13 +7,13 @@ from semantic_version import django_fields as semver_fields
 
 class VersionModel(models.Model):
     version = semver_fields.VersionField(verbose_name='my version')
-    spec = semver_fields.SpecField(verbose_name='my spec')
-    speclist = semver_fields.SpecListField(verbose_name='my spec list')
+    spec = semver_fields.SpecItemField(verbose_name='my spec')
+    speclist = semver_fields.SpecField(verbose_name='my spec list')
 
 
 class PartialVersionModel(models.Model):
     partial = semver_fields.VersionField(partial=True, verbose_name='partial version')
     optional = semver_fields.VersionField(verbose_name='optional version', blank=True, null=True)
-    optional_spec = semver_fields.SpecField(verbose_name='optional spec', blank=True, null=True)
-    optional_speclist = semver_fields.SpecListField(verbose_name='optional spec list',
+    optional_spec = semver_fields.SpecItemField(verbose_name='optional spec', blank=True, null=True)
+    optional_speclist = semver_fields.SpecField(verbose_name='optional spec list',
         blank=True, null=True)
diff --git a/tests/test_base.py b/tests/test_base.py
index 49133c1..41ec6cf 100755
--- a/tests/test_base.py
+++ b/tests/test_base.py
@@ -161,25 +161,25 @@ class VersionTestCase(unittest.TestCase):
         )
 
 
-class SpecTestCase(unittest.TestCase):
+class SpecItemTestCase(unittest.TestCase):
     components = {
-        '==0.1.0': (base.Spec.KIND_EQUAL, 0, 1, 0, None, None),
-        '==0.1.2-rc3': (base.Spec.KIND_EQUAL, 0, 1, 2, ('rc3',), None),
-        '==0.1.2+build3.14': (base.Spec.KIND_EQUAL, 0, 1, 2, (), ('build3', '14')),
-        '<=0.1.1+': (base.Spec.KIND_LTE, 0, 1, 1, (), ()),
-        '<0.1.1': (base.Spec.KIND_LT, 0, 1, 1, None, None),
-        '<=0.1.1': (base.Spec.KIND_LTE, 0, 1, 1, None, None),
-        '>=0.2.3-rc2': (base.Spec.KIND_GTE, 0, 2, 3, ('rc2',), None),
-        '>0.2.3-rc2+': (base.Spec.KIND_GT, 0, 2, 3, ('rc2',), ()),
-        '>=2.0.0': (base.Spec.KIND_GTE, 2, 0, 0, None, None),
-        '!=0.1.1+': (base.Spec.KIND_NEQ, 0, 1, 1, (), ()),
-        '!=0.3.0': (base.Spec.KIND_NEQ, 0, 3, 0, None, None),
+        '==0.1.0': (base.SpecItem.KIND_EQUAL, 0, 1, 0, None, None),
+        '==0.1.2-rc3': (base.SpecItem.KIND_EQUAL, 0, 1, 2, ('rc3',), None),
+        '==0.1.2+build3.14': (base.SpecItem.KIND_EQUAL, 0, 1, 2, (), ('build3', '14')),
+        '<=0.1.1+': (base.SpecItem.KIND_LTE, 0, 1, 1, (), ()),
+        '<0.1.1': (base.SpecItem.KIND_LT, 0, 1, 1, None, None),
+        '<=0.1.1': (base.SpecItem.KIND_LTE, 0, 1, 1, None, None),
+        '>=0.2.3-rc2': (base.SpecItem.KIND_GTE, 0, 2, 3, ('rc2',), None),
+        '>0.2.3-rc2+': (base.SpecItem.KIND_GT, 0, 2, 3, ('rc2',), ()),
+        '>=2.0.0': (base.SpecItem.KIND_GTE, 2, 0, 0, None, None),
+        '!=0.1.1+': (base.SpecItem.KIND_NEQ, 0, 1, 1, (), ()),
+        '!=0.3.0': (base.SpecItem.KIND_NEQ, 0, 3, 0, None, None),
     }
 
     def test_components(self):
         for spec_text, components in self.components.items():
             kind, major, minor, patch, prerelease, build = components
-            spec = base.Spec(spec_text)
+            spec = base.SpecItem(spec_text)
 
             self.assertEqual(kind, spec.kind)
             self.assertEqual(major, spec.spec.major)
@@ -244,7 +244,7 @@ class SpecTestCase(unittest.TestCase):
 
     def test_matches(self):
         for spec_text, versions in self.matches.items():
-            spec = base.Spec(spec_text)
+            spec = base.SpecItem(spec_text)
             matching, failing = versions
 
             for version_text in matching:
@@ -260,22 +260,22 @@ class SpecTestCase(unittest.TestCase):
                     "%r should not match %r" % (version, spec))
 
     def test_equality(self):
-        spec1 = base.Spec('==0.1.0')
-        spec2 = base.Spec('==0.1.0')
+        spec1 = base.SpecItem('==0.1.0')
+        spec2 = base.SpecItem('==0.1.0')
         self.assertEqual(spec1, spec2)
         self.assertFalse(spec1 == '==0.1.0')
 
     def test_to_string(self):
-        spec = base.Spec('==0.1.0')
+        spec = base.SpecItem('==0.1.0')
         self.assertEqual('==0.1.0', str(spec))
-        self.assertEqual(base.Spec.KIND_EQUAL, spec.kind)
+        self.assertEqual(base.SpecItem.KIND_EQUAL, spec.kind)
 
     def test_hash(self):
         self.assertEqual(1,
-            len(set([base.Spec('==0.1.0'), base.Spec('==0.1.0')])))
+            len(set([base.SpecItem('==0.1.0'), base.SpecItem('==0.1.0')])))
 
 
-class SpecListTestCase(unittest.TestCase):
+class SpecTestCase(unittest.TestCase):
     examples = {
         '>=0.1.1,<0.1.2': ['>=0.1.1', '<0.1.2'],
         '>=0.1.0,!=0.1.3-rc1,<0.1.3': ['>=0.1.0', '!=0.1.3-rc1', '<0.1.3'],
@@ -283,14 +283,14 @@ class SpecListTestCase(unittest.TestCase):
 
     def test_parsing(self):
         for spec_list_text, specs in self.examples.items():
-            spec_list = base.SpecList(spec_list_text)
+            spec_list = base.Spec(spec_list_text)
 
             self.assertEqual(spec_list_text, str(spec_list))
             self.assertNotEqual(spec_list_text, spec_list)
             self.assertEqual(specs, [str(spec) for spec in spec_list])
 
             for spec_text in specs:
-                self.assertTrue(repr(base.Spec(spec_text)) in repr(spec_list))
+                self.assertTrue(repr(base.SpecItem(spec_text)) in repr(spec_list))
 
     split_examples = {
         ('>=0.1.1', '<0.1.2', '!=0.1.1+build1'): ['>=0.1.1', '<0.1.2', '!=0.1.1+build1'],
@@ -299,14 +299,14 @@ class SpecListTestCase(unittest.TestCase):
 
     def test_parsing_split(self):
         for spec_list_texts, specs in self.split_examples.items():
-            spec_list = base.SpecList(*spec_list_texts)
+            spec_list = base.Spec(*spec_list_texts)
 
             self.assertEqual(','.join(spec_list_texts), str(spec_list))
             self.assertEqual(specs, [str(spec) for spec in spec_list])
-            self.assertEqual(spec_list, base.SpecList(','.join(spec_list_texts)))
+            self.assertEqual(spec_list, base.Spec(','.join(spec_list_texts)))
 
             for spec_text in specs:
-                self.assertTrue(repr(base.Spec(spec_text)) in repr(spec_list))
+                self.assertTrue(repr(base.SpecItem(spec_text)) in repr(spec_list))
 
     matches = {
         '>=0.1.1,<0.1.2': (
@@ -322,7 +322,7 @@ class SpecListTestCase(unittest.TestCase):
 
     def test_matches(self):
         for spec_list_text, versions in self.matches.items():
-            spec_list = base.SpecList(spec_list_text)
+            spec_list = base.Spec(spec_list_text)
             matching, failing = versions
 
             for version_text in matching:
@@ -341,17 +341,17 @@ class SpecListTestCase(unittest.TestCase):
 
     def test_equality(self):
         for spec_list_text in self.examples:
-            slist1 = base.SpecList(spec_list_text)
-            slist2 = base.SpecList(spec_list_text)
+            slist1 = base.Spec(spec_list_text)
+            slist2 = base.Spec(spec_list_text)
             self.assertEqual(slist1, slist2)
             self.assertFalse(slist1 == spec_list_text)
 
     def test_contains(self):
-        self.assertFalse('ii' in base.SpecList('>=0.1.1'))
+        self.assertFalse('ii' in base.Spec('>=0.1.1'))
 
     def test_hash(self):
         self.assertEqual(1,
-            len(set([base.SpecList('>=0.1.1'), base.SpecList('>=0.1.1')])))
+            len(set([base.Spec('>=0.1.1'), base.Spec('>=0.1.1')])))
 
 
 if __name__ == '__main__':  # pragma: no cover
diff --git a/tests/test_django.py b/tests/test_django.py
index d8eef7d..5768c47 100644
--- a/tests/test_django.py
+++ b/tests/test_django.py
@@ -38,14 +38,14 @@ class DjangoFieldTestCase(unittest.TestCase):
         obj = models.VersionModel(version='0.1.1', spec='>0.1.0', speclist='==0.1.1,!=0.1.1-alpha')
 
         self.assertEqual(semantic_version.Version('0.1.1'), obj.version)
-        self.assertEqual(semantic_version.Spec('>0.1.0'), obj.spec)
-        self.assertEqual(semantic_version.SpecList('==0.1.1,!=0.1.1-alpha'), obj.speclist)
+        self.assertEqual(semantic_version.SpecItem('>0.1.0'), obj.spec)
+        self.assertEqual(semantic_version.Spec('==0.1.1,!=0.1.1-alpha'), obj.speclist)
 
         alt_obj = models.VersionModel(version=obj.version, spec=obj.spec, speclist=obj.speclist)
 
         self.assertEqual(semantic_version.Version('0.1.1'), alt_obj.version)
-        self.assertEqual(semantic_version.Spec('>0.1.0'), alt_obj.spec)
-        self.assertEqual(semantic_version.SpecList('==0.1.1,!=0.1.1-alpha'), alt_obj.speclist)
+        self.assertEqual(semantic_version.SpecItem('>0.1.0'), alt_obj.spec)
+        self.assertEqual(semantic_version.Spec('==0.1.1,!=0.1.1-alpha'), alt_obj.speclist)
         self.assertEqual(obj.spec, alt_obj.spec)
         self.assertEqual(obj.version, alt_obj.version)
         self.assertEqual(obj.speclist, alt_obj.speclist)