From ae6c5b7405c236f54eaa844b0faeac5e241804cb Mon Sep 17 00:00:00 2001
From: "aedampir@gmail.com" <aedampir@gmail.com>
Date: Thu, 19 May 2016 15:07:56 +0700
Subject: [PATCH] added overloads with repositoryId for
 IObservableRepoCollaboratorsClient

---
 .../IObservableRepoCollaboratorsClient.cs     | 59 +++++++++++++
 .../ObservableRepoCollaboratorsClient.cs      | 82 +++++++++++++++++++
 Octokit/Clients/RepoCollaboratorsClient.cs    |  2 +
 3 files changed, 143 insertions(+)

diff --git a/Octokit.Reactive/Clients/IObservableRepoCollaboratorsClient.cs b/Octokit.Reactive/Clients/IObservableRepoCollaboratorsClient.cs
index 9c657c6c..8d9b1373 100644
--- a/Octokit.Reactive/Clients/IObservableRepoCollaboratorsClient.cs
+++ b/Octokit.Reactive/Clients/IObservableRepoCollaboratorsClient.cs
@@ -23,6 +23,17 @@ namespace Octokit.Reactive
         /// <returns>A <see cref="IObservable{User}"/> of <see cref="User"/>s for the specified repository.</returns>
         IObservable<User> GetAll(string owner, string name);
 
+        /// <summary>
+        /// Gets all the collaborators on a repository.
+        /// </summary>
+        /// <remarks>
+        /// See the <a href="http://developer.github.com/v3/repos/collaborators/#list">API documentation</a> for more information.
+        /// </remarks>
+        /// <param name="repositoryId">The id of the repository</param>
+        /// <exception cref="ApiException">Thrown when a general API error occurs.</exception>
+        /// <returns>A <see cref="IObservable{User}"/> of <see cref="User"/>s for the specified repository.</returns>
+        IObservable<User> GetAll(int repositoryId);
+
         /// <summary>
         /// Gets all the collaborators on a repository.
         /// </summary>
@@ -36,6 +47,18 @@ namespace Octokit.Reactive
         /// <returns>A <see cref="IObservable{User}"/> of <see cref="User"/>s for the specified repository.</returns>
         IObservable<User> GetAll(string owner, string name, ApiOptions options);
 
+        /// <summary>
+        /// Gets all the collaborators on a repository.
+        /// </summary>
+        /// <remarks>
+        /// See the <a href="http://developer.github.com/v3/repos/collaborators/#list">API documentation</a> for more information.
+        /// </remarks>
+        /// <param name="repositoryId">The id of the repository</param>
+        /// <param name="options">Options for changing the API response</param>
+        /// <exception cref="ApiException">Thrown when a general API error occurs.</exception>
+        /// <returns>A <see cref="IObservable{User}"/> of <see cref="User"/>s for the specified repository.</returns>
+        IObservable<User> GetAll(int repositoryId, ApiOptions options);
+
         /// <summary>
         /// Checks if a user is a collaborator on a repository.
         /// </summary>
@@ -49,6 +72,18 @@ namespace Octokit.Reactive
         /// <returns><see cref="bool"/>True if user is a collaborator else false</returns>
         IObservable<bool> IsCollaborator(string owner, string name, string user);
 
+        /// <summary>
+        /// Checks if a user is a collaborator on a repository.
+        /// </summary>
+        /// <remarks>
+        /// See the <a href="http://developer.github.com/v3/repos/collaborators/#get">API documentation</a> for more information.
+        /// </remarks>
+        /// <param name="repositoryId">The id of the repository</param>
+        /// <param name="user">Username of the prospective collaborator</param>
+        /// <exception cref="ApiException">Thrown when a general API error occurs.</exception>
+        /// <returns><see cref="bool"/>True if user is a collaborator else false</returns>
+        IObservable<bool> IsCollaborator(int repositoryId, string user);
+
         /// <summary>
         /// Adds a new collaborator to the repository.
         /// </summary>
