Changeset 115:20f6691fd32f

Timestamp:

02/21/10 17:57:49 (7 months ago)

Author:

Roger Gammans <rgammans@…>

Branch:

default

Message:

Generalise reference attribute type.

• Update FindBestType? to search through bases classes for a match too.
• Improve attribute test.

Files:

• MysteryMachine/schema/MMAttributeValue.py (modified) (2 diffs)
• MysteryMachine/schema/MMObject.py (modified) (1 diff)
• tests/attribTest.py (modified) (2 diffs)
• tests/attribValueTest.py (modified) (1 diff)

MysteryMachine/schema/MMAttributeValue.py

@@ -82 +82 @@
     """
     """
-    #Handle base class and more sets in the key. 
-    return (sorted(TypeLookup[atype],key=operator.itemgetter(1),reverse= True ))[0][0]
+    #Handle base class and more sets in the key get a list 
+    # of classes to use for candidate handlers. 
+    candidates = list()
+    try:
+        typelist = atype.__mro__
+    except:
+        typelist = list(atype)
+
+    #Collect the handlers for the functions.
+    for t in typelist:
+        if t in TypeLookup:
+            candidates += TypeLookup[t]
+    
+    modlogger.debug("candiate attrval's %s" % candidates)
+    rlist = sorted(candidates,key=operator.itemgetter(1),
+                    reverse= True )
+    return rlist[0][0]
 
 
@@ -144 +159 @@
     return str(self.__class__)+"(\""+self.get_raw()+"\")"
 
+
+  def __str__(self):
+    return self.get_raw()
+
   def get_raw(self, obj = None):
     """

MysteryMachine/schema/MMObject.py

@@ -220 +220 @@
 
 
-class MMAttributeValue_MMObjectRef(MMAttributeValue):
-    """
-    """
-    typename = "objectref"
-    contain_prefs = { MMObject: 100 }
+class MMAttributeValue_MMRef(MMAttributeValue):
+    """
+    """
+    typename = "ref"
+    contain_prefs = { MMBase: 50 }
 
     def __init__(self,*args,**kwargs):
-        super(MMAttributeValue_MMObjectRef, self).__init__(*args,**kwargs)
-        if isinstance(self.value,MMObject):
+        super(MMAttributeValue_MMRef, self).__init__(*args,**kwargs)
+        if isinstance(self.value,MMBase):
             #Get string represenation of the object.
             #TODO Store object here so it cached.
             self.parts['obj'] = repr(self.value)
-        
+            
         if not self._validate(): raise Error()    
         #All ok.

tests/attribTest.py

@@ -32 +32 @@
         return self.x
 
+class fakeParent:
+    def __init__(self):
+        self.updated = False
+    def Updated(self):
+        return self.updated
+
+    def __setitem__(self,name,val):
+        self.updated = True
+    def resetUpdate(self):
+        self.updated = False
 class attribTest(unittest.TestCase):
     
@@ -42 +52 @@
     # Test MMObject fetching
     # Test handling of parse errors.
+    # Test AttributeValue export resolution.
+    def testAttrValExport(self):
+       attr=MMAttribute("document","test\n----\n\n\nA Message",None)
+       self.assertEquals("test\n----\n\n\nA Message",attr.get_raw())
+
+    def testAttrParentStuff(self):
+       p = fakeParent()
+       attr=MMAttribute("document","test\n----\n\n\nA Message",p)
+       self.assertTrue(p is attr.get_owner())
+       v = attr.get_value()
+
+       attr.set_value("diff")
+       self.assertTrue(p.Updated())
+       v1 = attr.get_value()
+       self.assertEquals("diff",str(v1))
+
 def getTestNames():
-        return [ 'attribTest.attribTest' ] 
+    return [ 'attribTest.attribTest' ] 
 
 if __name__ == '__main__':

tests/attribValueTest.py

@@ -76 +76 @@
         self.assertEqual(self.objrefB.get_object(self.objA) , self.objB )
 
-
     def makeRef(self):
-        self.objrefA = MMAttributeValue_MMObjectRef( value = self.objA )
-        self.objrefB = MMAttributeValue_MMObjectRef( value = self.objB )        
+        self.objrefA = MMAttributeValue_MMRef( value = self.objA )
+        self.objrefB = MMAttributeValue_MMRef( value = self.objB )