Merge pull request #485 from brettryan/master

Add compact framework support
restsharp · Dec 19, 2013 · 9d3405b · 9d3405b
2 parents 516c4a2 + 2493e15
commit 9d3405b
Show file tree

Hide file tree

Showing 35 changed files with 388 additions and 59 deletions.
diff --git a/README.markdown b/README.markdown
@@ -6,7 +6,7 @@
 
 ### Features
 
-* Supports .NET 3.5+, Silverlight 4, Windows Phone 7, Mono, MonoTouch, Mono for Android
+* Supports .NET 3.5+, Silverlight 4, Windows Phone 7, Mono, MonoTouch, Mono for Android, Compact Framework 3.5
 * Easy installation using [NuGet](http://nuget.org/packages/RestSharp) for most .NET flavors
 * Automatic XML and JSON deserialization
 * Supports custom serialization and deserialization via ISerializer and IDeserializer

diff --git a/RestSharp.Compact.sln b/RestSharp.Compact.sln
@@ -0,0 +1,20 @@
+
+Microsoft Visual Studio Solution File, Format Version 10.00
+# Visual Studio 2008
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RestSharp.Compact", "RestSharp\RestSharp.Compact.csproj", "{A29E330B-F854-4287-BEB2-C4CBE9D9C637}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{A29E330B-F854-4287-BEB2-C4CBE9D9C637}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A29E330B-F854-4287-BEB2-C4CBE9D9C637}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A29E330B-F854-4287-BEB2-C4CBE9D9C637}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A29E330B-F854-4287-BEB2-C4CBE9D9C637}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/RestSharp/Authenticators/OAuth/Extensions/CollectionExtensions.cs b/RestSharp/Authenticators/OAuth/Extensions/CollectionExtensions.cs
@@ -49,7 +49,7 @@ public static void ForEach<T>(this IEnumerable<T> items, Action<T> action)
 			}
 		}
 
-#if !WINDOWS_PHONE && !SILVERLIGHT
+#if !WINDOWS_PHONE && !SILVERLIGHT && !PocketPC
 
 		public static void AddRange(this IDictionary<string, string> collection, NameValueCollection range)
 		{

diff --git a/RestSharp/Authenticators/OAuth/Extensions/StringExtensions.cs b/RestSharp/Authenticators/OAuth/Extensions/StringExtensions.cs
@@ -104,7 +104,7 @@ public static string PercentEncode(this string s)
 		}
 
 		private const RegexOptions Options =
-#if !WINDOWS_PHONE && !SILVERLIGHT
+#if !WINDOWS_PHONE && !SILVERLIGHT && !PocketPC
 			RegexOptions.Compiled | RegexOptions.IgnoreCase;
 #else
 			RegexOptions.IgnoreCase;

