TerribleDev/Untappd.Net
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #25 from tparnell8/master

Browse Source 
minor improvements
This commit is contained in:
Tommy Parnell
2015-04-23 08:10:06 -04:00
parent ae582d6fc2 88ce5b7ac7
commit cd12db9469
16 changed files with 132 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@@ -6,7 +6,7 @@
*.user
*.userosscache
*.sln.docstates
*.DotSettings
# User-specific files (MonoDevelop/Xamarin Studio)
*.userprefs

21
src/Untappd.Net.UnitTests/Authentication/TestAuthenticationHelper.cs
View File

@@ -1,8 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using NUnit.Framework;
using Untappd.Net.Authentication;
using Untappd.Net.Client;
@@ -47,5 +43,22 @@ namespace Untappd.Net.UnitTests.Authentication
AuthenticationHelper.TokenUrl(new UnAuthenticatedUntappdCredentials("d", "d"), "ds", string.Empty);
}
[Test]
public void TestTokenUrl()
{
var s = AuthenticationHelper.TokenUrl(new UnAuthenticatedUntappdCredentials("d", "d"), "ds", "code");
Assert.AreEqual(s, Constants.OAuthTokenEndPoint + "/?client_id=d&client_secret=d&response_type=code&redirect_url=ds&code=code");
}
[Test]
public void TestRedirectUrl()
{
var s = AuthenticationHelper.RedirectUserTo(new UnAuthenticatedUntappdCredentials("d", "d"), "ds");
Assert.AreEqual(s, Constants.BaseRequestString + "/?client_id=d&response_type=code&redirect_url=ds");
}
}
}

9
src/Untappd.Net.UnitTests/Request/TestRepository.cs
View File

@@ -45,5 +45,14 @@ namespace Untappd.Net.UnitTests.Request
Assert.IsTrue(constructorTest.Client != null);
Assert.IsTrue(constructorTest.Request != null);
}
[Test]
public void ConfirmConfigureGetRequestClearsParams()
{
var constructorTest = new Repository();
constructorTest.Request.Parameters.Add(new Parameter(){Name = "param"});
Assert.IsTrue(constructorTest.Request.Parameters.Count > 0);
constructorTest.ConfigureGetRequest("endpoint");
Assert.IsTrue(constructorTest.Request.Parameters.Count == 0);
}
}
}

74
src/Untappd.Net.UnitTests/Responses/TestDeserializer.cs
View File

