add missing parameters and tests to generate-archive

cloudinary · Apr 8, 2017 · f347dc2 · f347dc2
1 parent 86ac7eb
commit f347dc2
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 14 deletions.
diff --git a/lib/cloudinary/utils.rb b/lib/cloudinary/utils.rb
@@ -823,7 +823,9 @@ def self.archive_params(options = {})
       :public_ids=>options[:public_ids] && Cloudinary::Utils.build_array(options[:public_ids]),
       :prefixes=>options[:prefixes] && Cloudinary::Utils.build_array(options[:prefixes]),
       :expires_at=>options[:expires_at],
-      :transformations => build_eager(options[:transformations])
+      :transformations => build_eager(options[:transformations]),
+      :skip_transformation_name=>Cloudinary::Utils.as_safe_bool(options[:skip_transformation_name]),
+      :allow_missing=>Cloudinary::Utils.as_safe_bool(options[:allow_missing])
     }
   end
 

diff --git a/spec/archive_spec.rb b/spec/archive_spec.rb
@@ -22,6 +22,12 @@
         :effect => :blackwhite
       }
     )
+    Cloudinary::Uploader.upload(
+      "http://res.cloudinary.com/demo/image/upload/sample.jpg",
+      :public_id      => 'tag_sample_raw.jpg',
+      :resource_type  => 'raw',
+      :tags           => [TEST_TAG, TIMESTAMP_TAG],
+    )
   end
   include_context "cleanup", TIMESTAMP_TAG
 end
@@ -64,18 +70,6 @@
     let!(:target_public_id) {
       "gem_test#{ rand(1000000)}"
     }
-    let!(:archive_result) {
-      Cloudinary::Uploader.create_archive(
-        {
-          :target_public_id => target_public_id,
-          :public_ids       => %w(tag_sample tag_samplebw),
-          :tags             => [TEST_TAG, TIMESTAMP_TAG]
-        }.merge(options))
-    }
-    let(:options) { { :mode => :create } }
-    it 'should return a Hash' do
-      expect(archive_result).to be_a(Hash)
-    end
     expected_keys = %w(
               resource_type
               type
@@ -91,10 +85,41 @@
               resource_count
               file_count
             )
-    it "should include keys: #{expected_keys.join(', ')}" do
+    let!(:archive_result) {
+      Cloudinary::Uploader.create_archive(
+        {
+          :target_public_id => target_public_id,
+          :public_ids       => %w(tag_sample tag_samplebw),
+          :tags             => [TEST_TAG, TIMESTAMP_TAG],
+          :transformations   => [{width: 100, height: 100, crop: "fill"},{effect: "grayscale"}],
+          :skip_transformation_name => true
+        }.merge(options))
+    }
+    let(:options) { { :mode => :create } }
+    it 'should return a Hash with suitable set of keys' do
+      expect(archive_result).to be_a(Hash)
       expect(archive_result.keys).to include(*expected_keys)
     end
   end
+  describe 'create archive based on raw resources and missing public IDs' do
+    let!(:target_public_id) {
+      "gem_test#{ rand(1000000)}"
+    }
+    let!(:archive_result) {
+      Cloudinary::Uploader.create_archive(
+        {
+          :target_public_id => target_public_id,
+          :public_ids       => %w(tag_sample_raw.jpg non-wxisting-resource),
+          :resource_type    => 'raw',
+          :allow_missing    => true
+        }.merge(options))
+    }
+    let(:options) { { :mode => :create } }
+    it 'should skip missing public IDs and successfully generate the archive containing raw resources' do
+      expect(archive_result).to be_a(Hash)
+      expect(archive_result["resource_count"]).to equal(1)
+    end
+  end
   describe '.create_zip' do
     it 'should call create_archive with "zip" format' do
       expect(Cloudinary::Uploader).to receive(:create_archive).with({ :tags => TEST_TAG }, "zip")