From 3b7ba99b9dac91a190a46e499c7b3bc84cd78732 Mon Sep 17 00:00:00 2001 From: Tommy Parnell Date: Sat, 2 May 2015 21:01:09 -0400 Subject: [PATCH 1/3] additional test --- .gitignore | 1 + src/Untappd.Net.UnitTests/Request/TestRepository.cs | 10 ++++++++++ 2 files changed, 11 insertions(+) diff --git a/.gitignore b/.gitignore index 830d556..ff13331 100644 --- a/.gitignore +++ b/.gitignore @@ -10,6 +10,7 @@ # User-specific files (MonoDevelop/Xamarin Studio) *.userprefs +**/.settings # Build results [Dd]ebug/ [Dd]ebugPublic/ diff --git a/src/Untappd.Net.UnitTests/Request/TestRepository.cs b/src/Untappd.Net.UnitTests/Request/TestRepository.cs index 5b89871..b2ad545 100644 --- a/src/Untappd.Net.UnitTests/Request/TestRepository.cs +++ b/src/Untappd.Net.UnitTests/Request/TestRepository.cs @@ -7,6 +7,7 @@ using RestSharp; using Untappd.Net.Client; using Untappd.Net.Request; using Untappd.Net.Responses.BeerInfo; +using Untappd.Net.Responses.Actions; namespace Untappd.Net.UnitTests.Request { @@ -54,6 +55,15 @@ namespace Untappd.Net.UnitTests.Request repository.GetAsync(mockAuthCreds.Object, "awesome", bodyParam).Wait(); request.Verify(a => a.AddParameter("key", "value")); request.Verify(a => a.AddParameter("access_token", "accessToken")); + + mockAuthCreds.Setup(a => a.AccessToken).Returns("PostaccessToken"); + var checkin = new CheckIn("-5", "EST", 1044097) { Shout = "Awesome Brew", Rating = 4 }; + repository.Post(mockAuthCreds.Object, checkin); + request.Verify(a => a.AddParameter("access_token", "PostaccessToken")); + + mockAuthCreds.Setup(a => a.AccessToken).Returns("PostAsyncaccessToken"); + repository.PostAsync(mockAuthCreds.Object, checkin).Wait(); + request.Verify(a => a.AddParameter("access_token", "PostAsyncaccessToken")); } [Test] From 59cea319ef8787db1577b85b217cf4dc2d586e47 Mon Sep 17 00:00:00 2001 From: Tommy Parnell Date: Sat, 2 May 2015 21:04:43 -0400 Subject: [PATCH 2/3] add readme docs --- README.md | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/README.md b/README.md index 8651533..c298d33 100644 --- a/README.md +++ b/README.md @@ -46,6 +46,17 @@ var t = new Repository().Get(ts); ``` +For Actions (usually post requests). Note: Actions return a dynamic object. Usually these responses are not needed, and you should still be able to use the dynamic object's data. If strong typed returns is required feel free to file an issue. However we don't predict people will really need to care about the returns of these actions. + + +```csharp + +var ts = new AuthenticatedUntappdCredentials("token", "key", "secret"); +var checkin = new CheckIn("-5", "EST", 1044097) { Shout = "Awesome Brew", Rating = 4 }; +var response = repository.Post(ts, checkin); + +``` + ## Contributing * Everyone is welcome to contribute! From 17e699711928162f3a4d2bc1d33a06213115d786 Mon Sep 17 00:00:00 2001 From: Tommy Parnell Date: Sat, 2 May 2015 22:02:19 -0400 Subject: [PATCH 3/3] fix up some deserialization problems --- src/Untappd.Net/Responses/Feeds/ActivityFeed.cs | 3 ++- src/Untappd.Net/Responses/Feeds/UserActivityFeed.cs | 3 ++- src/Untappd.Net/Responses/UserInfo.cs | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/Untappd.Net/Responses/Feeds/ActivityFeed.cs b/src/Untappd.Net/Responses/Feeds/ActivityFeed.cs index 22031c9..ab79fa5 100644 --- a/src/Untappd.Net/Responses/Feeds/ActivityFeed.cs +++ b/src/Untappd.Net/Responses/Feeds/ActivityFeed.cs @@ -331,7 +331,7 @@ namespace Untappd.Net.Responses.Feeds.ActivityFeed [JsonProperty("count")] public int Count { get; set; } - [JsonProperty("auth_toast")] + [JsonProperty("auth_toast", NullValueHandling = NullValueHandling.Ignore)] public bool AuthToast { get; set; } [JsonProperty("items")] @@ -516,6 +516,7 @@ namespace Untappd.Net.Responses.Feeds.ActivityFeed public Meta Meta { get; set; } [JsonProperty("notifications")] + [JsonConverter(typeof(SingleObjectArrayConverter))] public Notifications Notifications { get; set; } [JsonProperty("response")] diff --git a/src/Untappd.Net/Responses/Feeds/UserActivityFeed.cs b/src/Untappd.Net/Responses/Feeds/UserActivityFeed.cs index d03a1d9..43c6616 100644 --- a/src/Untappd.Net/Responses/Feeds/UserActivityFeed.cs +++ b/src/Untappd.Net/Responses/Feeds/UserActivityFeed.cs @@ -348,7 +348,7 @@ namespace Untappd.Net.Responses.Feeds.UserActivityFeed [JsonProperty("count")] public int Count { get; set; } - [JsonProperty("auth_toast")] + [JsonProperty("auth_toast", NullValueHandling = NullValueHandling.Ignore)] public bool AuthToast { get; set; } [JsonProperty("items")] @@ -483,6 +483,7 @@ namespace Untappd.Net.Responses.Feeds.UserActivityFeed public Meta Meta { get; set; } [JsonProperty("notifications")] + [JsonConverter(typeof(SingleObjectArrayConverter))] public Notifications Notifications { get; set; } [JsonProperty("response")] diff --git a/src/Untappd.Net/Responses/UserInfo.cs b/src/Untappd.Net/Responses/UserInfo.cs index 5d75338..d605eab 100644 --- a/src/Untappd.Net/Responses/UserInfo.cs +++ b/src/Untappd.Net/Responses/UserInfo.cs @@ -872,6 +872,7 @@ namespace Untappd.Net.Responses.UserInfo public Meta Meta { get; set; } [JsonProperty("notifications")] + [JsonConverter(typeof(SingleObjectArrayConverter))] public Notifications Notifications { get; set; } [JsonProperty("response")]