@@ -1,21 +1,21 @@
using System;
using System.Collections.Generic;
using System.Collections.Generic;
using System.IO;
using Newtonsoft.Json;
using NUnit.Framework;
using Untappd.Net.Client;
using Untappd.Net.Request;
using Newtonsoft.Json;
using UserInfo = Untappd.Net.Responses.UserInfo;
using ActivityFeed = Untappd.Net.Responses.Feeds.ActivityFeed;
using UserActivityFeed = Untappd.Net.Responses.Feeds.UserActivityFeed;
using UserBadges = Untappd.Net.Responses.UserBadges;
using BeerInfo = Untappd.Net.Responses.BeerInfo;
using BeerSearch = Untappd.Net.Responses.BeerSearch;
using BreweryInfo = Untappd.Net.Responses.BreweryInfo;
using BrewerySearch = Untappd.Net.Responses.BrewerySearch;
using Untappd.Net.Responses.BeerInfo;
using Untappd.Net.Responses.BeerSearch;
using Untappd.Net.Responses.BreweryInfo;
using Untappd.Net.Responses.BrewerySearch;
using Untappd.Net.Responses.Feeds.ActivityFeed;
using Untappd.Net.Responses.Feeds.UserActivityFeed;
using Untappd.Net.Responses.UserBadges;
using Untappd.Net.Responses.UserFriends;
using Untappd.Net.Responses.UserInfo;
using Untappd.Net.Responses.VenueInfo;
using UserDistinctBeers = Untappd.Net.Responses.UserDistinctBeer;
using UserFriends = Untappd.Net.Responses.UserFriends;
using UserWishList = Untappd.Net.Responses.UserWishlist;
using VenueInfo = Untappd.Net.Responses.VenueInfo;
namespace Untappd.Net.UnitTests
{
@@ -38,92 +38,92 @@ namespace Untappd.Net.UnitTests
var repo = new Repository();
//var resp = repo.Get<ActivityFeed.ActivityFeed>(credentials);
var resp3 = repo.Get<BrewerySearch.BrewerySearch>(credentials, "", parameters);
var resp2 = repo.Get<UserActivityFeed.UserActivityFeed>(credentials);
var resp3 = repo.Get<BrewerySearch>(credentials, "", parameters);
var resp2 = repo.Get<UserActivityFeed>(credentials);
}
[Test]
public void TestJsonDeserializeUserBadges()
{
var json = System.IO.File.ReadAllText(string.Format(ResponsePath, "UserBadges.json"));
var jsonresult = JsonConvert.DeserializeObject<UserBadges.UserBadges>(json);
var json = File.ReadAllText(string.Format(ResponsePath, "UserBadges.json"));
var jsonresult = JsonConvert.DeserializeObject<UserBadges>(json);
}
[Test]
public void TestJsonDeserializerBeerInfo()
{
var json = System.IO.File.ReadAllText(string.Format(ResponsePath, "BeerInfo.json"));
var jsonresult = JsonConvert.DeserializeObject<BeerInfo.BeerInfo>(json);
var json = File.ReadAllText(string.Format(ResponsePath, "BeerInfo.json"));
var jsonresult = JsonConvert.DeserializeObject<BeerInfo>(json);
}
[Test]
public void TestJsonDeserializerBeerSearch()
{
var json = System.IO.File.ReadAllText(string.Format(ResponsePath, "BeerSearch.json"));
var jsonresult = JsonConvert.DeserializeObject<BeerSearch.BeerSearch>(json);
var json = File.ReadAllText(string.Format(ResponsePath, "BeerSearch.json"));
var jsonresult = JsonConvert.DeserializeObject<BeerSearch>(json);
}
[Test]
public void TestJsonDeserializerBreweryInfo()
{
var json = System.IO.File.ReadAllText(string.Format(ResponsePath, "BreweryInfo.json"));
var jsonresult = JsonConvert.DeserializeObject<BreweryInfo.BreweryInfo>(json);
var json = File.ReadAllText(string.Format(ResponsePath, "BreweryInfo.json"));
var jsonresult = JsonConvert.DeserializeObject<BreweryInfo>(json);
}
[Test]
public void TestJsonDeserializerBrewerySearch()
{
var json = System.IO.File.ReadAllText(string.Format(ResponsePath, "BrewerySearch.json"));
var jsonresult = JsonConvert.DeserializeObject<BrewerySearch.BrewerySearch>(json);
var json = File.ReadAllText(string.Format(ResponsePath, "BrewerySearch.json"));
var jsonresult = JsonConvert.DeserializeObject<BrewerySearch>(json);
}
[Test]
public void TestJsonDeserializerUserDistinctBeers()
{
var json = System.IO.File.ReadAllText(string.Format(ResponsePath, "UserDistinctBeers.json"));
var json = File.ReadAllText(string.Format(ResponsePath, "UserDistinctBeers.json"));
var jsonresult = JsonConvert.DeserializeObject<UserDistinctBeers.UserDistinctBeers>(json);
}
[Test]
public void TestJsonDeserializerUserFriends()
{
var json = System.IO.File.ReadAllText(string.Format(ResponsePath, "UserFriends.json"));
var jsonresult = JsonConvert.DeserializeObject<UserFriends.UserFriends>(json);
var json = File.ReadAllText(string.Format(ResponsePath, "UserFriends.json"));
var jsonresult = JsonConvert.DeserializeObject<UserFriends>(json);
}
[Test]
public void TestJsonDeserializerUserInfo()
{
var json = System.IO.File.ReadAllText(string.Format(ResponsePath, "UserInfo.json"));
var jsonresult = JsonConvert.DeserializeObject<UserInfo.UserInfo>(json);
var json = File.ReadAllText(string.Format(ResponsePath, "UserInfo.json"));
var jsonresult = JsonConvert.DeserializeObject<UserInfo>(json);
}
[Test]
public void TestJsonDeserializerUserWishList()
{
var json = System.IO.File.ReadAllText(string.Format(ResponsePath, "UserWishList.json"));
var json = File.ReadAllText(string.Format(ResponsePath, "UserWishList.json"));
var jsonresult = JsonConvert.DeserializeObject<UserWishList.UserWishList>(json);
}
[Test]
public void TestJsonDeserializerVenueInfo()
{
var json = System.IO.File.ReadAllText(string.Format(ResponsePath, "VenueInfo.json"));
var jsonresult = JsonConvert.DeserializeObject<VenueInfo.VenueInfo>(json);
var json = File.ReadAllText(string.Format(ResponsePath, "VenueInfo.json"));
var jsonresult = JsonConvert.DeserializeObject<VenueInfo>(json);
}
[Test]
public void TestJsonDeserializerActivityFeed()
{
var json = System.IO.File.ReadAllText(string.Format(ResponsePath, "ActivityFeed.json"));
var jsonresult = JsonConvert.DeserializeObject<ActivityFeed.ActivityFeed>(json);
var json = File.ReadAllText(string.Format(ResponsePath, "ActivityFeed.json"));
var jsonresult = JsonConvert.DeserializeObject<ActivityFeed>(json);
}
[Test]
public void TestJsonDeserializerUserActivityFeed()
{
var json = System.IO.File.ReadAllText(string.Format(ResponsePath, "UserActivityFeed.json"));
var jsonresult = JsonConvert.DeserializeObject<UserActivityFeed.UserActivityFeed>(json);
var json = File.ReadAllText(string.Format(ResponsePath, "UserActivityFeed.json"));
var jsonresult = JsonConvert.DeserializeObject<UserActivityFeed>(json);
}
}
}

