grim 1.3.1 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 30464651a26c1f6e432aff72789ab8f1f2af0ce1
-  data.tar.gz: cc290f2afdafe2e16001a8ed3e05a3c3730a1c00
+  metadata.gz: 03ab2fa755b3007eeb540551be56697a60545d6f
+  data.tar.gz: ef026ecc3608773e405d3fbf628e0773e4362041
 SHA512:
-  metadata.gz: e4aa1e307eb53b753676a77dc2d4b15880764c49b0c4b647062ed8f54e0757b1df24915c71a2aaceb28013a12250da7db283d3195a843c0a69d69b7cfb757913
-  data.tar.gz: 79d39dd5645978619f81f056e3c089e60193bc2358d6e37d8aaff6d49e4f33d23c091ffb4602e7e014ba244acb9199e3aed095db20ac9b7bce7e68cc58ade64c
+  metadata.gz: a1f1b4fc008c7f0a0ac5e376ce53e4bf897236b2eb4f4607b03fb1a3a379cca559456dbafbaadfa48f04540e43b82a8b6c37cd0c8a985bcd813577d9da272596
+  data.tar.gz: d6cd65a0a403f8dad817eb92f54c3d518202767c5e1bf34b386e4e97b834382fd3dd11cc643f0ffe1e89d13d7c7b78afbc3478bfa922a259526d474534e0d876

data/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
@@ -113,7 +113,8 @@ pdf[3].save('/path/to/image.png')
 * [@BobaFaux](https://github.com/BobaFaux)
 * [@Rubikan](https://github.com/Rubikan)
 * [@victormier](https://github.com/victormier)
-* [@philgooch][(https://github.com/philgooch)]
+* [@philgooch](https://github.com/philgooch)
+* [@adamcrown](https://github.com/adamcrown)
 
 ## License
 

data/lib/grim/image_magick_processor.rb

@@ -23,6 +23,25 @@ module Grim
     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 @@ module Grim
       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

data/lib/grim/version.rb

@@ -1,4 +1,4 @@
 # encoding: UTF-8
 module Grim
-  VERSION = "1.3.1" unless defined?(::Grim::VERSION)
+  VERSION = "1.3.2" unless defined?(::Grim::VERSION)
 end

data/spec/lib/grim/image_magick_processor_spec.rb

@@ -104,7 +104,7 @@ describe Grim::ImageMagickProcessor do
 
     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
@@ -112,20 +112,33 @@ describe Grim::ImageMagickProcessor do
       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
+
+  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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grim
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.2
 platform: ruby
 authors:
 - Jonathan Hoyt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-08 00:00:00.000000000 Z
+date: 2017-05-24 00:00:00.000000000 Z
 dependencies: []
 description: Grim is a simple gem for extracting a page from a pdf and converting
   it to an image as well as extract the text from the page as a string. It basically