zoriya/octokit.net
1
0
Fork 0
mirror of https://github.com/zoriya/octokit.net.git synced 2026-06-05 19:46:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #420 from octokit/shiftkey/search-issues-corrected-api

Browse Source 
Updated SearchIssues to use correct API response
This commit is contained in:
Phil Haack
2014-03-05 11:12:19 -08:00
parent 8ef006d35d 7da2cd04ac
commit 904fbe533a
12 changed files with 90 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Octokit.Reactive/Clients/IObservableSearchClient.cs
+1 -1
View File
@@ -29,7 +29,7 @@ namespace Octokit.Reactive
/// </summary>
/// <param name="search"></param>
/// <returns>List of issues</returns>
IObservable<Issue> SearchIssues(SearchIssuesRequest search);
IObservable<SearchIssuesResult> SearchIssues(SearchIssuesRequest search);
/// <summary>
/// search code
Octokit.Reactive/Clients/ObservableSearchClient.cs
+7 -11
View File
@@ -1,7 +1,5 @@
using System;
using System.Reactive;
using System.Reactive.Threading.Tasks;
using Octokit.Reactive.Internal;
namespace Octokit.Reactive
{
@@ -10,15 +8,13 @@ namespace Octokit.Reactive
/// </summary>
public class ObservableSearchClient : IObservableSearchClient
{
readonly IConnection _connection;
readonly IGitHubClient _client;
readonly ISearchClient _client;
public ObservableSearchClient(IGitHubClient client)
{
Ensure.ArgumentNotNull(client, "client");
_client = client;
_connection = client.Connection;
_client = client.Search;
}
/// <summary>
@@ -30,7 +26,7 @@ namespace Octokit.Reactive
public IObservable<SearchRepositoryResult> SearchRepo(SearchRepositoriesRequest search)
{
Ensure.ArgumentNotNull(search, "search");
return _client.Search.SearchRepo(search).ToObservable();
return _client.SearchRepo(search).ToObservable();
}
/// <summary>
@@ -42,7 +38,7 @@ namespace Octokit.Reactive
public IObservable<SearchUsersResult> SearchUsers(SearchUsersRequest search)
{
Ensure.ArgumentNotNull(search, "search");
return _client.Search.SearchUsers(search).ToObservable();
return _client.SearchUsers(search).ToObservable();
}
/// <summary>
@@ -51,10 +47,10 @@ namespace Octokit.Reactive
/// </summary>
/// <param name="search"></param>
/// <returns>List of issues</returns>
public IObservable<Issue> SearchIssues(SearchIssuesRequest search)
public IObservable<SearchIssuesResult> SearchIssues(SearchIssuesRequest search)
{
Ensure.ArgumentNotNull(search, "search");
return _connection.GetAndFlattenAllPages<Issue>(ApiUrls.SearchIssues(), search.Parameters);
return _client.SearchIssues(search).ToObservable();
}
/// <summary>
@@ -66,7 +62,7 @@ namespace Octokit.Reactive
public IObservable<SearchCodeResult> SearchCode(SearchCodeRequest search)
{
Ensure.ArgumentNotNull(search, "search");
return _client.Search.SearchCode(search).ToObservable();
return _client.SearchCode(search).ToObservable();
}
}
}
Octokit.Tests.Integration/Clients/SearchClientTests.cs
+12
View File
@@ -42,4 +42,16 @@ public class SearchClientTests
Assert.NotEmpty(repos.Items);
}
[Fact]
public async Task SearchForWordInCode()
{
var request = new SearchIssuesRequest("windows");
request.SortField = IssueSearchSort.Created;
request.Order = SortDirection.Descending;
var repos = await _gitHubClient.Search.SearchIssues(request);
Assert.NotEmpty(repos.Items);
}
}
Octokit.Tests/Clients/SearchClientTests.cs
+35 -35
View File
@@ -494,7 +494,7 @@ namespace Octokit.Tests.Clients
var connection = Substitute.For<IApiConnection>();
var client = new SearchClient(connection);
client.SearchIssues(new SearchIssuesRequest("something"));
connection.Received().GetAll<Issue>(Arg.Is<Uri>(u => u.ToString() == "search/issues"), Arg.Any<Dictionary<string, string>>());
connection.Received().Get<SearchIssuesResult>(Arg.Is<Uri>(u => u.ToString() == "search/issues"), Arg.Any<Dictionary<string, string>>());
}
[Fact]
@@ -513,7 +513,7 @@ namespace Octokit.Tests.Clients
client.SearchIssues(request);
connection.Received().GetAll<Issue>(
connection.Received().Get<SearchIssuesResult>(
Arg.Is<Uri>(u => u.ToString() == "search/issues"),
Arg.Is<Dictionary<string, string>>(d => d["q"] == "pub"));
}
@@ -528,7 +528,7 @@ namespace Octokit.Tests.Clients
client.SearchIssues(request);
connection.Received().GetAll<Issue>(
connection.Received().Get<SearchIssuesResult>(
Arg.Is<Uri>(u => u.ToString() == "search/issues"),
Arg.Is<Dictionary<string, string>>(d =>
d["sort"] == "comments"));
@@ -545,7 +545,7 @@ namespace Octokit.Tests.Clients
client.SearchIssues(request);
connection.Received().GetAll<Issue>(
connection.Received().Get<SearchIssuesResult>(
Arg.Is<Uri>(u => u.ToString() == "search/issues"),
Arg.Is<Dictionary<string, string>>(d =>
d["sort"] == "updated" &&
@@ -561,7 +561,7 @@ namespace Octokit.Tests.Clients
client.SearchIssues(request);
connection.Received().GetAll<Issue>(
connection.Received().Get<SearchIssuesResult>(
Arg.Is<Uri>(u => u.ToString() == "search/issues"),
Arg.Is<Dictionary<string, string>>(d =>
d["order"] == "desc"));
@@ -577,7 +577,7 @@ namespace Octokit.Tests.Clients
client.SearchIssues(request);
connection.Received().GetAll<Issue>(
connection.Received().Get<SearchIssuesResult>(
Arg.Is<Uri>(u => u.ToString() == "search/issues"),
Arg.Is<Dictionary<string, string>>(d => d["q"] == "something+in:comment"));
}
@@ -592,7 +592,7 @@ namespace Octokit.Tests.Clients
client.SearchIssues(request);
connection.Received().GetAll<Issue>(
connection.Received().Get<SearchIssuesResult>(
Arg.Is<Uri>(u => u.ToString() == "search/issues"),
Arg.Is<Dictionary<string, string>>(d => d["q"] == "something+in:body,title"));
}
@@ -607,7 +607,7 @@ namespace Octokit.Tests.Clients
client.SearchIssues(request);
connection.Received().GetAll<Issue>(
connection.Received().Get<SearchIssuesResult>(
Arg.Is<Uri>(u => u.ToString() == "search/issues"),
Arg.Is<Dictionary<string, string>>(d => d["q"] == "something+type:issue"));
}
@@ -622,7 +622,7 @@ namespace Octokit.Tests.Clients
client.SearchIssues(request);
connection.Received().GetAll<Issue>(
connection.Received().Get<SearchIssuesResult>(
Arg.Is<Uri>(u => u.ToString() == "search/issues"),
Arg.Is<Dictionary<string, string>>(d => d["q"] == "something+type:pr"));
}
@@ -637,7 +637,7 @@ namespace Octokit.Tests.Clients
client.SearchIssues(request);
connection.Received().GetAll<Issue>(
connection.Received().Get<SearchIssuesResult>(
Arg.Is<Uri>(u => u.ToString() == "search/issues"),
Arg.Is<Dictionary<string, string>>(d => d["q"] == "something+author:alfhenrik"));
}
@@ -652,7 +652,7 @@ namespace Octokit.Tests.Clients
client.SearchIssues(request);
connection.Received().GetAll<Issue>(
connection.Received().Get<SearchIssuesResult>(
Arg.Is<Uri>(u => u.ToString() == "search/issues"),
Arg.Is<Dictionary<string, string>>(d => d["q"] == "something+assignee:alfhenrik"));
}
@@ -667,7 +667,7 @@ namespace Octokit.Tests.Clients
client.SearchIssues(request);
connection.Received().GetAll<Issue>(
connection.Received().Get<SearchIssuesResult>(
Arg.Is<Uri>(u => u.ToString() == "search/issues"),
Arg.Is<Dictionary<string, string>>(d => d["q"] == "something+mentions:alfhenrik"));
}
@@ -682,7 +682,7 @@ namespace Octokit.Tests.Clients
client.SearchIssues(request);
connection.Received().GetAll<Issue>(
connection.Received().Get<SearchIssuesResult>(
Arg.Is<Uri>(u => u.ToString() == "search/issues"),
Arg.Is<Dictionary<string, string>>(d => d["q"] == "something+commenter:alfhenrik"));
}
@@ -697,7 +697,7 @@ namespace Octokit.Tests.Clients
client.SearchIssues(request);
connection.Received().GetAll<Issue>(
connection.Received().Get<SearchIssuesResult>(
Arg.Is<Uri>(u => u.ToString() == "search/issues"),
Arg.Is<Dictionary<string, string>>(d => d["q"] == "something+involves:alfhenrik"));
}
@@ -712,7 +712,7 @@ namespace Octokit.Tests.Clients
client.SearchIssues(request);
connection.Received().GetAll<Issue>(
connection.Received().Get<SearchIssuesResult>(
Arg.Is<Uri>(u => u.ToString() == "search/issues"),
Arg.Is<Dictionary<string, string>>(d => d["q"] == "something+state:Open"));
}
@@ -727,7 +727,7 @@ namespace Octokit.Tests.Clients
client.SearchIssues(request);
connection.Received().GetAll<Issue>(
connection.Received().Get<SearchIssuesResult>(
Arg.Is<Uri>(u => u.ToString() == "search/issues"),
Arg.Is<Dictionary<string, string>>(d => d["q"] == "something+state:Closed"));
}
@@ -742,7 +742,7 @@ namespace Octokit.Tests.Clients
client.SearchIssues(request);
connection.Received().GetAll<Issue>(
connection.Received().Get<SearchIssuesResult>(
Arg.Is<Uri>(u => u.ToString() == "search/issues"),
Arg.Is<Dictionary<string, string>>(d => d["q"] == "something+label:bug"));
}
@@ -757,7 +757,7 @@ namespace Octokit.Tests.Clients
client.SearchIssues(request);
connection.Received().GetAll<Issue>(
connection.Received().Get<SearchIssuesResult>(
Arg.Is<Uri>(u => u.ToString() == "search/issues"),
Arg.Is<Dictionary<string, string>>(d => d["q"] == "something+label:bug+label:feature"));
}
@@ -772,7 +772,7 @@ namespace Octokit.Tests.Clients
client.SearchIssues(request);
connection.Received().GetAll<Issue>(
connection.Received().Get<SearchIssuesResult>(
Arg.Is<Uri>(u => u.ToString() == "search/issues"),
Arg.Is<Dictionary<string, string>>(d => d["q"] == "something+language:CSharp"));
}
@@ -787,7 +787,7 @@ namespace Octokit.Tests.Clients
client.SearchIssues(request);
connection.Received().GetAll<Issue>(
connection.Received().Get<SearchIssuesResult>(
Arg.Is<Uri>(u => u.ToString() == "search/issues"),
Arg.Is<Dictionary<string, string>>(d => d["q"] == "something+created:>2014-01-01"));
}
@@ -802,7 +802,7 @@ namespace Octokit.Tests.Clients
client.SearchIssues(request);
connection.Received().GetAll<Issue>(
connection.Received().Get<SearchIssuesResult>(
Arg.Is<Uri>(u => u.ToString() == "search/issues"),
Arg.Is<Dictionary<string, string>>(d => d["q"] == "something+created:>=2014-01-01"));
}
@@ -817,7 +817,7 @@ namespace Octokit.Tests.Clients
client.SearchIssues(request);
connection.Received().GetAll<Issue>(
connection.Received().Get<SearchIssuesResult>(
Arg.Is<Uri>(u => u.ToString() == "search/issues"),
Arg.Is<Dictionary<string, string>>(d => d["q"] == "something+created:<2014-01-01"));
}
@@ -832,7 +832,7 @@ namespace Octokit.Tests.Clients
client.SearchIssues(request);
connection.Received().GetAll<Issue>(
connection.Received().Get<SearchIssuesResult>(
Arg.Is<Uri>(u => u.ToString() == "search/issues"),
Arg.Is<Dictionary<string, string>>(d => d["q"] == "something+created:<=2014-01-01"));
}
@@ -847,7 +847,7 @@ namespace Octokit.Tests.Clients
client.SearchIssues(request);
connection.Received().GetAll<Issue>(
connection.Received().Get<SearchIssuesResult>(
Arg.Is<Uri>(u => u.ToString() == "search/issues"),
Arg.Is<Dictionary<string, string>>(d => d["q"] == "something+updated:>2014-01-01"));
}
@@ -862,7 +862,7 @@ namespace Octokit.Tests.Clients
client.SearchIssues(request);
connection.Received().GetAll<Issue>(
connection.Received().Get<SearchIssuesResult>(
Arg.Is<Uri>(u => u.ToString() == "search/issues"),
Arg.Is<Dictionary<string, string>>(d => d["q"] == "something+updated:>=2014-01-01"));
}
@@ -877,7 +877,7 @@ namespace Octokit.Tests.Clients
client.SearchIssues(request);
connection.Received().GetAll<Issue>(
connection.Received().Get<SearchIssuesResult>(
Arg.Is<Uri>(u => u.ToString() == "search/issues"),
Arg.Is<Dictionary<string, string>>(d => d["q"] == "something+updated:<2014-01-01"));
}
@@ -892,7 +892,7 @@ namespace Octokit.Tests.Clients
client.SearchIssues(request);
connection.Received().GetAll<Issue>(
connection.Received().Get<SearchIssuesResult>(
Arg.Is<Uri>(u => u.ToString() == "search/issues"),
Arg.Is<Dictionary<string, string>>(d => d["q"] == "something+updated:<=2014-01-01"));
}
@@ -907,7 +907,7 @@ namespace Octokit.Tests.Clients
client.SearchIssues(request);
connection.Received().GetAll<Issue>(
connection.Received().Get<SearchIssuesResult>(
Arg.Is<Uri>(u => u.ToString() == "search/issues"),
Arg.Is<Dictionary<string, string>>(d => d["q"] == "something+comments:>10"));
}
@@ -922,7 +922,7 @@ namespace Octokit.Tests.Clients
client.SearchIssues(request);
connection.Received().GetAll<Issue>(
connection.Received().Get<SearchIssuesResult>(
Arg.Is<Uri>(u => u.ToString() == "search/issues"),
Arg.Is<Dictionary<string, string>>(d => d["q"] == "something+comments:>=10"));
}
@@ -937,7 +937,7 @@ namespace Octokit.Tests.Clients
client.SearchIssues(request);
connection.Received().GetAll<Issue>(
connection.Received().Get<SearchIssuesResult>(
Arg.Is<Uri>(u => u.ToString() == "search/issues"),
Arg.Is<Dictionary<string, string>>(d => d["q"] == "something+comments:<10"));
}
@@ -952,7 +952,7 @@ namespace Octokit.Tests.Clients
client.SearchIssues(request);
connection.Received().GetAll<Issue>(
connection.Received().Get<SearchIssuesResult>(
Arg.Is<Uri>(u => u.ToString() == "search/issues"),
Arg.Is<Dictionary<string, string>>(d => d["q"] == "something+comments:<=10"));
}
@@ -967,7 +967,7 @@ namespace Octokit.Tests.Clients
client.SearchIssues(request);
connection.Received().GetAll<Issue>(
connection.Received().Get<SearchIssuesResult>(
Arg.Is<Uri>(u => u.ToString() == "search/issues"),
Arg.Is<Dictionary<string, string>>(d => d["q"] == "something+comments:10..20"));
}
@@ -982,7 +982,7 @@ namespace Octokit.Tests.Clients
client.SearchIssues(request);
connection.Received().GetAll<Issue>(
connection.Received().Get<SearchIssuesResult>(
Arg.Is<Uri>(u => u.ToString() == "search/issues"),
Arg.Is<Dictionary<string, string>>(d => d["q"] == "something+user:alfhenrik"));
}
@@ -997,7 +997,7 @@ namespace Octokit.Tests.Clients
client.SearchIssues(request);
connection.Received().GetAll<Issue>(
connection.Received().Get<SearchIssuesResult>(
Arg.Is<Uri>(u => u.ToString() == "search/issues"),
Arg.Is<Dictionary<string, string>>(d => d["q"] == "something+repo:octokit.net"));
}
@@ -1014,7 +1014,7 @@ namespace Octokit.Tests.Clients
client.SearchIssues(request);
connection.Received().GetAll<Issue>(
connection.Received().Get<SearchIssuesResult>(
Arg.Is<Uri>(u => u.ToString() == "search/issues"),
Arg.Is<Dictionary<string, string>>(d => d["q"] ==
"something+label:bug+user:alfhenrik+repo:octokit.net"));
Octokit/Clients/ISearchClient.cs
+3 -5
View File
@@ -1,7 +1,5 @@
#if NET_45
using System.Collections.Generic;
#endif
using System.Threading.Tasks;
using System.Threading.Tasks;
namespace Octokit
{
/// <summary>
@@ -31,7 +29,7 @@ namespace Octokit
/// </summary>
/// <param name="search"></param>
/// <returns>List of issues</returns>
Task<IReadOnlyList<Issue>> SearchIssues(SearchIssuesRequest search);
Task<SearchIssuesResult> SearchIssues(SearchIssuesRequest search);
/// <summary>
/// search code
Octokit/Clients/SearchClient.cs
+4 -6
View File
@@ -1,7 +1,5 @@
#if NET_45
using System.Collections.Generic;
#endif
using System.Threading.Tasks;
using System.Threading.Tasks;
namespace Octokit
{
/// <summary>
@@ -49,10 +47,10 @@ namespace Octokit
/// </summary>
/// <param name="search"></param>
/// <returns>List of issues</returns>
public Task<IReadOnlyList<Issue>> SearchIssues(SearchIssuesRequest search)
public Task<SearchIssuesResult> SearchIssues(SearchIssuesRequest search)
{
Ensure.ArgumentNotNull(search, "search");
return ApiConnection.GetAll<Issue>(ApiUrls.SearchIssues(), search.Parameters);
return ApiConnection.Get<SearchIssuesResult>(ApiUrls.SearchIssues(), search.Parameters);
}
/// <summary>
Octokit/Models/Response/SearchIssuesResult.cs
+23
View File
@@ -0,0 +1,23 @@
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Globalization;
namespace Octokit
{
[DebuggerDisplay("{DebuggerDisplay,nq}")]
public class SearchIssuesResult
{
public int TotalCount { get; set; }
[System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
public IReadOnlyList<Issue> Items { get; set; }
internal string DebuggerDisplay
{
get
{
return String.Format(CultureInfo.InvariantCulture, "TotalCount: {0}", TotalCount);
}
}
}
}
Octokit/Octokit-Mono.csproj
+1
View File
@@ -309,6 +309,7 @@
<Compile Include="Models\Response\SearchRepositoryResult.cs" />
<Compile Include="Models\Response\SearchUsersResult.cs" />
<Compile Include="Models\Response\SearchCodeResult.cs" />
<Compile Include="Models\Response\SearchIssuesResult.cs" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
</Project>
Octokit/Octokit-MonoAndroid.csproj
+1
View File
@@ -320,6 +320,7 @@
<Compile Include="Models\Response\SearchRepositoryResult.cs" />
<Compile Include="Models\Response\SearchUsersResult.cs" />
<Compile Include="Models\Response\SearchCodeResult.cs" />
<Compile Include="Models\Response\SearchIssuesResult.cs" />
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Novell\Novell.MonoDroid.CSharp.targets" />
</Project>
Octokit/Octokit-Monotouch.csproj
+1
View File
@@ -315,6 +315,7 @@
<Compile Include="Models\Response\SearchRepositoryResult.cs" />
<Compile Include="Models\Response\SearchUsersResult.cs" />
<Compile Include="Models\Response\SearchCodeResult.cs" />
<Compile Include="Models\Response\SearchIssuesResult.cs" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
</Project>
Octokit/Octokit-netcore45.csproj
+1
View File
@@ -307,6 +307,7 @@
<Compile Include="Helpers\HttpClientExtensions.cs" />
<Compile Include="Models\Response\SearchUsersResult.cs" />
<Compile Include="Models\Response\SearchCodeResult.cs" />
<Compile Include="Models\Response\SearchIssuesResult.cs" />
</ItemGroup>
<ItemGroup>
<CodeAnalysisDictionary Include="..\CustomDictionary.xml">
Octokit/Octokit.csproj
+1
View File
@@ -141,6 +141,7 @@
<Compile Include="Models\Response\RepositoryLanguage.cs" />
<Compile Include="Models\Response\RepositoryTag.cs" />
<Compile Include="Models\Response\SearchCodeResult.cs" />
<Compile Include="Models\Response\SearchIssuesResult.cs" />
<Compile Include="Models\Response\SearchRepositoryResult.cs" />
<Compile Include="Models\Response\SearchUsersResult.cs" />
<Compile Include="Models\Response\Subscription.cs" />