Test suite runs and passes!

[zzz-floof.git] / floof / model / tags.py

diff --git a/floof/model/tags.py b/floof/model/tags.py
index 1a41278..c3ea907 100644 (file)
--- a/floof/model/tags.py
+++ b/floof/model/tags.py
@@ -1,46 +1,20 @@
 from elixir import *
 from art import Art
-from floof.lib.dbhelpers import find_or_create, update_or_create
-
 
 class Tag(Entity):
     # look into how ondelete works.  This just sets a database property.
-    art = ManyToOne('Art', ondelete='cascade')
-    tagger = ManyToOne('User', ondelete='cascade')
-    tagtext = ManyToOne('TagText')
+    art = ManyToOne('Art', ondelete='cascade', required=True)
+    tagger = ManyToOne('User', ondelete='cascade', required=True)
+    tagtext = ManyToOne('TagText', required=True)
 
     def __unicode__(self):
         if not self.tagtext:
             return "(broken)"
         return unicode(self.tagtext)
 
-
 class TagText(Entity):
-    text = Field(Unicode(50)) # gotta enforce this somehow
+    text = Field(Unicode(50), required=True) # gotta enforce this somehow
     tags = OneToMany('Tag')
 
     def __unicode__(self):
         return self.text
-
-
-class TagMixin(object):
-    def add_tags(self, tags, user):
-        for text in tags.split():
-            if text[0] == '-':
-                # Nega-tags
-                tagtext = TagText.get_by(text=text[1:])
-                if tagtext:
-                    tag = Tag.get_by(art=self, tagger=user, tagtext=tagtext)
-                    if tag:
-                        elixir.session.delete(tag)
-
-            else:
-                if len(text) > 50:
-                    raise "Long Tag!" # can we handle this more gracefully?
-                # sqlite seems happy to store strings much longer than the supplied limit...
-
-                # elixir should really have its own find_or_create.
-                tagtext = find_or_create(TagText, text=text)
-                tag     = find_or_create(Tag, art=self, tagger=user, tagtext=tagtext)
-                
-Art.__bases__ += (TagMixin, )