Merge pull request #15 from lucassklp/develop

Versão 1.2.0

Models/Consumers/GoogleConsumer.cs

@@ -0,0 +1,15 @@
+using Rx.Http;
+using System;
+
+namespace Models.Consumers
+{
+    public class GoogleConsumer : RxConsumer
+    {
+        public GoogleConsumer(IConsumerConfiguration<GoogleConsumer> configuration) : base(configuration)
+        {
+
+        }
+
+        public IObservable<string> GetGoogleContent() => Get("");
+    }
+}

Models/Consumers/JsonPlaceHolderConsumer.cs

@@ -0,0 +1,17 @@
+using Rx.Http;
+using System;
+using System.Collections.Generic;
+
+namespace Models.Consumers
+{
+    public class JsonPlaceHolderConsumer : RxConsumer
+    {
+        public JsonPlaceHolderConsumer(IConsumerConfiguration<JsonPlaceHolderConsumer> configuration) : base(configuration)
+        {
+
+        }
+
+        public IObservable<List<Todo>> GetTodos() => Get<List<Todo>>("todos");
+        public IObservable<Identifiable> SendPost(Post post) => Post<Identifiable>("posts", post);
+    }
+}

Models/Consumers/TheMovieDatabaseConsumer.cs

@@ -1,6 +1,5 @@
 using Rx.Http;
 using Rx.Http.Interceptors;
-using Rx.Http.Requests;
 using System;
 
 namespace Models.Consumers
@@ -9,17 +8,17 @@ public class TheMovieDatabaseConsumer : RxConsumer
     {
         public TheMovieDatabaseConsumer(IConsumerConfiguration<TheMovieDatabaseConsumer> config) : base(config)
         {
-            config.AddInterceptors(new TheMovieDatabaseInterceptor());
+            config.RequestInterceptors.Add(new TheMovieDatabaseInterceptor());
         }
 
         public IObservable<Result> ListMovies() => Get<Result>("movie/popular");
     }
 
-    public class TheMovieDatabaseInterceptor : RxInterceptor
+    public class TheMovieDatabaseInterceptor : RxRequestInterceptor
     {
-        public void Intercept(RxHttpRequest request)
+        public void Intercept(RxHttpRequestOptions request)
         {
-            request.QueryStrings.Add("api_key", "eb7b25db28349bd4eef1498a5be9842f");
+            request.AddQueryString("api_key", "eb7b25db28349bd4eef1498a5be9842f");
         }
     }
 }

Models/Models.csproj

@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
+    <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
   </ItemGroup>
 
   <ItemGroup>

Models/Post.cs