@@ -62,6 +97,18 @@ namespace Octokit.Reactive
         /// <returns><see cref="Unit"/></returns>
         IObservable<Unit> Add(string owner, string name, string user);
 
+        /// <summary>
+        /// Adds a new collaborator to the repository.
+        /// </summary>
+        /// <remarks>
+        /// See the <a href="http://developer.github.com/v3/repos/collaborators/#add-collaborator">API documentation</a> for more information.
+        /// </remarks>
+        /// <param name="repositoryId">The id of the repository</param>
+        /// <param name="user">Username of the new collaborator</param>
+        /// <exception cref="ApiException">Thrown when a general API error occurs.</exception>
+        /// <returns><see cref="Unit"/></returns>
+        IObservable<Unit> Add(int repositoryId, string user);
+
         /// <summary>
         /// Deletes a collaborator from the repository.
         /// </summary>
@@ -74,5 +121,17 @@ namespace Octokit.Reactive
         /// <exception cref="ApiException">Thrown when a general API error occurs.</exception>
         /// <returns><see cref="Unit"/></returns>
         IObservable<Unit> Delete(string owner, string name, string user);
+
+        /// <summary>
+        /// Deletes a collaborator from the repository.
+        /// </summary>
+        /// <remarks>
+        /// See the <a href="http://developer.github.com/v3/repos/collaborators/#remove-collaborator">API documentation</a> for more information.
+        /// </remarks>
+        /// <param name="repositoryId">The id of the repository</param>
+        /// <param name="user">Username of the removed collaborator</param>
+        /// <exception cref="ApiException">Thrown when a general API error occurs.</exception>
+        /// <returns><see cref="Unit"/></returns>
+        IObservable<Unit> Delete(int repositoryId, string user);
     }
 }
diff --git a/Octokit.Reactive/Clients/ObservableRepoCollaboratorsClient.cs b/Octokit.Reactive/Clients/ObservableRepoCollaboratorsClient.cs
index cfa537e8..1240f2f0 100644
--- a/Octokit.Reactive/Clients/ObservableRepoCollaboratorsClient.cs
+++ b/Octokit.Reactive/Clients/ObservableRepoCollaboratorsClient.cs
@@ -46,6 +46,20 @@ namespace Octokit.Reactive
             return GetAll(owner, name, ApiOptions.None);
         }
 
+        /// <summary>
+        /// Gets all the collaborators on a repository.
+        /// </summary>
+        /// <remarks>
+        /// See the <a href="http://developer.github.com/v3/repos/collaborators/#list">API documentation</a> for more information.
+        /// </remarks>
+        /// <param name="repositoryId">The id of the repository</param>
+        /// <exception cref="ApiException">Thrown when a general API error occurs.</exception>
+        /// <returns>A <see cref="IObservable{User}"/> of <see cref="User"/>s for the specified repository.</returns>
+        public IObservable<User> GetAll(int repositoryId)
+        {
+            return GetAll(repositoryId, ApiOptions.None);
+        }
+
         /// <summary>
         /// Gets all the collaborators on a repository.
         /// </summary>
@@ -66,6 +80,23 @@ namespace Octokit.Reactive
             return _connection.GetAndFlattenAllPages<User>(ApiUrls.RepoCollaborators(owner, name), options);
         }
 
+        /// <summary>
+        /// Gets all the collaborators on a repository.
+        /// </summary>
+        /// <remarks>
+        /// See the <a href="http://developer.github.com/v3/repos/collaborators/#list">API documentation</a> for more information.
+        /// </remarks>
+        /// <param name="repositoryId">The id of the repository</param>
+        /// <param name="options">Options for changing the API response</param>
+        /// <exception cref="ApiException">Thrown when a general API error occurs.</exception>
+        /// <returns>A <see cref="IObservable{User}"/> of <see cref="User"/>s for the specified repository.</returns>
+        public IObservable<User> GetAll(int repositoryId, ApiOptions options)
+        {
+            Ensure.ArgumentNotNull(options, "options");
+
+            return _connection.GetAndFlattenAllPages<User>(ApiUrls.RepoCollaborators(repositoryId), options);
+        }
+
         /// <summary>
         /// Checks if a user is a collaborator on a repository.
         /// </summary>
