Merge branch 'master' of https://github.com/restsharp/RestSharp

Author: jsclayton

README.markdown

@@ -17,50 +17,51 @@
 * Multi-part form/file uploads
 * T4 Helper to generate C# classes from an XML document
 
-### Basic Usage
-    var client = new RestClient("http://example.com");
-    // client.Authenticator = new HttpBasicAuthenticator(username, password);
+```csharp
+var client = new RestClient("http://example.com");
+// client.Authenticator = new HttpBasicAuthenticator(username, password);
 
-    var request = new RestRequest("resource/{id}", Method.POST);
-    request.AddParameter("name", "value"); // adds to POST or URL querystring based on Method
-    request.AddUrlSegment("id", 123); // replaces matching token in request.Resource
+var request = new RestRequest("resource/{id}", Method.POST);
+request.AddParameter("name", "value"); // adds to POST or URL querystring based on Method
+request.AddUrlSegment("id", 123); // replaces matching token in request.Resource
 
-    // add parameters for all properties on an object
-    request.AddObject(object);
+// add parameters for all properties on an object
+request.AddObject(object);
 
-    // or just whitelisted properties
-    request.AddObject(object, "PersonId", "Name", ...);
+// or just whitelisted properties
+request.AddObject(object, "PersonId", "Name", ...);
 
-    // easily add HTTP Headers
-    request.AddHeader("header", "value");
+// easily add HTTP Headers
+request.AddHeader("header", "value");
 
-    // add files to upload (works with compatible verbs)
-    request.AddFile(path);
+// add files to upload (works with compatible verbs)
+request.AddFile(path);
 
-    // execute the request
-    RestResponse response = client.Execute(request);
-    var content = response.Content; // raw content as string
+// execute the request
+RestResponse response = client.Execute(request);
+var content = response.Content; // raw content as string
 
-    // or automatically deserialize result
-    // return content type is sniffed but can be explicitly set via RestClient.AddHandler();
-    RestResponse<Person> response2 = client.Execute<Person>(request);
-    var name = response2.Data.Name;
+// or automatically deserialize result
+// return content type is sniffed but can be explicitly set via RestClient.AddHandler();
+RestResponse<Person> response2 = client.Execute<Person>(request);
+var name = response2.Data.Name;
 
-    // or download and save file to disk
-    client.DownloadData(request).SaveAs(path);
+// or download and save file to disk
+client.DownloadData(request).SaveAs(path);
 
-    // easy async support
-    client.ExecuteAsync(request, response => {
-        Console.WriteLine(response.Content);
-    });
+// easy async support
+client.ExecuteAsync(request, response => {
+    Console.WriteLine(response.Content);
+});
 
-    // async with deserialization
-    var asyncHandle = client.ExecuteAsync<Person>(request, response => {
-        Console.WriteLine(response.Data.Name);
-    });
-    
-    // abort the request on demand
-    asyncHandle.Abort();
+// async with deserialization
+var asyncHandle = client.ExecuteAsync<Person>(request, response => {
+    Console.WriteLine(response.Data.Name);
+});
+
+// abort the request on demand
+asyncHandle.Abort();
+```
 
   [1]: http://restsharp.org
   [2]: http://twitter.com/RestSharp

RestSharp.MonoDroid/RestSharp.MonoDroid.csproj

@@ -240,7 +240,10 @@
     <Compile Include="..\RestSharp\RestRequestAsyncHandle.cs">
       <Link>RestRequestAsyncHandle.cs</Link>
     </Compile>
-  </ItemGroup>
+	<Compile Include="..\RestSharp\Deserializers\DotNetXmlDeserializer.cs">
+      <Link>Deserializers\DotNetXmlDeserializer.cs</Link>
+    </Compile>
+   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Novell\Novell.MonoDroid.CSharp.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.

RestSharp.MonoTouch/RestSharp.MonoTouch.csproj

@@ -287,7 +287,10 @@
     <Compile Include="..\RestSharp\Serializers\DotNetXmlSerializer.cs">
       <Link>Serializers\DotNetXmlSerializer.cs</Link>
     </Compile>
-  </ItemGroup>
+    <Compile Include="..\RestSharp\Deserializers\DotNetXmlDeserializer.cs">
+      <Link>Deserializers\DotNetXmlDeserializer.cs</Link>
+    </Compile>
+   </ItemGroup>
   <ItemGroup>
     <Folder Include="Authenticators\" />
     <Folder Include="Deserializers\" />

RestSharp.Silverlight/RestSharp.Silverlight.csproj

@@ -82,6 +82,9 @@
     <Compile Include="..\RestSharp\Deserializers\DeserializeAsAttribute.cs">
       <Link>Deserializers\DeserializeAsAttribute.cs</Link>
     </Compile>
