Merge pull request #23 from cloudinary/tests/createArchive

Fixes to create_archive signature and raw resources uploading

Author: tocker

Cloudinary.Test/CloudinaryTest.cs

@@ -284,20 +284,20 @@ public void TestUploadOverwrite()
                 Tags = TEST_TAG
             };
 
-            var img1 = m_cloudinary.Upload(uploadParams, "raw");
+            var img1 = m_cloudinary.Upload(uploadParams);
 
             Assert.NotNull(img1);
 
             uploadParams.File = new FileDescription(m_testPdfPath);
 
-            var img2 = m_cloudinary.Upload(uploadParams, "raw");
+            var img2 = m_cloudinary.Upload(uploadParams);
 
             Assert.NotNull(img2);
             Assert.AreEqual(img1.Length, img2.Length);
 
             uploadParams.Overwrite = true;
 
-            img2 = m_cloudinary.Upload(uploadParams, "raw");
+            img2 = m_cloudinary.Upload(uploadParams);
 
             Assert.NotNull(img2);
             Assert.AreNotEqual(img1.Length, img2.Length);
@@ -2399,6 +2399,32 @@ public void TestCreateArchive()
             Assert.AreEqual(2, result.FileCount);
         }
 
+        [Test]
+        public void TestCreateArchiveRawResources()
+        {
+            RawUploadParams uploadParams = new RawUploadParams()
+            {
+                File = new FileDescription(m_testImagePath),
+                Folder = "test_folder",
+                Type = "private"
+            };
+
+            RawUploadResult uploadResult1 = m_cloudinary.Upload(uploadParams, "raw");
+
+            uploadParams.File = new FileDescription(m_testPdfPath);
+
+            RawUploadResult uploadResult2 = m_cloudinary.Upload(uploadParams, "raw");
+            
+            string targetPublicId = string.Format("archive_id_{0}", UnixTimeNow());
+
+            ArchiveParams parameters = new ArchiveParams().PublicIds(new List<string> { uploadResult1.PublicId, uploadResult2.PublicId })
+                                            .ResourceType("raw")
+                                            .Type("private")
+                                            .UseOriginalFilename(true);
+            ArchiveResult result = m_cloudinary.CreateArchive(parameters);
+            Assert.AreEqual(2, result.FileCount);
+        }
+
         [Test]
         public void TestCreateArchiveMultiplePublicIds()
         {

Cloudinary/Actions/ArchiveParams.cs

@@ -366,9 +366,6 @@ public override SortedDictionary<string, object> ToParamsDictionary()
             if (m_prefixes != null && m_prefixes.Count > 0)
                 AddParam(dict, "prefixes", m_prefixes);
 
-            if (!string.IsNullOrEmpty(m_resourceType))
-                AddParam(dict, "resource_type", m_resourceType);
-
             if (!string.IsNullOrEmpty(m_type))
                 AddParam(dict, "type", m_type);
 

Cloudinary/Actions/RawUploadParams.cs

@@ -249,7 +249,7 @@ public FileDescription(string filePath)
             m_path = filePath;
 
             if (!m_isRemote)
-                m_name = Path.GetFileNameWithoutExtension(m_path);
+                m_name = Path.GetFileName(m_path);
             else
                 m_name = m_path;
         }

Cloudinary/Cloudinary.cs

@@ -1188,15 +1188,17 @@ public ExplodeResult Explode(ExplodeParams parameters)
         /// <returns>Result of operation</returns>
         public ArchiveResult CreateArchive(ArchiveParams parameters)
         {
-            var url = m_api.ApiUrlV.
+            Url url = m_api.ApiUrlV.
                 ResourceType(RESOURCE_TYPE_IMAGE).
-                Action(ACTION_GENERATE_ARCHIVE).
-                BuildUrl();
+                Action(ACTION_GENERATE_ARCHIVE);
+            if (!String.IsNullOrEmpty(parameters.ResourceType()))
+                url.ResourceType(parameters.ResourceType());
+            string uri = url.BuildUrl();
 
             parameters.Mode(ArchiveCallMode.Create);
 
             using (HttpWebResponse response = m_api.Call(
-                HttpMethod.POST, url, parameters.ToParamsDictionary(), null))
+                HttpMethod.POST, uri, parameters.ToParamsDictionary(), null))
             {
                 return ArchiveResult.Parse(response);
             }