feat: support sorting dict

Author: sean2077

jsonpath/__init__.py

@@ -2,7 +2,7 @@
 Author       : zhangxianbing1
 Date         : 2020-12-27 09:22:14
 LastEditors  : zhangxianbing1
-LastEditTime : 2021-01-04 10:27:22
+LastEditTime : 2021-01-04 10:50:28
 Description  : JSONPath
 """
 __version__ = "0.0.2"
@@ -212,20 +212,28 @@ def _trace(self, obj, i: int):
         # sort
         if step.startswith("/(") and step.endswith(")"):
             if isinstance(obj, list):
-                step = step[2:-1]
-                for sortby in step.split(",")[::-1]:
+                for sortby in step[2:-1].split(",")[::-1]:
                     if sortby.startswith("~"):
                         obj.sort(
                             key=lambda t, k=sortby: _getattr(t, k[1:]), reverse=True
                         )
                     else:
                         obj.sort(key=lambda t, k=sortby: _getattr(t, k))
-
+            elif isinstance(obj, dict):
+                obj = [(k, v) for k, v in obj.items()]
+                for sortby in step[2:-1].split(",")[::-1]:
+                    if sortby.startswith("~"):
+                        obj.sort(
+                            key=lambda t, k=sortby: _getattr(t[1], k[1:]), reverse=True
+                        )
+                    else:
+                        obj.sort(key=lambda t, k=sortby: _getattr(t[1], k))
+                obj = {k: v for k, v in obj}
             self._traverse(self._trace, obj, i + 1)
             return
 
 
 if __name__ == "__main__":
     with open("test/data/2.json", "rb") as f:
         d = json.load(f)
-    JSONPath("$.book[/(price)].price").parse(d)
+    JSONPath("$.scores[/(score)].score").parse(d)

test/conftest.py

@@ -1,44 +1,12 @@
-import pytest
+import json
 from collections import namedtuple
 
+import pytest
+
 TestCase = namedtuple("TestCase", ("expr", "data", "result"))
 
-data = {
-    "a.b c": "a.b c",
-    "book": [
-        {
-            "category": "reference",
-            "author": "Nigel Rees",
-            "title": "Sayings of the Century",
-            "price": 8.95,
-            "brand": {"version": "v1.0.0"},
-        },
-        {
-            "category": "fiction",
-            "author": "Evelyn Waugh",
-            "title": "Sword of Honour",
-            "price": 12.99,
-            "brand": {"version": "v0.0.1"},
-        },
-        {
-            "category": "fiction",
-            "author": "Herman Melville",
-            "title": "Moby Dick",
-            "isbn": "0-553-21311-3",
-            "price": 8.99,
-            "brand": {"version": "v1.0.2"},
-        },
-        {
-            "category": "fiction",
-            "author": "J. R. R. Tolkien",
-            "title": "The Lord of the Rings",
-            "isbn": "0-395-19395-8",
-            "price": 22.99,
-            "brand": {"version": "v1.0.3"},
-        },
-    ],
-    "bicycle": {"color": "red", "price": 19.95},
-}
+with open("test/data/2.json", "rb") as f:
+    data = json.load(f)
 
 
 @pytest.fixture(
@@ -75,6 +43,7 @@
             data,
             ["v0.0.1", "v1.0.0", "v1.0.2", "v1.0.3"],
         ),
+        TestCase("$.scores[/(score)].score", data, [60, 85, 90, 95, 100]),
     ]
 )
 def cases(request):

test/data/2.json

@@ -1,35 +1,69 @@
 {
-    "foo.bar": "foo.bar",
+    "a.b c": "a.b c",
     "book": [
         {
             "category": "reference",
             "author": "Nigel Rees",
             "title": "Sayings of the Century",
-            "price": 8.95
+            "price": 8.95,
+            "brand": {
+                "version": "v1.0.0"
+            }
         },
         {
             "category": "fiction",
             "author": "Evelyn Waugh",
             "title": "Sword of Honour",
-            "price": 12.99
+            "price": 12.99,
+            "brand": {
+                "version": "v0.0.1"
+            }
         },
         {
             "category": "fiction",
             "author": "Herman Melville",
             "title": "Moby Dick",
             "isbn": "0-553-21311-3",
-            "price": 8.99
+            "price": 8.99,
+            "brand": {
+                "version": "v1.0.2"
+            }
         },
         {
             "category": "fiction",
             "author": "J. R. R. Tolkien",
             "title": "The Lord of the Rings",
             "isbn": "0-395-19395-8",
-            "price": 22.99
+            "price": 22.99,
+            "brand": {
+                "version": "v1.0.3"
+            }
         }
     ],
     "bicycle": {
         "color": "red",
         "price": 19.95
+    },
+    "scores": {
+        "math": {
+            "score": 100,
+            "avg": 60
+        },
+        "english": {
+            "score": 95,
+            "avg": 80
+        },
+        "physic": {
+            "score": 90,
+            "avg": 70
+        },
+        "chemistry": {
+            "score": 85,
+            "avg": 80
+        },
+        "chinese": {
+            "score": 60,
+            "avg": 75
+        }
     }
 }