31
src/Untappd.Net.UnitTests/Responses/TestResponseEndpoints.cs Normal file
View File

@@ -0,0 +1,31 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Reflection;
using System.Text;
using System.Threading.Tasks;
using NUnit.Framework;
using Untappd.Net.Request;
namespace Untappd.Net.UnitTests.Responses
{
[TestFixture]
public class TestResponseEndpoints
{
/// <summary>
/// Run through all the endpoints to make sure they all atleast do not error out.
/// This is so we can get a high code coverage, while also covering new types that get added.
/// </summary>
[Test]
public void RunAllEndpoints()
{
var objects = Assembly.GetAssembly(typeof (IRequest)).GetTypes().Where(myType =>
myType.IsClass
&& !myType.IsAbstract
&& myType.GetInterface("IRequest") != null).Select(type => (IRequest) Activator.CreateInstance(type)).ToList();
objects.ForEach(a=>Assert.IsNotNullOrEmpty(a.EndPoint("t")));
}
}
}

1
src/Untappd.Net.UnitTests/Untappd.Net.UnitTests.csproj
View File

@@ -77,6 +77,7 @@
<Compile Include="Exception\TestEndpointConfigurationException.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Request\TestRepository.cs" />
<Compile Include="Responses\TestResponseEndpoints.cs" />
</ItemGroup>
<ItemGroup>
<None Include="Responses\Json\ActivityFeed.json" />

5
src/Untappd.Net/Authentication/AuthenticationHelper.cs
View File

