Merge pull request #32 from creativecirclemedia/optional-colorspace

Make -colorspace argument optional

Author: jonmagic

lib/grim/image_magick_processor.rb

@@ -23,6 +23,25 @@ def count(path)
     end
 
     def save(pdf, index, path, options)
+      command = prepare_command(pdf, index, path, options)
+      command_env = {}
+
+      if @ghostscript_path && @ghostscript_path != DefaultGhostScriptPath
+        command_env['PATH'] = "#{File.dirname(@ghostscript_path)}#{File::PATH_SEPARATOR}#{ENV['PATH']}"
+      end
+
+      Grim.logger.debug { "Running imagemagick command" }
+      if command_env.any?
+        Grim.logger.debug { command_env.map {|k,v| "#{k}=#{v}" }.join(" ") }
+      end
+      Grim.logger.debug { command.join(" ") }
+
+      result, status = Open3.capture2e(command_env, command.join(" "))
+
+      status.success? || raise(UnprocessablePage, result)
+    end
+
+    def prepare_command(pdf, index, path, options)
       width      = options.fetch(:width,   Grim::WIDTH)
       density    = options.fetch(:density, Grim::DENSITY)
       quality    = options.fetch(:quality, Grim::QUALITY)
@@ -36,27 +55,13 @@ def save(pdf, index, path, options)
       command << "-antialias"
       command << "-render"
       command << "-quality #{quality}"
-      command << "-colorspace #{colorspace}"
+      command << "-colorspace #{colorspace}" unless colorspace.nil?
       command << "-interlace none"
       command << "-density #{density}"
       command << "#{Shellwords.shellescape(pdf.path)}[#{index}]"
       command << path
 
-      command_env = {}
-
-      if @ghostscript_path && @ghostscript_path != DefaultGhostScriptPath
-        command_env['PATH'] = "#{File.dirname(@ghostscript_path)}#{File::PATH_SEPARATOR}#{ENV['PATH']}"
-      end
-
-      Grim.logger.debug { "Running imagemagick command" }
-      if command_env.any?
-        Grim.logger.debug { command_env.map {|k,v| "#{k}=#{v}" }.join(" ") }
-      end
-      Grim.logger.debug { command.join(" ") }
-
-      result, status = Open3.capture2e(command_env, command.join(" "))
-
-      status.success? || raise(UnprocessablePage, result)
+      command
     end
   end
 end

spec/lib/grim/image_magick_processor_spec.rb

@@ -128,4 +128,17 @@
       expect(`convert #{@path2} -verbose info:`.downcase.include?("alpha")).to be(false)
     end
   end
+
+  describe "#prepare_command" do
+    before(:each) do
+      @path = tmp_path("to_png_spec.jpg")
+      @pdf  = Grim::Pdf.new(fixture_path("smoker.pdf"))
+    end
+
+    it "removes -colorspace if colorspace option is nil" do
+      processor = Grim::ImageMagickProcessor.new
+      expect(processor.prepare_command(@pdf, 0, @path, {:colorspace => nil}).join(" ")).not_to \
+        match(/-colorspace/)
+    end
+  end
 end