Merge pull request #19 from RTLcoil/features/new-features

Ability to set AllowWriteStreamBuffering for upload

Author: ronen-burin

Cloudinary.Test/CloudinaryTest.cs

@@ -1635,6 +1635,19 @@ public void TestAgentPlatformHeaders()
             StringAssert.IsMatch(@"Test\/1\.0 CloudinaryDotNet\/(\d+)\.(\d+)\.(\d+)", request.UserAgent);
         }
 
+        [Test]
+        public void TestAllowWriteStreamBufferingSet()
+        {
+            var largeFilePath = m_testLargeImagePath;
+            var rawUploadParams = new BasicRawUploadParams() { File = new FileDescription(largeFilePath) };
+
+            //check of AllowWriteStreamBuffering option set to false
+            HttpWebRequest requestDefault = null;
+            GetMockBodyOfCoudinaryRequest(rawUploadParams, (p, t) => { return p.UploadLarge(t, 5 * 1024 * 1024); }, out requestDefault);
+            Assert.IsFalse(requestDefault.AllowWriteStreamBuffering);
+            Assert.IsFalse(requestDefault.AllowAutoRedirect);
+        }
+
         [Test]
         public void TestExplicitInvalidate()
         {

Cloudinary.Test/IntegrationTestBase.cs

@@ -118,8 +118,23 @@ protected Cloudinary GetCloudinaryInstance(Account account)
         /// <param name="requestParams">Parameters for Cloudinary call</param>
         /// <param name="cloudinaryCall">Cloudinary call, e.g. "(cloudinaryInstance, params) => {return cloudinaryInstance.Text(params); }"</param>
         /// <returns></returns>
-        protected string GetMockBodyOfCoudinaryRequest<TParams, TResult>(TParams requestParams, Func<Cloudinary, TParams, TResult> cloudinaryCall) 
-            where TParams: BaseParams 
+        protected string GetMockBodyOfCoudinaryRequest<TParams, TResult>(TParams requestParams, Func<Cloudinary, TParams, TResult> cloudinaryCall)
+            where TParams : BaseParams
+            where TResult : BaseResult
+        {
+            HttpWebRequest request = null;
+            return GetMockBodyOfCoudinaryRequest(requestParams, cloudinaryCall, out request);
+        }
+
+        /// <summary>
+        /// Get stream represented as String and request object from mock request to Cloudinary API
+        /// </summary>
+        /// <param name="requestParams">Parameters for Cloudinary call</param>
+        /// <param name="cloudinaryCall">Cloudinary call, e.g. "(cloudinaryInstance, params) => {return cloudinaryInstance.Text(params); }"</param>
+        /// <param name="request">HttpWebRequest object as out parameter for further analyze of properties</param>
+        /// <returns></returns>
+        protected string GetMockBodyOfCoudinaryRequest<TParams, TResult>(TParams requestParams, Func<Cloudinary, TParams, TResult> cloudinaryCall, out HttpWebRequest request)
+            where TParams : BaseParams
             where TResult : BaseResult
         {
             #region Mock infrastructure
@@ -129,12 +144,12 @@ protected string GetMockBodyOfCoudinaryRequest<TParams, TResult>(TParams request
             mock.Setup(x => x.GetResponse()).Returns((WebResponse)null);
             mock.CallBase = true;
 
-            HttpWebRequest request = null;
+            HttpWebRequest localRequest = null;
             Func<string, HttpWebRequest> requestBuilder = (x) =>
             {
-                request = mock.Object;
-                request.Headers = new WebHeaderCollection();
-                return request;
+                localRequest = mock.Object;
+                localRequest.Headers = new WebHeaderCollection();
+                return localRequest;
             };
             #endregion
 
@@ -148,7 +163,8 @@ protected string GetMockBodyOfCoudinaryRequest<TParams, TResult>(TParams request
             // consciously return null in GetResponse() and extinguish the ArgumentNullException while parsing response, 'cause it's not in focus of current test
             catch (ArgumentNullException) { }
 
-            MemoryStream stream = request.GetRequestStream() as MemoryStream;
+            MemoryStream stream = localRequest.GetRequestStream() as MemoryStream;
+            request = localRequest;
             return System.Text.Encoding.Default.GetString(stream.ToArray());
         }
 

Cloudinary/Api.cs

@@ -333,6 +333,9 @@ public HttpWebResponse Call(HttpMethod method, string url, SortedDictionary<stri
             }
             if ((method == HttpMethod.POST || method == HttpMethod.PUT) && parameters != null)
             {
+                request.AllowWriteStreamBuffering = false;
+                request.AllowAutoRedirect = false;
+
                 if (UseChunkedEncoding)
                     request.SendChunked = true;