Merge branch 'feature/Unique_response_type_for_JSON_responses' into develop

Author: darrylwhitmore

NScrape.Test/Properties/AssemblyInfo.cs

@@ -1,5 +1,4 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 // General Information about an assembly is controlled through the following 

NScrape/Forms/HtmlForm.cs

@@ -315,7 +315,7 @@ private string DownloadFormHtml() {
 		private void Initialize( int formOrdinal ) {
 			var formDefinitions = HtmlFormDefinition.Parse( Html ).ToList();
 
-			if ( formOrdinal < 0 || formOrdinal >= formDefinitions.Count() ) {
+			if ( formOrdinal < 0 || formOrdinal >= formDefinitions.Count ) {
 				throw new ArgumentException( string.Format( CultureInfo.CurrentCulture, NScrapeResources.InvalidFormOrdinal, formOrdinal ) );
 			}
 

NScrape/GetWebRequest.cs

@@ -40,7 +40,7 @@ public GetWebRequest( Uri destination, bool autoRedirect )
         /// </returns>
         public override string ToString()
         {
-            return string.Format("GET {0}", this.Destination);
+            return string.Format("GET {0}", Destination);
         }
     }
 }

NScrape/JsonWebResponse.cs

@@ -1,21 +1,26 @@
 using System;
 using System.Text;
 
-namespace NScrape
-{
-    /// <summary>
-    /// Represents a web response for a request that returned JSON.
-    /// </summary>
-    public class JsonWebResponse : TextWebResponse
-    {
-        internal JsonWebResponse(bool success, Uri url, string text, Encoding encoding)
-            : base(url, WebResponseType.JavaScript, success, text, encoding)
-        {
-        }
+namespace NScrape {
+	/// <summary>
+	/// Represents a web response for a request that returned JSON.
+	/// </summary>
+	public class JsonWebResponse : TextWebResponse {
 
-        /// <summary>
-        /// Gets the JSON data.
-        /// </summary>
-        public string Json { get { return Text; } }
-    }
+		/// <summary>
+		/// Initializes a new instance of the <see cref="JsonWebResponse"/> class.
+		/// </summary>
+		/// <param name="success"><b>true</b> if the response is considered successful, <b>false</b> otherwise.</param>
+		/// <param name="responseUrl">The URL of the response.</param>
+		/// <param name="text">The JSON text of the response.</param>
+		/// <param name="encoding">The encoding of the JSON text.</param>
+		public JsonWebResponse( bool success, Uri responseUrl, string text, Encoding encoding )
+			: base( responseUrl, WebResponseType.Json, success, text, encoding ) {
+		}
+
+		/// <summary>
+		/// Gets the JSON data.
+		/// </summary>
+		public string Json { get { return Text; } }
+	}
 }

NScrape/NScrapeUtility.cs

@@ -1,8 +1,5 @@
 using System;
-using System.Collections.Specialized;
 using System.Globalization;
-using System.Web;
-using Microsoft.JScript;
 
 namespace NScrape {
 	/// <summary>

NScrape/PostWebRequest.cs

@@ -120,7 +120,7 @@ public PostWebRequest( Uri destination, string requestData, string contentType,
         /// </returns>
         public override string ToString()
         {
-            return string.Format("POST {0}", this.Destination);
+            return string.Format("POST {0}", Destination);
         }
     }
 }

NScrape/RedirectedWebResponse.cs

@@ -1,5 +1,4 @@
 using System;
-using System.IO;
 
 namespace NScrape {
     /// <summary>

NScrape/TextWebResponse.cs

@@ -17,7 +17,7 @@ public abstract class TextWebResponse : WebResponse {
 		/// <param name="success"><b>true</b> if the response is considered successful, <b>false</b> otherwise.</param>
 		/// <param name="text">The text of the response.</param>
         /// <param name="encoding">The encoding of the text.</param>
-        public TextWebResponse( Uri responseUrl, WebResponseType responseType, bool success, string text, Encoding encoding )
+        protected TextWebResponse( Uri responseUrl, WebResponseType responseType, bool success, string text, Encoding encoding )
             : base( responseUrl, responseType, success ) {
             this.text = text;
             this.encoding = encoding;

NScrape/UnexpectedWebResponseGenerator.cs

@@ -12,7 +12,7 @@ public static Exception CreateException( string message, WebResponse response )
             switch ( response.ResponseType ) {
 
 				case WebResponseType.Exception:
-                    var exceptionResponse = response as ExceptionWebResponse;
+                    var exceptionResponse = (ExceptionWebResponse)response;
 
                     exception = exceptionResponse.Exception;
                     break;
@@ -26,7 +26,7 @@ public static Exception CreateException( string message, WebResponse response )
                     break;
 
 				case WebResponseType.Unsupported:
-                    var unsupportedResponse = response as UnsupportedWebResponse;
+                    var unsupportedResponse = (UnsupportedWebResponse)response;
 
                     exception = new WebException( string.Format( CultureInfo.CurrentCulture, NScrapeResources.UnsupportedResponseContentType, unsupportedResponse.ContentType ) );
                     break;

NScrape/WebResponseType.cs

@@ -23,6 +23,11 @@ public enum WebResponseType {
 		/// </summary>
 		JavaScript,
 
+		/// <summary>
+		/// A JSON reponse.
+		/// </summary>
+		Json,
+
 		/// <summary>
 		/// A redirect reponse.
 		/// </summary>