From d1bca34f6cfe16796a2af82408e53d68e803227a Mon Sep 17 00:00:00 2001 From: Rikki Tooley Date: Sat, 6 Dec 2014 13:35:37 +0000 Subject: [PATCH] Renaming Shout to LastShout See #17 --- .../Commands/AlbumApi/GetAlbumShoutsCommandTests.cs | 6 +++--- .../Commands/AlbumApi/GetAlbumTopTagsCommandTest.cs | 9 --------- src/IF.Lastfm.Core/Api/AlbumApi.cs | 2 +- src/IF.Lastfm.Core/Api/ArtistApi.cs | 2 +- .../Api/Commands/AlbumApi/GetAlbumShoutsCommand.cs | 8 ++++---- .../Api/Commands/ArtistApi/GetArtistShoutsCommand.cs | 8 ++++---- .../Api/Commands/TrackApi/GetTrackShoutsCommand.cs | 8 ++++---- .../Api/Commands/UserApi/GetUserShoutsCommand.cs | 8 ++++---- src/IF.Lastfm.Core/Api/IAlbumApi.cs | 2 +- src/IF.Lastfm.Core/Api/IArtistApi.cs | 2 +- src/IF.Lastfm.Core/Api/ITrackApi.cs | 2 +- src/IF.Lastfm.Core/Api/IUserApi.cs | 2 +- src/IF.Lastfm.Core/Api/TrackApi.cs | 2 +- src/IF.Lastfm.Core/Api/UserApi.cs | 2 +- src/IF.Lastfm.Core/Objects/{Shout.cs => LastShout.cs} | 10 +++++----- 15 files changed, 32 insertions(+), 41 deletions(-) rename src/IF.Lastfm.Core/Objects/{Shout.cs => LastShout.cs} (77%) diff --git a/src/IF.Lastfm.Core.Tests/Api/Commands/AlbumApi/GetAlbumShoutsCommandTests.cs b/src/IF.Lastfm.Core.Tests/Api/Commands/AlbumApi/GetAlbumShoutsCommandTests.cs index 39f45f9..90d4bc5 100644 --- a/src/IF.Lastfm.Core.Tests/Api/Commands/AlbumApi/GetAlbumShoutsCommandTests.cs +++ b/src/IF.Lastfm.Core.Tests/Api/Commands/AlbumApi/GetAlbumShoutsCommandTests.cs @@ -31,10 +31,10 @@ public async Task HandleSuccessResponse() Assert.IsTrue(parsed.Success); Assert.IsNotNull(parsed.Content); - var expectedShouts = new List + var expectedShouts = new List { - new Shout("uhIgor", "Nunca vou cansar disso.", "Thu, 23 Oct 2014 02:20:30"), - new Shout("Zachary-K", + new LastShout("uhIgor", "Nunca vou cansar disso.", "Thu, 23 Oct 2014 02:20:30"), + new LastShout("Zachary-K", "Oblivion is the best song on whole album. Maybe i dig it but i don't want to really. Or i'm not in the right mood for it.", "Wed, 17 Sep 2014 21:04:36") }; diff --git a/src/IF.Lastfm.Core.Tests/Api/Commands/AlbumApi/GetAlbumTopTagsCommandTest.cs b/src/IF.Lastfm.Core.Tests/Api/Commands/AlbumApi/GetAlbumTopTagsCommandTest.cs index 9fd4498..9197bf9 100644 --- a/src/IF.Lastfm.Core.Tests/Api/Commands/AlbumApi/GetAlbumTopTagsCommandTest.cs +++ b/src/IF.Lastfm.Core.Tests/Api/Commands/AlbumApi/GetAlbumTopTagsCommandTest.cs @@ -2,16 +2,12 @@ using IF.Lastfm.Core.Api.Enums; using IF.Lastfm.Core.Tests.Resources; using Microsoft.VisualStudio.TestTools.UnitTesting; -using System; -using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; namespace IF.Lastfm.Core.Tests.Api.Commands.AlbumApi { - - [TestClass] public class GetAlbumTopTagsCommandTest : CommandTestsBase { @@ -34,7 +30,6 @@ public void Constructor() Assert.AreEqual(_command.Method, "album.gettoptags"); Assert.AreEqual(_command.Parameters["album"], "Believe"); Assert.AreEqual(_command.Parameters["artist"], "Cher"); - } [TestMethod] @@ -46,10 +41,8 @@ public async Task HandleSuccessResponse() Assert.IsTrue(parsed.Success); Assert.IsNotNull(parsed.Content); - } - [TestMethod] public async Task HandleEmptyResponse() { @@ -75,6 +68,4 @@ public async Task HandleErrorResponse() Assert.IsTrue(!parsed.Content.Any()); } } - - } diff --git a/src/IF.Lastfm.Core/Api/AlbumApi.cs b/src/IF.Lastfm.Core/Api/AlbumApi.cs index 80a3cdb..7c2fc5c 100644 --- a/src/IF.Lastfm.Core/Api/AlbumApi.cs +++ b/src/IF.Lastfm.Core/Api/AlbumApi.cs @@ -68,7 +68,7 @@ public async Task> SearchForAlbumAsync(string albumname, return await command.ExecuteAsync(); } - public async Task> GetShoutsAsync(string albumname, string artistname, bool autocorrect = false, int page = 1, int count = LastFm.DefaultPageLength) + public async Task> GetShoutsAsync(string albumname, string artistname, bool autocorrect = false, int page = 1, int count = LastFm.DefaultPageLength) { var command = new GetAlbumShoutsCommand(Auth, albumname, artistname) { diff --git a/src/IF.Lastfm.Core/Api/ArtistApi.cs b/src/IF.Lastfm.Core/Api/ArtistApi.cs index 91e9f63..dae9577 100644 --- a/src/IF.Lastfm.Core/Api/ArtistApi.cs +++ b/src/IF.Lastfm.Core/Api/ArtistApi.cs @@ -94,7 +94,7 @@ public async Task> GetTopTagsForArtistAsync(string artist, throw new NotImplementedException(); } - public async Task> GetShoutsForArtistAsync(string artist, int page = 0, int count = LastFm.DefaultPageLength, bool autocorrect = false) + public async Task> GetShoutsForArtistAsync(string artist, int page = 0, int count = LastFm.DefaultPageLength, bool autocorrect = false) { var command = new GetArtistShoutsCommand(Auth, artist) { diff --git a/src/IF.Lastfm.Core/Api/Commands/AlbumApi/GetAlbumShoutsCommand.cs b/src/IF.Lastfm.Core/Api/Commands/AlbumApi/GetAlbumShoutsCommand.cs index 38c3ec6..a1fbd77 100644 --- a/src/IF.Lastfm.Core/Api/Commands/AlbumApi/GetAlbumShoutsCommand.cs +++ b/src/IF.Lastfm.Core/Api/Commands/AlbumApi/GetAlbumShoutsCommand.cs @@ -9,7 +9,7 @@ namespace IF.Lastfm.Core.Api.Commands.AlbumApi { - internal class GetAlbumShoutsCommand : GetAsyncCommandBase> + internal class GetAlbumShoutsCommand : GetAsyncCommandBase> { public string AlbumName { get; set; } @@ -36,7 +36,7 @@ public override void SetParameters() DisableCaching(); } - public async override Task> HandleResponse(HttpResponseMessage response) + public async override Task> HandleResponse(HttpResponseMessage response) { var json = await response.Content.ReadAsStringAsync(); @@ -47,11 +47,11 @@ public async override Task> HandleResponse(HttpResponseMessa var itemsToken = jtoken.SelectToken("shout"); var pageInfoToken = jtoken.SelectToken("@attr"); - return PageResponse.CreateSuccessResponse(itemsToken, pageInfoToken, Shout.ParseJToken); + return PageResponse.CreateSuccessResponse(itemsToken, pageInfoToken, LastShout.ParseJToken); } else { - return LastResponse.CreateErrorResponse>(error); + return LastResponse.CreateErrorResponse>(error); } } } diff --git a/src/IF.Lastfm.Core/Api/Commands/ArtistApi/GetArtistShoutsCommand.cs b/src/IF.Lastfm.Core/Api/Commands/ArtistApi/GetArtistShoutsCommand.cs index e3a74a8..1e7741e 100644 --- a/src/IF.Lastfm.Core/Api/Commands/ArtistApi/GetArtistShoutsCommand.cs +++ b/src/IF.Lastfm.Core/Api/Commands/ArtistApi/GetArtistShoutsCommand.cs @@ -9,7 +9,7 @@ namespace IF.Lastfm.Core.Api.Commands.ArtistApi { - internal class GetArtistShoutsCommand : GetAsyncCommandBase> + internal class GetArtistShoutsCommand : GetAsyncCommandBase> { public string ArtistName { get; set; } public bool Autocorrect { get; set; } @@ -30,7 +30,7 @@ public override void SetParameters() DisableCaching(); } - public override async Task> HandleResponse(HttpResponseMessage response) + public override async Task> HandleResponse(HttpResponseMessage response) { var json = await response.Content.ReadAsStringAsync(); @@ -42,11 +42,11 @@ public override async Task> HandleResponse(HttpResponseMessa var itemsToken = shoutsToken.SelectToken("shout"); var pageInfoToken = shoutsToken.SelectToken("@attr"); - return PageResponse.CreateSuccessResponse(itemsToken, pageInfoToken, Shout.ParseJToken); + return PageResponse.CreateSuccessResponse(itemsToken, pageInfoToken, LastShout.ParseJToken); } else { - return LastResponse.CreateErrorResponse>(error); + return LastResponse.CreateErrorResponse>(error); } } } diff --git a/src/IF.Lastfm.Core/Api/Commands/TrackApi/GetTrackShoutsCommand.cs b/src/IF.Lastfm.Core/Api/Commands/TrackApi/GetTrackShoutsCommand.cs index ea2f3b9..497dec8 100644 --- a/src/IF.Lastfm.Core/Api/Commands/TrackApi/GetTrackShoutsCommand.cs +++ b/src/IF.Lastfm.Core/Api/Commands/TrackApi/GetTrackShoutsCommand.cs @@ -9,7 +9,7 @@ namespace IF.Lastfm.Core.Api.Commands.TrackApi { - internal class GetTrackShoutsCommand : GetAsyncCommandBase> + internal class GetTrackShoutsCommand : GetAsyncCommandBase> { public string TrackName { get; set; } @@ -36,7 +36,7 @@ public override void SetParameters() DisableCaching(); } - public async override Task> HandleResponse(HttpResponseMessage response) + public async override Task> HandleResponse(HttpResponseMessage response) { var json = await response.Content.ReadAsStringAsync(); @@ -47,11 +47,11 @@ public async override Task> HandleResponse(HttpResponseMessa var itemsToken = jtoken.SelectToken("shout"); var pageInfoToken = jtoken.SelectToken("@attr"); - return PageResponse.CreateSuccessResponse(itemsToken, pageInfoToken, Shout.ParseJToken); + return PageResponse.CreateSuccessResponse(itemsToken, pageInfoToken, LastShout.ParseJToken); } else { - return LastResponse.CreateErrorResponse>(error); + return LastResponse.CreateErrorResponse>(error); } } } diff --git a/src/IF.Lastfm.Core/Api/Commands/UserApi/GetUserShoutsCommand.cs b/src/IF.Lastfm.Core/Api/Commands/UserApi/GetUserShoutsCommand.cs index 45ebcb8..ea05bea 100644 --- a/src/IF.Lastfm.Core/Api/Commands/UserApi/GetUserShoutsCommand.cs +++ b/src/IF.Lastfm.Core/Api/Commands/UserApi/GetUserShoutsCommand.cs @@ -8,7 +8,7 @@ namespace IF.Lastfm.Core.Api.Commands.UserApi { - internal class GetUserShoutsCommand : GetAsyncCommandBase> + internal class GetUserShoutsCommand : GetAsyncCommandBase> { public string Username { get; set; } @@ -26,7 +26,7 @@ public override void SetParameters() DisableCaching(); } - public async override Task> HandleResponse(HttpResponseMessage response) + public async override Task> HandleResponse(HttpResponseMessage response) { var json = await response.Content.ReadAsStringAsync(); @@ -38,11 +38,11 @@ public async override Task> HandleResponse(HttpResponseMessa var itemsToken = shoutsToken.SelectToken("shout"); var pageInfoToken = jtoken.SelectToken("@attr"); - return PageResponse.CreateSuccessResponse(itemsToken, pageInfoToken, Shout.ParseJToken); + return PageResponse.CreateSuccessResponse(itemsToken, pageInfoToken, LastShout.ParseJToken); } else { - return LastResponse.CreateErrorResponse>(error); + return LastResponse.CreateErrorResponse>(error); } } } diff --git a/src/IF.Lastfm.Core/Api/IAlbumApi.cs b/src/IF.Lastfm.Core/Api/IAlbumApi.cs index 96cde1e..3fb173c 100644 --- a/src/IF.Lastfm.Core/Api/IAlbumApi.cs +++ b/src/IF.Lastfm.Core/Api/IAlbumApi.cs @@ -30,7 +30,7 @@ Task> SearchForAlbumAsync(string album, int page = 1, int itemsPerPage = LastFm.DefaultPageLength); - Task> GetShoutsAsync(string albumname, + Task> GetShoutsAsync(string albumname, string artistname, bool autocorrect = false, int page = 1, diff --git a/src/IF.Lastfm.Core/Api/IArtistApi.cs b/src/IF.Lastfm.Core/Api/IArtistApi.cs index 54bae77..a11ebcb 100644 --- a/src/IF.Lastfm.Core/Api/IArtistApi.cs +++ b/src/IF.Lastfm.Core/Api/IArtistApi.cs @@ -38,7 +38,7 @@ Task> GetUserTagsForArtistAsync(string artist, Task> GetTopTagsForArtistAsync(string artist, bool autocorrect = false); - Task> GetShoutsForArtistAsync(string artistname, + Task> GetShoutsForArtistAsync(string artistname, int page = 0, int count = LastFm.DefaultPageLength, bool autocorrect = false); diff --git a/src/IF.Lastfm.Core/Api/ITrackApi.cs b/src/IF.Lastfm.Core/Api/ITrackApi.cs index 001907c..d20c863 100644 --- a/src/IF.Lastfm.Core/Api/ITrackApi.cs +++ b/src/IF.Lastfm.Core/Api/ITrackApi.cs @@ -12,7 +12,7 @@ public interface ITrackApi Task ScrobbleAsync(Scrobble scrobble); //Task ScrobbleAsync(IEnumerable scrobble); - Task> GetShoutsForTrackAsync(string trackname, + Task> GetShoutsForTrackAsync(string trackname, string artistname, bool autocorrect = false, int page = 0, diff --git a/src/IF.Lastfm.Core/Api/IUserApi.cs b/src/IF.Lastfm.Core/Api/IUserApi.cs index 1747e1a..1f65cd6 100644 --- a/src/IF.Lastfm.Core/Api/IUserApi.cs +++ b/src/IF.Lastfm.Core/Api/IUserApi.cs @@ -24,7 +24,7 @@ Task> GetRecentStations(string username, int pagenumber, int count = LastFm.DefaultPageLength); - Task> GetShoutsAsync(string username, + Task> GetShoutsAsync(string username, int pagenumber, int count = LastFm.DefaultPageLength); diff --git a/src/IF.Lastfm.Core/Api/TrackApi.cs b/src/IF.Lastfm.Core/Api/TrackApi.cs index 1a67eaf..2694e3c 100644 --- a/src/IF.Lastfm.Core/Api/TrackApi.cs +++ b/src/IF.Lastfm.Core/Api/TrackApi.cs @@ -55,7 +55,7 @@ public async Task ScrobbleAsync(Scrobble scrobble) } } - public async Task> GetShoutsForTrackAsync(string trackname, string artistname, bool autocorrect = false, int page = 0, int count = LastFm.DefaultPageLength) + public async Task> GetShoutsForTrackAsync(string trackname, string artistname, bool autocorrect = false, int page = 0, int count = LastFm.DefaultPageLength) { var command = new GetTrackShoutsCommand(Auth, trackname, artistname) { diff --git a/src/IF.Lastfm.Core/Api/UserApi.cs b/src/IF.Lastfm.Core/Api/UserApi.cs index 304af04..a277998 100644 --- a/src/IF.Lastfm.Core/Api/UserApi.cs +++ b/src/IF.Lastfm.Core/Api/UserApi.cs @@ -65,7 +65,7 @@ public async Task> GetRecentStations(string username, return await command.ExecuteAsync(); } - public async Task> GetShoutsAsync(string username, int pagenumber, int count = LastFm.DefaultPageLength) + public async Task> GetShoutsAsync(string username, int pagenumber, int count = LastFm.DefaultPageLength) { var command = new GetUserShoutsCommand(Auth, username) { diff --git a/src/IF.Lastfm.Core/Objects/Shout.cs b/src/IF.Lastfm.Core/Objects/LastShout.cs similarity index 77% rename from src/IF.Lastfm.Core/Objects/Shout.cs rename to src/IF.Lastfm.Core/Objects/LastShout.cs index 6a1e52b..73393eb 100644 --- a/src/IF.Lastfm.Core/Objects/Shout.cs +++ b/src/IF.Lastfm.Core/Objects/LastShout.cs @@ -3,7 +3,7 @@ namespace IF.Lastfm.Core.Objects { - public class Shout : ILastfmObject + public class LastShout : ILastfmObject { #region Properties @@ -15,20 +15,20 @@ public class Shout : ILastfmObject #endregion - public Shout() + public LastShout() { } - public Shout(string author, string body, string time) + public LastShout(string author, string body, string time) { Author = author; Body = body; TimePosted = DateTime.Parse(time); } - public static Shout ParseJToken(JToken token) + public static LastShout ParseJToken(JToken token) { - var s = new Shout(); + var s = new LastShout(); s.Body = token.Value("body"); s.Author = token.Value("author");