From 2bda837366653d6ac35c25a35b7a16a5e5f83b4e Mon Sep 17 00:00:00 2001 From: Tommy Parnell Date: Mon, 20 Apr 2015 01:08:14 -0400 Subject: [PATCH 1/9] minor readme update --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index d2bfeb6..53f9bc9 100644 --- a/README.md +++ b/README.md @@ -29,8 +29,10 @@ var t = new Repository().Get(ts, "tparnell"); ## Contributing +* Everyone is welcome to contribute! +* If you are looking for something to do, look at the issues. * There are no special instructions, submit pull requests against the master branch. -* Releases to nuget occur on successful release branch builds +* Releases to nuget occur on successful release branch builds. * The only reason I do not publish on master, is because sometimes commits can just contain readme files, or unit tests changes that do not affect the nuget package ## TODO From cc3bc0fc3a33b74e36ec4f419498ee740d5458bb Mon Sep 17 00:00:00 2001 From: Tommy Parnell Date: Mon, 20 Apr 2015 01:10:07 -0400 Subject: [PATCH 2/9] remove todo section --- README.md | 9 --------- 1 file changed, 9 deletions(-) diff --git a/README.md b/README.md index 53f9bc9..45c6279 100644 --- a/README.md +++ b/README.md @@ -34,12 +34,3 @@ var t = new Repository().Get(ts, "tparnell"); * There are no special instructions, submit pull requests against the master branch. * Releases to nuget occur on successful release branch builds. * The only reason I do not publish on master, is because sometimes commits can just contain readme files, or unit tests changes that do not affect the nuget package - -## TODO - -* Actually Make unit tests -* Add authentication layer -* Implement API calls that require authentication tokens -* Coveralls? -* Code Quality? -* Exception Handling? From 5565474ff036830f7e55cf23fcf87bd17ee74fe9 Mon Sep 17 00:00:00 2001 From: Tommy Parnell Date: Mon, 20 Apr 2015 18:12:32 -0400 Subject: [PATCH 3/9] unit test things --- src/Untappd.Net.UnitTests/Class1.cs | 7 +-- .../TestAuthenticatedUntappdCredentials.cs | 31 +++++++++++ .../TestUnAuthenticatedUntappdCredentials.cs | 27 ++++++++++ .../Exception/TestBaseUntappdException.cs | 33 ++++++++++++ .../TestEndpointConfigurationException.cs | 22 ++++++++ .../Request/TestRepository.cs | 53 +++++++++++++++++++ .../Untappd.Net.UnitTests.csproj | 16 ++++++ src/Untappd.Net.UnitTests/packages.config | 3 ++ .../Client/AuthenticatedUntappdCredentials.cs | 6 ++- .../UnAuthenticatedUntappdCredentials.cs | 7 +-- .../Exception/BaseUntappdException.cs | 31 +++++++++++ .../EndpointConfigurationException.cs | 21 ++++++++ src/Untappd.Net/Properties/AssemblyInfo.cs | 1 + .../Request/AuthenticatedRequest.cs | 9 +++- src/Untappd.Net/Request/Repository.cs | 28 +++++++--- src/Untappd.Net/Untappd.Net.csproj | 2 + 16 files changed, 276 insertions(+), 21 deletions(-) create mode 100644 src/Untappd.Net.UnitTests/Client/TestAuthenticatedUntappdCredentials.cs create mode 100644 src/Untappd.Net.UnitTests/Client/TestUnAuthenticatedUntappdCredentials.cs create mode 100644 src/Untappd.Net.UnitTests/Exception/TestBaseUntappdException.cs create mode 100644 src/Untappd.Net.UnitTests/Exception/TestEndpointConfigurationException.cs create mode 100644 src/Untappd.Net.UnitTests/Request/TestRepository.cs create mode 100644 src/Untappd.Net/Exception/BaseUntappdException.cs create mode 100644 src/Untappd.Net/Exception/EndpointConfigurationException.cs diff --git a/src/Untappd.Net.UnitTests/Class1.cs b/src/Untappd.Net.UnitTests/Class1.cs index 322cd6e..48eff6d 100644 --- a/src/Untappd.Net.UnitTests/Class1.cs +++ b/src/Untappd.Net.UnitTests/Class1.cs @@ -1,8 +1,9 @@ using System; using NUnit.Framework; -using Untappd.Client.Net; +using Untappd.Net.Client; using Untappd.Net.Request; using Untappd.Net.Responses.UserDistinctBeer; +using Untappd.Net.Responses.UserInfo; namespace Untappd.Net.UnitTests { @@ -13,8 +14,8 @@ namespace Untappd.Net.UnitTests [Ignore] public void Test() { - var ts = new UnAuthenticatedUntappdCredentials("clientid", "clientkey"); - var t = new Repository().Get(ts, "tparnell"); + var ts = new UnAuthenticatedUntappdCredentials("id", "se"); + var t = new Repository().Get(ts, "tparnell"); Console.WriteLine(t); } } diff --git a/src/Untappd.Net.UnitTests/Client/TestAuthenticatedUntappdCredentials.cs b/src/Untappd.Net.UnitTests/Client/TestAuthenticatedUntappdCredentials.cs new file mode 100644 index 0000000..9a38ab1 --- /dev/null +++ b/src/Untappd.Net.UnitTests/Client/TestAuthenticatedUntappdCredentials.cs @@ -0,0 +1,31 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using NUnit.Framework; +using Untappd.Net.Client; + +namespace Untappd.Net.UnitTests.Client +{ + [TestFixture] + public class TestAuthenticatedUntappdCredentials + { + [Test] + [ExpectedException(typeof(ArgumentNullException))] + public void ExpectException() + { + var t = new AuthenticatedUntappdCredentials(null, "d", "d"); + } + [Test] + public void ExpectValid() + { + var token = "awesome"; + var t = new AuthenticatedUntappdCredentials(token, "d", "d"); + Assert.AreEqual(token, "awesome"); + token = "newString"; + //Make sure the reference is not copied over + Assert.AreEqual("awesome", t.AccessToken); + } + } +} diff --git a/src/Untappd.Net.UnitTests/Client/TestUnAuthenticatedUntappdCredentials.cs b/src/Untappd.Net.UnitTests/Client/TestUnAuthenticatedUntappdCredentials.cs new file mode 100644 index 0000000..1ea1460 --- /dev/null +++ b/src/Untappd.Net.UnitTests/Client/TestUnAuthenticatedUntappdCredentials.cs @@ -0,0 +1,27 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using NUnit.Framework; +using Untappd.Net.Client; + +namespace Untappd.Net.UnitTests.Client +{ + [TestFixture] + public class TestUnAuthenticatedUntappdCredentials + { + [Test] + [ExpectedException(typeof(ArgumentNullException))] + public void ExpectClientIdException() + { + var t = new UnAuthenticatedUntappdCredentials(string.Empty, "t"); + } + [Test] + [ExpectedException(typeof(ArgumentNullException))] + public void ExpectClientSecretException() + { + var t = new UnAuthenticatedUntappdCredentials("t", string.Empty); + } + } +} diff --git a/src/Untappd.Net.UnitTests/Exception/TestBaseUntappdException.cs b/src/Untappd.Net.UnitTests/Exception/TestBaseUntappdException.cs new file mode 100644 index 0000000..c685739 --- /dev/null +++ b/src/Untappd.Net.UnitTests/Exception/TestBaseUntappdException.cs @@ -0,0 +1,33 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using NUnit.Framework; +using Untappd.Net.Exception; + +namespace Untappd.Net.UnitTests.Exception +{ + [TestFixture] + public class TestBaseUntappdException + { + [ExpectedException(typeof (BaseUntappdException))] + [Test] + public void TestStandardException() + { + throw new BaseUntappdException(); + } + [ExpectedException(typeof(BaseUntappdException), ExpectedMessage = "messageHere")] + [Test] + public void TestStandardExceptionWithMessage() + { + throw new BaseUntappdException("messageHere"); + } + [ExpectedException(typeof(BaseUntappdException), ExpectedMessage = "messageHere")] + [Test] + public void TestStandardExceptionWithInner() + { + throw new BaseUntappdException("messageHere", new System.Exception("innerException!")); + } + } +} diff --git a/src/Untappd.Net.UnitTests/Exception/TestEndpointConfigurationException.cs b/src/Untappd.Net.UnitTests/Exception/TestEndpointConfigurationException.cs new file mode 100644 index 0000000..b6deddc --- /dev/null +++ b/src/Untappd.Net.UnitTests/Exception/TestEndpointConfigurationException.cs @@ -0,0 +1,22 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using NUnit.Framework; +using Untappd.Net.Exception; + +namespace Untappd.Net.UnitTests.Exception +{ + [TestFixture] + public class TestEndpointConfigurationException + { + [Test] + [ExpectedException(typeof(EndpointConfigurationException), ExpectedMessage = "Invalid endpoint configured")] + public void TestThrownExeption() + { + throw new EndpointConfigurationException(); + } + + } +} diff --git a/src/Untappd.Net.UnitTests/Request/TestRepository.cs b/src/Untappd.Net.UnitTests/Request/TestRepository.cs new file mode 100644 index 0000000..8221a74 --- /dev/null +++ b/src/Untappd.Net.UnitTests/Request/TestRepository.cs @@ -0,0 +1,53 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Moq; +using Newtonsoft.Json; +using NUnit.Framework; +using RestSharp; +using Untappd.Net.Client; +using Untappd.Net.Request; +using Untappd.Net.Responses.BeerInfo; + +namespace Untappd.Net.UnitTests.Request +{ + [TestFixture] + public class TestRepository + { + [Test] + public void ConfirmRequestWorks() + { + var mockCreds = new Mock(); + mockCreds.Setup(a => a.ClientId).Returns("id"); + mockCreds.Setup(a => a.ClientSecret).Returns("secret"); + var bodyParam = new Dictionary(){{"key", "value"}}; + var client = new Mock(); + var request = new Mock(); + request.Setup(a => a.AddParameter(It.IsAny(), It.IsAny())); + request.Setup(a => a.AddParameter(It.IsAny(), It.IsAny())); + + var response = new Mock(); + var obj = JsonConvert.SerializeObject(new BeerInfo()); + response.Setup(a => a.Content).Returns(obj); + client.Setup((a) => a.Execute(It.IsAny())).Callback(() => + { + }).Returns(response.Object); + var repository = new Repository(client.Object, request.Object); + + repository.Get(mockCreds.Object, "awesome", bodyParam); + request.Verify(a => a.AddParameter("client_id", mockCreds.Object.ClientId)); + request.Verify(a => a.AddParameter("client_secret", mockCreds.Object.ClientSecret)); + request.Verify(a => a.AddParameter("key", "value")); + } + + [Test] + public void ConfirmBasicConstructorWorks() + { + var constructorTest = new Repository(); + Assert.IsTrue(constructorTest.Client != null); + Assert.IsTrue(constructorTest.Request != null); + } + } +} diff --git a/src/Untappd.Net.UnitTests/Untappd.Net.UnitTests.csproj b/src/Untappd.Net.UnitTests/Untappd.Net.UnitTests.csproj index 50d666e..0986b69 100644 --- a/src/Untappd.Net.UnitTests/Untappd.Net.UnitTests.csproj +++ b/src/Untappd.Net.UnitTests/Untappd.Net.UnitTests.csproj @@ -30,6 +30,13 @@ 4 + + ..\..\packages\Moq.4.2.1502.0911\lib\net40\Moq.dll + + + False + ..\..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll + ..\..\packages\NUnitTestAdapter.1.2\lib\nunit.core.dll False @@ -49,6 +56,10 @@ ..\..\packages\NUnitTestAdapter.1.2\lib\NUnit.VisualStudio.TestAdapter.dll False + + False + ..\..\packages\RestSharp.105.0.1\lib\net4\RestSharp.dll + @@ -59,7 +70,12 @@ + + + + + diff --git a/src/Untappd.Net.UnitTests/packages.config b/src/Untappd.Net.UnitTests/packages.config index 1e5dba5..079df90 100644 --- a/src/Untappd.Net.UnitTests/packages.config +++ b/src/Untappd.Net.UnitTests/packages.config @@ -1,5 +1,8 @@  + + + \ No newline at end of file diff --git a/src/Untappd.Net/Client/AuthenticatedUntappdCredentials.cs b/src/Untappd.Net/Client/AuthenticatedUntappdCredentials.cs index 52f6180..9f539aa 100644 --- a/src/Untappd.Net/Client/AuthenticatedUntappdCredentials.cs +++ b/src/Untappd.Net/Client/AuthenticatedUntappdCredentials.cs @@ -3,7 +3,6 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using Untappd.Client.Net; namespace Untappd.Net.Client { @@ -19,7 +18,10 @@ namespace Untappd.Net.Client public AuthenticatedUntappdCredentials(string accessToken, string clientId, string clientSecret) :base(clientId, clientSecret) { - if (string.IsNullOrWhiteSpace(accessToken)) throw new ArgumentNullException("accessToken"); + if (string.IsNullOrWhiteSpace(accessToken)) + { + throw new ArgumentNullException("accessToken"); + } AccessToken = string.Copy(accessToken); } } diff --git a/src/Untappd.Net/Client/UnAuthenticatedUntappdCredentials.cs b/src/Untappd.Net/Client/UnAuthenticatedUntappdCredentials.cs index 7d308cb..7375a00 100644 --- a/src/Untappd.Net/Client/UnAuthenticatedUntappdCredentials.cs +++ b/src/Untappd.Net/Client/UnAuthenticatedUntappdCredentials.cs @@ -1,11 +1,6 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Untappd.Net.Client; -namespace Untappd.Client.Net +namespace Untappd.Net.Client { public class UnAuthenticatedUntappdCredentials : IUntappdCredentials { diff --git a/src/Untappd.Net/Exception/BaseUntappdException.cs b/src/Untappd.Net/Exception/BaseUntappdException.cs new file mode 100644 index 0000000..f85182d --- /dev/null +++ b/src/Untappd.Net/Exception/BaseUntappdException.cs @@ -0,0 +1,31 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Runtime.Serialization; +using System.Text; +using System.Threading.Tasks; + +namespace Untappd.Net.Exception +{ + [Serializable] + public class BaseUntappdException : System.Exception + { + public BaseUntappdException() + { + } + + public BaseUntappdException(string message) : base(message) + { + } + + public BaseUntappdException(string message, System.Exception inner) : base(message, inner) + { + } + + protected BaseUntappdException( + SerializationInfo info, + StreamingContext context) : base(info, context) + { + } + } +} diff --git a/src/Untappd.Net/Exception/EndpointConfigurationException.cs b/src/Untappd.Net/Exception/EndpointConfigurationException.cs new file mode 100644 index 0000000..d7e880a --- /dev/null +++ b/src/Untappd.Net/Exception/EndpointConfigurationException.cs @@ -0,0 +1,21 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Untappd.Net.Exception +{ + public class EndpointConfigurationException : BaseUntappdException + { + /// + /// Called when a class has an empty endpoint + /// + /// + public EndpointConfigurationException() + :base("Invalid endpoint configured") + { + + } + } +} diff --git a/src/Untappd.Net/Properties/AssemblyInfo.cs b/src/Untappd.Net/Properties/AssemblyInfo.cs index 4334128..8fb909f 100644 --- a/src/Untappd.Net/Properties/AssemblyInfo.cs +++ b/src/Untappd.Net/Properties/AssemblyInfo.cs @@ -34,3 +34,4 @@ using System.Runtime.InteropServices; // [assembly: AssemblyVersion("1.0.*")] [assembly: AssemblyVersion("1.0.*")] [assembly: AssemblyFileVersion("1.0.*")] +[assembly: InternalsVisibleTo("Untappd.Net.UnitTests")] \ No newline at end of file diff --git a/src/Untappd.Net/Request/AuthenticatedRequest.cs b/src/Untappd.Net/Request/AuthenticatedRequest.cs index 4f012af..5535c7c 100644 --- a/src/Untappd.Net/Request/AuthenticatedRequest.cs +++ b/src/Untappd.Net/Request/AuthenticatedRequest.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; +using Untappd.Net.Exception; namespace Untappd.Net.Request { @@ -10,12 +11,16 @@ namespace Untappd.Net.Request { protected abstract string _EndPoint { get; } /// - /// Pass in the parameter into the request...ie username, brewery, etc. + /// Pass in the url parameter into the request...ie username, brewery, etc. /// - /// + /// this can be null if request has no url params /// internal string EndPoint(string parameter) { + if (string.IsNullOrWhiteSpace(_EndPoint)) + { + throw new EndpointConfigurationException(); + } return string.Format(_EndPoint, parameter); } } diff --git a/src/Untappd.Net/Request/Repository.cs b/src/Untappd.Net/Request/Repository.cs index fcc6f01..1b103b9 100644 --- a/src/Untappd.Net/Request/Repository.cs +++ b/src/Untappd.Net/Request/Repository.cs @@ -5,13 +5,26 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using Untappd.Client.Net; using Untappd.Net.Client; namespace Untappd.Net.Request { public class Repository { + internal IRestClient Client; + internal IRestRequest Request; + public Repository() + { + Client = new RestClient(Constants.BaseRequestString); + Request = new RestRequest(); + } + + internal Repository(IRestClient client, IRestRequest request) + { + Client = client; + Request = request; + } + /// /// Get the things! /// @@ -23,18 +36,17 @@ namespace Untappd.Net.Request public TResult Get (IUntappdCredentials credentials, string urlParameter, IDictionary bodyParameters = null) where TResult : UnAuthenticatedRequest,new() { - // throw new NotImplementedException(); var result = new TResult(); - var client = new RestClient(Constants.BaseRequestString); - var request = new RestRequest(result.EndPoint(urlParameter), Method.GET); - request.AddParameter("client_id", credentials.ClientId); - request.AddParameter("client_secret", credentials.ClientSecret); + Request.Resource = result.EndPoint(urlParameter); + Request.Method = Method.GET; + Request.AddParameter("client_id", credentials.ClientId); + Request.AddParameter("client_secret", credentials.ClientSecret); if (bodyParameters != null) foreach (var x in bodyParameters) { - request.AddParameter(x.Key, x.Value); + Request.AddParameter(x.Key, x.Value); } - var resp = client.Execute(request); + var resp = Client.Execute(Request); var jsonresult = JsonConvert.DeserializeObject(resp.Content); return jsonresult; diff --git a/src/Untappd.Net/Untappd.Net.csproj b/src/Untappd.Net/Untappd.Net.csproj index 6a77633..f3c45f8 100644 --- a/src/Untappd.Net/Untappd.Net.csproj +++ b/src/Untappd.Net/Untappd.Net.csproj @@ -51,6 +51,8 @@ + + From 71a1b313e60b791a5b87ec7636be3c0fe0610760 Mon Sep 17 00:00:00 2001 From: Tommy Parnell Date: Mon, 20 Apr 2015 18:25:48 -0400 Subject: [PATCH 4/9] seal up classes --- src/Untappd.Net.UnitTests/Class1.cs | 4 ++-- .../Client/TestAuthenticatedUntappdCredentials.cs | 4 ---- .../Client/TestUnAuthenticatedUntappdCredentials.cs | 4 ---- .../Exception/TestBaseUntappdException.cs | 7 +------ .../Exception/TestEndpointConfigurationException.cs | 7 +------ src/Untappd.Net.UnitTests/Properties/AssemblyInfo.cs | 1 - src/Untappd.Net.UnitTests/Request/TestRepository.cs | 10 +++------- .../Client/AuthenticatedUntappdCredentials.cs | 6 +----- .../Client/IAuthenticatedUntappdCredentials.cs | 8 +------- src/Untappd.Net/Client/IUntappdCredentials.cs | 8 +------- src/Untappd.Net/Constants.cs | 8 +------- src/Untappd.Net/Exception/BaseUntappdException.cs | 11 ----------- .../Exception/EndpointConfigurationException.cs | 8 +------- src/Untappd.Net/Properties/AssemblyInfo.cs | 4 ++-- src/Untappd.Net/Request/AuthenticatedRequest.cs | 7 +------ src/Untappd.Net/Request/Repository.cs | 9 +++------ src/Untappd.Net/Request/UnAuthenticatedRequest.cs | 8 +------- src/Untappd.Net/Responses/BeerInfo.cs | 8 ++------ src/Untappd.Net/Responses/BeerSearch.cs | 8 ++------ src/Untappd.Net/Responses/BreweryInfo.cs | 8 ++------ src/Untappd.Net/Responses/BrewerySearch.cs | 8 ++------ src/Untappd.Net/Responses/Feeds/UserActivityFeed.cs | 8 ++------ src/Untappd.Net/Responses/UserBadges.cs | 8 ++------ src/Untappd.Net/Responses/UserDistinctBeer.cs | 8 ++------ src/Untappd.Net/Responses/UserFriends.cs | 8 ++------ src/Untappd.Net/Responses/UserInfo.cs | 8 ++------ src/Untappd.Net/Responses/UserWishlist.cs | 8 ++------ src/Untappd.Net/Responses/VenueInfo.cs | 8 ++------ 28 files changed, 41 insertions(+), 161 deletions(-) diff --git a/src/Untappd.Net.UnitTests/Class1.cs b/src/Untappd.Net.UnitTests/Class1.cs index 48eff6d..6cef4b8 100644 --- a/src/Untappd.Net.UnitTests/Class1.cs +++ b/src/Untappd.Net.UnitTests/Class1.cs @@ -2,7 +2,6 @@ using NUnit.Framework; using Untappd.Net.Client; using Untappd.Net.Request; -using Untappd.Net.Responses.UserDistinctBeer; using Untappd.Net.Responses.UserInfo; namespace Untappd.Net.UnitTests @@ -14,7 +13,8 @@ namespace Untappd.Net.UnitTests [Ignore] public void Test() { - var ts = new UnAuthenticatedUntappdCredentials("id", "se"); + + var ts = new UnAuthenticatedUntappdCredentials("id", "scrt"); var t = new Repository().Get(ts, "tparnell"); Console.WriteLine(t); } diff --git a/src/Untappd.Net.UnitTests/Client/TestAuthenticatedUntappdCredentials.cs b/src/Untappd.Net.UnitTests/Client/TestAuthenticatedUntappdCredentials.cs index 9a38ab1..6cb0242 100644 --- a/src/Untappd.Net.UnitTests/Client/TestAuthenticatedUntappdCredentials.cs +++ b/src/Untappd.Net.UnitTests/Client/TestAuthenticatedUntappdCredentials.cs @@ -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.Client; diff --git a/src/Untappd.Net.UnitTests/Client/TestUnAuthenticatedUntappdCredentials.cs b/src/Untappd.Net.UnitTests/Client/TestUnAuthenticatedUntappdCredentials.cs index 1ea1460..535e46b 100644 --- a/src/Untappd.Net.UnitTests/Client/TestUnAuthenticatedUntappdCredentials.cs +++ b/src/Untappd.Net.UnitTests/Client/TestUnAuthenticatedUntappdCredentials.cs @@ -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.Client; diff --git a/src/Untappd.Net.UnitTests/Exception/TestBaseUntappdException.cs b/src/Untappd.Net.UnitTests/Exception/TestBaseUntappdException.cs index c685739..04b0064 100644 --- a/src/Untappd.Net.UnitTests/Exception/TestBaseUntappdException.cs +++ b/src/Untappd.Net.UnitTests/Exception/TestBaseUntappdException.cs @@ -1,9 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using NUnit.Framework; +using NUnit.Framework; using Untappd.Net.Exception; namespace Untappd.Net.UnitTests.Exception diff --git a/src/Untappd.Net.UnitTests/Exception/TestEndpointConfigurationException.cs b/src/Untappd.Net.UnitTests/Exception/TestEndpointConfigurationException.cs index b6deddc..3102af2 100644 --- a/src/Untappd.Net.UnitTests/Exception/TestEndpointConfigurationException.cs +++ b/src/Untappd.Net.UnitTests/Exception/TestEndpointConfigurationException.cs @@ -1,9 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using NUnit.Framework; +using NUnit.Framework; using Untappd.Net.Exception; namespace Untappd.Net.UnitTests.Exception diff --git a/src/Untappd.Net.UnitTests/Properties/AssemblyInfo.cs b/src/Untappd.Net.UnitTests/Properties/AssemblyInfo.cs index 743012e..9c38891 100644 --- a/src/Untappd.Net.UnitTests/Properties/AssemblyInfo.cs +++ b/src/Untappd.Net.UnitTests/Properties/AssemblyInfo.cs @@ -1,5 +1,4 @@ using System.Reflection; -using System.Runtime.CompilerServices; using System.Runtime.InteropServices; // General Information about an assembly is controlled through the following diff --git a/src/Untappd.Net.UnitTests/Request/TestRepository.cs b/src/Untappd.Net.UnitTests/Request/TestRepository.cs index 8221a74..071c97c 100644 --- a/src/Untappd.Net.UnitTests/Request/TestRepository.cs +++ b/src/Untappd.Net.UnitTests/Request/TestRepository.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using System.Collections.Generic; using Moq; using Newtonsoft.Json; using NUnit.Framework; @@ -22,7 +18,7 @@ namespace Untappd.Net.UnitTests.Request var mockCreds = new Mock(); mockCreds.Setup(a => a.ClientId).Returns("id"); mockCreds.Setup(a => a.ClientSecret).Returns("secret"); - var bodyParam = new Dictionary(){{"key", "value"}}; + var bodyParam = new Dictionary {{"key", "value"}}; var client = new Mock(); var request = new Mock(); request.Setup(a => a.AddParameter(It.IsAny(), It.IsAny())); @@ -31,7 +27,7 @@ namespace Untappd.Net.UnitTests.Request var response = new Mock(); var obj = JsonConvert.SerializeObject(new BeerInfo()); response.Setup(a => a.Content).Returns(obj); - client.Setup((a) => a.Execute(It.IsAny())).Callback(() => + client.Setup(a => a.Execute(It.IsAny())).Callback(() => { }).Returns(response.Object); var repository = new Repository(client.Object, request.Object); diff --git a/src/Untappd.Net/Client/AuthenticatedUntappdCredentials.cs b/src/Untappd.Net/Client/AuthenticatedUntappdCredentials.cs index 9f539aa..24897a6 100644 --- a/src/Untappd.Net/Client/AuthenticatedUntappdCredentials.cs +++ b/src/Untappd.Net/Client/AuthenticatedUntappdCredentials.cs @@ -1,12 +1,8 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace Untappd.Net.Client { - public class AuthenticatedUntappdCredentials : UnAuthenticatedUntappdCredentials + public sealed class AuthenticatedUntappdCredentials : UnAuthenticatedUntappdCredentials { internal string AccessToken { get; private set; } /// diff --git a/src/Untappd.Net/Client/IAuthenticatedUntappdCredentials.cs b/src/Untappd.Net/Client/IAuthenticatedUntappdCredentials.cs index de5ae68..629bec2 100644 --- a/src/Untappd.Net/Client/IAuthenticatedUntappdCredentials.cs +++ b/src/Untappd.Net/Client/IAuthenticatedUntappdCredentials.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Untappd.Net.Client +namespace Untappd.Net.Client { public interface IAuthenticatedUntappdCredentials : IUntappdCredentials { diff --git a/src/Untappd.Net/Client/IUntappdCredentials.cs b/src/Untappd.Net/Client/IUntappdCredentials.cs index b23fe36..dad9dba 100644 --- a/src/Untappd.Net/Client/IUntappdCredentials.cs +++ b/src/Untappd.Net/Client/IUntappdCredentials.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Untappd.Net.Client +namespace Untappd.Net.Client { public interface IUntappdCredentials { diff --git a/src/Untappd.Net/Constants.cs b/src/Untappd.Net/Constants.cs index 3c657a7..058817f 100644 --- a/src/Untappd.Net/Constants.cs +++ b/src/Untappd.Net/Constants.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Untappd.Net +namespace Untappd.Net { public struct Constants { diff --git a/src/Untappd.Net/Exception/BaseUntappdException.cs b/src/Untappd.Net/Exception/BaseUntappdException.cs index f85182d..eb59dc2 100644 --- a/src/Untappd.Net/Exception/BaseUntappdException.cs +++ b/src/Untappd.Net/Exception/BaseUntappdException.cs @@ -1,9 +1,4 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Runtime.Serialization; -using System.Text; -using System.Threading.Tasks; namespace Untappd.Net.Exception { @@ -21,11 +16,5 @@ namespace Untappd.Net.Exception public BaseUntappdException(string message, System.Exception inner) : base(message, inner) { } - - protected BaseUntappdException( - SerializationInfo info, - StreamingContext context) : base(info, context) - { - } } } diff --git a/src/Untappd.Net/Exception/EndpointConfigurationException.cs b/src/Untappd.Net/Exception/EndpointConfigurationException.cs index d7e880a..30f8324 100644 --- a/src/Untappd.Net/Exception/EndpointConfigurationException.cs +++ b/src/Untappd.Net/Exception/EndpointConfigurationException.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Untappd.Net.Exception +namespace Untappd.Net.Exception { public class EndpointConfigurationException : BaseUntappdException { diff --git a/src/Untappd.Net/Properties/AssemblyInfo.cs b/src/Untappd.Net/Properties/AssemblyInfo.cs index 8fb909f..4590a21 100644 --- a/src/Untappd.Net/Properties/AssemblyInfo.cs +++ b/src/Untappd.Net/Properties/AssemblyInfo.cs @@ -32,6 +32,6 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyFileVersion("1.0.*")] +[assembly: AssemblyVersion("0.2.*")] +[assembly: AssemblyFileVersion("0.2.*")] [assembly: InternalsVisibleTo("Untappd.Net.UnitTests")] \ No newline at end of file diff --git a/src/Untappd.Net/Request/AuthenticatedRequest.cs b/src/Untappd.Net/Request/AuthenticatedRequest.cs index 5535c7c..0f766bb 100644 --- a/src/Untappd.Net/Request/AuthenticatedRequest.cs +++ b/src/Untappd.Net/Request/AuthenticatedRequest.cs @@ -1,9 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Untappd.Net.Exception; +using Untappd.Net.Exception; namespace Untappd.Net.Request { diff --git a/src/Untappd.Net/Request/Repository.cs b/src/Untappd.Net/Request/Repository.cs index 1b103b9..21c8a9b 100644 --- a/src/Untappd.Net/Request/Repository.cs +++ b/src/Untappd.Net/Request/Repository.cs @@ -1,10 +1,7 @@ -using Newtonsoft.Json; -using RestSharp; -using System; +using System; using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using Newtonsoft.Json; +using RestSharp; using Untappd.Net.Client; namespace Untappd.Net.Request diff --git a/src/Untappd.Net/Request/UnAuthenticatedRequest.cs b/src/Untappd.Net/Request/UnAuthenticatedRequest.cs index 3df95aa..420ad74 100644 --- a/src/Untappd.Net/Request/UnAuthenticatedRequest.cs +++ b/src/Untappd.Net/Request/UnAuthenticatedRequest.cs @@ -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 abstract class UnAuthenticatedRequest : AuthenticatedRequest { diff --git a/src/Untappd.Net/Responses/BeerInfo.cs b/src/Untappd.Net/Responses/BeerInfo.cs index a7426dc..b7e7bf4 100644 --- a/src/Untappd.Net/Responses/BeerInfo.cs +++ b/src/Untappd.Net/Responses/BeerInfo.cs @@ -1,15 +1,11 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using System.Collections.Generic; using Newtonsoft.Json; using Untappd.Net.Request; namespace Untappd.Net.Responses.BeerInfo { - public class ResponseTime + public sealed class ResponseTime { [JsonProperty("time")] diff --git a/src/Untappd.Net/Responses/BeerSearch.cs b/src/Untappd.Net/Responses/BeerSearch.cs index 7ec9c90..de8e3ef 100644 --- a/src/Untappd.Net/Responses/BeerSearch.cs +++ b/src/Untappd.Net/Responses/BeerSearch.cs @@ -1,15 +1,11 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using System.Collections.Generic; using Newtonsoft.Json; using Untappd.Net.Request; namespace Untappd.Net.Responses.BeerSearch { - public class ResponseTime + public sealed class ResponseTime { [JsonProperty("time")] diff --git a/src/Untappd.Net/Responses/BreweryInfo.cs b/src/Untappd.Net/Responses/BreweryInfo.cs index b9e6ac6..a6b916d 100644 --- a/src/Untappd.Net/Responses/BreweryInfo.cs +++ b/src/Untappd.Net/Responses/BreweryInfo.cs @@ -1,15 +1,11 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using System.Collections.Generic; using Newtonsoft.Json; using Untappd.Net.Request; namespace Untappd.Net.Responses.BreweryInfo { - public class ResponseTime + public sealed class ResponseTime { [JsonProperty("time")] diff --git a/src/Untappd.Net/Responses/BrewerySearch.cs b/src/Untappd.Net/Responses/BrewerySearch.cs index 8032909..8c85929 100644 --- a/src/Untappd.Net/Responses/BrewerySearch.cs +++ b/src/Untappd.Net/Responses/BrewerySearch.cs @@ -1,15 +1,11 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using System.Collections.Generic; using Newtonsoft.Json; using Untappd.Net.Request; namespace Untappd.Net.Responses.BrewerySearch { - public class ResponseTime + public sealed class ResponseTime { [JsonProperty("time")] diff --git a/src/Untappd.Net/Responses/Feeds/UserActivityFeed.cs b/src/Untappd.Net/Responses/Feeds/UserActivityFeed.cs index ebc4ce3..9adcd4a 100644 --- a/src/Untappd.Net/Responses/Feeds/UserActivityFeed.cs +++ b/src/Untappd.Net/Responses/Feeds/UserActivityFeed.cs @@ -1,14 +1,10 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using System.Collections.Generic; using Newtonsoft.Json; using Untappd.Net.Request; namespace Untappd.Net.Responses.Feeds { - public class ResponseTime + public sealed class ResponseTime { [JsonProperty("time")] diff --git a/src/Untappd.Net/Responses/UserBadges.cs b/src/Untappd.Net/Responses/UserBadges.cs index 8e773fe..9f6311b 100644 --- a/src/Untappd.Net/Responses/UserBadges.cs +++ b/src/Untappd.Net/Responses/UserBadges.cs @@ -1,15 +1,11 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using System.Collections.Generic; using Newtonsoft.Json; using Untappd.Net.Request; namespace Untappd.Net.Responses.UserBadges { - public class ResponseTime + public sealed class ResponseTime { [JsonProperty("time")] diff --git a/src/Untappd.Net/Responses/UserDistinctBeer.cs b/src/Untappd.Net/Responses/UserDistinctBeer.cs index da78330..ee90749 100644 --- a/src/Untappd.Net/Responses/UserDistinctBeer.cs +++ b/src/Untappd.Net/Responses/UserDistinctBeer.cs @@ -1,15 +1,11 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using System.Collections.Generic; using Newtonsoft.Json; using Untappd.Net.Request; namespace Untappd.Net.Responses.UserDistinctBeer { - public class ResponseTime + public sealed class ResponseTime { [JsonProperty("time")] diff --git a/src/Untappd.Net/Responses/UserFriends.cs b/src/Untappd.Net/Responses/UserFriends.cs index 9e17775..5002ef6 100644 --- a/src/Untappd.Net/Responses/UserFriends.cs +++ b/src/Untappd.Net/Responses/UserFriends.cs @@ -1,15 +1,11 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using System.Collections.Generic; using Newtonsoft.Json; using Untappd.Net.Request; namespace Untappd.Net.Responses.UserFriends { - public class ResponseTime + public sealed class ResponseTime { [JsonProperty("time")] diff --git a/src/Untappd.Net/Responses/UserInfo.cs b/src/Untappd.Net/Responses/UserInfo.cs index 6e1650d..028fc29 100644 --- a/src/Untappd.Net/Responses/UserInfo.cs +++ b/src/Untappd.Net/Responses/UserInfo.cs @@ -1,15 +1,11 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using System.Collections.Generic; using Newtonsoft.Json; using Untappd.Net.Request; namespace Untappd.Net.Responses.UserInfo { - public class ResponseTime + public sealed class ResponseTime { [JsonProperty("time")] diff --git a/src/Untappd.Net/Responses/UserWishlist.cs b/src/Untappd.Net/Responses/UserWishlist.cs index c62c72f..6f7a3ac 100644 --- a/src/Untappd.Net/Responses/UserWishlist.cs +++ b/src/Untappd.Net/Responses/UserWishlist.cs @@ -1,15 +1,11 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using System.Collections.Generic; using Newtonsoft.Json; using Untappd.Net.Request; namespace Untappd.Net.Responses.UserWishlist { - public class ResponseTime + public sealed class ResponseTime { [JsonProperty("time")] diff --git a/src/Untappd.Net/Responses/VenueInfo.cs b/src/Untappd.Net/Responses/VenueInfo.cs index 6217574..993b65b 100644 --- a/src/Untappd.Net/Responses/VenueInfo.cs +++ b/src/Untappd.Net/Responses/VenueInfo.cs @@ -1,15 +1,11 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using System.Collections.Generic; using Newtonsoft.Json; using Untappd.Net.Request; namespace Untappd.Net.Responses.VenueInfo { - public class ResponseTime + public sealed class ResponseTime { [JsonProperty("time")] From 8beb86de04844d12da57abe7db044d01f452f360 Mon Sep 17 00:00:00 2001 From: Tommy Parnell Date: Mon, 20 Apr 2015 18:30:08 -0400 Subject: [PATCH 5/9] increment appveyor version --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 7536f35..77da6f0 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,4 +1,4 @@ -version: 0.1.{build} +version: 0.2.{build} configuration: Release assembly_info: patch: true From fb413174427aa3d2d317d8886eef08fdbf000f64 Mon Sep 17 00:00:00 2001 From: Tommy Parnell Date: Mon, 20 Apr 2015 18:43:45 -0400 Subject: [PATCH 6/9] minor update to readme --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 45c6279..8ddc131 100644 --- a/README.md +++ b/README.md @@ -22,6 +22,7 @@ Note: Additional parameters can be passed into the Get Method with an IDictionar var ts = new UnAuthenticatedUntappdCredentials("key", "secret"); var t = new Repository().Get(ts, "tparnell"); +ar t = new Repository().Get(ts, "BeerIdHere"); ``` From ada5199f2a866fa082fb8eee1fd056f6a45e20d0 Mon Sep 17 00:00:00 2001 From: Tommy Parnell Date: Mon, 20 Apr 2015 19:05:50 -0400 Subject: [PATCH 7/9] update myget feed --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 77da6f0..7b682ad 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -23,7 +23,7 @@ deploy: on: branch: release - provider: NuGet - server: https://www.myget.org/F/untappd-net/api/v2 + server: https://www.myget.org/F/untappd-net/ api_key: secure: wsN6BzH8ETiXhB9SndP57mHhivqM+CVnghI/+w5XE3bI8K092Z4V4FrJixcrxKnI on: From a6f6c47d433b8a04c3343110fa92a888a633f229 Mon Sep 17 00:00:00 2001 From: Tommy Parnell Date: Mon, 20 Apr 2015 19:48:55 -0400 Subject: [PATCH 8/9] adjust readme --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 8ddc131..8c8fdab 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@ Note: Additional parameters can be passed into the Get Method with an IDictionar var ts = new UnAuthenticatedUntappdCredentials("key", "secret"); var t = new Repository().Get(ts, "tparnell"); -ar t = new Repository().Get(ts, "BeerIdHere"); +var t = new Repository().Get(ts, "BeerIdHere"); ``` @@ -31,7 +31,7 @@ ar t = new Repository().Get(ts, "BeerIdHere"); ## Contributing * Everyone is welcome to contribute! -* If you are looking for something to do, look at the issues. +* If you are looking for something to do, look at the issues. * There are no special instructions, submit pull requests against the master branch. * Releases to nuget occur on successful release branch builds. * The only reason I do not publish on master, is because sometimes commits can just contain readme files, or unit tests changes that do not affect the nuget package From 409793da96606753d7438c28e54a7bbf141e12e8 Mon Sep 17 00:00:00 2001 From: Tommy Parnell Date: Mon, 20 Apr 2015 19:57:36 -0400 Subject: [PATCH 9/9] fix badges --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 8c8fdab..dd2a84e 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ -**Master:** [![Build status](https://ci.appveyor.com/api/projects/status/rfnpsdmrkjx4a6un/branch/master?svg=true)](https://ci.appveyor.com/project/tparnell8/untappd-net/branch/master) -**Release:**[![Build status](https://ci.appveyor.com/api/projects/status/rfnpsdmrkjx4a6un/branch/release?svg=true)](https://ci.appveyor.com/project/tparnell8/untappd-net/branch/release) +**Master:** [![Build status](https://ci.appveyor.com/api/projects/status/e21297waldfrso3p/branch/master?svg=true)](https://ci.appveyor.com/project/tparnell8/untappd-net/branch/master) +**Release:**[![Build status](https://ci.appveyor.com/api/projects/status/e21297waldfrso3p/branch/master?svg=true)](https://ci.appveyor.com/project/tparnell8/untappd-net/branch/Release) **Tips:** [![Shameless tip badge tips](https://img.shields.io/gratipay/TommyParnell.svg)](https://gratipay.com/TommyParnell) # Untappd.Net