@@ -86,6 +117,23 @@ namespace Octokit.Reactive
             return _client.IsCollaborator(owner, name, user).ToObservable();
         }
 
+        /// <summary>
+        /// Checks if a user is a collaborator on a repository.
+        /// </summary>
+        /// <remarks>
+        /// See the <a href="http://developer.github.com/v3/repos/collaborators/#get">API documentation</a> for more information.
+        /// </remarks>
+        /// <param name="repositoryId">The id of the repository</param>
+        /// <param name="user">Username of the prospective collaborator</param>
+        /// <exception cref="ApiException">Thrown when a general API error occurs.</exception>
+        /// <returns><see cref="bool"/>True if user is a collaborator else false</returns>
+        public IObservable<bool> IsCollaborator(int repositoryId, string user)
+        {
+            Ensure.ArgumentNotNullOrEmptyString(user, "user");
+
+            return _client.IsCollaborator(repositoryId, user).ToObservable();
+        }
+
         /// <summary>
         /// Adds a new collaborator to the repository.
         /// </summary>
@@ -106,6 +154,23 @@ namespace Octokit.Reactive
             return _client.Add(owner, name, user).ToObservable();
         }
 
+        /// <summary>
+        /// Adds a new collaborator to the repository.
+        /// </summary>
+        /// <remarks>
+        /// See the <a href="http://developer.github.com/v3/repos/collaborators/#add-collaborator">API documentation</a> for more information.
+        /// </remarks>
+        /// <param name="repositoryId">The id of the repository</param>
+        /// <param name="user">Username of the new collaborator</param>
+        /// <exception cref="ApiException">Thrown when a general API error occurs.</exception>
+        /// <returns><see cref="Unit"/></returns>
+        public IObservable<Unit> Add(int repositoryId, string user)
+        {
+            Ensure.ArgumentNotNullOrEmptyString(user, "user");
+
+            return _client.Add(repositoryId, user).ToObservable();
+        }
+
         /// <summary>
         /// Deletes a collaborator from the repository.
         /// </summary>
@@ -125,5 +190,22 @@ namespace Octokit.Reactive
 
             return _client.Delete(owner, name, user).ToObservable();
         }
+
+        /// <summary>
+        /// Deletes a collaborator from the repository.
+        /// </summary>
+        /// <remarks>
+        /// See the <a href="http://developer.github.com/v3/repos/collaborators/#remove-collaborator">API documentation</a> for more information.
+        /// </remarks>
+        /// <param name="repositoryId">The id of the repository</param>
+        /// <param name="user">Username of the removed collaborator</param>
+        /// <exception cref="ApiException">Thrown when a general API error occurs.</exception>
+        /// <returns><see cref="Unit"/></returns>
+        public IObservable<Unit> Delete(int repositoryId, string user)
+        {
+            Ensure.ArgumentNotNullOrEmptyString(user, "user");
+
+            return _client.Delete(repositoryId, user).ToObservable();
+        }
     }
 }
diff --git a/Octokit/Clients/RepoCollaboratorsClient.cs b/Octokit/Clients/RepoCollaboratorsClient.cs
index 272038af..18137e51 100644
--- a/Octokit/Clients/RepoCollaboratorsClient.cs
+++ b/Octokit/Clients/RepoCollaboratorsClient.cs
@@ -86,6 +86,8 @@ namespace Octokit
         /// <returns>A <see cref="IReadOnlyPagedCollection{User}"/> of <see cref="User"/>s for the specified repository.</returns>
         public Task<IReadOnlyList<User>> GetAll(int repositoryId, ApiOptions options)
         {
+            Ensure.ArgumentNotNull(options, "options");
+
             return ApiConnection.GetAll<User>(ApiUrls.RepoCollaborators(repositoryId), options);
         }