Merge branch 'master' into develop

CHANGES.md

@@ -1,5 +1,9 @@
 # Revision History
 
+## 0.7.2 (2016/03/30)
+
+- Now preserving order of `attr` decorators on `Dictionary` converters.
+
 ## 0.7.1 (2016/03/30)
 
 - Updated `String` to fetch `true` and `false` as strings.

tests/test_ordering.py

@@ -7,8 +7,15 @@
 from . import strip
 
 
+@yorm.attr(status=yorm.types.Boolean)
+@yorm.attr(label=yorm.types.String)
+class StatusDictionary(yorm.types.Dictionary):
+    """Sample dictionary converter with ordered attributes."""
+
+
 @yorm.attr(string=yorm.types.String)
 @yorm.attr(number_int=yorm.types.Integer)
+@yorm.attr(dictionary=StatusDictionary)
 @yorm.attr(number_real=yorm.types.Float)
 @yorm.attr(truthy=yorm.types.Boolean)
 @yorm.attr(falsey=yorm.types.Boolean)
@@ -25,10 +32,14 @@ def test_attribute_order_is_maintained(tmpdir):
     sample.number_real = 4.2
     sample.truthy = False
     sample.falsey = True
+    sample.dictionary['status'] = 1
 
     expect(sample.__mapper__.text) == strip("""
     string: Hello, world!
     number_int: 42
+    dictionary:
+      status: true
+      label: ''
     number_real: 4.2
     truthy: false
     falsey: true
@@ -44,13 +55,17 @@ def test_existing_files_are_reorderd(tmpdir):
         number_real: 3
         string: 4
         truthy: 5
+        dictionary: {label: foo}
         """))
     sample = Sample()
     sample.falsey = 0
 
     expect(sample.__mapper__.text) == strip("""
     string: 4
     number_int: 2
+    dictionary:
+      status: false
+      label: foo
     number_real: 3.0
     truthy: true
     falsey: false

yorm/__init__.py

@@ -3,7 +3,7 @@
 import sys
 
 __project__ = 'YORM'
-__version__ = '0.7.1'
+__version__ = '0.7.2'
 
 VERSION = __project__ + '-' + __version__
 

yorm/types/containers.py

@@ -21,8 +21,7 @@ def to_data(cls, value):
         value2 = cls.create_default()
         value2.update_value(value, strict=True)
 
-        data = {}
-
+        data = common.attrs[cls].__class__()
         for name, converter in common.attrs[cls].items():
             data[name] = converter.to_data(value2.get(name, None))