Implemented IUserEmailsClient GetAll and Add methods

Octokit.Tests.Integration/Clients/UserEmailsClientTests.cs

@@ -0,0 +1,21 @@
+using System.Net.Http.Headers;
+using System.Threading.Tasks;
+using Xunit;
+
+namespace Octokit.Tests.Integration.Clients
+{
+    public class UserEmailsClientTests
+    {
+        [IntegrationTest]
+        public async Task CanGetEmail()
+        {
+            var github = new GitHubClient(new ProductHeaderValue("OctokitTests"))
+            {
+                Credentials = Helper.Credentials
+            };
+
+            var emails = await github.User.Email.GetAll();
+            Assert.NotEmpty(emails);
+        }
+    }
+}

Octokit.Tests.Integration/Clients/UsersClientTests.cs

@@ -99,22 +99,4 @@ public async Task FailsWhenAuthenticatedWithBadCredentials()
             Assert.Equal(HttpStatusCode.Unauthorized, e.StatusCode);
         }
     }
-
-    public class TheGetEmailsMethod
-    {
-        [IntegrationTest]
-        public async Task RetrievesEmailsForUser()
-        {
-            var github = new GitHubClient(new ProductHeaderValue("OctokitTests"))
-            {
-                Credentials = Helper.Credentials
-            };
-
-            var emails = await github.User.GetEmails();
-
-            Assert.NotEmpty(emails);
-            var email = emails.First();
-            Assert.True(email.Primary);
-        }
-    }
 }

Octokit.Tests.Integration/Octokit.Tests.Integration.csproj

@@ -69,6 +69,7 @@
     <Compile Include="Clients\MilestonesClientTests.cs" />
     <Compile Include="Clients\ReferencesClientTests.cs" />
     <Compile Include="Clients\TreeClientTests.cs" />
+    <Compile Include="Clients\UserEmailsClientTests.cs" />
     <Compile Include="Clients\FollowersClientTests.cs" />
     <Compile Include="IntegrationTestAttribute.cs" />
     <Compile Include="Clients\IssuesClientTests.cs" />

Octokit.Tests/Clients/UserEmailsClientTests.cs

@@ -0,0 +1,56 @@
+using NSubstitute;
+using Octokit.Tests.Helpers;
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Xunit;
+
+namespace Octokit.Tests.Clients
+{
+    public class UserEmailsClientTests
+    {
+        public class TheGetAllMethod
+        {
+            [Fact]
+            public void GetsCorrectUrl()
+            {
+                var connection = Substitute.For<IApiConnection>();
+                var client = new UserEmailsClient(connection);
+
+                client.GetAll();
+
+                connection.Received(1)
+                    .GetAll<EmailAddress>(Arg.Is<Uri>(u => u.ToString() == "user/emails"));
+            }
+        }
+
+        public class TheAddMethod
+        {
+            [Fact]
+            public void PostsToCorrectUrl()
+            {
+                var connection = Substitute.For<IApiConnection>();
+                var client = new UserEmailsClient(connection);
+
+                client.Add("octocat@github.com");
+
+                connection.Received(1)
+                    .Post<IReadOnlyList<string>>(Arg.Is<Uri>(u => u.ToString() == "user/emails"), Arg.Any<string[]>());
+            }
+
+            [Fact]
+            public async Task EnsuresNonNullArgument()
+            {
+                var client = new UserEmailsClient(Substitute.For<IApiConnection>());
+                await AssertEx.Throws<ArgumentNullException>(async () => await client.Add(null));
+            }
+
+            [Fact]
+            public async Task EnsuresNoNullEmails()
+            {
+                var client = new UserEmailsClient(Substitute.For<IApiConnection>());
+                await AssertEx.Throws<ArgumentException>(async () => await client.Add("octokit@github.com", null));
+            }
+        }
+    }
+}

Octokit.Tests/Clients/UsersClientTests.cs

@@ -90,20 +90,5 @@ public async Task EnsuresArgumentsNotNull()
                 await AssertEx.Throws<ArgumentNullException>(() => userEndpoint.Update(null));
             }
         }