+    <Compile Include="..\RestSharp\Deserializers\DotNetXmlDeserializer.cs">
+      <Link>Deserializers\DotNetXmlDeserializer.cs</Link>
+    </Compile>
     <Compile Include="..\RestSharp\Deserializers\IDeserializer.cs">
       <Link>Deserializers\IDeserializer.cs</Link>
     </Compile>

RestSharp.Tests/JsonTests.cs

@@ -195,6 +195,7 @@ public void Can_Deserialize_With_Default_Root()
 			Assert.Equal(new Guid(GuidString), p.Guid);
 
 			Assert.Equal(Order.Third, p.Order);
+			Assert.Equal(Disposition.SoSo, p.Disposition);
 
 			Assert.NotNull(p.Friends);
 			Assert.Equal(10, p.Friends.Count);
@@ -522,7 +523,8 @@ private string CreateJson()
 			doc["ReadOnly"] = "dummy";
 			doc["Url"] = "http://example.com";
 			doc["UrlPath"] = "/foo/bar";
-			doc["Order"] = "Third";
+			doc["Order"] = "third";
+			doc["Disposition"] = "so_so";
 
 			doc["Guid"] = new Guid(GuidString).ToString();
 			doc["EmptyGuid"] = "";

RestSharp.Tests/SampleClasses/misc.cs

@@ -47,6 +47,8 @@ public class PersonForXml
 
 		public Order Order { get; set; }
 
+		public Disposition Disposition { get; set; }
+
 	}
 
 	public class PersonForJson
@@ -74,6 +76,7 @@ public class PersonForJson
 
 		public Order Order { get; set; }
 
+		public Disposition Disposition { get; set; }
 	}
 
 	public enum Order { 
@@ -82,6 +85,13 @@ public enum Order {
 		Third
 	}
 
+	public enum Disposition
+	{
+		Friendly,
+		SoSo,
+		SteerVeryClear
+	}
+
 	public class Friend
 	{
 		public string Name { get; set; }

RestSharp.Tests/XmlTests.cs

@@ -283,6 +283,7 @@ public void Can_Deserialize_Elements_On_Default_Root()
 			Assert.Equal(new Uri("/foo/bar", UriKind.RelativeOrAbsolute), p.UrlPath);
 
 			Assert.Equal(Order.Third, p.Order);
+			Assert.Equal(Disposition.SoSo, p.Disposition);
 
 			Assert.NotNull(p.Friends);
 			Assert.Equal(10, p.Friends.Count);
@@ -682,7 +683,8 @@ private static string CreateElementsXml()
 
 			root.Add(new XElement("Url", "http://example.com"));
 			root.Add(new XElement("UrlPath", "/foo/bar"));
-			root.Add(new XElement("Order", "Third"));
+			root.Add(new XElement("Order", "third"));
+			root.Add(new XElement("Disposition", "so-so"));
 
 			root.Add(new XElement("BestFriend",
 						new XElement("Name", "The Fonz"),

RestSharp.WindowsPhone.Mango/RestSharp.WindowsPhone.Mango.csproj

@@ -128,6 +128,9 @@
     <Compile Include="..\restsharp\deserializers\DeserializeAsAttribute.cs">
       <Link>Deserializers\DeserializeAsAttribute.cs</Link>
     </Compile>
+    <Compile Include="..\RestSharp\Deserializers\DotNetXmlDeserializer.cs">
+      <Link>Deserializers\DotNetXmlDeserializer.cs</Link>
+    </Compile>
     <Compile Include="..\restsharp\deserializers\IDeserializer.cs">
       <Link>Deserializers\IDeserializer.cs</Link>
     </Compile>

RestSharp.WindowsPhone/RestSharp.WindowsPhone.csproj

@@ -128,6 +128,9 @@
     <Compile Include="..\RestSharp\Deserializers\DeserializeAsAttribute.cs">
       <Link>Deserializers\DeserializeAsAttribute.cs</Link>
     </Compile>
+    <Compile Include="..\RestSharp\Deserializers\DotNetXmlDeserializer.cs">
+      <Link>Deserializers\DotNetXmlDeserializer.cs</Link>
+    </Compile>
     <Compile Include="..\restsharp\deserializers\IDeserializer.cs">
       <Link>Deserializers\IDeserializer.cs</Link>
     </Compile>

RestSharp/Authenticators/NtlmAuthenticator.cs

@@ -23,8 +23,8 @@ namespace RestSharp
 	/// </summary>
 	public class NtlmAuthenticator : IAuthenticator
 	{
-        public void Authenticate(IRestClient client, IRestRequest request)
-        {
+		public void Authenticate(IRestClient client, IRestRequest request)
+		{
 			request.Credentials = System.Net.CredentialCache.DefaultCredentials;
 		}
 	}