From 053bfce73949db2f275312f40487a949ea2a43fd Mon Sep 17 00:00:00 2001
From: cortadocodes <cortado.codes@protonmail.com>
Date: Mon, 3 May 2021 16:29:00 +0100
Subject: [PATCH 1/2] IMP: Allow tags to contain capitals and forward slashes

---
 octue/resources/tag.py        |  2 +-
 tests/mixins/test_taggable.py | 11 -----------
 tests/resources/test_tag.py   | 12 ++++++++++++
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/octue/resources/tag.py b/octue/resources/tag.py
index b3657c990..a6cf9464d 100644
--- a/octue/resources/tag.py
+++ b/octue/resources/tag.py
@@ -8,7 +8,7 @@
 from octue.utils.encoders import OctueJSONEncoder
 
 
-TAG_PATTERN = re.compile(r"^$|^[a-z0-9][a-z0-9:\-]*(?<![:-])$")
+TAG_PATTERN = re.compile(r"^$|^[A-Za-z0-9/][A-Za-z0-9:\-/]*(?<![:-])$")
 
 
 class Tag(Filterable):
diff --git a/tests/mixins/test_taggable.py b/tests/mixins/test_taggable.py
index 04a27a914..597b17757 100644
--- a/tests/mixins/test_taggable.py
+++ b/tests/mixins/test_taggable.py
@@ -24,9 +24,6 @@ def test_instantiates_with_tags(self):
         taggable = MyTaggable(tags="a b c")
         self.assertEqual(set(taggable.tags), {Tag("a"), Tag("b"), Tag("c")})
 
-        with self.assertRaises(exceptions.InvalidTagException):
-            MyTaggable(tags=":a b c")
-
     def test_instantiates_with_tag_set(self):
         """Ensures datafile inherits correctly from the Taggable class and passes arguments through"""
         taggable_1 = MyTaggable(tags="")
@@ -76,14 +73,6 @@ def test_valid_tags(self):
             },
         )
 
-    def test_invalid_tags(self):
-        """Ensures invalid tags raise an error"""
-        taggable = MyTaggable()
-
-        for tag in "-bah", "humbug:", "SHOUTY", r"back\slashy", {"not-a": "string"}:
-            with self.assertRaises(exceptions.InvalidTagException):
-                taggable.add_tags(tag)
-
     def test_mixture_valid_invalid(self):
         """Ensures that adding a variety of tags, some of which are invalid, doesn't partially add them to the object"""
         taggable = MyTaggable()
diff --git a/tests/resources/test_tag.py b/tests/resources/test_tag.py
index ac2e57d0d..7933d7280 100644
--- a/tests/resources/test_tag.py
+++ b/tests/resources/test_tag.py
@@ -1,9 +1,21 @@
+from octue import exceptions
 from octue.resources.filter_containers import FilterList, FilterSet
 from octue.resources.tag import Tag, TagSet
 from tests.base import BaseTestCase
 
 
 class TestTag(BaseTestCase):
+    def test_invalid_tags_cause_error(self):
+        """Test that invalid tags cause an error to be raised."""
+        for tag in ":a", "@", "a_b", "-bah", "humbug:", r"back\slashy", {"not-a": "string"}:
+            with self.assertRaises(exceptions.InvalidTagException):
+                Tag(tag)
+
+    def test_valid_tags(self):
+        """Test that valid tags instantiate as expected."""
+        for tag in "hello", "hello:world", "hello-world:goodbye", "HELLO-WORLD", "Asia/Pacific":
+            Tag(tag)
+
     def test_subtags(self):
         """ Test that subtags are correctly parsed from tags. """
         self.assertEqual(Tag("a:b:c").subtags, FilterList([Tag("a"), Tag("b"), Tag("c")]))

From 7ff84cb60bedb7f1749da865055f7c740793222c Mon Sep 17 00:00:00 2001
From: cortadocodes <cortado.codes@protonmail.com>
Date: Mon, 3 May 2021 17:31:24 +0100
Subject: [PATCH 2/2] FIX: Disallow slashes at start or end of tag

---
 octue/resources/tag.py      | 6 +++---
 tests/resources/test_tag.py | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/octue/resources/tag.py b/octue/resources/tag.py
index a6cf9464d..3c0dfee3c 100644
--- a/octue/resources/tag.py
+++ b/octue/resources/tag.py
@@ -8,12 +8,12 @@
 from octue.utils.encoders import OctueJSONEncoder
 
 
-TAG_PATTERN = re.compile(r"^$|^[A-Za-z0-9/][A-Za-z0-9:\-/]*(?<![:-])$")
+TAG_PATTERN = re.compile(r"^$|^[A-Za-z0-9][A-Za-z0-9:\-/]*(?<![/:-])$")
 
 
 class Tag(Filterable):
-    """A tag starts and ends with a character in [a-z] or [0-9]. It can contain the colon discriminator or hyphens.
-    Empty strings are also valid. More valid examples:
+    """A tag starts and ends with a character in [A-Za-z0-9]. It can contain the colon discriminator, forward slashes
+    or hyphens. Empty strings are also valid. More valid examples:
        system:32
        angry-marmaduke
        mega-man:torso:component:12
diff --git a/tests/resources/test_tag.py b/tests/resources/test_tag.py
index 7933d7280..442cd7d08 100644
--- a/tests/resources/test_tag.py
+++ b/tests/resources/test_tag.py
@@ -7,7 +7,7 @@
 class TestTag(BaseTestCase):
     def test_invalid_tags_cause_error(self):
         """Test that invalid tags cause an error to be raised."""
-        for tag in ":a", "@", "a_b", "-bah", "humbug:", r"back\slashy", {"not-a": "string"}:
+        for tag in ":a", "@", "a_b", "-bah", "humbug:", r"back\slashy", {"not-a": "string"}, "/a", "a/":
             with self.assertRaises(exceptions.InvalidTagException):
                 Tag(tag)