-
-        public class TheGetEmailsMethod
-        {
-            [Fact]
-            public void SendsUpdateToCorrectUrl()
-            {
-                var endpoint = new Uri("user/emails", UriKind.Relative);
-                var client = Substitute.For<IApiConnection>();
-                var usersClient = new UsersClient(client);
-
-                usersClient.GetEmails();
-
-                client.Received().GetAll<EmailAddress>(endpoint, null);
-            }
-        }
     }
 }

Octokit.Tests/Octokit.Tests.csproj

@@ -86,6 +86,7 @@
     <Compile Include="Clients\ReleasesClientTests.cs" />
     <Compile Include="Clients\SshKeysClientTests.cs" />
     <Compile Include="Clients\TreesClientTests.cs" />
+    <Compile Include="Clients\UserEmailsClientTests.cs" />
     <Compile Include="Clients\WatchedClientTests.cs" />
     <Compile Include="Clients\FollowersClientTests.cs" />
     <Compile Include="Exceptions\ApiExceptionTests.cs" />

Octokit/Clients/IUserEmailsClient.cs

@@ -0,0 +1,23 @@
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Threading.Tasks;
+
+namespace Octokit
+{
+    public interface IUserEmailsClient
+    {
+        /// <summary>
+        /// Gets all email addresses for the authenticated user.
+        /// </summary>
+        /// <returns></returns>
+        [SuppressMessage("Microsoft.Design", "CA1024:UsePropertiesWhereAppropriate")]
+        Task<IReadOnlyList<EmailAddress>> GetAll();
+
+        /// <summary>
+        /// Adds email addresses for the authenticated user.
+        /// </summary>
+        /// <param name="emailAddresses">The email addresses to add.</param>
+        /// <returns></returns>
+        Task<IReadOnlyList<string>> Add(params string[] emailAddresses);
+    }
+}

Octokit/Clients/IUsersClient.cs

@@ -12,6 +12,8 @@ namespace Octokit
     /// </remarks>
     public interface IUsersClient
     {
+        IUserEmailsClient Email { get; }
+
         /// <summary>
         /// Returns the user specified by the login.
         /// </summary>
@@ -35,13 +37,6 @@ public interface IUsersClient
         /// <returns>A <see cref="User"/></returns>
         Task<User> Update(UserUpdate user);
 
-        /// <summary>
-        /// Returns emails for the current user.
-        /// </summary>
-        /// <returns></returns>
-        [SuppressMessage("Microsoft.Design", "CA1024:UsePropertiesWhereAppropriate")]
-        Task<IReadOnlyList<EmailAddress>> GetEmails();
-
         /// <summary>
         /// A client for GitHub's User Followers API
         /// </summary>

Octokit/Clients/UserEmailsClient.cs

@@ -0,0 +1,37 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace Octokit
+{
+    public class UserEmailsClient : ApiClient, IUserEmailsClient
+    {
+        public UserEmailsClient(IApiConnection apiConnection)
+            : base(apiConnection)
+        { }
+
+        /// <summary>
+        /// Gets all email addresses for the authenticated user.
+        /// </summary>
+        /// <returns></returns>
+        public Task<IReadOnlyList<EmailAddress>> GetAll()
+        {
+            return ApiConnection.GetAll<EmailAddress>(ApiUrls.Emails());
+        }
+
+        /// <summary>
+        /// Adds email addresses for the authenticated user.
+        /// </summary>
+        /// <param name="emailAddresses">The email addresses to add.</param>
+        /// <returns></returns>
+        public Task<IReadOnlyList<string>> Add(params string[] emailAddresses)
+        {
+            Ensure.ArgumentNotNull(emailAddresses, "emailAddresses");
+            if (emailAddresses.Any(String.IsNullOrWhiteSpace))
+                throw new ArgumentException("Cannot contain null, empty or whitespace values", "emailAddresses");
+
+            return ApiConnection.Post<IReadOnlyList<string>>(ApiUrls.Emails(), emailAddresses);
+        }
+    }
+}

Octokit/Clients/UsersClient.cs

@@ -23,9 +23,12 @@ public class UsersClient : ApiClient, IUsersClient
         /// <param name="apiConnection">An API connection</param>
         public UsersClient(IApiConnection apiConnection) : base(apiConnection)
         {
+            Email = new UserEmailsClient(apiConnection);
             Followers = new FollowersClient(apiConnection);
         }
 
+        public IUserEmailsClient Email { get; private set; }
+
         /// <summary>
         /// Returns the user specified by the login.
         /// </summary>
@@ -61,15 +64,6 @@ public Task<User> Update(UserUpdate user)
             return ApiConnection.Patch<User>(_userEndpoint, user);
         }
 
