From cbbce90a432cc60fae483ba91ab32002ef482824 Mon Sep 17 00:00:00 2001
From: ceee <cee@live.at>
Date: Fri, 14 Jun 2013 12:13:57 +0200
Subject: [PATCH] update Retrieve model to serve a List + Dictionary of items;

---
 PocketSharp.Console/Program.cs                |  2 +-
 .../Components/{Get.cs => Retrieve.cs}        | 12 ++---
 PocketSharp/IPocketClient.cs                  | 50 -------------------
 PocketSharp/Models/Retrieve.cs                | 24 +++++++--
 PocketSharp/PocketClient.cs                   |  8 +--
 PocketSharp/PocketSharp.csproj                |  3 +-
 6 files changed, 33 insertions(+), 66 deletions(-)
 rename PocketSharp/Components/{Get.cs => Retrieve.cs} (53%)
 delete mode 100644 PocketSharp/IPocketClient.cs

diff --git a/PocketSharp.Console/Program.cs b/PocketSharp.Console/Program.cs
index b3a729c..0316273 100644
--- a/PocketSharp.Console/Program.cs
+++ b/PocketSharp.Console/Program.cs
@@ -16,7 +16,7 @@ namespace PocketSharp.Console
       PocketClient client = new PocketClient("15396-f6f92101d72c8e270a6c9bb3");
       client.AccessCode = "a85134a7-243c-6656-ab82-97c901";
 
-      client.Get();
+      client.Retrieve();
 
       System.Console.ReadKey();
     }
