Merge branch 'master' into issue-240

Author: bdscharf

CONTRIBUTING.rst

@@ -50,7 +50,7 @@ You need to install some dependencies to develop on flask-restx:
 
     $ pip install -e .[dev]
 
-An Invoke ``tasks.py`` is provided to simplify the common tasks:
+An [Invoke](http://www.pyinvoke.org/) ``tasks.py`` is provided to simplify the common tasks:
 
 .. code-block:: console
 

flask_restx/fields.py

@@ -864,7 +864,12 @@ def output(self, key, obj, ordered=False):
                     # we are using pop() so that we don't
                     # loop over the whole object every time dropping the
                     # complexity to O(n)
-                    (objkey, val) = self._flat.pop()
+                    if ordered:
+                        # Get first element if respecting order
+                        (objkey, val) = self._flat.pop(0)
+                    else:
+                        # Previous default retained
+                        (objkey, val) = self._flat.pop()
                     if (
                         objkey not in self._cache
                         and objkey not in self.exclude

flask_restx/marshalling.py

@@ -76,7 +76,7 @@ def marshal(data, fields, envelope=None, skip_none=False, mask=None, ordered=Fal
                     if keys:
                         field.exclude |= set(keys)
                         keys = []
-                value = field.output(dkey, data)
+                value = field.output(dkey, data, ordered=ordered)
                 if is_wildcard:
 
                     def _append(k, v):

package.json

@@ -1,6 +1,6 @@
 {
   "name": "flask-restx",
-  "version": "0.4.1.dev",
+  "version": "0.4.1-dev",
   "description": "Fully featured framework for fast, easy and documented API development with Flask",
   "repository": "python-restx/flask-restx",
   "keywords": [
@@ -10,7 +10,7 @@
   "author": "python-restx authors",
   "license": "BSD-3-Clause",
   "dependencies": {
-    "swagger-ui-dist": "^3.4.0",
+    "swagger-ui-dist": "^3.48.0",
     "typeface-droid-sans": "0.0.40"
   }
 }

tests/test_marshalling.py

@@ -221,6 +221,21 @@ def test_marshal_nested(self):
 
         assert output == expected
 
+    def test_marshal_ordered(self):
+        model = OrderedDict(
+            [("foo", fields.Raw), ("baz", fields.Raw), ("bar", fields.Raw)]
+        )
+        marshal_fields = {
+            "foo": 1,
+            "baz": 2,
+            "bar": 3
+        }
+        expected_ordered = OrderedDict([("foo", 1), ("baz", 2), ("bar", 3)])
+        ordered_output = marshal(marshal_fields, model, ordered=True)
+        assert ordered_output == expected_ordered
+        unordered_output = marshal(marshal_fields, model)
+        assert not isinstance(unordered_output, OrderedDict)
+
     def test_marshal_nested_ordered(self):
         model = OrderedDict(
             [("foo", fields.Raw), ("fee", fields.Nested({"fye": fields.String,}))]