-        /// <summary>
-        /// Returns emails for the current user.
-        /// </summary>
-        /// <returns></returns>
-        public Task<IReadOnlyList<EmailAddress>> GetEmails()
-        {
-            return ApiConnection.GetAll<EmailAddress>(ApiUrls.Emails(), null);
-        }
-
         /// <summary>
         /// A client for GitHub's User Followers API
         /// </summary>

Octokit/Octokit-Mono.csproj

@@ -252,6 +252,8 @@
     <Compile Include="Models\Request\BodyWrapper.cs" />
     <Compile Include="Models\Request\BaseSearchRequest.cs" />
     <Compile Include="Helpers\EnumExtensions.cs" />
+    <Compile Include="Clients\IUserEmailsClient.cs" />
+    <Compile Include="Clients\UserEmailsClient.cs" />
     <Compile Include="Models\Response\Emoji.cs" />
     <Compile Include="Clients\FollowersClient.cs" />
     <Compile Include="Clients\IFollowersClient.cs" />

Octokit/Octokit-MonoAndroid.csproj

@@ -258,6 +258,8 @@
     <Compile Include="Models\Response\Branch.cs" />
     <Compile Include="Models\Request\BaseSearchRequest.cs" />
     <Compile Include="Helpers\EnumExtensions.cs" />
+    <Compile Include="Clients\IUserEmailsClient.cs" />
+    <Compile Include="Clients\UserEmailsClient.cs" />
     <Compile Include="Clients\IWatchedClient.cs" />
     <Compile Include="Clients\WatchedClient.cs" />
     <Compile Include="Models\Request\NewSubscription.cs" />

Octokit/Octokit-Monotouch.csproj

@@ -253,6 +253,8 @@
     <Compile Include="Models\Response\Branch.cs" />
     <Compile Include="Models\Request\BaseSearchRequest.cs" />
     <Compile Include="Helpers\EnumExtensions.cs" />
+    <Compile Include="Clients\IUserEmailsClient.cs" />
+    <Compile Include="Clients\UserEmailsClient.cs" />
     <Compile Include="Clients\IWatchedClient.cs" />
     <Compile Include="Clients\WatchedClient.cs" />
     <Compile Include="Models\Request\NewSubscription.cs" />

Octokit/Octokit-netcore45.csproj

@@ -252,6 +252,8 @@
     <Compile Include="Models\Response\GistComment.cs" />
     <Compile Include="Models\Request\BodyWrapper.cs" />
     <Compile Include="Models\Request\BaseSearchRequest.cs" />
+    <Compile Include="Clients\IUserEmailsClient.cs" />
+    <Compile Include="Clients\UserEmailsClient.cs" />
     <Compile Include="Models\Response\Emoji.cs" />
   </ItemGroup>
   <ItemGroup>

Octokit/Octokit.csproj

@@ -54,6 +54,8 @@
       <Link>Properties\SolutionInfo.cs</Link>
     </Compile>
     <Compile Include="Clients\ActivitiesClient.cs" />
+    <Compile Include="Clients\IUserEmailsClient.cs" />
+    <Compile Include="Clients\UserEmailsClient.cs" />
     <Compile Include="Clients\IWatchedClient.cs" />
     <Compile Include="Clients\SearchClient.cs" />
     <Compile Include="Clients\ISearchClient.cs" />