diff --git a/PocketSharp/Components/Get.cs b/PocketSharp/Components/Retrieve.cs
similarity index 53%
rename from PocketSharp/Components/Get.cs
rename to PocketSharp/Components/Retrieve.cs
index 5a5f042..05f6317 100644
--- a/PocketSharp/Components/Get.cs
+++ b/PocketSharp/Components/Retrieve.cs
@@ -7,14 +7,14 @@ using System.Text;
 
 namespace PocketSharp
 {
-  public partial class PocketClient : IPocketClient
+  public partial class PocketClient
   {
-    public bool Get()
+    public bool Retrieve()
     {
-      //var parameters = new List<Parameter>()
-      //{
-      //  new Parameter { Name = "favorite", Value = "1", Type = ParameterType.GetOrPost }
-      //};
+      var parameters = new List<Parameter>()
+      {
+        new Parameter { Name = "favorite", Value = "1", Type = ParameterType.GetOrPost }
+      };
 
       Retrieve result = GetResource<Retrieve>("get", parameters);
 
diff --git a/PocketSharp/IPocketClient.cs b/PocketSharp/IPocketClient.cs
deleted file mode 100644
index a282c34..0000000
--- a/PocketSharp/IPocketClient.cs
+++ /dev/null
@@ -1,50 +0,0 @@
-using RestSharp;
-using System;
-using System.Collections.Generic;
-
-namespace PocketSharp
-{
-  public interface IPocketClient
-  {
-    /// <summary>
-    /// base URL for the API
-    /// </summary>
-    Uri BaseUrl { get; set; }
-
-    /// <summary>
-    /// Accessor for the Pocket API key
-    /// see: http://getpocket.com/developer
-    /// </summary>
-    string ConsumerKey { get; set; }
-
-    /// <summary>
-    /// Returns all associated data from the last request
-    /// </summary>
-    IRestResponse LastRequestData { get; }
-
-    /// <summary>
-    /// Makes a HTTP REST request to the API
-    /// </summary>
-    /// <param name="request">The request.</param>
-    /// <returns></returns>
-    string Request(RestRequest request);
-
-    /// <summary>
-    /// Makes a typed HTTP REST request to the API
-    /// </summary>
-    /// <typeparam name="T"></typeparam>
-    /// <param name="request">The request.</param>
-    /// <returns></returns>
-    T Request<T>(RestRequest request) where T : new();
-
-    /// <summary>
-    /// Fetches a typed resource
-    /// </summary>
-    /// <typeparam name="T"></typeparam>
-    /// <param name="method">Requested method (path after /v3/)</param>
-    /// <param name="parameters">Additional POST parameters</param>
-    /// <returns></returns>
-    /// <exception cref="APIException">No access token available. Use authentification first.</exception>
-    T GetResource<T>(string method, List<Parameter> parameters) where T : class, new();
-  }
-}
diff --git a/PocketSharp/Models/Retrieve.cs b/PocketSharp/Models/Retrieve.cs
index a5c1058..8966042 100644
--- a/PocketSharp/Models/Retrieve.cs
+++ b/PocketSharp/Models/Retrieve.cs
@@ -7,13 +7,31 @@ namespace PocketSharp.Models
   [DataContract]
   class Retrieve : ResponseBase
   {
-    [DataMember]
-    public bool Complete { get; set; }
+    [DataMember(Name = "complete")]
+    public int Complete;
 
     [DataMember]
     public int Since { get; set; }
 
     [DataMember(Name = "list")]
-    public List<PocketItem> Items { get; set; }
+    public Dictionary<string, PocketItem> ItemDictionary { get; set; }
+
+    [IgnoreDataMember]
+    public List<PocketItem> Items
+    {
+      get
+      {
+        var itemEnumerator = ItemDictionary.GetEnumerator();
+        List<PocketItem> result = new List<PocketItem>();
+
+        while (itemEnumerator.MoveNext())
+        {
+          result.Add(itemEnumerator.Current.Value);
+        }
+
+        return result;
+      }
+      private set {}
+    }
   }
 }
diff --git a/PocketSharp/PocketClient.cs b/PocketSharp/PocketClient.cs
index 97add76..d9dc1fc 100644
--- a/PocketSharp/PocketClient.cs
+++ b/PocketSharp/PocketClient.cs
@@ -5,7 +5,7 @@ using System.Net;
 
 namespace PocketSharp
 {
-  public partial class PocketClient : IPocketClient
+  public partial class PocketClient
   {
     /// <summary>
     /// REST client used for the API communication
@@ -87,7 +87,7 @@ namespace PocketSharp
     /// </summary>
     /// <param name="request">The request.</param>
     /// <returns></returns>
-    public string Request(RestRequest request)
+    protected string Request(RestRequest request)
     {
       IRestResponse response = _restClient.Execute(request);
 
@@ -103,7 +103,7 @@ namespace PocketSharp
     /// <typeparam name="T"></typeparam>
     /// <param name="request">The request.</param>
     /// <returns></returns>
-    public T Request<T>(RestRequest request) where T : new()
+    protected T Request<T>(RestRequest request) where T : new()
     {
       IRestResponse<T> response = _restClient.Execute<T>(request);
 
@@ -122,7 +122,7 @@ namespace PocketSharp
     /// <param name="parameters">Additional POST parameters</param>
     /// <returns></returns>
     /// <exception cref="APIException">No access token available. Use authentification first.</exception>
-    public T GetResource<T>(string method, List<Parameter> parameters) where T : class, new()
+    protected T GetResource<T>(string method, List<Parameter> parameters) where T : class, new()
     {
       // every single Pocket API endpoint requires HTTP POST data
       var request = new RestRequest(method, Method.POST);
diff --git a/PocketSharp/PocketSharp.csproj b/PocketSharp/PocketSharp.csproj
index 8a67ed3..c1c8c67 100644
--- a/PocketSharp/PocketSharp.csproj
+++ b/PocketSharp/PocketSharp.csproj
@@ -48,8 +48,7 @@
   <ItemGroup>
     <Compile Include="APIException.cs" />
     <Compile Include="Components\Authentification.cs" />
-    <Compile Include="Components\Get.cs" />
-    <Compile Include="IPocketClient.cs" />
+    <Compile Include="Components\Retrieve.cs" />
     <Compile Include="JsonDeserializer.cs" />
     <Compile Include="Models\Authentification\AccessCode.cs" />
     <Compile Include="Models\Authentification\RequestCode.cs" />