Merge branch 'master' into optional-colorspace

Author: adamcrown

README.md

@@ -23,10 +23,10 @@ Grim is a simple gem for extracting (reaping) a page from a pdf and converting i
 
 ## Prerequisites
 
-You will need ghostscript, imagemagick, and poppler installed. On the Mac (OSX) I highly recommend using [Homebrew](http://mxcl.github.com/homebrew/) to get them installed.
+You will need ghostscript, imagemagick, and xpdf installed. On the Mac (OSX) I highly recommend using [Homebrew](http://mxcl.github.com/homebrew/) to get them installed.
 
 ```bash
-$ brew install ghostscript imagemagick poppler
+$ brew install ghostscript imagemagick xpdf
 ```
 
 ## Installation

spec/lib/grim/image_magick_processor_spec.rb

@@ -104,28 +104,28 @@
 
     it "should use colorspace" do
       Grim::ImageMagickProcessor.new.save(@pdf, 0, @path1, {:colorspace => 'RGB'})
-      Grim::ImageMagickProcessor.new.save(@pdf, 0, @path2, {:colorspace => 'sRGB'})
+      Grim::ImageMagickProcessor.new.save(@pdf, 0, @path2, {:colorspace => 'CMYK'})
 
       file1_size = File.stat(@path1).size
       file2_size = File.stat(@path2).size
 
       expect(file1_size).to_not eq(file2_size)
     end
   end
-  
+
   describe "#save with alpha option" do
     before(:each) do
       @path1 = tmp_path("to_png_spec-1.png")
       @path2 = tmp_path("to_png_spec-2.png")
       @pdf  = Grim::Pdf.new(fixture_path("remove_alpha.pdf"))
     end
-    
+
     it "should use alpha" do
       Grim::ImageMagickProcessor.new.save(@pdf, 0, @path1, {:alpha => 'Set'})
       Grim::ImageMagickProcessor.new.save(@pdf, 0, @path2, {:alpha => 'Remove'})
 
-      expect(`convert #{@path1} -verbose info:`.include?("alpha: 8-bit")).to be(true)
-      expect(`convert #{@path2} -verbose info:`.include?("alpha: 1-bit")).to be(true)
+      expect(`convert #{@path1} -verbose info:`.downcase.include?("alpha: 8-bit")).to be(true)
+      expect(`convert #{@path2} -verbose info:`.downcase.include?("alpha")).to be(false)
     end
   end
 end