@@ -1,9 +1,16 @@
-namespace Models
+using Newtonsoft.Json;
+
+namespace Models
 {
     public class Post
     {
+        [JsonProperty("title")]
         public string Title { get; set; }
+
+        [JsonProperty("body")]
         public string Body { get; set; }
+
+        [JsonProperty("userId")]
         public int UserId { get; set; }
 
     }

Models/Postman/PostResponse.cs

@@ -0,0 +1,25 @@
+using Newtonsoft.Json;
+using System.Collections.Generic;
+
+namespace Models.Postman
+{
+    public class PostResponse : PostResponse<string>
+    {
+
+    }
+
+    public class PostResponse<T>
+    {
+        [JsonProperty("args")]
+        public Dictionary<string, string> Args { get; set; }
+
+        [JsonProperty("data")]
+        public T Data { get; set; }
+
+        [JsonProperty("form")]
+        public Dictionary<string, string> Form { get; set; }
+
+        [JsonProperty("headers")]
+        public Dictionary<string, string> Headers { get; set; }
+    }
+}

Models/Todo.cs

@@ -1,10 +1,28 @@
+using Newtonsoft.Json;
+using System;
+
 namespace Models
 {
-    public class Todo
+    public class Todo : IEquatable<Todo>
     {
-        public int userId { get; set; }
-        public int id { get; set; }
-        public string title { get; set; }
-        public bool completed { get; set; }
+        [JsonProperty("userId")]
+        public int UserId { get; set; }
+
+        [JsonProperty("id")]
+        public int Id { get; set; }
+
+        [JsonProperty("title")]
+        public string Title { get; set; }
+
+        [JsonProperty("completed")]
+        public bool IsCompleted { get; set; }
+
+        public bool Equals(Todo other)
+        {
+            return this.Id == other.Id &&
+                this.IsCompleted == other.IsCompleted &&
+                this.Title == other.Title &&
+                this.UserId == other.UserId;
+        }
     }
 }

README.md

@@ -8,38 +8,35 @@
 </a>
 <img alt="npm version" src="https://img.shields.io/nuget/v/Rx.Http.svg">
 
-
 <!-- snyk does not support .NET Core yet -->
 <!-- https://github.com/snyk/snyk/issues/489 -->
 <!-- <a href="https://snyk.io//test/github/lucassklp/Rx.Http?targetFile=Rx.Http/Rx.Http.csproj"><img src="https://snyk.io//test/github/lucassklp/Rx.Http/badge.svg?targetFile=Rx.Http/Rx.Http.csproj" alt="Known Vulnerabilities" data-canonical-src="https://snyk.io//test/github/lucassklp/Rx.Http?targetFile=Rx.Http/Rx.Http.csproj" style="max-width:100%;"></a> -->
 
 </p>
 
-A lightweight library that is inpired in [Angular 2+ Http Client](https://angular.io/guide/http) built on top of [.NET Http Client](https://docs.microsoft.com/pt-br/dotnet/api/system.net.http.httpclient) that help programmers to make asynchronous http requests, 
-
+A lightweight library that is inpired in [Angular 2+ Http Client](https://angular.io/guide/http) built on top of [.NET Http Client](https://docs.microsoft.com/pt-br/dotnet/api/system.net.http.httpclient) that help programmers to make asynchronous http requests.
 
 # Installation
 
 If you are using Package Manager:
 
 ```bash
-Install-Package Rx.Http -Version 1.0.0
+Install-Package Rx.Http -Version 1.2.0
 ```
 
 If you are using .NET CLI
 
 ```bash
-dotnet add package Rx.Http --version 1.0.0
+dotnet add package Rx.Http --version 1.2.0
 ```
 
-
 ## Example of use
 
 ```csharp
 using Rx.Http;
 using System.Reactive.Linq;
 
-public class Program 
+public class Program
 {
     public static async void Main()
     {
@@ -66,10 +63,16 @@ You can customize your request by using options. It make possible you set **quer
 ```csharp
 http.Get<List<Todo>>("https://jsonplaceholder.typicode.com/todos/", options =>
 {
-    options.RequestMediaType = new JsonHttpMediaType();
-    options.ResponseMediaType = new JsonHttpMediaType();
-    options.AddHeader("Authorization", "Bearer <token>");
-    options.QueryStrings.Add("name", "John Doe");
+    options.SetRequestMediaType(new JsonHttpMediaType())
+        .SetResponseMediaType(new JsonHttpMediaType())
+        .AddHeader(new {
+            Authorization = "Bearer <token>"
+            Accept = "application/json"
+        })
+        .AddQueryString(new {
+            name = "John Doe",
+            index = 1
+        });
 });
 ```
 
@@ -101,7 +104,7 @@ The code above shows how to use Consumers and Interceptors.
     {
         public TheMovieDatabaseConsumer(IConsumerConfiguration<TheMovieDatabaseConsumer> configuration): base(configuration)
         {
-            configuration.Interceptors.Add(new TheMovieDatabaseInterceptor());
+            configuration.AddRequestInterceptors(new TheMovieDatabaseInterceptor());
         }
 
         public IObservable<Result> ListMovies() => Get<Result>("movie/popular");
@@ -111,12 +114,13 @@ The code above shows how to use Consumers and Interceptors.
     {
         public void Intercept(RxHttpRequest request)
         {
-            request.QueryStrings.Add("api_key", "key");
+            request.AddQueryString("api_key", "key");
         }
     }
 ```
 
 ## RxHttpRequestException
+
 This exception is threw when the server reply with a HTTP Status different of 2xx. There's two ways to handle this exception:
 
 ```csharp
@@ -134,10 +138,10 @@ This exception is threw when the server reply with a HTTP Status different of 2x
     }
 
     //Or using reactive way
-    http.Get<List<Todo>>(url).Subscribe(response => 
+    http.Get<List<Todo>>(url).Subscribe(response =>
     {
         //...
-    }, exception => 
+    }, exception =>
     {
         HttpResponseMessage response = (exception as RxHttpRequestException)?.Response;
         //...
@@ -162,6 +166,19 @@ public void ConfigureServices(ServiceCollection services)
 }
 ```
 
+## Logging
+
+You can implement your own custom logging mechanism by implementing the interface RxHttpLogging.
+We provide a built-in logging mechanism called "RxHttpDefaultLogging".
+
+Here is a example that show how to use RxHttpDefaultLogging mechanism. If you have a custom logging mechanism you must replace RxHttpDefaultLogging for your class implementation.
+
+```csharp
+private static void ConfigureServices(ServiceCollection services)
+{
+    services.AddRxHttpLogging<RxHttpDefaultLogging>();
+}
+```
 
 ### Roadmap
 

Rx.Http/ConsumerConfiguration.cs

@@ -6,18 +6,17 @@ namespace Rx.Http
 {
     public class ConsumerProvider<T> : IConsumerConfiguration<T>
     {
-        public List<RxInterceptor> Interceptors { get; set; }
-        public ConsumerProvider(HttpClient http)
-        {
-            Interceptors = new List<RxInterceptor>();
-            Http = http;
-        }
+        public List<RxRequestInterceptor> RequestInterceptors { get; private set; }
+        public List<RxResponseInterceptor> ResponseInterceptors { get; private set; }
+        public HttpClient Http { get; private set; }
+        public RxHttpLogging Logger { get; set; }
 
-        public void AddInterceptors(params RxInterceptor[] interceptors)
+        public ConsumerProvider(HttpClient http, RxHttpLogging logger = null)
         {
-            Interceptors.AddRange(interceptors);
+            RequestInterceptors = new List<RxRequestInterceptor>();
+            ResponseInterceptors = new List<RxResponseInterceptor>();
+            Http = http;
+            Logger = logger;
         }
-
-        public HttpClient Http { get; private set; }
     }
 }

Rx.Http/Exceptions/RxInvalidHeaderParameterException.cs

@@ -0,0 +1,12 @@
+using System;
+
+namespace Rx.Http.Exceptions
+{
+    public class RxInvalidHeaderParameterException : Exception
+    {
+        public RxInvalidHeaderParameterException() : base("The header key or value provided are invalid for http request.")
+        {
+
+        }
+    }
+}

Rx.Http/RxHttpClientFactoryExtension.cs → Rx.Http/Extensions/RxHttpClientFactoryExtension.cs

@@ -6,7 +6,7 @@
 using System.Collections.Generic;
 using System.Net.Http;
 
-namespace Rx.Http
+namespace Rx.Http.Extensions
 {
     public static class RxHttpClientFactoryExtension
     {

Rx.Http/Extensions/RxHttpLoggingExtension.cs

@@ -0,0 +1,21 @@
+#if NETSTANDARD2_0
+
+using Microsoft.Extensions.DependencyInjection;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Rx.Http.Extensions
+{
+    public static class RxHttpLoggingExtension
+    {
+        public static IServiceCollection AddRxHttpLogging<TLogging>(this IServiceCollection services)
+            where TLogging : RxHttpLogging
+        {
+            services.AddScoped<RxHttpLogging, TLogging>();
+            return services;
+        }
+    }
+}
+
+#endif

Rx.Http/IConsumerConfiguration.cs

@@ -6,8 +6,10 @@ namespace Rx.Http
 {
     public interface IConsumerConfiguration<out T>
     {
-        List<RxInterceptor> Interceptors { get; set; }
-        void AddInterceptors(params RxInterceptor[] interceptors);
+        List<RxRequestInterceptor> RequestInterceptors { get; }
+        List<RxResponseInterceptor> ResponseInterceptors { get; }
         HttpClient Http { get; }
+        RxHttpLogging Logger { get; }
+
     }
 }

Rx.Http/Interceptors/RxRequestInterceptor.cs

@@ -0,0 +1,7 @@
+namespace Rx.Http.Interceptors
+{
+    public interface RxRequestInterceptor
+    {
+        void Intercept(RxHttpRequestOptions request);
+    }
+}

Rx.Http/Interceptors/RxResponseInterceptor.cs

@@ -0,0 +1,9 @@
+using System.Net.Http;
+
+namespace Rx.Http.Interceptors
+{
+    public interface RxResponseInterceptor
+    {
+        void Intercept(HttpResponseMessage response);
+    }
+}