Merge pull request #691 from xtreme-tanzeeb-khalili/master

Add more sophisticated multi-page PDF support

lib/carrierwave/processing/rmagick.rb

@@ -249,13 +249,14 @@ def manipulate!(options={})
 
       frames = if image.size > 1
         list = ::Magick::ImageList.new
-        image.each do |frame|
-          list << (block_given? ? yield( frame ) : frame)
+        image.each_with_index do |frame, index|
+          processed_frame = block_given? ? yield( frame, index ) : frame
+          list << processed_frame if processed_frame
         end
         block_given? ? list : list.append(true)
       else
         frame = image.first
-        frame = yield( frame ) if block_given?
+        frame = yield( frame, 0 ) if block_given?
         frame
       end
 

spec/uploader/processing_spec.rb

@@ -83,11 +83,45 @@
       @uploader.process!("test.jpg")
     end
 
-    it "should successfully process a multi-page PDF when using RMagick" do
-      @uploader_class.send :include, CarrierWave::RMagick
-      @uploader_class.process :convert => 'jpg'
-      @uploader.cache! File.open(file_path("multi_page.pdf"))
-      @uploader.process!
+    context "when using RMagick" do
+      before do
+        def @uploader.cover
+          manipulate! { |frame, index| frame if index.zero? }
+        end
+
+        @uploader_class.send :include, CarrierWave::RMagick
+      end
+
+      after do
+        @uploader.instance_eval { undef cover }
+      end
+
+      context "with a multi-page PDF" do
+        before do
+          @uploader.cache! File.open(file_path("multi_page.pdf"))
+        end
+
+        it "should successfully process" do
+          @uploader_class.process :convert => 'jpg'
+          @uploader.process!
+        end
+
+        it "should support page specific transformations" do
+          @uploader_class.process :cover
+          @uploader.process!
+        end
+      end
+
+      context "with a simple image" do
+        before do
+          @uploader.cache! File.open(file_path("portrait.jpg"))
+        end
+
+        it "should still allow page specific transformations" do
+          @uploader_class.process :cover
+          @uploader.process!
+        end
+      end
     end
 
     context "with 'enable_processing' set to false" do