Merge pull request #14 from lucassklp/develop

Version 1.0.0
lucassklp · Nov 8, 2019 · af3a719 · af3a719
2 parents 3d49bd1 + b731726
commit af3a719
Show file tree

Hide file tree

Showing 10 changed files with 118 additions and 22 deletions.
diff --git a/Models/Consumers/TheMovieDatabaseConsumer.cs b/Models/Consumers/TheMovieDatabaseConsumer.cs
@@ -1,10 +1,9 @@
-using Models;
 using Rx.Http;
 using Rx.Http.Interceptors;
 using Rx.Http.Requests;
 using System;
 
-namespace Samples.Consumers
+namespace Models.Consumers
 {
     public class TheMovieDatabaseConsumer : RxConsumer
     {
@@ -20,7 +19,7 @@ public class TheMovieDatabaseInterceptor : RxInterceptor
     {
         public void Intercept(RxHttpRequest request)
         {
-            request.QueryStrings.Add("api_key", "key");
+            request.QueryStrings.Add("api_key", "eb7b25db28349bd4eef1498a5be9842f");
         }
     }
 }
diff --git a/README.md b/README.md
@@ -17,20 +17,19 @@
 
 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, 
 
-**Note: This project is under development and is NOT recommend to use in production environment yet.**
 
 # Installation
 
 If you are using Package Manager:
 
 ```bash
-Install-Package Rx.Http -Version 0.9.7
+Install-Package Rx.Http -Version 1.0.0
 ```
 
 If you are using .NET CLI
 
 ```bash
-dotnet add package Rx.Http --version 0.9.7
+dotnet add package Rx.Http --version 1.0.0
 ```
 
 
@@ -45,11 +44,11 @@ public class Program
     public static async void Main()
     {
         //Initialize the RxHttpClient
-        var http = new RxHttpClient(new HttpClient())
+        var http = new RxHttpClient(new HttpClient());
 
         //Retrieve a list of To-Do item and print the title of each element asynchronously
-        http.Get<List<Todo>>("https://jsonplaceholder.typicode.com/todos/").Subscribe(itens => {
-            itens.ForEach(item => Console.WriteLine(item.title));
+        http.Get<List<Todo>>("https://jsonplaceholder.typicode.com/todos/").Subscribe(items => {
+            items.ForEach(item => Console.WriteLine(item.title));
         });
 
         //Making the same request using await

diff --git a/Rx.Http/Rx.Http.csproj b/Rx.Http/Rx.Http.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <TargetFrameworks>netstandard2.0;net45</TargetFrameworks>
-        <Version>0.9.7</Version>
+        <Version>1.0.0</Version>
         <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
         <Authors>Lucas Simas</Authors>
         <Description>A lightweight library that is inpired in Angular Http Client built on top of .NET HttpClient that and help programmers to make asynchronous http requests.</Description>

diff --git a/Rx.Http/RxConsumer.cs b/Rx.Http/RxConsumer.cs
@@ -25,53 +25,53 @@ protected IObservable<TResponse> Get<TResponse>(string url, Action<RxHttpRequest
             return request.Request<TResponse>();
         }
 
-        public IObservable<string> Get(string url, Action<RxHttpRequestOptions> opts = null)
+        protected IObservable<string> Get(string url, Action<RxHttpRequestOptions> opts = null)
         {
             var request = http.CreateGetRequest(url, opts);
             interceptors.ForEach(x => x.Intercept(request));
             return request.Request();
         }
 
 
-        public IObservable<TResponse> Post<TResponse>(string url, object obj = null, Action<RxHttpRequestOptions> opts = null)
+        protected IObservable<TResponse> Post<TResponse>(string url, object obj = null, Action<RxHttpRequestOptions> opts = null)
             where TResponse : class
         {
             var request = http.CreatePostRequest(url, obj, opts);
             interceptors.ForEach(x => x.Intercept(request));
             return request.Request<TResponse>();
         }
 
-        public IObservable<string> Post(string url, object obj = null, Action<RxHttpRequestOptions> opts = null)
+        protected IObservable<string> Post(string url, object obj = null, Action<RxHttpRequestOptions> opts = null)
         {
             var request = http.CreatePostRequest(url, obj, opts);
             interceptors.ForEach(x => x.Intercept(request));
             return request.Request();
         }
 
-        public IObservable<TResponse> Put<TResponse>(string url, object obj = null, Action<RxHttpRequestOptions> opts = null)
+        protected IObservable<TResponse> Put<TResponse>(string url, object obj = null, Action<RxHttpRequestOptions> opts = null)
             where TResponse : class
         {
             var request = http.CreatePutRequest(url, obj, opts);
             interceptors.ForEach(x => x.Intercept(request));
             return request.Request<TResponse>();
         }
 
-        public IObservable<string> Put(string url, object obj = null, Action<RxHttpRequestOptions> opts = null)
+        protected IObservable<string> Put(string url, object obj = null, Action<RxHttpRequestOptions> opts = null)
         {
             var request = http.CreatePutRequest(url, obj, opts);
             interceptors.ForEach(x => x.Intercept(request));
             return request.Request();
         }
 
-        public IObservable<TResponse> Delete<TResponse>(string url, Action<RxHttpRequestOptions> opts = null)
+        protected IObservable<TResponse> Delete<TResponse>(string url, Action<RxHttpRequestOptions> opts = null)
             where TResponse : class
         {
             var request = http.CreateDeleteRequest(url, opts);
             interceptors.ForEach(x => x.Intercept(request));
             return request.Request<TResponse>();
         }
 
-        public IObservable<string> Delete(string url, Action<RxHttpRequestOptions> opts = null)
+        protected IObservable<string> Delete(string url, Action<RxHttpRequestOptions> opts = null)
         {
             var request = http.CreateDeleteRequest(url, opts);
             interceptors.ForEach(x => x.Intercept(request));

diff --git a/Samples/Program.cs b/Samples/Program.cs
@@ -3,7 +3,7 @@
 using Microsoft.Extensions.Logging.Console;
 using Microsoft.Extensions.Logging.Debug;
 using Rx.Http;
-using Samples.Consumers;
+using Models.Consumers;
 using System;
 using System.Threading.Tasks;
 
@@ -42,6 +42,5 @@ private static void ConfigureServices(ServiceCollection services)
             })
             .AddTransient<Application>();
         }
-
     }
 }
