From 95b6363cd934b94f9f3cf72b0248ec7accf5354d Mon Sep 17 00:00:00 2001 From: pltaylor Date: Tue, 5 Nov 2013 12:14:16 -0500 Subject: [PATCH] Rename class to IEvents and add IActivities class --- ...tsClient.cs => IObservableEventsClient.cs} | 2 +- ...ntsClient.cs => ObservableEventsClient.cs} | 4 +-- Octokit.Reactive/Octokit.Reactive.csproj | 4 +-- ...ntsClientTests.cs => EventsClientTests.cs} | 36 +++++++++---------- Octokit.Tests/Octokit.Tests.csproj | 4 +-- ...ests.cs => ObservableEventsClientTests.cs} | 36 +++++++++---------- Octokit/Clients/ActivitiesClient.cs | 13 +++++++ ...ctivityEventsClient.cs => EventsClient.cs} | 4 +-- Octokit/Clients/IActivitiesClient.cs | 7 ++++ ...tivityEventsClient.cs => IEventsClient.cs} | 2 +- Octokit/GitHubClient.cs | 4 +-- Octokit/IGitHubClient.cs | 2 +- Octokit/Octokit.csproj | 6 ++-- 13 files changed, 73 insertions(+), 51 deletions(-) rename Octokit.Reactive/Clients/{IObservableActivityEventsClient.cs => IObservableEventsClient.cs} (98%) rename Octokit.Reactive/Clients/{ObservableActivityEventsClient.cs => ObservableEventsClient.cs} (97%) rename Octokit.Tests/Clients/{ActivityEventsClientTests.cs => EventsClientTests.cs} (86%) rename Octokit.Tests/Reactive/{ObservableActivityEventsClientTests.cs => ObservableEventsClientTests.cs} (85%) create mode 100644 Octokit/Clients/ActivitiesClient.cs rename Octokit/Clients/{ActivityEventsClient.cs => EventsClient.cs} (97%) create mode 100644 Octokit/Clients/IActivitiesClient.cs rename Octokit/Clients/{IActivityEventsClient.cs => IEventsClient.cs} (99%) diff --git a/Octokit.Reactive/Clients/IObservableActivityEventsClient.cs b/Octokit.Reactive/Clients/IObservableEventsClient.cs similarity index 98% rename from Octokit.Reactive/Clients/IObservableActivityEventsClient.cs rename to Octokit.Reactive/Clients/IObservableEventsClient.cs index fd9251fd..5dbf588f 100644 --- a/Octokit.Reactive/Clients/IObservableActivityEventsClient.cs +++ b/Octokit.Reactive/Clients/IObservableEventsClient.cs @@ -2,7 +2,7 @@ namespace Octokit.Reactive { - public interface IObservableActivityEventsClient + public interface IObservableEventsClient { /// /// Gets all the public events diff --git a/Octokit.Reactive/Clients/ObservableActivityEventsClient.cs b/Octokit.Reactive/Clients/ObservableEventsClient.cs similarity index 97% rename from Octokit.Reactive/Clients/ObservableActivityEventsClient.cs rename to Octokit.Reactive/Clients/ObservableEventsClient.cs index a56c885a..e317d2de 100644 --- a/Octokit.Reactive/Clients/ObservableActivityEventsClient.cs +++ b/Octokit.Reactive/Clients/ObservableEventsClient.cs @@ -3,11 +3,11 @@ using Octokit.Reactive.Internal; namespace Octokit.Reactive { - public class ObservableActivityEventsClient : IObservableActivityEventsClient + public class ObservableEventsClient : IObservableEventsClient { IConnection _connection; - public ObservableActivityEventsClient(IGitHubClient client) + public ObservableEventsClient(IGitHubClient client) { Ensure.ArgumentNotNull(client, "client"); diff --git a/Octokit.Reactive/Octokit.Reactive.csproj b/Octokit.Reactive/Octokit.Reactive.csproj index 909f6dd6..ddd17a18 100644 --- a/Octokit.Reactive/Octokit.Reactive.csproj +++ b/Octokit.Reactive/Octokit.Reactive.csproj @@ -73,8 +73,8 @@ Properties\SolutionInfo.cs - - + + diff --git a/Octokit.Tests/Clients/ActivityEventsClientTests.cs b/Octokit.Tests/Clients/EventsClientTests.cs similarity index 86% rename from Octokit.Tests/Clients/ActivityEventsClientTests.cs rename to Octokit.Tests/Clients/EventsClientTests.cs index eb722cb0..cbe84e0c 100644 --- a/Octokit.Tests/Clients/ActivityEventsClientTests.cs +++ b/Octokit.Tests/Clients/EventsClientTests.cs @@ -6,7 +6,7 @@ using Xunit; namespace Octokit.Tests.Clients { - public class ActivityEventsClientTests + public class EventsClientTests { public class TheGetAllMethod { @@ -14,7 +14,7 @@ namespace Octokit.Tests.Clients public void RequestsCorrectUrl() { var connection = Substitute.For(); - var client = new ActivityEventsClient(connection); + var client = new EventsClient(connection); client.GetAll(); @@ -28,7 +28,7 @@ namespace Octokit.Tests.Clients public void RequestsCorrectUrl() { var connection = Substitute.For(); - var client = new ActivityEventsClient(connection); + var client = new EventsClient(connection); client.GetAllForRepository("fake", "repo"); @@ -39,7 +39,7 @@ namespace Octokit.Tests.Clients public async Task EnsuresArgumentsNotNull() { var connection = Substitute.For(); - var client = new ActivityEventsClient(connection); + var client = new EventsClient(connection); await AssertEx.Throws(async () => await client.GetAllForRepository(null, "name")); await AssertEx.Throws(async () => await client.GetAllForRepository("", "name")); @@ -54,7 +54,7 @@ namespace Octokit.Tests.Clients public void RequestsCorrectUrl() { var connection = Substitute.For(); - var client = new ActivityEventsClient(connection); + var client = new EventsClient(connection); client.GetAllForRepositoryNetwork("fake", "repo"); @@ -65,7 +65,7 @@ namespace Octokit.Tests.Clients public async Task EnsuresArgumentsNotNull() { var connection = Substitute.For(); - var client = new ActivityEventsClient(connection); + var client = new EventsClient(connection); await AssertEx.Throws(async () => await client.GetAllForRepositoryNetwork(null, "name")); await AssertEx.Throws(async () => await client.GetAllForRepositoryNetwork("", "name")); @@ -80,7 +80,7 @@ namespace Octokit.Tests.Clients public void RequestsCorrectUrl() { var connection = Substitute.For(); - var client = new ActivityEventsClient(connection); + var client = new EventsClient(connection); client.GetAllForOrganization("fake"); @@ -91,7 +91,7 @@ namespace Octokit.Tests.Clients public async Task EnsuresArgumentsNotNull() { var connection = Substitute.For(); - var client = new ActivityEventsClient(connection); + var client = new EventsClient(connection); await AssertEx.Throws(async () => await client.GetAllForOrganization(null)); await AssertEx.Throws(async () => await client.GetAllForOrganization("")); @@ -104,7 +104,7 @@ namespace Octokit.Tests.Clients public void RequestsCorrectUrl() { var connection = Substitute.For(); - var client = new ActivityEventsClient(connection); + var client = new EventsClient(connection); client.GetUserReceived("fake"); @@ -115,7 +115,7 @@ namespace Octokit.Tests.Clients public async Task EnsuresArgumentsNotNull() { var connection = Substitute.For(); - var client = new ActivityEventsClient(connection); + var client = new EventsClient(connection); await AssertEx.Throws(async () => await client.GetUserReceived(null)); await AssertEx.Throws(async () => await client.GetUserReceived("")); @@ -128,7 +128,7 @@ namespace Octokit.Tests.Clients public void RequestsCorrectUrl() { var connection = Substitute.For(); - var client = new ActivityEventsClient(connection); + var client = new EventsClient(connection); client.GetUserReceivedPublic("fake"); @@ -139,7 +139,7 @@ namespace Octokit.Tests.Clients public async Task EnsuresArgumentsNotNull() { var connection = Substitute.For(); - var client = new ActivityEventsClient(connection); + var client = new EventsClient(connection); await AssertEx.Throws(async () => await client.GetUserReceivedPublic(null)); await AssertEx.Throws(async () => await client.GetUserReceivedPublic("")); @@ -152,7 +152,7 @@ namespace Octokit.Tests.Clients public void RequestsCorrectUrl() { var connection = Substitute.For(); - var client = new ActivityEventsClient(connection); + var client = new EventsClient(connection); client.GetUserPerformed("fake"); @@ -163,7 +163,7 @@ namespace Octokit.Tests.Clients public async Task EnsuresArgumentsNotNull() { var connection = Substitute.For(); - var client = new ActivityEventsClient(connection); + var client = new EventsClient(connection); await AssertEx.Throws(async () => await client.GetUserPerformed(null)); await AssertEx.Throws(async () => await client.GetUserPerformed("")); @@ -176,7 +176,7 @@ namespace Octokit.Tests.Clients public void RequestsCorrectUrl() { var connection = Substitute.For(); - var client = new ActivityEventsClient(connection); + var client = new EventsClient(connection); client.GetUserPerformedPublic("fake"); @@ -187,7 +187,7 @@ namespace Octokit.Tests.Clients public async Task EnsuresArgumentsNotNull() { var connection = Substitute.For(); - var client = new ActivityEventsClient(connection); + var client = new EventsClient(connection); await AssertEx.Throws(async () => await client.GetUserPerformedPublic(null)); await AssertEx.Throws(async () => await client.GetUserPerformedPublic("")); @@ -200,7 +200,7 @@ namespace Octokit.Tests.Clients public void RequestsCorrectUrl() { var connection = Substitute.For(); - var client = new ActivityEventsClient(connection); + var client = new EventsClient(connection); client.GetForAnOrganization("fake", "org"); @@ -211,7 +211,7 @@ namespace Octokit.Tests.Clients public async Task EnsuresArgumentsNotNull() { var connection = Substitute.For(); - var client = new ActivityEventsClient(connection); + var client = new EventsClient(connection); await AssertEx.Throws(async () => await client.GetForAnOrganization(null, "org")); await AssertEx.Throws(async () => await client.GetForAnOrganization("", "org")); diff --git a/Octokit.Tests/Octokit.Tests.csproj b/Octokit.Tests/Octokit.Tests.csproj index 42f8895a..14f98c19 100644 --- a/Octokit.Tests/Octokit.Tests.csproj +++ b/Octokit.Tests/Octokit.Tests.csproj @@ -62,7 +62,7 @@ - + @@ -111,7 +111,7 @@ - + diff --git a/Octokit.Tests/Reactive/ObservableActivityEventsClientTests.cs b/Octokit.Tests/Reactive/ObservableEventsClientTests.cs similarity index 85% rename from Octokit.Tests/Reactive/ObservableActivityEventsClientTests.cs rename to Octokit.Tests/Reactive/ObservableEventsClientTests.cs index beddfebb..8066c514 100644 --- a/Octokit.Tests/Reactive/ObservableActivityEventsClientTests.cs +++ b/Octokit.Tests/Reactive/ObservableEventsClientTests.cs @@ -9,7 +9,7 @@ using Xunit; namespace Octokit.Tests.Reactive { - public class ObservableActivityEventsClientTests + public class ObservableEventsClientTests { public class TheGetAllMethod { @@ -17,7 +17,7 @@ namespace Octokit.Tests.Reactive public void RequestsCorrectUrl() { var gitHubClient = Substitute.For(); - var client = new ObservableActivityEventsClient(gitHubClient); + var client = new ObservableEventsClient(gitHubClient); client.GetAll(); @@ -31,7 +31,7 @@ namespace Octokit.Tests.Reactive public void RequestsCorrectUrl() { var gitHubClient = Substitute.For(); - var client = new ObservableActivityEventsClient(gitHubClient); + var client = new ObservableEventsClient(gitHubClient); client.GetAllForRepository("fake", "repo"); @@ -42,7 +42,7 @@ namespace Octokit.Tests.Reactive public async Task EnsuresArgumentsNotNull() { var gitHubClient = Substitute.For(); - var client = new ObservableActivityEventsClient(gitHubClient); + var client = new ObservableEventsClient(gitHubClient); await AssertEx.Throws(async () => await client.GetAllForRepository(null, "name")); await AssertEx.Throws(async () => await client.GetAllForRepository("", "name")); @@ -57,7 +57,7 @@ namespace Octokit.Tests.Reactive public void RequestsCorrectUrl() { var gitHubClient = Substitute.For(); - var client = new ObservableActivityEventsClient(gitHubClient); + var client = new ObservableEventsClient(gitHubClient); client.GetAllForRepositoryNetwork("fake", "repo"); @@ -68,7 +68,7 @@ namespace Octokit.Tests.Reactive public async Task EnsuresArgumentsNotNull() { var gitHubClient = Substitute.For(); - var client = new ObservableActivityEventsClient(gitHubClient); + var client = new ObservableEventsClient(gitHubClient); await AssertEx.Throws(async () => await client.GetAllForRepositoryNetwork(null, "name")); await AssertEx.Throws(async () => await client.GetAllForRepositoryNetwork("", "name")); @@ -83,7 +83,7 @@ namespace Octokit.Tests.Reactive public void RequestsCorrectUrl() { var gitHubClient = Substitute.For(); - var client = new ObservableActivityEventsClient(gitHubClient); + var client = new ObservableEventsClient(gitHubClient); client.GetAllForOrganization("fake"); @@ -94,7 +94,7 @@ namespace Octokit.Tests.Reactive public async Task EnsuresArgumentsNotNull() { var gitHubClient = Substitute.For(); - var client = new ObservableActivityEventsClient(gitHubClient); + var client = new ObservableEventsClient(gitHubClient); await AssertEx.Throws(async () => await client.GetAllForOrganization(null)); await AssertEx.Throws(async () => await client.GetAllForOrganization("")); @@ -107,7 +107,7 @@ namespace Octokit.Tests.Reactive public void RequestsCorrectUrl() { var gitHubClient = Substitute.For(); - var client = new ObservableActivityEventsClient(gitHubClient); + var client = new ObservableEventsClient(gitHubClient); client.GetUserReceived("fake"); @@ -118,7 +118,7 @@ namespace Octokit.Tests.Reactive public async Task EnsuresArgumentsNotNull() { var gitHubClient = Substitute.For(); - var client = new ObservableActivityEventsClient(gitHubClient); + var client = new ObservableEventsClient(gitHubClient); await AssertEx.Throws(async () => await client.GetUserReceived(null)); await AssertEx.Throws(async () => await client.GetUserReceived("")); @@ -131,7 +131,7 @@ namespace Octokit.Tests.Reactive public void RequestsCorrectUrl() { var gitHubClient = Substitute.For(); - var client = new ObservableActivityEventsClient(gitHubClient); + var client = new ObservableEventsClient(gitHubClient); client.GetUserReceivedPublic("fake"); @@ -142,7 +142,7 @@ namespace Octokit.Tests.Reactive public async Task EnsuresArgumentsNotNull() { var gitHubClient = Substitute.For(); - var client = new ObservableActivityEventsClient(gitHubClient); + var client = new ObservableEventsClient(gitHubClient); await AssertEx.Throws(async () => await client.GetUserReceivedPublic(null)); await AssertEx.Throws(async () => await client.GetUserReceivedPublic("")); @@ -155,7 +155,7 @@ namespace Octokit.Tests.Reactive public void RequestsCorrectUrl() { var gitHubClient = Substitute.For(); - var client = new ObservableActivityEventsClient(gitHubClient); + var client = new ObservableEventsClient(gitHubClient); client.GetUserPerformed("fake"); @@ -166,7 +166,7 @@ namespace Octokit.Tests.Reactive public async Task EnsuresArgumentsNotNull() { var gitHubClient = Substitute.For(); - var client = new ObservableActivityEventsClient(gitHubClient); + var client = new ObservableEventsClient(gitHubClient); await AssertEx.Throws(async () => await client.GetUserPerformed(null)); await AssertEx.Throws(async () => await client.GetUserPerformed("")); @@ -179,7 +179,7 @@ namespace Octokit.Tests.Reactive public void RequestsCorrectUrl() { var gitHubClient = Substitute.For(); - var client = new ObservableActivityEventsClient(gitHubClient); + var client = new ObservableEventsClient(gitHubClient); client.GetUserPerformedPublic("fake"); @@ -190,7 +190,7 @@ namespace Octokit.Tests.Reactive public async Task EnsuresArgumentsNotNull() { var gitHubClient = Substitute.For(); - var client = new ObservableActivityEventsClient(gitHubClient); + var client = new ObservableEventsClient(gitHubClient); await AssertEx.Throws(async () => await client.GetUserPerformedPublic(null)); await AssertEx.Throws(async () => await client.GetUserPerformedPublic("")); @@ -203,7 +203,7 @@ namespace Octokit.Tests.Reactive public void RequestsCorrectUrl() { var gitHubClient = Substitute.For(); - var client = new ObservableActivityEventsClient(gitHubClient); + var client = new ObservableEventsClient(gitHubClient); client.GetForAnOrganization("fake", "org"); @@ -214,7 +214,7 @@ namespace Octokit.Tests.Reactive public async Task EnsuresArgumentsNotNull() { var gitHubClient = Substitute.For(); - var client = new ObservableActivityEventsClient(gitHubClient); + var client = new ObservableEventsClient(gitHubClient); await AssertEx.Throws(async () => await client.GetForAnOrganization(null, "org")); await AssertEx.Throws(async () => await client.GetForAnOrganization("", "org")); diff --git a/Octokit/Clients/ActivitiesClient.cs b/Octokit/Clients/ActivitiesClient.cs new file mode 100644 index 00000000..8b47d9fa --- /dev/null +++ b/Octokit/Clients/ActivitiesClient.cs @@ -0,0 +1,13 @@ +namespace Octokit +{ + public class ActivitiesClient : ApiClient, IActivitiesClient + { + public ActivitiesClient(IApiConnection apiConnection) + : base(apiConnection) + { + Event = new EventsClient(apiConnection); + } + + public IEventsClient Event { get; private set; } + } +} diff --git a/Octokit/Clients/ActivityEventsClient.cs b/Octokit/Clients/EventsClient.cs similarity index 97% rename from Octokit/Clients/ActivityEventsClient.cs rename to Octokit/Clients/EventsClient.cs index 0c3020e0..45a21471 100644 --- a/Octokit/Clients/ActivityEventsClient.cs +++ b/Octokit/Clients/EventsClient.cs @@ -3,9 +3,9 @@ using System.Threading.Tasks; namespace Octokit { - public class ActivityEventsClient : ApiClient, IActivityEventsClient + public class EventsClient : ApiClient, IEventsClient { - public ActivityEventsClient(IApiConnection apiConnection) + public EventsClient(IApiConnection apiConnection) : base(apiConnection) { } diff --git a/Octokit/Clients/IActivitiesClient.cs b/Octokit/Clients/IActivitiesClient.cs new file mode 100644 index 00000000..1d024078 --- /dev/null +++ b/Octokit/Clients/IActivitiesClient.cs @@ -0,0 +1,7 @@ +namespace Octokit +{ + public interface IActivitiesClient + { + IEventsClient Event { get; } + } +} \ No newline at end of file diff --git a/Octokit/Clients/IActivityEventsClient.cs b/Octokit/Clients/IEventsClient.cs similarity index 99% rename from Octokit/Clients/IActivityEventsClient.cs rename to Octokit/Clients/IEventsClient.cs index 6a1e903e..9f436818 100644 --- a/Octokit/Clients/IActivityEventsClient.cs +++ b/Octokit/Clients/IEventsClient.cs @@ -3,7 +3,7 @@ using System.Threading.Tasks; namespace Octokit { - public interface IActivityEventsClient + public interface IEventsClient { /// /// Gets all the public events diff --git a/Octokit/GitHubClient.cs b/Octokit/GitHubClient.cs index 970e7771..75296b4e 100644 --- a/Octokit/GitHubClient.cs +++ b/Octokit/GitHubClient.cs @@ -80,7 +80,7 @@ namespace Octokit Connection = connection; var apiConnection = new ApiConnection(connection); Authorization = new AuthorizationsClient(apiConnection); - Event = new ActivityEventsClient(apiConnection); + Activity = new IActivitiesClient(apiConnection); Issue = new IssuesClient(apiConnection); Miscellaneous = new MiscellaneousClient(connection); Notification = new NotificationsClient(apiConnection); @@ -127,7 +127,7 @@ namespace Octokit public IConnection Connection { get; private set; } public IAuthorizationsClient Authorization { get; private set; } - public IActivityEventsClient Event { get; set; } + public IActivitiesClient Activity { get; set; } public IIssuesClient Issue { get; private set; } public IMiscellaneousClient Miscellaneous { get; private set; } public IOrganizationsClient Organization { get; private set; } diff --git a/Octokit/IGitHubClient.cs b/Octokit/IGitHubClient.cs index 3a87d78c..c8586208 100644 --- a/Octokit/IGitHubClient.cs +++ b/Octokit/IGitHubClient.cs @@ -7,7 +7,7 @@ namespace Octokit IConnection Connection { get; } IAuthorizationsClient Authorization { get; } - IActivityEventsClient Event { get; } + IActivitiesClient Activity { get; } IIssuesClient Issue { get; } IMiscellaneousClient Miscellaneous { get; } IOrganizationsClient Organization { get; } diff --git a/Octokit/Octokit.csproj b/Octokit/Octokit.csproj index fd2499f7..a8d41bba 100644 --- a/Octokit/Octokit.csproj +++ b/Octokit/Octokit.csproj @@ -52,12 +52,14 @@ Properties\SolutionInfo.cs - + + + - +