Ungenericized get_item_queryset and added tag/issue queryset fetching methods to...

[philo.git] / models / fields.py

diff --git a/models/fields.py b/models/fields.py
index 7f76b9c..0289e57 100644 (file)
--- a/models/fields.py
+++ b/models/fields.py
@@ -1,96 +1,63 @@
+from django import forms

 from django.db import models
 from django.db import models

-from django.db.models import signals
-from django.core.exceptions import ObjectDoesNotExist, FieldError
-from django.contrib.contenttypes.models import ContentType
-from functools import partial
-from philo.models.base import Attribute, Relationship, Entity
+from django.utils import simplejson as json
+from philo.forms.fields import JSONFormField
+from philo.validators import TemplateValidator, json_validator

 
 
 
 

-__all__ = ('AttributeField', 'RelationshipField')
+class TemplateField(models.TextField):
+       def __init__(self, allow=None, disallow=None, secure=True, *args, **kwargs):
+               super(TemplateField, self).__init__(*args, **kwargs)
+               self.validators.append(TemplateValidator(allow, disallow, secure))

 
 
 
 

-class AttributeFieldDescriptor(object):
+class JSONDescriptor(object):

        def __init__(self, field):
                self.field = field
        
        def __get__(self, instance, owner):
        def __init__(self, field):
                self.field = field
        
        def __get__(self, instance, owner):

-               if instance:
-                       try:
-                               return instance.attribute_set.get(key__exact=self.field.key).value
-                       except ObjectDoesNotExist:
-                               return None
-               else:
-                       raise AttributeError('The \'%s\' attribute can only be accessed from %s instances.' % (self.field.name, owner.__name__))
+               if instance is None:
+                       raise AttributeError # ?
+               
+               if self.field.name not in instance.__dict__:
+                       json_string = getattr(instance, self.field.attname)
+                       instance.__dict__[self.field.name] = json.loads(json_string)
+               
+               return instance.__dict__[self.field.name]

        
        def __set__(self, instance, value):
        
        def __set__(self, instance, value):

-               try:
-                       attribute = instance.attribute_set.get(key__exact=self.field.key)
-               except ObjectDoesNotExist:
-                       attribute = Attribute()
-                       attribute.entity = instance
-                       attribute.key = self.field.key
-               attribute.value = value
-               attribute.save()
+               instance.__dict__[self.field.name] = value
+               setattr(instance, self.field.attname, json.dumps(value))

        
        def __delete__(self, instance):
        
        def __delete__(self, instance):

-               instance.attribute_set.filter(key__exact=self.field.key).delete()
+               del(instance.__dict__[self.field.name])
+               setattr(instance, self.field.attname, json.dumps(None))

 
 
 
 

-class AttributeField(object):
-       def __init__(self, key):
-               self.key = key
+class JSONField(models.TextField):
+       default_validators = [json_validator]

        
        

-       def actually_contribute_to_class(self, sender, **kwargs):
-               setattr(sender, self.name, AttributeFieldDescriptor(self))
+       def get_attname(self):
+               return "%s_json" % self.name

        
        def contribute_to_class(self, cls, name):
        
        def contribute_to_class(self, cls, name):

-               if issubclass(cls, Entity):
-                       self.name = name
-                       signals.class_prepared.connect(self.actually_contribute_to_class, sender=cls)
-               else:
-                       raise FieldError('AttributeFields can only be declared on Entity subclasses.')
-
-
-class RelationshipFieldDescriptor(object):
-       def __init__(self, field):
-               self.field = field
-       
-       def __get__(self, instance, owner):
-               if instance:
-                       try:
-                               return instance.relationship_set.get(key__exact=self.field.key).value
-                       except ObjectDoesNotExist:
-                               return None
-               else:
-                       raise AttributeError('The \'%s\' attribute can only be accessed from %s instances.' % (self.field.name, owner.__name__))
-       
-       def __set__(self, instance, value):
-               if isinstance(value, (models.Model, type(None))):
-                       try:
-                               relationship = instance.relationship_set.get(key__exact=self.field.key)
-                       except ObjectDoesNotExist:
-                               relationship = Relationship()
-                               relationship.entity = instance
-                               relationship.key = self.field.key
-                       relationship.value = value
-                       relationship.save()
-               else:
-                       raise AttributeError('The \'%\' attribute can only be set using existing Model objects.' % self.field.name)
-       
-       def __delete__(self, instance):
-               instance.relationship_set.filter(key__exact=self.field.key).delete()
-
-
-class RelationshipField(object):
-       def __init__(self, key):
-               self.key = key
-       
-       def actually_contribute_to_class(self, sender, **kwargs):
-               setattr(sender, self.name, RelationshipFieldDescriptor(self))
-       
-       def contribute_to_class(self, cls, name):
-               if issubclass(cls, Entity):
-                       self.name = name
-                       signals.class_prepared.connect(self.actually_contribute_to_class, sender=cls)
-               else:
-                       raise FieldError('RelationshipFields can only be declared on Entity subclasses.')
\ No newline at end of file
+               super(JSONField, self).contribute_to_class(cls, name)
+               setattr(cls, name, JSONDescriptor(self))
+               models.signals.pre_init.connect(self.fix_init_kwarg, sender=cls)
+       
+       def fix_init_kwarg(self, sender, args, kwargs, **signal_kwargs):
+               if self.name in kwargs:
+                       kwargs[self.attname] = json.dumps(kwargs.pop(self.name))
+       
+       def formfield(self, *args, **kwargs):
+               kwargs["form_class"] = JSONFormField
+               return super(JSONField, self).formfield(*args, **kwargs)
+
+
+try:
+       from south.modelsinspector import add_introspection_rules
+except ImportError:
+       pass
+else:
+       add_introspection_rules([], ["^philo\.models\.fields\.TemplateField"])
+       add_introspection_rules([], ["^philo\.models\.fields\.JSONField"])
\ No newline at end of file