diff --git a/Tests/ConsumersTests.cs b/Tests/ConsumersTests.cs
@@ -1,8 +1,36 @@
-namespace Rx.Http.Tests
+using Models.Consumers;
+using System.Reactive.Linq;
+using Xunit;
+
+namespace Tests
 {
-    internal class ConsumersTests
+    public class ConsumersTests
     {
+        private Injector injector;
+        public ConsumersTests()
+        {
+            injector = new Injector();
+        }
+
+        [Fact]
+        public async void CheckIfRequestIsWorking()
+        {
+            var tmdbConsumer = this.injector.Get<TheMovieDatabaseConsumer>();
+            var response = await tmdbConsumer.ListMovies();
+
+            Assert.NotNull(response);
+        }
+
+        [Fact]
+        public async void CheckSameRequestTwice()
+        {
+            var tmdbConsumer = this.injector.Get<TheMovieDatabaseConsumer>();
+            var response1 = await tmdbConsumer.ListMovies();
+            var response2 = await tmdbConsumer.ListMovies();
 
+            Assert.NotNull(response1);
+            Assert.NotNull(response2);
+        }
 
     }
 }
diff --git a/Tests/InjectionTests.cs b/Tests/InjectionTests.cs
@@ -0,0 +1,34 @@
+using Models.Consumers;
+using Rx.Http;
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Xunit;
+
+namespace Tests
+{
+    public class InjectionTests
+    {
+        private Injector injector;
+        public InjectionTests()
+        {
+            injector = new Injector();
+        }
+
+        [Fact]
+        public void CheckIfConsumerIsInjected()
+        {
+            var tmdbConsumer = this.injector.Get<TheMovieDatabaseConsumer>();
+
+            Assert.NotNull(tmdbConsumer);
+        }
+
+        [Fact]
+        public void CheckIfRxHttpClientIsInjected()
+        {
+            var http = this.injector.Get<RxHttpClient>();
+
+            Assert.NotNull(http);
+        }
+    }
+}
diff --git a/Tests/Injector.cs b/Tests/Injector.cs
@@ -0,0 +1,35 @@
+using Microsoft.Extensions.DependencyInjection;
+using Models.Consumers;
+using Rx.Http;
+using System;
+
+namespace Tests
+{
+    class Injector
+    {
+        private ServiceProvider serviceProvider;
+        public Injector()
+        {
+            var serviceCollection = new ServiceCollection();
+            ConfigureServices(serviceCollection);
+            serviceProvider = serviceCollection.BuildServiceProvider();
+        }
+
+        private void ConfigureServices(ServiceCollection services)
+        {
+            services.AddHttpClient<RxHttpClient>();
+
+            services.AddConsumer<TheMovieDatabaseConsumer>(http =>
+            {
+                http.BaseAddress = new Uri(@"https://api.themoviedb.org/3/");
+            })
+            .AddTransient<ConsumersTests>();
+        }
+
+        public T Get<T>()
+        {
+            return this.serviceProvider.GetService<T>();
+        }
+
+    }
+}
diff --git a/Tests/RequestTests.cs b/Tests/RequestTests.cs
@@ -1,5 +1,6 @@
 using Models;
 using Models.Postman;
+using Rx.Http;
 using Rx.Http.Exceptions;
 using Rx.Http.MediaTypes;
 using System.Collections.Generic;
@@ -8,7 +9,7 @@
 using System.Reactive.Linq;
 using Xunit;
 
-namespace Rx.Http.Tests
+namespace Tests
 {
     public class RequestTests
     {

diff --git a/Tests/Tests.csproj b/Tests/Tests.csproj
@@ -14,6 +14,7 @@
           <PrivateAssets>all</PrivateAssets>
           <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
+      <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.2.0" />
     </ItemGroup>
 
     <ItemGroup>