Release new versions of Sieve via CI

.github/workflows/ci_publish.yml

@@ -19,9 +19,8 @@ name: ci_publish
 on:
   push:
     branches:
+      - master
       - 'releases/*'
-    tags:
-      - 'v*'
 
 jobs:
   ubuntu-latest:

README.md

@@ -75,7 +75,7 @@ Where `SieveCustomSortMethodsOfPosts` for example is:
 ```C#
 public class SieveCustomSortMethods : ISieveCustomSortMethods
 {
-    public IQueryable<Post> Popularity(IQueryable<Post> source, bool useThenBy, bool desc) // The method is given an indicator of whether to use ThenBy(), and if the query is descending 
+    public IQueryable<Post> Popularity(IQueryable<Post> source, bool useThenBy, bool desc) // The method is given an indicator of weather to use ThenBy(), and if the query is descending 
     {
         var result = useThenBy ?
             ((IOrderedQueryable<Post>)source).ThenBy(p => p.LikeCount) : // ThenBy only works on IOrderedQueryable<TEntity>

Sieve/Models/FilterTerm.cs

@@ -6,36 +6,43 @@ namespace Sieve.Models
 {
     public class FilterTerm : IFilterTerm, IEquatable<FilterTerm>
     {
-        private const string EscapedPipePattern = @"(?<!($|[^\\]|^)(\\\\)*?\\)\|";
+        public FilterTerm() { }
+
+        private const string EscapedPipePattern = @"(?<!($|[^\\])(\\\\)*?\\)\|";
         private const string PipeToEscape = @"\|";
-        private const string BackslashToEscape = @"\\";
-        private const string OperatorsRegEx = @"(!@=\*|!_=\*|!=\*|!@=|!_=|==\*|@=\*|_=\*|==|!=|>=|<=|>|<|@=|_=)";
-        private const string EscapeNegPatternForOper = @"(?<!\\)" + OperatorsRegEx;
-        private const string EscapePosPatternForOper = @"(?<=\\)" + OperatorsRegEx;
+
+        private static readonly string[] Operators = new string[] {
+                    "!@=*",
+                    "!_=*",
+                    "!=*",
+                    "!@=",
+                    "!_=",
+                    "==*",
+                    "@=*",
+                    "_=*",
+                    "==",
+                    "!=",
+                    ">=",
+                    "<=",
+                    ">",
+                    "<",
+                    "@=",
+                    "_="
+        };
 
         public string Filter
         {
             set
             {
-                var filterSplits = Regex.Split(value,EscapeNegPatternForOper).Select(t => t.Trim()).ToArray();
-                
+                var filterSplits = value.Split(Operators, StringSplitOptions.RemoveEmptyEntries)
+                    .Select(t => t.Trim()).ToArray();
                 Names = Regex.Split(filterSplits[0], EscapedPipePattern).Select(t => t.Trim()).ToArray();
-
-                if (filterSplits.Length > 2)
-                {
-                    foreach (var match in Regex.Matches(filterSplits[2],EscapePosPatternForOper))
-                    {
-                        var matchStr = match.ToString();
-                        filterSplits[2] = filterSplits[2].Replace('\\' + matchStr, matchStr);
-                    }
-
-                    Values = Regex.Split(filterSplits[2], EscapedPipePattern)
+                Values = filterSplits.Length > 1
+                    ? Regex.Split(filterSplits[1], EscapedPipePattern)
                         .Select(t => t.Replace(PipeToEscape, "|").Trim())
-                        .Select(t => t.Replace(BackslashToEscape, "\\").Trim())
-                        .ToArray();
-                }
- 
-                Operator = Regex.Match(value,EscapeNegPatternForOper).Value;
+                        .ToArray()
+                    : null;
+                Operator = Array.Find(Operators, o => value.Contains(o)) ?? "==";
                 OperatorParsed = GetOperatorParsed(Operator);
                 OperatorIsCaseInsensitive = Operator.EndsWith("*");
                 OperatorIsNegated = OperatorParsed != FilterOperator.NotEquals && Operator.StartsWith("!");

SieveUnitTests/General.cs

@@ -73,7 +73,7 @@ namespace SieveUnitTests
                     CategoryId = 2,
                     TopComment = new Comment { Id = 1, Text = "D1" },
                     FeaturedComment = new Comment { Id = 7, Text = "D2" }
-                }
+                },
             }.AsQueryable();
 
             _comments = new List<Comment>
@@ -684,116 +684,15 @@ namespace SieveUnitTests
                     DateCreated = DateTimeOffset.UtcNow.AddDays(-1),
                     Text = "Here is | another comment"
                 },
-                new Comment
-                {
-                    Id = 2,
-                    DateCreated = DateTimeOffset.UtcNow.AddDays(-1),
-                    Text = @"Here is \| another comment(1)"
-                }
             }.AsQueryable();
 
-            var model = new SieveModel
+            var model = new SieveModel()
             {
-                Filters = @"Text==Here is \| a comment|Here is \| another comment|Here is \\\| another comment(1)",
+                Filters = "Text==Here is \\| a comment|Here is \\| another comment",
             };
 
             var result = _processor.Apply(model, comments);
-            Assert.Equal(3, result.Count());
+            Assert.Equal(2, result.Count());
         }
-        
-        [Theory]
-        [InlineData("CategoryId==1,(CategoryId|LikeCount)==50")]
-        [InlineData("(CategoryId|LikeCount)==50,CategoryId==1")]
-        public void CanFilterWithEscape(string filter)
-        {
-            var model = new SieveModel
-            {
-                Filters = filter
-            };
-
-            var result = _processor.Apply(model, _posts);
-            var entry = result.FirstOrDefault();
-            var resultCount = result.Count();
-
-            Assert.NotNull(entry);
-            Assert.Equal(1, resultCount);
-        }
-        
-        [Theory]
-        [InlineData(@"Title@=\\")]
-        public void CanFilterWithEscapedBackSlash(string filter)
-        {
-            var posts = new List<Post>
-            {
-                new Post
-                {
-                    Id = 1,
-                    Title = "E\\",
-                    LikeCount = 4,
-                    IsDraft = true,
-                    CategoryId = 1,
-                    TopComment = new Comment { Id = 1, Text = "E1" },
-                    FeaturedComment = new Comment { Id = 7, Text = "E2" }
-                }
-            }.AsQueryable();
-            
-            var model = new SieveModel
-            {
-                Filters = filter
-            };
-
-            var result = _processor.Apply(model, posts);
-            var entry = result.FirstOrDefault();
-            var resultCount = result.Count();
-
-            Assert.NotNull(entry);
-            Assert.Equal(1, resultCount);
-        }
-        
-        [Theory]
-        [InlineData(@"Title@=\== ")]
-        [InlineData(@"Title@=\!= ")]
-        [InlineData(@"Title@=\> ")]
-        [InlineData(@"Title@=\< ")]
-        [InlineData(@"Title@=\<= ")]
-        [InlineData(@"Title@=\>= ")]
-        [InlineData(@"Title@=\@= ")]
-        [InlineData(@"Title@=\_= ")]
-        [InlineData(@"Title@=!\@= ")]
-        [InlineData(@"Title@=!\_= ")]
-        [InlineData(@"Title@=\@=* ")]
-        [InlineData(@"Title@=\_=* ")]
-        [InlineData(@"Title@=\==* ")]
-        [InlineData(@"Title@=\!=* ")]
-        [InlineData(@"Title@=!\@=* ")]
-        public void CanFilterWithEscapedOperators(string filter)
-        {
-            var posts = new List<Post>
-            {
-                new Post
-                {
-                    Id = 1,
-                    Title = @"Operators: == != > < >= <= @= _= !@= !_= @=* _=* ==* !=* !@=* !_=* ",
-                    LikeCount = 1,
-                    IsDraft = true,
-                    CategoryId = 1,
-                    TopComment = new Comment { Id = 1, Text = "F1" },
-                    FeaturedComment = new Comment { Id = 7, Text = "F2" }
-                }
-            }.AsQueryable();
-            
-            var model = new SieveModel
-            {
-                Filters = filter,
-            };
-
-            var result = _processor.Apply(model, posts);
-            var entry = result.FirstOrDefault();
-            var resultCount = result.Count();
-
-            Assert.NotNull(entry);
-            Assert.Equal(1, resultCount);
-        }
-        
     }
 }

build/Build.cs

@@ -21,8 +21,7 @@ using static Nuke.Common.Tools.DotNet.DotNetTasks;
     InvokedTargets = new[] {nameof(Ci)},
     CacheKeyFiles = new string[0])]
 [GitHubActions("ci_publish", GitHubActionsImage.UbuntuLatest,
-    OnPushBranches = new[] { "releases/*" },
-    OnPushTags = new[] { "v*" },
+    OnPushBranches = new[] {"master", "releases/*"},
     AutoGenerate = true,
     InvokedTargets = new[] {nameof(CiPublish)},
     CacheKeyFiles = new string[0],
@@ -84,7 +83,6 @@ class Build : NukeBuild
     Target Package => _ => _
         .DependsOn(Test)
         .Executes(() =>
-        
         {
             DotNetPack(s => s
                 .SetProject(SieveProject)