Added news loading

Fixed UnixDateTimeConverter

.gitignore

@@ -154,3 +154,4 @@ $RECYCLE.BIN/
 
 # Mac desktop service store files
 .DS_Store
+

Meduza.net/Api.cs

@@ -1,15 +1,15 @@
-using System;
-using System.ComponentModel;
-using System.Diagnostics;
-using System.IO;
+using System.ComponentModel;
 using System.Net;
 using System.Net.Http;
 using System.Runtime.CompilerServices;
-using System.Text;
 using System.Threading.Tasks;
 using Meduza.net.Annotations;
+using Meduza.net.Models.Api;
+using Meduza.net.Models.Api.Enum;
 using Meduza.net.Models.Api.Page;
+using Meduza.net.Models.Api.Types;
 using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
 
 namespace Meduza.net {
 	public sealed class Api : INotifyPropertyChanged {
@@ -56,5 +56,10 @@ private void OnPropertyChanged([CallerMemberName] string propertyName = null) {
 			var handler = PropertyChanged;
 			if (handler != null) handler(this, new PropertyChangedEventArgs(propertyName));
 		}
+
+		public async Task<News> LoadNewsAsync(string uri) {
+			var content = await _httpClient.GetStringAsync(uri);
+			return JObject.Parse(content).GetValue("root").ToObject<News>();
+		}
 	}
 }

Meduza.net/Helpers/UnixDateTimeConverter.cs

@@ -12,22 +12,22 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s
 		public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer) {
 			var intValue = reader.Value as int?;
 			if (intValue.HasValue) {
-				return _unixStartDateTime.AddMilliseconds(intValue.Value);
+				return _unixStartDateTime.AddSeconds(intValue.Value);
 			}
 
 			var longValue = reader.Value as long?;
 			if (longValue.HasValue) {
-				return _unixStartDateTime.AddMilliseconds(longValue.Value);
+				return _unixStartDateTime.AddSeconds(longValue.Value);
 			}
 
 			var doubleValue = reader.Value as double?;
 			if (doubleValue.HasValue) {
-				return _unixStartDateTime.AddMilliseconds(doubleValue.Value);
+				return _unixStartDateTime.AddSeconds(doubleValue.Value);
 			}
 
 			var stringValue = reader.Value as string;
 			if (!string.IsNullOrWhiteSpace(stringValue)) {
-				return _unixStartDateTime.AddMilliseconds(Double.Parse(stringValue));
+				return _unixStartDateTime.AddSeconds(Double.Parse(stringValue));
 			}
 
 			throw new ArgumentException();

Meduza.net/Meduza.net.csproj

@@ -40,6 +40,7 @@
     <Compile Include="Helpers\UnixDateTimeConverter.cs" />
     <Compile Include="Models\Api\Card\BackgroundImage.cs" />
     <Compile Include="Models\Api\Card\Chapter.cs" />
+    <Compile Include="Models\Api\Content.cs" />
     <Compile Include="Models\Api\Document.cs" />
     <Compile Include="Models\Api\Enum\DocumentType.cs" />
     <Compile Include="Models\Api\Enum\FunType.cs" />
@@ -48,6 +49,7 @@
     <Compile Include="Models\Api\Page\Main.cs" />
     <Compile Include="Models\Api\Root.cs" />
     <Compile Include="Models\Api\Source.cs" />
+    <Compile Include="Models\Api\Types\News.cs" />
     <Compile Include="Properties\Annotations.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Uris.cs" />

Meduza.net/Models/Api/Content.cs

@@ -0,0 +1,26 @@
+using Newtonsoft.Json;
+
+namespace Meduza.net.Models.Api {
+	public sealed class Content {
+		private readonly string _body;
+		private readonly string _layoutUri;
+		private readonly string _description;
+		public Content(
+			string body,
+			[JsonProperty(PropertyName = "layout_url")] string layoutUri,
+			string description) {
+			_body = body;
+			_layoutUri = layoutUri;
+			_description = description;
+		}
+		public string Body {
+			get { return _body; }
+		}
+		public string LayoutUri {
+			get { return _layoutUri; }
+		}
+		public string Description {
+			get { return _description; }
+		}
+	}
+}

Meduza.net/Models/Api/Document.cs

@@ -7,7 +7,7 @@
 using Newtonsoft.Json.Converters;
 
 namespace Meduza.net.Models.Api {
-	public sealed class Document {
+	public class Document {
 		private readonly string _uri;
 		private readonly string _title;
 		private readonly string _secondTitle;
@@ -108,6 +108,6 @@ public Image Image {
 		public FunType FunType { get; set; }
 
 		//Topic properties
-		public IReadOnlyList<string> Content { get; set; }		
+		public IReadOnlyList<string> Content { get; set; }
 	}
 }

Meduza.net/Models/Api/Types/News.cs

@@ -0,0 +1,44 @@
+using System;
+using System.Collections.Generic;
+using Meduza.net.Helpers;
+using Meduza.net.Models.Api.Enum;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+
+namespace Meduza.net.Models.Api.Types {
+	public sealed class News : Document {
+		public News(
+			[JsonProperty(PropertyName = "url")] string uri,
+			string title,
+			[JsonProperty(PropertyName = "second_title")] string secondTitle,
+			IReadOnlyList<IReadOnlyList<string>> authors,
+
+			[JsonProperty(PropertyName = "document_type")] 
+			[JsonConverter(typeof(StringEnumConverter))]
+			DocumentType documentType,
+
+			int version,
+			[JsonProperty(PropertyName = "published_at")]
+			[JsonConverter(typeof(UnixDateTimeConverter))] DateTime publishedAt,
+
+			[JsonProperty(PropertyName = "updated_at")]
+			[JsonConverter(typeof(UnixDateTimeConverter))] DateTime updatedAt,
+
+			[JsonProperty(PropertyName = "full")] bool isFull,
+			Source source,
+			Image image)
+			: base(
+			uri, 
+			title, 
+			secondTitle, 
+			authors, 
+			documentType, 
+			version, 
+			publishedAt, 
+			updatedAt, 
+			isFull, 
+			source, 
+			image) { }
+		public new Content Content { get; set; }
+	}
+}

Tests/Loading.cs

@@ -1,4 +1,5 @@
-using Meduza.net;
+using System.Linq;
+using Meduza.net;
 using NUnit.Framework;
 
 namespace Tests {
@@ -18,5 +19,14 @@ public async void NonDefaultInitialization() {
 			await api.InitializeAsync();		
 			Assert.NotNull(api.Main);
 		}
+		[Test]
+		public async void LoadNews() {
+			var api = new Api();
+
+			var document = api.Main.Documents.First();
+			var fullDocument = await api.LoadNewsAsync(document.Value.Uri);
+
+			Assert.NotNull(fullDocument);
+		}
 	}
 }