From 6e2c2467e88410aabb516b3903583a36fa18cca8 Mon Sep 17 00:00:00 2001
From: pltaylor <pltaylor3@gmail.com>
Date: Mon, 4 Nov 2013 14:25:16 -0500
Subject: [PATCH] Finish up ObservableIssueCommentsClient

---
 .../Clients/IObservableIssueCommentsClient.cs |  6 +--
 .../Clients/ObservableIssueCommentsClient.cs  | 45 +++++++++----------
 .../Clients/ObservableIssuesClient.cs         |  2 +
 Octokit/Octokit-netcore45.csproj              |  2 +-
 4 files changed, 26 insertions(+), 29 deletions(-)

diff --git a/Octokit.Reactive/Clients/IObservableIssueCommentsClient.cs b/Octokit.Reactive/Clients/IObservableIssueCommentsClient.cs
index fb003b50..ce8483fa 100644
--- a/Octokit.Reactive/Clients/IObservableIssueCommentsClient.cs
+++ b/Octokit.Reactive/Clients/IObservableIssueCommentsClient.cs
@@ -4,7 +4,7 @@ using System;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 
-namespace Octokit.Reactive.Clients
+namespace Octokit.Reactive
 {
     public interface IObservableIssueCommentsClient
     {
@@ -27,7 +27,7 @@ namespace Octokit.Reactive.Clients
         /// <param name="owner">The owner of the repository</param>
         /// <param name="name">The name of the repository</param>
         /// <returns></returns>
-        IObservable<IssueComment> GetForRepository(string owner, string name);
+        IObservable<IReadOnlyList<IssueComment>> GetForRepository(string owner, string name);
 
         /// <summary>
         /// Gets Issue Comments for a specified Issue.
@@ -37,7 +37,7 @@ namespace Octokit.Reactive.Clients
         /// <param name="name">The name of the repository</param>
         /// <param name="number">The issue number</param>
         /// <returns></returns>
-        IObservable<IssueComment> GetForIssue(string owner, string name, int number);
+        IObservable<IReadOnlyList<IssueComment>> GetForIssue(string owner, string name, int number);
 
         /// <summary>
         /// Creates a new Issue Comment for a specified Issue.
diff --git a/Octokit.Reactive/Clients/ObservableIssueCommentsClient.cs b/Octokit.Reactive/Clients/ObservableIssueCommentsClient.cs
index 6076d38c..b621fd1d 100644
--- a/Octokit.Reactive/Clients/ObservableIssueCommentsClient.cs
+++ b/Octokit.Reactive/Clients/ObservableIssueCommentsClient.cs
@@ -1,21 +1,20 @@
 using System;
 using System.Collections.Generic;
-using Octokit.Reactive.Internal;
+using System.Reactive.Threading.Tasks;
 
-namespace Octokit.Reactive.Clients
+namespace Octokit.Reactive
 {
     class ObservableIssueCommentsClient : IObservableIssueCommentsClient
     {
-        readonly IIssuesClient _client;
-        readonly IConnection _connection;
+        readonly IIssueCommentsClient _client;
 
         public ObservableIssueCommentsClient(IGitHubClient client)
         {
             Ensure.ArgumentNotNull(client, "client");
 
-            _client = client.Issue;
-            _connection = client.Connection;
+            _client = client.Issue.Comment;
         }
+
         /// <summary>
         /// Gets a single Issue Comment by number.
         /// </summary>
@@ -28,11 +27,10 @@ namespace Octokit.Reactive.Clients
         /// <returns>The <see cref="IssueComment"/>s for the specified Issue Comment.</returns>
         public IObservable<IssueComment> Get(string owner, string name, int number)
         {
-            //Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            //Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
+            Ensure.ArgumentNotNullOrEmptyString(name, "name");
 
-            //return _client.Get<IssueComment>(ApiUrls.IssueComment(owner, name, number));
-            throw new NotImplementedException();
+            return _client.Get(owner, name, number).ToObservable();
         }
 
         /// <summary>
@@ -44,12 +42,12 @@ namespace Octokit.Reactive.Clients
         /// <param name="owner">The owner of the repository</param>
         /// <param name="name">The name of the repository</param>
         /// <returns>The list of <see cref="IssueComment"/>s for the specified Repository.</returns>
-        public IObservable<IssueComment> GetForRepository(string owner, string name)
+        public IObservable<IReadOnlyList<IssueComment>> GetForRepository(string owner, string name)
         {
             Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
             Ensure.ArgumentNotNullOrEmptyString(name, "name");
 
-            return _connection.GetAndFlattenAllPages<IssueComment>(ApiUrls.IssueComments(owner, name));
+            return _client.GetForRepository(owner, name).ToObservable();
         }
 
         /// <summary>
@@ -62,12 +60,12 @@ namespace Octokit.Reactive.Clients
         /// <param name="name">The name of the repository</param>
         /// <param name="number">The issue number</param>
         /// <returns>The list of <see cref="IssueComment"/>s for the specified Issue.</returns>
-        public IObservable<IssueComment> GetForIssue(string owner, string name, int number)
+        public IObservable<IReadOnlyList<IssueComment>> GetForIssue(string owner, string name, int number)
         {
             Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
             Ensure.ArgumentNotNullOrEmptyString(name, "name");
 
-            return _connection.GetAndFlattenAllPages<IssueComment>(ApiUrls.IssueComments(owner, name, number));
+            return _client.GetForIssue(owner, name, number).ToObservable();
         }
 
         /// <summary>
@@ -83,12 +81,11 @@ namespace Octokit.Reactive.Clients
         /// <returns>The <see cref="IssueComment"/>s for that was just created.</returns>
         public IObservable<IssueComment> Create(string owner, string name, int number, string newComment)
         {
-            //Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            //Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            //Ensure.ArgumentNotNull(newComment, "newComment");
+            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
+            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNull(newComment, "newComment");
 
-            //return _connection.Post<IssueComment>(ApiUrls.IssueComments(owner, name, number), newComment);
-            throw new NotImplementedException();
+            return _client.Create(owner, name, number, newComment).ToObservable();
         }
 
         /// <summary>
@@ -104,13 +101,11 @@ namespace Octokit.Reactive.Clients
         /// <returns>The <see cref="IssueComment"/>s for that was just updated.</returns>
         public IObservable<IssueComment> Update(string owner, string name, int number, string commentUpdate)
         {
-            //Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            //Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            //Ensure.ArgumentNotNull(commentUpdate, "commentUpdate");
+            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
+            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNull(commentUpdate, "commentUpdate");
 
-            //return _connection.Patch<IssueComment>(ApiUrls.IssueComment(owner, name, number), commentUpdate);
-
-            throw new NotImplementedException();
+            return _client.Update(owner, name, number, commentUpdate).ToObservable();
         }
     }
 }
diff --git a/Octokit.Reactive/Clients/ObservableIssuesClient.cs b/Octokit.Reactive/Clients/ObservableIssuesClient.cs
index e5e160dd..38db8211 100644
--- a/Octokit.Reactive/Clients/ObservableIssuesClient.cs
+++ b/Octokit.Reactive/Clients/ObservableIssuesClient.cs
@@ -13,6 +13,7 @@ namespace Octokit.Reactive
 
         public IObservableAssigneesClient Assignee { get; private set; }
         public IObservableMilestonesClient Milestone { get; private set; }
+        public IObservableIssueCommentsClient Comments { get; private set; }
 
         public ObservableIssuesClient(IGitHubClient client)
         {
@@ -22,6 +23,7 @@ namespace Octokit.Reactive
             _connection = client.Connection;
             Assignee = new ObservableAssigneesClient(client);
             Milestone = new ObservableMilestonesClient(client);
+            Comments = new ObservableIssueCommentsClient(client);
         }
 
         /// <summary>
diff --git a/Octokit/Octokit-netcore45.csproj b/Octokit/Octokit-netcore45.csproj
index 42a6a3c1..23751a56 100644
--- a/Octokit/Octokit-netcore45.csproj
+++ b/Octokit/Octokit-netcore45.csproj
@@ -128,7 +128,6 @@
     <Compile Include="Http\IRequest.cs" />
     <Compile Include="Http\IResponse.cs" />
     <Compile Include="Http\Request.cs" />
-    <Compile Include="Models\IssueComment.cs" />
     <Compile Include="Models\Request\AuthorizationUpdate.cs" />
     <Compile Include="Models\Request\IssueRequest.cs" />
     <Compile Include="Models\Request\IssueUpdate.cs" />
@@ -155,6 +154,7 @@
     <Compile Include="Models\Response\GitTag.cs" />
     <Compile Include="Models\Response\EventInfo.cs" />
     <Compile Include="Models\Response\Issue.cs" />
+    <Compile Include="Models\Response\IssueComment.cs" />
     <Compile Include="Models\Response\IssueEvent.cs" />
     <Compile Include="Models\Response\Label.cs" />
     <Compile Include="Models\Response\Milestone.cs" />