[RFC][WIP] Step 1: Move The World

Octokit.Reactive/ObservableGitHubClient.cs

@@ -6,26 +6,31 @@ public class ObservableGitHubClient : IObservableGitHubClient
     {
         readonly IGitHubClient _gitHubClient;
 
+        [Obsolete("Use OctokitHttpClient.Create to configure your HTTP details, and then call the new ObservableGitHubClient ctor. This will be moved in a future release.")]
         public ObservableGitHubClient(ProductHeaderValue productInformation)
             : this(new GitHubClient(productInformation))
         {
         }
 
+        [Obsolete("Use OctokitHttpClient.Create to configure your HTTP details, and then call the new ObservableGitHubClient ctor. This will be moved in a future release.")]
         public ObservableGitHubClient(ProductHeaderValue productInformation, ICredentialStore credentialStore)
             : this(new GitHubClient(productInformation, credentialStore))
         {
         }
 
+        [Obsolete("Use OctokitHttpClient.Create to configure your HTTP details, and then call the new ObservableGitHubClient ctor. This will be moved in a future release.")]
         public ObservableGitHubClient(ProductHeaderValue productInformation, Uri baseAddress)
             : this(new GitHubClient(productInformation, baseAddress))
         {
         }
 
+        [Obsolete("Use OctokitHttpClient.Create to configure your HTTP details, and then call the new ObservableGitHubClient ctor. This will be moved in a future release.")]
         public ObservableGitHubClient(ProductHeaderValue productInformation, ICredentialStore credentialStore, Uri baseAddress)
             : this(new GitHubClient(productInformation, credentialStore, baseAddress))
         {
         }
 
+        [Obsolete("Use OctokitHttpClient.Create to configure your HTTP details, and then call the new ObservableGitHubClient ctor. This will be moved in a future release.")]
         public ObservableGitHubClient(IGitHubClient gitHubClient)
         {
             Ensure.ArgumentNotNull(gitHubClient, "githubClient");

Octokit.Tests.Integration/Clients/GitHubClientTests.cs

@@ -2,14 +2,34 @@
 using Octokit.Tests.Integration;
 using Octokit.Tests.Integration.Helpers;
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.Threading.Tasks;
+using Octokit.Internal;
 using Xunit;
 
 public class GitHubClientTests
 {
+    public class Monkey
+    {
+        [IntegrationTest]
+        public void Setup()
+        {
+            var info = new ClientInfo("my-cool-app")
+            {
+                Credentials = new InMemoryCredentialStore(new Credentials("my-token-here")),
+                Server = new Uri("https://my-cool-enterprise.com")
+            };
+
+            var http = HttpClientFactory.Create(info);
+
+            var productHeader = new ProductHeaderValue("my-cool-app");
+            var connection = new Connection(productHeader, http);
+
+            // TODO: we probably need to guard here that we have enough
+            //       information to use this client against the GitHub API
+            var github = new GitHubClient(connection);
+        }
+    }
+
     public class TheLastApiInfoProperty
     {
         [IntegrationTest]

Octokit.Tests.Integration/HttpClientAdapterTests.cs

@@ -3,6 +3,7 @@
 using System.Net.Http;
 using System.Threading;
 using System.Threading.Tasks;
+using Octokit;
 using Octokit.Internal;
 using Octokit.Tests.Integration;
 using Xunit;
@@ -14,18 +15,20 @@ public class TheSendAsyncMethod
         [IntegrationTest]
         public async Task CanDownloadImage()
         {
-            var httpClient = new HttpClientAdapter(HttpMessageHandlerFactory.CreateDefault);
+            var httpClient = HttpClientFactory.Create();
             var request = new Request
             {
                 BaseAddress = new Uri("https://github.global.ssl.fastly.net/", UriKind.Absolute),
                 Endpoint = new Uri("/images/icons/emoji/poop.png?v=5", UriKind.RelativeOrAbsolute),
                 Method = HttpMethod.Get
             };
 
-            var response = await httpClient.Send(request, CancellationToken.None);
+            var message = HttpRequestBuilder.Create(request);
+
+            var response = await httpClient.SendAsync(message, CancellationToken.None);
 
             // Spot check some of dem bytes.
-            var imageBytes = (byte[])response.Body;
+            var imageBytes = await response.Content.ReadAsByteArrayAsync();
             Assert.Equal(137, imageBytes[0]);
             Assert.Equal(80, imageBytes[1]);
             Assert.Equal(78, imageBytes[2]);
@@ -35,7 +38,7 @@ public async Task CanDownloadImage()
         [IntegrationTest]
         public async Task CanCancelARequest()
         {
-            var httpClient = new HttpClientAdapter(HttpMessageHandlerFactory.CreateDefault);
+            var httpClient = HttpClientFactory.Create();
             var request = new Request
             {
                 BaseAddress = new Uri("https://github.global.ssl.fastly.net/", UriKind.Absolute),
@@ -44,7 +47,9 @@ public async Task CanCancelARequest()
                 Timeout = TimeSpan.FromMilliseconds(10)
             };
 
-            var response = httpClient.Send(request, CancellationToken.None);
+            var message = HttpRequestBuilder.Create(request);
+
+            var response = httpClient.SendAsync(message, CancellationToken.None);
 
             await Task.Delay(TimeSpan.FromSeconds(2));
 

Octokit.Tests/Clients/EventsClientTests.cs

@@ -2,6 +2,8 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Net;
+using System.Net.Http;
+using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 using NSubstitute;
@@ -509,10 +511,15 @@ public async Task DeserializesStarredEventCorrectly()
 
         private EventsClient GetTestingEventsClient(JsonObject response)
         {
-            var responseString = response.ToString();
-            var httpClientMock = Substitute.For<IHttpClient>();
-            httpClientMock.Send(Arg.Is((IRequest r) => r.Endpoint.ToString().Contains("events")), Arg.Any<CancellationToken>()).Returns(Task.FromResult(
-                new Response(HttpStatusCode.Accepted, responseString, new Dictionary<string, string>(), "application/json") as IResponse));
+            var responseMessage = new HttpResponseMessage(HttpStatusCode.Accepted);
+            responseMessage.Content = new StringContent(response.ToString(), Encoding.UTF8, "application/json");
+
+            var httpClientMock = Substitute.For<HttpClient>();
+
+
+            httpClientMock
+                .SendAsync(Arg.Is<HttpRequestMessage>(r => r.RequestUri.ToString().Contains("events")), Arg.Any<CancellationToken>())
+                .Returns(Task.FromResult(responseMessage));
 
             return new EventsClient(new ApiConnection(new Connection(new ProductHeaderValue("mock"), httpClientMock)));
         }

Octokit.Tests/GitHubClientTests.cs

@@ -99,10 +99,16 @@ public void IsRetrievedFromCredentialStore()
             {
                 var credentialStore = Substitute.For<ICredentialStore>();
                 credentialStore.GetCredentials().Returns(Task.Factory.StartNew(() => new Credentials("foo", "bar")));
-                var client = new GitHubClient(new ProductHeaderValue("OctokitTests"), credentialStore);
 
-                Assert.Equal("foo", client.Credentials.Login);
-                Assert.Equal("bar", client.Credentials.Password);
+                var info = new ClientInfo("Octokit-Tests")
+                {
+                    Credentials = credentialStore
+                };
+
+                var http = HttpClientFactory.Create(info);
+
+                Assert.Equal("Basic", http.DefaultRequestHeaders.Authorization.Scheme);
+                Assert.NotEmpty(http.DefaultRequestHeaders.Authorization.Parameter);
             }
         }
 

Octokit.Tests/Helpers/Arg.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Net.Http;
 using System.Threading;
 using NSubstitute;
 using Octokit.Internal;
@@ -33,6 +34,11 @@ public static IRequest Request
             get { return Arg.Any<IRequest>(); }
         }
 
+        public static HttpRequestMessage HttpRequest
+        {
+            get { return Arg.Any<HttpRequestMessage>(); }
+        }
+
         public static object Object
         {
             get { return Arg.Any<object>(); }