Changeset 90:a8d83de5b460 for nagslang

Timestamp:

09/02/13 00:18:50 (8 years ago)

Author:

Stefano Rivera <stefano@…>

Branch:

default

Phase:

public

Amend:

63393330313363613231316330613166373636623937663033313537396430393532623165393632

Message:

Dump our YAML subset too

Location:

nagslang

Files:

• level_serializer.py (modified) (2 diffs)
• tests/test_level_serializer.py (modified) (2 diffs)

nagslang/level_serializer.py

@@ -6 +6 @@
 
 import re
-# TODO: Dump pyyaml
-import yaml
 
 
 def dump(data, file_object):
-    yaml.dump(data, file_object, default_flow_style=False)
+    file_object.write('\n'.join(_dump(data, 0)))
+
+
+def _dump(obj, indent):
+    if isinstance(obj, list):
+        for item in obj:
+            yield '%s- %s' % (' ' * indent,
+                              '\n'.join(_dump(item, indent + 2)).strip())
+    elif isinstance(obj, dict):
+        for k, v in obj.iteritems():
+            if isinstance(v, basestring):
+                yield '%s%s: %s' % (' ' * indent, k, v)
+            else:
+                extra = 0 if isinstance(v, list) else 2
+                yield '%s%s:\n%s' % (' ' * indent, k,
+                                     '\n'.join(_dump(v, indent + extra)))
+    elif isinstance(obj, basestring):
+        yield '%s%s' % (' ' * indent, obj)
 
 
@@ -56 +71 @@
             parent_key = None
 
-        while lm and lm.group(2).startswith('-'):
+        while lm and lm.group(2).startswith('- '):
             # Nested lists
             prefix, line = lm.groups()

nagslang/tests/test_level_serializer.py

@@ -1 @@
-from unittest import TestCase
+from unittest import TestCase, SkipTest
 from StringIO import StringIO
+
+try:
+    import yaml
+except ImportError:
+    yaml = None  # pyflakes:ignore
 
 from nagslang.level_serializer import load, dump
 
 
-class TestSimple(TestCase):
+class TestRoundTrip(TestCase):
     def roundtrip(self, data):
         f = StringIO()
+        self.dump(data, f)
+        f.seek(0)
+        print '\n=== Begin ===\n%s\n=== End ===' % f.buf.rstrip()
+        self.assertEqual(self.load(f), data)
+
+    def dump(self, data, f):
         dump(data, f)
-        f.seek(0)
-        #print '\n== Begin ==\n%s== End ==' % f.buf
-        self.assertEqual(load(f), data)
+
+    def load(self, f):
+        return load(f)
 
     def test_simple_dict(self):
@@ -46 +57 @@
             ],
         })
+
+
+class TestFromPyYAML(TestRoundTrip):
+    def dump(self, data, f):
+        if yaml is None:
+            raise SkipTest('yaml module unavailable')
+        yaml.dump(data, f, default_flow_style=False)
+
+
+class TestToPyYAML(TestRoundTrip):
+    def load(self, f):
+        if yaml is None:
+            raise SkipTest('yaml module unavailable')
+        return yaml.load(f)