@@ -1,10 +1,5 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Untappd.Net.Client;
using Untappd.Net.Request;
namespace Untappd.Net.Authentication
{

4
src/Untappd.Net/Client/UnAuthenticatedUntappdCredentials.cs
View File

@@ -1,6 +1,4 @@
using System;
namespace Untappd.Net.Client
namespace Untappd.Net.Client
{
public class UnAuthenticatedUntappdCredentials : UntappdCredentials, IUnAuthenticatedUntappdCredentials
{

2
src/Untappd.Net/Client/UntappdCredentials.cs
View File

@@ -12,7 +12,7 @@ namespace Untappd.Net.Client
/// </summary>
/// <param name="clientId"></param>
/// <param name="clientSecret"></param>
public UntappdCredentials(string clientId, string clientSecret)
protected UntappdCredentials(string clientId, string clientSecret)
{
if (string.IsNullOrWhiteSpace(clientId))
{

1
src/Untappd.Net/Request/BasicRequest.cs
View File

@@ -1,4 +1,5 @@
using System;
namespace Untappd.Net.Request
{
public abstract class BasicRequest

8
src/Untappd.Net/Request/IAuthenticatedRequest.cs
View File

@@ -1,10 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Untappd.Net.Request
namespace Untappd.Net.Request
{
public interface IAuthenticatedRequest : IRequest
{

8
src/Untappd.Net/Request/IRequest.cs
View File

@@ -1,10 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Untappd.Net.Request
namespace Untappd.Net.Request
{
public interface IRequest
{

8
src/Untappd.Net/Request/IUnAuthenticatedRequest.cs
View File

@@ -1,10 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Untappd.Net.Request
namespace Untappd.Net.Request
{
public interface IUnAuthenticatedRequest : IRequest
{

40
src/Untappd.Net/Request/Repository.cs
View File

@@ -1,10 +1,7 @@
using System;
using System.Collections.Generic;
using System.Threading.Tasks;
using System.Collections.Generic;
using Newtonsoft.Json;
using RestSharp;
using Untappd.Net.Client;
using System.Threading;
namespace Untappd.Net.Request
{
@@ -25,15 +22,18 @@ namespace Untappd.Net.Request
Request = request;
}
private void ConfigureGetRequest(IRestRequest request, string endPoint, IDictionary<string, string> bodyParameters = null)
internal void ConfigureGetRequest(string endPoint, IDictionary<string, string> bodyParameters = null)
{
request.Resource = endPoint;
request.Method = Method.GET;
if (request.Parameters != null) this.Request.Parameters.Clear();
Request.Resource = endPoint;
Request.Method = Method.GET;
if (Request.Parameters != null) Request.Parameters.Clear();
if (bodyParameters == null) return;
foreach (var param in bodyParameters)
{
Request.AddParameter(param.Key, param.Value);
}
if (bodyParameters != null)
foreach (var param in bodyParameters)
request.AddParameter(param.Key, param.Value);
}
/// <summary>
@@ -48,12 +48,12 @@ namespace Untappd.Net.Request
where TResult : IUnAuthenticatedRequest,new()
{
var result = new TResult();
this.ConfigureGetRequest(this.Request, result.EndPoint(urlParameter), bodyParameters);
ConfigureGetRequest(result.EndPoint(urlParameter), bodyParameters);
this.Request.AddParameter("client_id", credentials.ClientId);
this.Request.AddParameter("client_secret", credentials.ClientSecret);
Request.AddParameter("client_id", credentials.ClientId);
Request.AddParameter("client_secret", credentials.ClientSecret);
return this.DoRestRequest<TResult>(this.Request);
return DoRestRequest<TResult>();
}
/// <summary>
@@ -68,17 +68,17 @@ namespace Untappd.Net.Request
where TResult : IAuthenticatedRequest, new()
{
var result = new TResult();
this.ConfigureGetRequest(this.Request, result.EndPoint(urlParameter), bodyParameters);
ConfigureGetRequest(result.EndPoint(urlParameter), bodyParameters);
this.Request.AddParameter("access_token", credentials.AccessToken);
Request.AddParameter("access_token", credentials.AccessToken);
return this.DoRestRequest<TResult>(this.Request);
return DoRestRequest<TResult>();
}
private TResult DoRestRequest<TResult>(IRestRequest request)
private TResult DoRestRequest<TResult>()
{
var client = new RestClient(Constants.BaseRequestString);
var resp = client.Execute(request);
var resp = client.Execute(Request);
return JsonConvert.DeserializeObject<TResult>(resp.Content);
}

1
src/Untappd.Net/Responses/UserBadges.cs
View File

@@ -1,7 +1,6 @@
using System.Collections.Generic;
using Newtonsoft.Json;
using Untappd.Net.Request;
using System.ComponentModel;
namespace Untappd.Net.Responses.UserBadges
{

19
src/Untappd.Net/SingleObjectArrayConverter.cs
View File

@@ -19,17 +19,18 @@ namespace Untappd.Net
public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
{
object retval = new Object();
var retval = new Object();
if (reader.TokenType == JsonToken.StartObject)
switch (reader.TokenType)
{
T instance = (T)serializer.Deserialize(reader, typeof(T));
retval = instance;
}
else if (reader.TokenType == JsonToken.StartArray)
{
reader.Read();
retval = null;
case JsonToken.StartObject:
var instance = (T)serializer.Deserialize(reader, typeof(T));
retval = instance;
break;
case JsonToken.StartArray:
reader.Read();
retval = null;
break;
}
return retval;