diff --git a/RestSharp/Authenticators/OAuth/HttpPostParameterType.cs b/RestSharp/Authenticators/OAuth/HttpPostParameterType.cs
@@ -2,7 +2,7 @@
 
 namespace RestSharp.Authenticators.OAuth
 {
-#if !SILVERLIGHT && !WINDOWS_PHONE
+#if !SILVERLIGHT && !WINDOWS_PHONE && !PocketPC
 	[Serializable]
 #endif
 	internal enum HttpPostParameterType

diff --git a/RestSharp/Authenticators/OAuth/OAuthParameterHandling.cs b/RestSharp/Authenticators/OAuth/OAuthParameterHandling.cs
@@ -2,7 +2,7 @@
 
 namespace RestSharp.Authenticators.OAuth
 {
-#if !SILVERLIGHT && !WINDOWS_PHONE
+#if !SILVERLIGHT && !WINDOWS_PHONE && !PocketPC
 	[Serializable]
 #endif
 	public enum OAuthParameterHandling

diff --git a/RestSharp/Authenticators/OAuth/OAuthSignatureMethod.cs b/RestSharp/Authenticators/OAuth/OAuthSignatureMethod.cs
@@ -2,7 +2,7 @@
 
 namespace RestSharp.Authenticators.OAuth
 {
-#if !SILVERLIGHT && !WINDOWS_PHONE
+#if !SILVERLIGHT && !WINDOWS_PHONE && !PocketPC
 	[Serializable]
 #endif
 	public enum OAuthSignatureMethod

diff --git a/RestSharp/Authenticators/OAuth/OAuthSignatureTreatment.cs b/RestSharp/Authenticators/OAuth/OAuthSignatureTreatment.cs
@@ -2,7 +2,7 @@
 
 namespace RestSharp.Authenticators.OAuth
 {
-#if !SILVERLIGHT && !WINDOWS_PHONE
+#if !SILVERLIGHT && !WINDOWS_PHONE && !PocketPC
 	[Serializable]
 #endif
 	public enum OAuthSignatureTreatment

diff --git a/RestSharp/Authenticators/OAuth/OAuthTools.cs b/RestSharp/Authenticators/OAuth/OAuthTools.cs
@@ -6,7 +6,7 @@
 
 namespace RestSharp.Authenticators.OAuth
 {
-#if !SILVERLIGHT && !WINDOWS_PHONE
+#if !SILVERLIGHT && !WINDOWS_PHONE && !PocketPC
 	[Serializable]
 #endif
 	internal static class OAuthTools
@@ -20,13 +20,13 @@ internal static class OAuthTools
 		private static readonly Random _random;
 		private static readonly object _randomLock = new object();
 
-#if !SILVERLIGHT && !WINDOWS_PHONE
+#if !SILVERLIGHT && !WINDOWS_PHONE && !PocketPC
 		private static readonly RandomNumberGenerator _rng = RandomNumberGenerator.Create();
 #endif
 
 		static OAuthTools()
 		{
-#if !SILVERLIGHT && !WINDOWS_PHONE
+#if !SILVERLIGHT && !WINDOWS_PHONE && !PocketPC
 			var bytes = new byte[4];
 			_rng.GetNonZeroBytes(bytes);
 			_random = new Random(BitConverter.ToInt32(bytes, 0));
@@ -305,6 +305,7 @@ public static string GetSignature(OAuthSignatureMethod signatureMethod, string s
 			string signature;
 			switch (signatureMethod)
 			{
+#if !PocketPC
 				case OAuthSignatureMethod.HmacSha1:
 				{
 					var crypto = new HMACSHA1();
@@ -315,14 +316,19 @@ public static string GetSignature(OAuthSignatureMethod signatureMethod, string s
 
 					break;
 				}
+#endif
 				case OAuthSignatureMethod.PlainText:
 				{
 				    signature = "{0}&{1}".FormatWith(consumerSecret, tokenSecret);
 
 				    break;
 				}
 				default:
+#if PocketPC
+					throw new NotImplementedException("Only PlainText is currently supported.");
+#else
 					throw new NotImplementedException("Only HMAC-SHA1 is currently supported.");
+#endif
 			}
 
 			var result = signatureTreatment == OAuthSignatureTreatment.Escaped

diff --git a/RestSharp/Authenticators/OAuth/OAuthType.cs b/RestSharp/Authenticators/OAuth/OAuthType.cs
@@ -2,7 +2,7 @@
 
 namespace RestSharp.Authenticators.OAuth
 {
-#if !SILVERLIGHT && !WINDOWS_PHONE
+#if !SILVERLIGHT && !WINDOWS_PHONE && !PocketPC
 	[Serializable]
 #endif
 	public enum OAuthType

diff --git a/RestSharp/Authenticators/OAuth/OAuthWebQueryInfo.cs b/RestSharp/Authenticators/OAuth/OAuthWebQueryInfo.cs
@@ -2,7 +2,7 @@
 
 namespace RestSharp.Authenticators.OAuth
 {
-#if !SILVERLIGHT && !WINDOWS_PHONE
+#if !SILVERLIGHT && !WINDOWS_PHONE && !PocketPC
 	[Serializable]
 #endif
 	public class OAuthWebQueryInfo

diff --git a/RestSharp/Authenticators/OAuth/OAuthWorkflow.cs b/RestSharp/Authenticators/OAuth/OAuthWorkflow.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using RestSharp.Authenticators.OAuth.Extensions;
-#if !WINDOWS_PHONE && !SILVERLIGHT
+#if !WINDOWS_PHONE && !SILVERLIGHT && !PocketPC
 using RestSharp.Contrib;
 #endif
 
@@ -213,19 +213,23 @@ public virtual OAuthWebQueryInfo BuildProtectedResourceInfo(string method, WebPa
 
 			// Include url parameters in query pool
 			var uri = new Uri(url);
-#if !SILVERLIGHT && !WINDOWS_PHONE
+#if !SILVERLIGHT && !WINDOWS_PHONE && !PocketPC
 			var urlParameters = HttpUtility.ParseQueryString(uri.Query);
 #else
 			var urlParameters = uri.Query.ParseQueryString();
 #endif
 
-#if !SILVERLIGHT && !WINDOWS_PHONE
+#if !SILVERLIGHT && !WINDOWS_PHONE && !PocketPC
 			foreach (var parameter in urlParameters.AllKeys)
 #else
 			foreach (var parameter in urlParameters.Keys)
 #endif
 			{
+#if PocketPC
+                switch (method.ToUpper())
+#else
 				switch (method.ToUpperInvariant())
+#endif
 				{
 					case "POST":
 						parameters.Add(new HttpPostParameter(parameter, urlParameters[parameter]));

diff --git a/RestSharp/Authenticators/OAuth/WebPairCollection.cs b/RestSharp/Authenticators/OAuth/WebPairCollection.cs
@@ -30,7 +30,7 @@ public WebPairCollection(IEnumerable<WebPair> parameters)
 			_parameters = new List<WebPair>(parameters);
 		}
 
-#if !WINDOWS_PHONE && !SILVERLIGHT
+#if !WINDOWS_PHONE && !SILVERLIGHT && !PocketPC
 		public WebPairCollection(NameValueCollection collection) : this()
 		{
 			AddCollection(collection);

diff --git a/RestSharp/Authenticators/OAuth/WebParameter.cs b/RestSharp/Authenticators/OAuth/WebParameter.cs
@@ -6,10 +6,10 @@
 
 namespace RestSharp.Authenticators.OAuth
 {
-#if !Smartphone
+#if !Smartphone && !PocketPC
 	[DebuggerDisplay("{Name}:{Value}")]
 #endif
-#if !SILVERLIGHT && !WINDOWS_PHONE
+#if !SILVERLIGHT && !WINDOWS_PHONE && !PocketPC
 	[Serializable]
 #endif
 	internal class WebParameter : WebPair

diff --git a/RestSharp/Authenticators/OAuth/WebParameterCollection.cs b/RestSharp/Authenticators/OAuth/WebParameterCollection.cs
@@ -10,7 +10,7 @@ public WebParameterCollection(IEnumerable<WebPair> parameters)
 		{
 		}
 
-#if !WINDOWS_PHONE && !SILVERLIGHT
+#if !WINDOWS_PHONE && !SILVERLIGHT && !PocketPC
 		public WebParameterCollection(NameValueCollection collection) : base(collection)
 		{
 		}

diff --git a/RestSharp/Authenticators/OAuth1Authenticator.cs b/RestSharp/Authenticators/OAuth1Authenticator.cs
@@ -156,7 +156,11 @@ private void AddOAuthData(IRestClient client, IRestRequest request, OAuthWorkflo
 				url = url.Substring(0, queryStringStart);
 
 			OAuthWebQueryInfo oauth;
+#if PocketPC
+            var method = request.Method.ToString().ToUpper();
+#else
 			var method = request.Method.ToString().ToUpperInvariant();
+#endif
 
 			var parameters = new WebParameterCollection();
 

diff --git a/RestSharp/Deserializers/JsonDeserializer.cs b/RestSharp/Deserializers/JsonDeserializer.cs
@@ -194,7 +194,11 @@ private object ConvertValue(Type type, object value)
 			{
 				return stringValue;
 			}
-			else if (type == typeof(DateTime) || type == typeof(DateTimeOffset))
+			else if (type == typeof(DateTime)
+#if !PocketPC
+                || type == typeof(DateTimeOffset)
+#endif
+                )
 			{
 				DateTime dt;
 				if (DateFormat.HasValue())
@@ -207,6 +211,9 @@ private object ConvertValue(Type type, object value)
 					dt = stringValue.ParseJsonDate(Culture);
 				}
 
+#if PocketPC
+                return dt;
+#else
 				if (type == typeof(DateTime))
 				{
 					return dt;
@@ -215,6 +222,7 @@ private object ConvertValue(Type type, object value)
 				{
 					return (DateTimeOffset)dt;
 				}
+#endif
 			}
 			else if (type == typeof(Decimal))
 			{

diff --git a/RestSharp/Deserializers/XmlDeserializer.cs b/RestSharp/Deserializers/XmlDeserializer.cs
@@ -171,6 +171,7 @@ protected virtual void Map(object x, XElement root)
 
 					prop.SetValue(x, value, null);
 				}
+#if !PocketPC
 				else if (type == typeof(DateTimeOffset))
 				{
 					var toConvert = value.ToString();
@@ -198,6 +199,7 @@ protected virtual void Map(object x, XElement root)
 						}
 					}
 				}
+#endif
 				else if (type == typeof(Decimal))
 				{
 					value = Decimal.Parse(value.ToString(), Culture);
@@ -264,7 +266,7 @@ protected virtual void Map(object x, XElement root)
 
 		private static bool TryGetFromString(string inputString, out object result, Type type)
 		{
-#if !SILVERLIGHT && !WINDOWS_PHONE
+#if !SILVERLIGHT && !WINDOWS_PHONE && !PocketPC
 			var converter = TypeDescriptor.GetConverter(type);
 			if (converter.CanConvertFrom(typeof(string)))
 			{

diff --git a/RestSharp/Extensions/MiscExtensions.cs b/RestSharp/Extensions/MiscExtensions.cs
@@ -25,7 +25,7 @@ namespace RestSharp.Extensions
 	/// </summary>
 	public static class MiscExtensions
 	{
-#if !WINDOWS_PHONE
+#if !WINDOWS_PHONE && !PocketPC
 		/// <summary>
 		/// Save a byte array to a file
 		/// </summary>
@@ -87,7 +87,7 @@ public static string AsString(this byte[] buffer)
 			Encoding encoding = Encoding.UTF8;
 
 #if FRAMEWORK
-			return encoding.GetString(buffer);
+			return encoding.GetString(buffer, 0, buffer.Length);
 #else
 			if (buffer == null || buffer.Length == 0)
 				return "";

diff --git a/RestSharp/Extensions/MonoHttp/HtmlEncoder.cs b/RestSharp/Extensions/MonoHttp/HtmlEncoder.cs
@@ -48,7 +48,11 @@ class HttpEncoder
 	{
 		static char[] hexChars = "0123456789abcdef".ToCharArray();
 		static object entitiesLock = new object();
+#if PocketPC
+		static Dictionary<string, char> entities;
+#else
 		static SortedDictionary<string, char> entities;
+#endif
 #if NET_4_0
 		static Lazy <HttpEncoder> defaultEncoder;
 		static Lazy <HttpEncoder> currentEncoderLazy;
@@ -229,7 +233,8 @@ string UrlPathEncode(string value)
 			for (int i = 0; i < length; i++)
 				UrlPathEncodeChar(value[i], result);
 
-			return Encoding.ASCII.GetString(result.ToArray());
+			byte[] bytes = result.ToArray();
+			return Encoding.ASCII.GetString(bytes, 0, bytes.Length);
 		}
 
 		internal static byte[] UrlEncodeToBytes(byte[] bytes, int offset, int count)
@@ -659,8 +664,11 @@ static void InitEntities()
 		{
 			// Build the hash table of HTML entity references.  This list comes
 			// from the HTML 4.01 W3C recommendation.
+#if PocketPC
+			entities = new Dictionary<string, char>(StringComparer.Ordinal);
+#else
 			entities = new SortedDictionary<string, char>(StringComparer.Ordinal);
-
+#endif
 			entities.Add("nbsp", '\u00A0');
 			entities.Add("iexcl", '\u00A1');
 			entities.Add("cent", '\u00A2');

diff --git a/RestSharp/Extensions/MonoHttp/HttpUtility.cs b/RestSharp/Extensions/MonoHttp/HttpUtility.cs
@@ -182,7 +182,7 @@ public static string UrlDecode(string s, Encoding e)
 
 			byte[] buf = bytes.ToArray();
 			bytes = null;
-			return e.GetString(buf);
+			return e.GetString(buf, 0, buf.Length);
 
 		}
 
@@ -412,7 +412,8 @@ public static string UrlEncode(string s, Encoding Enc)
 			// avoided GetByteCount call
 			byte[] bytes = new byte[Enc.GetMaxByteCount(s.Length)];
 			int realLen = Enc.GetBytes(s, 0, s.Length, bytes, 0);
-			return Encoding.ASCII.GetString(UrlEncodeToBytes(bytes, 0, realLen));
+			byte[] r = UrlEncodeToBytes(bytes, 0, realLen);
+			return Encoding.ASCII.GetString(r, 0, r.Length);
 		}
 
 		public static string UrlEncode(byte[] bytes)
@@ -422,8 +423,8 @@ public static string UrlEncode(byte[] bytes)
 
 			if (bytes.Length == 0)
 				return String.Empty;
-
-			return Encoding.ASCII.GetString(UrlEncodeToBytes(bytes, 0, bytes.Length));
+			byte[] r = UrlEncodeToBytes(bytes, 0, bytes.Length);
+			return Encoding.ASCII.GetString(r, 0, r.Length);
 		}
 
 		public static string UrlEncode(byte[] bytes, int offset, int count)
@@ -433,8 +434,8 @@ public static string UrlEncode(byte[] bytes, int offset, int count)
 
 			if (bytes.Length == 0)
 				return String.Empty;
-
-			return Encoding.ASCII.GetString(UrlEncodeToBytes(bytes, offset, count));
+			byte[] r = UrlEncodeToBytes(bytes, offset, count);
+			return Encoding.ASCII.GetString(r, 0, r.Length);
 		}
 
 		public static byte[] UrlEncodeToBytes(string str)
@@ -480,8 +481,8 @@ public static string UrlEncodeUnicode(string str)
 		{
 			if (str == null)
 				return null;
-
-			return Encoding.ASCII.GetString(UrlEncodeUnicodeToBytes(str));
+			byte[] r = UrlEncodeUnicodeToBytes(str);
+			return Encoding.ASCII.GetString(r, 0, r.Length);
 		}
 
 		public static byte[] UrlEncodeUnicodeToBytes(string str)