Merge branch 'master' of github.com:ScottIsAFool/PocketSharp into ScottIsAFool-master

PocketSharp/Components/Get.cs

@@ -11,13 +11,22 @@ namespace PocketSharp
   /// </summary>
   public partial class PocketClient
   {
-    /// <summary>
-    /// Retrieves items from pocket
-    /// with the given filters
-    /// </summary>
-    /// <param name="parameters">parameters, which are mapped to the officials from http://getpocket.com/developer/docs/v3/retrieve </param>
-    /// <returns></returns>
-    /// <exception cref="PocketException"></exception>
+      /// <summary>
+      /// Retrieves items from pocket
+      /// with the given filters
+      /// </summary>
+      /// <param name="state">The state.</param>
+      /// <param name="favorite">The favorite.</param>
+      /// <param name="tag">The tag.</param>
+      /// <param name="contentType">Type of the content.</param>
+      /// <param name="sort">The sort.</param>
+      /// <param name="search">The search.</param>
+      /// <param name="domain">The domain.</param>
+      /// <param name="since">The since.</param>
+      /// <param name="count">The count.</param>
+      /// <param name="offset">The offset.</param>
+      /// <returns></returns>
+      /// <exception cref="PocketException"></exception>
     public async Task<List<PocketItem>> Get(
       State? state = null,
       bool? favorite = null,

PocketSharp/Fody.targets

@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Choose>
+    <When Condition="$(NCrunchOriginalSolutionDir) != '' And $(NCrunchOriginalSolutionDir) != '*Undefined*'">
+      <PropertyGroup>
+        <FodySolutionDir>$(NCrunchOriginalSolutionDir)</FodySolutionDir>
+      </PropertyGroup>
+    </When>
+    <When Condition="$(SolutionDir) != '' And $(SolutionDir) != '*Undefined*'">
+      <PropertyGroup>
+        <FodySolutionDir>$(SolutionDir)</FodySolutionDir>
+      </PropertyGroup>
+    </When>
+    <When Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">
+      <PropertyGroup>
+        <FodySolutionDir>$(MSBuildProjectDirectory)\..\</FodySolutionDir>
+      </PropertyGroup>
+    </When>
+  </Choose>
+  <Choose>
+    <When Condition="$(KeyOriginatorFile) != '' And $(KeyOriginatorFile) != '*Undefined*'">
+      <PropertyGroup>
+        <FodyKeyFilePath>$(KeyOriginatorFile)</FodyKeyFilePath>
+      </PropertyGroup>
+    </When>
+    <When Condition="$(AssemblyOriginatorKeyFile) != '' And $(AssemblyOriginatorKeyFile) != '*Undefined*'">
+      <PropertyGroup>
+        <FodyKeyFilePath>$(AssemblyOriginatorKeyFile)</FodyKeyFilePath>
+      </PropertyGroup>
+    </When>
+    <Otherwise >
+      <PropertyGroup>
+        <FodyKeyFilePath></FodyKeyFilePath>
+      </PropertyGroup>
+    </Otherwise>
+  </Choose>
+  <PropertyGroup>
+    <IntermediateDir>$(ProjectDir)$(IntermediateOutputPath)</IntermediateDir>
+    <FodyMessageImportance Condition="$(FodyMessageImportance) == '' Or $(FodyMessageImportance) == '*Undefined*'">Low</FodyMessageImportance>
+    <FodySignAssembly Condition="$(FodySignAssembly) == '' Or $(FodySignAssembly) == '*Undefined*'">$(SignAssembly)</FodySignAssembly>
+    <FodyPath Condition="$(FodyPath) == '' Or $(FodyPath) == '*Undefined*'">$(MSBuildThisFileDirectory)</FodyPath>
+  </PropertyGroup>
+  <UsingTask
+      TaskName="Fody.WeavingTask"
+      AssemblyFile="$(FodyPath)\Fody.dll" />
+  <Target
+      AfterTargets="AfterCompile"
+      Name="WinFodyTarget"
+      Condition=" '$(OS)' == 'Windows_NT'">
+
+    <Fody.WeavingTask
+          AssemblyPath="@(IntermediateAssembly)"
+          IntermediateDir="$(IntermediateDir)"
+          KeyFilePath="$(FodyKeyFilePath)"
+          MessageImportance="$(FodyMessageImportance)"
+          ProjectDirectory="$(ProjectDir)"
+          SolutionDir="$(FodySolutionDir)"
+          References="@(ReferencePath)"
+          SignAssembly="$(FodySignAssembly)"
+          ReferenceCopyLocalPaths="@(ReferenceCopyLocalPaths)"
+          DefineConstants="$(DefineConstants)"
+      />
+  </Target>
+
+  <Target
+      AfterTargets="AfterBuild"
+      Name="NonWinFodyTarget"
+      Condition=" '$(OS)' != 'Windows_NT'">
+    <Fody.WeavingTask
+          AssemblyPath="$(TargetPath)"
+          IntermediateDir="$(IntermediateDir)"
+          KeyFilePath="$(FodyKeyFilePath)"
+          MessageImportance="$(FodyMessageImportance)"
+          ProjectDirectory="$(ProjectDir)"
+          SolutionDir="$(FodySolutionDir)"
+          References="@(ReferencePath)"
+          SignAssembly="$(FodySignAssembly)"
+          ReferenceCopyLocalPaths="$(ReferenceCopyLocalPaths)"
+          DefineConstants="$(DefineConstants)"
+      />
+  </Target>
+
+
+  <!--Support for ncrunch-->
+  <ItemGroup>
+    <None Include="$(FodyPath)\*.*" />
+  </ItemGroup>
+
+</Project>

PocketSharp/FodyWeavers.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Weavers>
+  <PropertyChanged />
+</Weavers>

PocketSharp/Models/PocketArticle.cs

@@ -1,13 +1,12 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+using PropertyChanged;
 
 namespace PocketSharp.Models
 {
   /// <summary>
   /// Readable article
   /// </summary>
+  [ImplementPropertyChanged]
   public class PocketArticle
   {
     /// <summary>

PocketSharp/Models/PocketAuthor.cs

@@ -1,6 +1,7 @@
 using Newtonsoft.Json;
 using System;
 using System.Runtime.Serialization;
+using PropertyChanged;
 
 namespace PocketSharp.Models
 {
@@ -8,6 +9,7 @@ namespace PocketSharp.Models
   /// Author
   /// </summary>
   [JsonObject]
+  [ImplementPropertyChanged]
   public class PocketAuthor
   {
     /// <summary>

PocketSharp/Models/PocketImage.cs

@@ -1,6 +1,7 @@
 using Newtonsoft.Json;
 using System;
 using System.Runtime.Serialization;
+using PropertyChanged;
 
 namespace PocketSharp.Models
 {
@@ -8,6 +9,7 @@ namespace PocketSharp.Models
   /// Image
   /// </summary>
   [JsonObject]
+  [ImplementPropertyChanged]
   public class PocketImage
   {
     /// <summary>

PocketSharp/Models/PocketItem.cs

@@ -1,7 +1,7 @@
 using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
-using System.Runtime.Serialization;
+using PropertyChanged;
 
 namespace PocketSharp.Models
 {
@@ -10,6 +10,7 @@ namespace PocketSharp.Models
   /// see: http://getpocket.com/developer/docs/v3/retrieve
   /// </summary>
   [JsonObject]
+  [ImplementPropertyChanged]
   public class PocketItem
   {
     /// <summary>

PocketSharp/Models/PocketStatistics.cs

@@ -1,5 +1,5 @@
 using Newtonsoft.Json;
-using System.Runtime.Serialization;
+using PropertyChanged;
 
 namespace PocketSharp.Models
 {
@@ -7,6 +7,7 @@ namespace PocketSharp.Models
   /// Statistics
   /// </summary>
   [JsonObject]
+  [ImplementPropertyChanged]
   public class PocketStatistics
   {
     /// <summary>

PocketSharp/Models/PocketTag.cs

@@ -1,21 +1,22 @@
 using Newtonsoft.Json;
-using System.Runtime.Serialization;
+using PropertyChanged;
 
 namespace PocketSharp.Models
 {
-  /// <summary>
-  /// Tag
-  /// </summary>
-  [JsonObject]
-  public class PocketTag
-  {
     /// <summary>
-    /// Gets or sets the name.
+    /// Tag
     /// </summary>
-    /// <value>
-    /// The name.
-    /// </value>
-    [JsonProperty("tag")]
-    public string Name { get; set; }
-  }
+    [JsonObject]
+    [ImplementPropertyChanged]
+    public class PocketTag
+    {
+        /// <summary>
+        /// Gets or sets the name.
+        /// </summary>
+        /// <value>
+        /// The name.
+        /// </value>
+        [JsonProperty("tag")]
+        public string Name { get; set; }
+    }
 }

PocketSharp/Models/PocketVideo.cs

@@ -1,40 +1,42 @@
 using Newtonsoft.Json;
 using System;
 using System.Runtime.Serialization;
+using PropertyChanged;
 
 namespace PocketSharp.Models
 {
-  /// <summary>
-  /// Video
-  /// </summary>
-  [JsonObject]
-  public class PocketVideo
-  {
     /// <summary>
-    /// Gets or sets the ID.
+    /// Video
     /// </summary>
-    /// <value>
-    /// The ID.
-    /// </value>
-    [JsonProperty("video_id")]
-    public string ID { get; set; }
+    [JsonObject]
+    [ImplementPropertyChanged]
+    public class PocketVideo
+    {
+        /// <summary>
+        /// Gets or sets the ID.
+        /// </summary>
+        /// <value>
+        /// The ID.
+        /// </value>
+        [JsonProperty("video_id")]
+        public string ID { get; set; }
 
-    /// <summary>
-    /// Gets or sets the external ID.
-    /// </summary>
-    /// <value>
-    /// The external ID.
-    /// </value>
-    [JsonProperty("vid")]
-    public string ExternalID { get; set; }
+        /// <summary>
+        /// Gets or sets the external ID.
+        /// </summary>
+        /// <value>
+        /// The external ID.
+        /// </value>
+        [JsonProperty("vid")]
+        public string ExternalID { get; set; }
 
-    /// <summary>
-    /// Gets or sets the URI.
-    /// </summary>
-    /// <value>
-    /// The URI.
-    /// </value>
-    [JsonProperty("src")]
-    public Uri Uri { get; set; }
-  }
+        /// <summary>
+        /// Gets or sets the URI.
+        /// </summary>
+        /// <value>
+        /// The URI.
+        /// </value>
+        [JsonProperty("src")]
+        public Uri Uri { get; set; }
+    }
 }

PocketSharp/PocketSharp.csproj

@@ -16,6 +16,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
+    <FodyPath>..\packages\Fody.1.17.4.0</FodyPath>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -36,6 +37,7 @@
   </PropertyGroup>
   <ItemGroup>
     <!-- A reference to the entire .NET Framework is automatically included -->
+    <None Include="Fody.targets" />
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
@@ -106,6 +108,9 @@
       <Name>NReadability</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="FodyWeavers.xml" />
+  </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
   <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
@@ -119,6 +124,7 @@
     <Error Condition="!Exists('..\packages\Microsoft.Bcl.Build.1.0.10\tools\Microsoft.Bcl.Build.targets')" Text="This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=317567." HelpKeyword="BCLBUILD2001" />
     <Error Condition="Exists('..\packages\Microsoft.Bcl.Build.1.0.10\tools\Microsoft.Bcl.Build.targets')" Text="The build restored NuGet packages. Build the project again to include these packages in the build. For more information, see http://go.microsoft.com/fwlink/?LinkID=317568." HelpKeyword="BCLBUILD2002" />
   </Target>
+  <Import Project="Fody.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">

PocketSharp/packages.config

@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="Fody" version="1.17.4.0" targetFramework="portable-net403+sl40+wp71+win" />
   <package id="Microsoft.Bcl" version="1.1.3" targetFramework="portable-net45+sl40+wp71+win" />
   <package id="Microsoft.Bcl.Async" version="1.0.16" targetFramework="portable-net45+sl40+wp71+win" />
   <package id="Microsoft.Bcl.Build" version="1.0.10" targetFramework="portable-net45+sl40+wp71+win" />
   <package id="Microsoft.Net.Http" version="2.2.15" targetFramework="portable-net403+sl40+wp71+win" />
   <package id="Newtonsoft.Json" version="5.0.8" targetFramework="portable-net45+sl40+wp71+win" />
+  <package id="PropertyChanged.Fody" version="1.41.0.0" targetFramework="portable-net403+sl40+wp71+win" />
 </packages>