Merge pull request #2 from krukle/dev

Release 0.0.3

Author: krukle

KalmarKommun.Datalager.Sort.Tests/KalmarKommun.Datalager.Sort.Tests.cs

@@ -1,4 +1,3 @@
-using Newtonsoft.Json.Linq;
 using NUnit.Framework;
 using System.Collections.Generic;
 
@@ -16,31 +15,11 @@ public void TestSortAscendingByParsedIntThenDescendingByText()
 
             var input = new Parameters
             {
-                ListToSort = JArray.FromObject(
-                    new List<Dictionary<string, string>>{
-                        new Dictionary<string, string> {
-                            { "season", "autum-2023" },
-                            { "month", "october" }
-                        },
-                        new Dictionary<string, string> {
-                            { "season", "spring-2022" }
-                        },
-                        new Dictionary<string, string> {
-                            { "season", "autum-2022" },
-                            { "month", "november" }
-                        },
-                        new Dictionary<string, string> {
-                            { "season", "spring-2023" }
-                        }
-                    }
-                ),
-                Key = JToken.FromObject("season")
-            };
-
-            var ret = Sort.SortAscendingByParsedIntThenDescendingByText(input, new System.Threading.CancellationToken());
-
-            Assert.That(ret.SortedList, Is.EqualTo(JArray.FromObject(
-                new List<Dictionary<string, string>> {
+                ListToSort = new List<Dictionary<string, string>> {
+                    new Dictionary<string, string> {
+                        { "season", "autum-2023" },
+                        { "month", "october" }
+                    },
                     new Dictionary<string, string> {
                         { "season", "spring-2022" }
                     },
@@ -50,12 +29,29 @@ public void TestSortAscendingByParsedIntThenDescendingByText()
                     },
                     new Dictionary<string, string> {
                         { "season", "spring-2023" }
-                    },
-                    new Dictionary<string, string> {
-                        { "season", "autum-2023" },
-                        { "month", "october" }
                     }
-                })));
+                },
+                Key = "season"
+            };
+
+            var ret = Sort.SortAscendingByParsedIntThenDescendingByText(input, new System.Threading.CancellationToken());
+
+            Assert.That(ret.SortedList, Is.EqualTo(new List<Dictionary<string, string>> {
+                new Dictionary<string, string> {
+                    { "season", "spring-2022" }
+                },
+                new Dictionary<string, string> {
+                    { "season", "autum-2022" },
+                    { "month", "november" }
+                },
+                new Dictionary<string, string> {
+                    { "season", "spring-2023" }
+                },
+                new Dictionary<string, string> {
+                    { "season", "autum-2023" },
+                    { "month", "october" }
+                }
+            }));
         }
     }
 }

KalmarKommun.Datalager.Sort/Definition.cs

@@ -1,6 +1,6 @@
 #pragma warning disable 1591
 
-using Newtonsoft.Json.Linq;
+using System.Collections.Generic;
 using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 
@@ -16,14 +16,14 @@ public class Parameters
         /// </summary>
         [DisplayFormat(DataFormatString = "Expression")]
         [DefaultValue(null)]
-        public JArray ListToSort { get; set; }
+        public List<Dictionary<string, string>> ListToSort { get; set; }
 
         /// <summary>
         /// Key of which value in dictionaries to sort list by.
         /// </summary>
         [DisplayFormat(DataFormatString = "Text")]
         [DefaultValue("")]
-        public JToken Key { get; set; }
+        public string Key { get; set; }
     }
 
     public class Result
@@ -32,6 +32,6 @@ public class Result
         /// Contains SortedList which is ListToSort, sorted by the provided Key.
         /// </summary>
         [DisplayFormat(DataFormatString = "Expression")]
-        public JArray SortedList;
+        public List<Dictionary<string, string>> SortedList;
     }
 }

KalmarKommun.Datalager.Sort/KalmarKommun.Datalager.Sort.cs

@@ -1,5 +1,4 @@
-using Newtonsoft.Json.Linq;
-using System;
+using System;
 using System.Linq;
 using System.Text.RegularExpressions;
 using System.Threading;
@@ -23,10 +22,10 @@ public static Result SortAscendingByParsedIntThenDescendingByText(Parameters inp
         {
             return new Result
             {
-                SortedList = JArray.FromObject(input.ListToSort
-                    .OrderBy(x => Int32.Parse(Regex.Match(x[input.Key.ToString()].ToString(), @"\d+").Value))
-                    .ThenByDescending(x => x[input.Key.ToString()])
-                    .ToList())
+                SortedList = input.ListToSort
+                    .OrderBy(x => Int32.Parse(Regex.Match(x[input.Key], @"\d+").Value))
+                    .ThenByDescending(x => x[input.Key])
+                    .ToList()
             };
         }
     }

KalmarKommun.Datalager.Sort/KalmarKommun.Datalager.Sort.csproj

@@ -9,7 +9,7 @@
     <IncludeSource>true</IncludeSource>
     <PackageTags>Frends</PackageTags>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
-    <Version>0.0.2</Version>
+    <Version>0.0.3</Version>
   </PropertyGroup>
 
   <ItemGroup>