Feat/support dependency injection

README.md

@@ -15,7 +15,7 @@ PS> Install-Package gmaps-api-net
 This project attempts to provide all the features available in the Google Maps API. It is being developed in C# for the Microsoft .NET including .Net Framework v4.6.1+ and .Net Standard v1.3+. *gmaps-api-net* is a fully featured API client library, providing strongly typed access to the API.
 
 ## Notable Upcoming 
-* Trying to achieve a formal v1.0 release for 2018. This is basically on-track for first week of January. File any major issues quickly to get addressed before v1.0!
+* Trying to achieve a formal v1.0 release. File any major issues quickly to get addressed before v1.0!
 * Planning a slight namespace/usage change for v2.0 release soon thereafter to support dependency injection and mocking away the library in your own testing apparatus.  Intention here is to isolate away the library returning values to returning known values during your testing. See branch [feat/support-dependency-injection](https://github.com/ericnewton76/gmaps-api-net/tree/feat/support-dependency-injection)
 * In relation to above, we will begin removing our tests for specific values, and testing instead for schema changes that Google is pushing through.
 
@@ -41,12 +41,12 @@ Google is now requiring a proper API key for accessing the service. Create a key
 Let's suppose we want to search an address and get more information about it. We can write:
 
 ```c#
-//always need to use YOUR_API_KEY for requests.  Do this in App_Start.
-GoogleSigned.AssignAllServices(new GoogleSigned("YOUR_API_KEY"));
+//always need to use YOUR_API_KEY for requests.
+var GMaps = new Google.Maps.Services("YOUR_API_KEY");
 
 var request = new GeocodingRequest();
 request.Address = "1600 Pennsylvania Ave NW, Washington, DC 20500";
-var response = new GeocodingService().GetResponse(request);
+var response = GMaps.GeocodingService.GetResponse(request);
 
 //The GeocodingService class submits the request to the API web service, and returns the
 //response strongly typed as a GeocodeResponse object which may contain zero, one or more results.
@@ -71,11 +71,12 @@ else
 Static Maps API support allows you to get a valid url or a streamed bitmap which you can use:
 
 ```c#
-//always need to use YOUR_API_KEY for requests.  Do this in App_Start.
-GoogleSigned.AssignAllServices(new GoogleSigned("YOUR_API_KEY"));
+//always need to use YOUR_API_KEY for requests.
+var GMaps = new Google.Maps.Services("YOUR_API_KEY");
+
 var map = new StaticMapRequest();
 map.Center = new Location("1600 Pennsylvania Ave NW, Washington, DC 20500");
-map.Size = new System.Drawing.Size(400, 400);
+map.Size = new GSize(400, 400);
 map.Zoom = 14;
 ```
 
@@ -112,33 +113,35 @@ this.imageControl.Image = img;
 
 ```c#
 //enterprise users to use your supplied information for requests.  Do this in App_Start.
-GoogleSigned.AssignAllServices(new GoogleSigned("gme-your-client-id", "your-signing-key", signType: GoogleSignedType.Business));
+var GMaps = new Google.Maps.Services(new GoogleSigned("gme-your-client-id", "your-signing-key"));
 
 // Then do as many requests as you like...
 var request = new GeocodingRequest();
 //...
-var response = GeocodingService.GetResponse(request);
+var response = GMaps.GeocodingService.GetResponse(request);
 ```
 
 ### Using a Google Maps API key
 
 ```c#
 //always need to use YOUR_API_KEY for requests.  Do this in App_Start.
-GoogleSigned.AssignAllServices(new GoogleSigned("your-api-key"));
+var GMaps = new Google.Maps.Services("YOUR_API_KEY");
 
 // Then do as many requests as you like...
 var request = new GeocodingRequest();
 //...
-var response = GeocodingService.GetResponse(request);
+var response = GMaps.GeocodingService.GetResponse(request);
 ```
 
 You can also use a particular key for a single request:
 
 ```c#
-const GoogleSigned apikey = new GoogleSigned("special_api_key_here");
+var GMaps = new Google.Maps.Services("YOUR_API_KEY");
+
+var GMapsSecretKey = GMaps.WithSigningService(new GoogleApiSigningService(new GoogleSigned("special_api_key_here"));
 var request = new GeocodingRequest();
 //...
-var service = new GeocodingService(request, apikey);
+var service = GMapsSecretKey.GeocodingService.GetResponse(request);
 ```
 
 ## Contact
@@ -150,6 +153,7 @@ Questions, comments and/or suggestions are welcome! Please raise an [issue](http
 ## Contributors
 A big thank you to all of our [contributors](https://github.com/ericnewton76/gmaps-api-net/graphs/contributors) including:
 
+- [Luis Farzati](https://github.com/luisfarzati)
 - [Eric Newton](https://github.com/ericnewton76)
 - [Sheepzez](https://github.com/Sheepzez)
 - [Mieliespoor](https://github.com/mieliespoor)

src/ConsoleApp1/Program.cs

@@ -6,6 +6,7 @@
 
 using Google.Maps;
 using Google.Maps.Geocoding;
+using Google.Maps.Common;
 
 namespace ConsoleApp1
 {
@@ -27,11 +28,11 @@ static void Main(string[] args)
 		static void README_QuickStart_Sample1()
 		{
 			//always need to use YOUR_API_KEY for requests.  Do this in App_Start.
-			GoogleSigned.AssignAllServices(new GoogleSigned("YOUR_API_KEY"));
+			var GMaps = new Google.Maps.Services("YOUR_API_KEY");
 
 			var request = new GeocodingRequest();
 			request.Address = "1600 Pennsylvania Ave NW, Washington, DC 20500";
-			var response = new GeocodingService().GetResponse(request);
+			var response = GMaps.GeocodingService.GetResponse(request);
 
 			//The GeocodingService class submits the request to the API web service, and returns the
 			//response strongly typed as a GeocodeResponse object which may contain zero, one or more results.
@@ -83,16 +84,15 @@ static void DoRequestsLoop()
 		static void DoGeocodeRequest()
 		{
 			//always need to use YOUR_API_KEY for requests.  Do this in App_Start.
-			//GoogleSigned.AssignAllServices(new GoogleSigned("YOUR_API_KEY"));
-			//commented out in the loop
+			var GMaps = new Google.Maps.Services("YOUR_API_KEY");
 
 			Console.WriteLine();
 			Console.WriteLine("Enter an address to geocode: ");
 			string geocodeAddress = Console.ReadLine();
 
 			var request = new GeocodingRequest();
 			request.Address = geocodeAddress;
-			var response = new GeocodingService().GetResponse(request);
+			var response = GMaps.GeocodingService.GetResponse(request);
 
 			//The GeocodingService class submits the request to the API web service, and returns the
 			//response strongly typed as a GeocodeResponse object which may contain zero, one or more results.

src/Google.Maps.Test/Direction/DirectionRequestTests.cs

@@ -3,6 +3,7 @@
 using System.Collections.Specialized;
 
 using NUnit.Framework;
+using Google.Maps.Common;
 
 namespace Google.Maps.Direction
 {

src/Google.Maps.Test/Direction/DirectionServiceTests.cs

@@ -21,7 +21,9 @@
 
 using NUnit.Framework;
 
-using Google.Maps.Shared;
+using Google.Maps.ApiCore;
+using Google.Maps.Common;
+using Google.Maps.Internal;
 
 namespace Google.Maps.Direction
 {
@@ -32,7 +34,14 @@ class DirectionServiceTests
 
 		DirectionService CreateService()
 		{
-			var svc = new DirectionService(TestingApiKey);
+			var svc = new DirectionService(
+				new Internal.MapsHttp(
+					new GoogleApiSigningService(
+						TestingApiKey
+					)
+				),
+				baseUri:null);
+
 			return svc;
 		}
 

src/Google.Maps.Test/DistanceMatrix/DistanceMatrixServiceTests.cs

@@ -2,6 +2,8 @@
 using System.Collections.Generic;
 
 using NUnit.Framework;
+using Google.Maps.ApiCore;
+using Google.Maps.Common;
 
 namespace Google.Maps.DistanceMatrix
 {
@@ -12,7 +14,14 @@ public class DistanceMatrixServiceTests
 
 		DistanceMatrixService CreateService()
 		{
-			var svc = new DistanceMatrixService(TestingApiKey);
+			var svc = new DistanceMatrixService(
+				new Internal.MapsHttp(
+					new GoogleApiSigningService(
+						TestingApiKey
+					)
+				),
+				baseUri: null
+			);
 			return svc;
 		}
 

src/Google.Maps.Test/Elevation/ElevationServiceTests.cs

@@ -18,6 +18,8 @@
 using System;
 
 using NUnit.Framework;
+using Google.Maps.ApiCore;
+using Google.Maps.Common;
 
 namespace Google.Maps.Elevation
 {
@@ -28,7 +30,15 @@ public class ElevationServiceTests
 
 		ElevationService CreateService()
 		{
-			var svc = new ElevationService(TestingApiKey);
+			var svc = new ElevationService(
+				new Internal.MapsHttp(
+					new GoogleApiSigningService(
+						TestingApiKey
+					)
+				),
+				baseUri:null
+			);
+
 			return svc;
 		}
 

src/Google.Maps.Test/Geocoding/GeocodingServiceTests.cs

@@ -21,7 +21,9 @@
 
 using NUnit.Framework;
 
-using Google.Maps.Shared;
+using Google.Maps.Common;
+using Google.Maps.ApiCore;
+using Google.Maps.Internal;
 
 namespace Google.Maps.Geocoding
 {
@@ -32,7 +34,14 @@ class GeocodingServiceTests
 
 		GeocodingService CreateService()
 		{
-			var svc = new GeocodingService(TestingApiKey);
+			var svc = new GeocodingService(
+				new Internal.MapsHttp(
+					new GoogleApiSigningService(
+						TestingApiKey
+					)
+				),
+				baseUri: null
+			);
 			return svc;
 		}
 
@@ -230,7 +239,7 @@ public void Utf8_Request_And_Response()
 				Address = "AL. GRUNWALDZKA 141, Gdańsk, 80 - 264, POLAND"
 			};
 
-			var response = new GeocodingService().GetResponse(request);
+			var response = CreateService().GetResponse(request);
 
 			if(response.Status == ServiceResponseStatus.OverQueryLimit)
 			{

src/Google.Maps.Test/GoogleMapsForBusinessTests.cs

@@ -3,6 +3,7 @@
 using NUnit.Framework;
 
 using Google.Maps.Geocoding;
+using Google.Maps.Common;
 
 namespace Google.Maps
 {
@@ -21,6 +22,15 @@ namespace Google.Maps
 	[Category("External Integrations")]
 	class GoogleMapsForBusinessTests
 	{
+		GoogleSigned TestingApiKey;
+		Google.Maps.Services GMaps;
+
+		[OneTimeSetUp]
+		public void OneTimeSetup()
+		{
+			TestingApiKey = GetRealSigningInstance();
+		}
+
 		private GoogleSigned GetRealSigningInstance()
 		{
 #if NETSTANDARD1
@@ -53,8 +63,7 @@ public void Geocoding_Request_Signed_With_Private_Key()
 				Address = "Stathern, UK"
 			};
 
-			GoogleSigned.AssignAllServices(GetRealSigningInstance());
-			var response = new GeocodingService().GetResponse(request);
+			var response = GMaps.GeocodingService.GetResponse(request);
 
 			Assert.AreEqual(ServiceResponseStatus.Ok, response.Status);
 		}
@@ -64,16 +73,15 @@ public void Geocoding_Request_Signed_With_Private_Key()
 		public void Geocoding_Request_Signed_With_Api_Key()
 		{
 			// Arrange
-			var sign = new GoogleSigned("AIzaSyDV-0ftj1tsjfd6GnEbtbxwHXnv6iR3UEU");
-			GoogleSigned.AssignAllServices(sign);
+			var GMaps = new Google.Maps.Services("AIzaSyDV-0ftj1tsjfd6GnEbtbxwHXnv6iR3UEU");
 
 			var request = new GeocodingRequest
 			{
 				Address = "Stathern, UK"
 			};
 
 			// Act
-			var response = new GeocodingService().GetResponse(request);
+			var response = GMaps.GeocodingService.GetResponse(request);
 
 			// Assert
 			Assert.AreEqual(ServiceResponseStatus.Ok, response.Status);

src/Google.Maps.Test/LatLngComparerTests.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 
 using NUnit.Framework;
+using Google.Maps.Internal;
 
 namespace Google.Maps
 {

src/Google.Maps.Test/MapColorTests.cs

@@ -1,4 +1,5 @@
 using NUnit.Framework;
+using Google.Maps.Common;
 
 namespace Google.Maps
 {
@@ -8,9 +9,9 @@ public class MapColorTests
 		[Test]
 		public void IsUndefined_Works()
 		{
-			var undefined = new MapColor();
-			var definedName = MapColor.FromName("red");
-			var definedRGB = MapColor.FromArgb(255,255,255);
+			var undefined = new GColor();
+			var definedName = GColor.FromName("red");
+			var definedRGB = GColor.FromArgb(255,255,255);
 
 			Assert.AreEqual(true, undefined.IsUndefined);
 			Assert.AreEqual(false, definedName.IsUndefined);
@@ -20,9 +21,9 @@ public void IsUndefined_Works()
 		[Test]
 		public void To24BitColor_Works()
 		{
-			var namedColor = MapColor.FromName("red");
-			var rgbColor = MapColor.FromArgb(255, 0, 0);
-			var rgbaColor = MapColor.FromArgb(255, 255, 0, 0);
+			var namedColor = GColor.FromName("red");
+			var rgbColor = GColor.FromArgb(255, 0, 0);
+			var rgbaColor = GColor.FromArgb(255, 255, 0, 0);
 
 			Assert.AreEqual("red", namedColor.To24BitColorString());
 			Assert.AreEqual("0xFF0000", rgbColor.To24BitColorString());
@@ -32,9 +33,9 @@ public void To24BitColor_Works()
 		[Test]
 		public void To32BitColor_Works()
 		{
-			var namedColor = MapColor.FromName("red");
-			var rgbColor = MapColor.FromArgb(255, 0, 0);
-			var rgbaColor = MapColor.FromArgb(255, 255, 0, 0);
+			var namedColor = GColor.FromName("red");
+			var rgbColor = GColor.FromArgb(255, 0, 0);
+			var rgbaColor = GColor.FromArgb(255, 255, 0, 0);
 
 			Assert.AreEqual("red", namedColor.To32BitColorString());
 			Assert.AreEqual("0xFF0000FF", rgbColor.To32BitColorString());