From 08aaed93b0628e4b4c855e06faea526472eae6c2 Mon Sep 17 00:00:00 2001 From: Haroon Date: Fri, 22 Nov 2013 10:35:07 +0000 Subject: [PATCH] renamed to searchqualifieroperator make it clearer what this class is, plus updated all relevant project files. --- Octokit.Tests/Clients/SearchClientTests.cs | 8 ++-- .../Models/Request/SearchQualifierOperator.cs | 20 ++++++++ .../Request/SearchRepositoriesRequest.cs | 46 ++++++++----------- Octokit/Octokit-Mono.csproj | 1 + Octokit/Octokit-netcore45.csproj | 1 + Octokit/Octokit.csproj | 1 + 6 files changed, 45 insertions(+), 32 deletions(-) create mode 100644 Octokit/Models/Request/SearchQualifierOperator.cs diff --git a/Octokit.Tests/Clients/SearchClientTests.cs b/Octokit.Tests/Clients/SearchClientTests.cs index f7342493..1bbf7be9 100644 --- a/Octokit.Tests/Clients/SearchClientTests.cs +++ b/Octokit.Tests/Clients/SearchClientTests.cs @@ -72,10 +72,10 @@ namespace Octokit.Tests.Clients //method 1... request.Size = new Range(55); //match 55Mb Exactly request.Size = new Range(100, 5000); //match repo's between 100 and 5000 MB's - request.Size = new Range(1000, QualifierOperator.GreaterOrEqualTo); //match repo's that are greater than or equal to 1000 - request.Size = new Range(1000, QualifierOperator.LessOrEqualTo); //match repo's that are less than or equal to 1000 - request.Size = new Range(1000, QualifierOperator.LessThan); //match repo's that are less than 1000 - request.Size = new Range(1000, QualifierOperator.GreaterThan); //match repo's that are greater than 1000 + request.Size = new Range(1000, SearchQualifierOperator.GreaterOrEqualTo); //match repo's that are greater than or equal to 1000 + request.Size = new Range(1000, SearchQualifierOperator.LessOrEqualTo); //match repo's that are less than or equal to 1000 + request.Size = new Range(1000, SearchQualifierOperator.LessThan); //match repo's that are less than 1000 + request.Size = new Range(1000, SearchQualifierOperator.GreaterThan); //match repo's that are greater than 1000 request.Size = Range.GreaterThan(5000); request.Size = Range.GreaterThanOrEquals(5000); request.Size = Range.LessThan(5000); diff --git a/Octokit/Models/Request/SearchQualifierOperator.cs b/Octokit/Models/Request/SearchQualifierOperator.cs new file mode 100644 index 00000000..e4988ae1 --- /dev/null +++ b/Octokit/Models/Request/SearchQualifierOperator.cs @@ -0,0 +1,20 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Octokit +{ + /// + /// Used for date and int comparisions in searches + /// + public enum SearchQualifierOperator + { + GreaterThan, // > + LessThan, // < + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", MessageId = "LessOr")] + LessOrEqualTo, // <= + GreaterOrEqualTo// >= + } +} diff --git a/Octokit/Models/Request/SearchRepositoriesRequest.cs b/Octokit/Models/Request/SearchRepositoriesRequest.cs index 532dceae..03840097 100644 --- a/Octokit/Models/Request/SearchRepositoriesRequest.cs +++ b/Octokit/Models/Request/SearchRepositoriesRequest.cs @@ -228,22 +228,21 @@ namespace Octokit /// Matches repositories with regards to the size /// We will use the to see what operator will be applied to the size qualifier /// - /// [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Globalization", "CA1305:SpecifyIFormatProvider", MessageId = "System.String.Format(System.String,System.Object[])"), System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Globalization", "CA1305:SpecifyIFormatProvider", MessageId = "System.Int32.ToString"), System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Globalization", "CA1305:SpecifyIFormatProvider", MessageId = "System.String.Format(System.String,System.Object)")] - public Range(int size, QualifierOperator op) + public Range(int size, SearchQualifierOperator op) { switch (op) { - case QualifierOperator.GreaterThan: + case SearchQualifierOperator.GreaterThan: query = string.Format(">{0}", size.ToString()); break; - case QualifierOperator.LessThan: + case SearchQualifierOperator.LessThan: query = string.Format("<{0}", size.ToString()); break; - case QualifierOperator.LessOrEqualTo: + case SearchQualifierOperator.LessOrEqualTo: query = string.Format("<={0}", size.ToString()); break; - case QualifierOperator.GreaterOrEqualTo: + case SearchQualifierOperator.GreaterOrEqualTo: query = string.Format(">={0}", size.ToString()); break; default: @@ -253,22 +252,22 @@ namespace Octokit public static Range LessThan(int size) { - return new Range(size, QualifierOperator.LessThan); + return new Range(size, SearchQualifierOperator.LessThan); } public static Range LessThanOrEquals(int size) { - return new Range(size, QualifierOperator.LessOrEqualTo); + return new Range(size, SearchQualifierOperator.LessOrEqualTo); } public static Range GreaterThan(int size) { - return new Range(size, QualifierOperator.GreaterThan); + return new Range(size, SearchQualifierOperator.GreaterThan); } public static Range GreaterThanOrEquals(int size) { - return new Range(size, QualifierOperator.GreaterOrEqualTo); + return new Range(size, SearchQualifierOperator.GreaterOrEqualTo); } public override string ToString() @@ -291,20 +290,20 @@ namespace Octokit /// /// [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Globalization", "CA1305:SpecifyIFormatProvider", MessageId = "System.String.Format(System.String,System.Object[])"), System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Globalization", "CA1305:SpecifyIFormatProvider", MessageId = "System.DateTime.ToString(System.String)"), System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Globalization", "CA1305:SpecifyIFormatProvider", MessageId = "System.String.Format(System.String,System.Object)")] - public DateRange(DateTime date, QualifierOperator op) + public DateRange(DateTime date, SearchQualifierOperator op) { switch (op) { - case QualifierOperator.GreaterThan: + case SearchQualifierOperator.GreaterThan: query = string.Format(">{0}", date.ToString("yyyy-mm-dd")); break; - case QualifierOperator.LessThan: + case SearchQualifierOperator.LessThan: query = string.Format("<{0}", date.ToString("yyyy-mm-dd")); break; - case QualifierOperator.LessOrEqualTo: + case SearchQualifierOperator.LessOrEqualTo: query = string.Format("<={0}", date.ToString("yyyy-mm-dd")); break; - case QualifierOperator.GreaterOrEqualTo: + case SearchQualifierOperator.GreaterOrEqualTo: query = string.Format(">={0}", date.ToString("yyyy-mm-dd")); break; default: @@ -320,7 +319,7 @@ namespace Octokit /// public static DateRange LessThan(DateTime date) { - return new DateRange(date, QualifierOperator.LessThan); + return new DateRange(date, SearchQualifierOperator.LessThan); } /// @@ -331,7 +330,7 @@ namespace Octokit /// public static DateRange LessThanOrEquals(DateTime date) { - return new DateRange(date, QualifierOperator.LessOrEqualTo); + return new DateRange(date, SearchQualifierOperator.LessOrEqualTo); } /// @@ -342,7 +341,7 @@ namespace Octokit /// public static DateRange GreaterThan(DateTime date) { - return new DateRange(date, QualifierOperator.GreaterThan); + return new DateRange(date, SearchQualifierOperator.GreaterThan); } /// @@ -353,7 +352,7 @@ namespace Octokit /// public static DateRange GreaterThanOrEquals(DateTime date) { - return new DateRange(date, QualifierOperator.GreaterOrEqualTo); + return new DateRange(date, SearchQualifierOperator.GreaterOrEqualTo); } public override string ToString() @@ -721,15 +720,6 @@ namespace Octokit Yaml } - public enum QualifierOperator - { - GreaterThan, // > - LessThan, // < - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", MessageId = "LessOr")] - LessOrEqualTo, // <= - GreaterOrEqualTo// >= - } - public enum RepoSearchSort { /// diff --git a/Octokit/Octokit-Mono.csproj b/Octokit/Octokit-Mono.csproj index 2c35e037..f34612fa 100644 --- a/Octokit/Octokit-Mono.csproj +++ b/Octokit/Octokit-Mono.csproj @@ -224,6 +224,7 @@ + \ No newline at end of file diff --git a/Octokit/Octokit-netcore45.csproj b/Octokit/Octokit-netcore45.csproj index fa6f07a3..b959e284 100644 --- a/Octokit/Octokit-netcore45.csproj +++ b/Octokit/Octokit-netcore45.csproj @@ -222,6 +222,7 @@ + diff --git a/Octokit/Octokit.csproj b/Octokit/Octokit.csproj index e4e32925..7235c026 100644 --- a/Octokit/Octokit.csproj +++ b/Octokit/Octokit.csproj @@ -57,6 +57,7 @@ +