image_proc 2.0.0 → 2.1.0

data/History.txt

@@ -1,3 +1,7 @@
+=== 2.1.0 / 2011-07-19
+
+* Check if the convert bin is available and try to intuit it's path
+
 === 2.0.0 / 2009-01-09
 
 * Make all methods return the destination path only

data/lib/image_proc.rb

@@ -9,7 +9,7 @@ require 'open3'
 # The whole idea is: a backend does not have to support cropping (we don't do it), it has only to be able to resize,
 # and a backend should have 2 public methods. That's the game.
 class ImageProc
-  VERSION = '2.0.0'
+  VERSION = '2.1.0'
 
   class Error < RuntimeError; end
   class MissingInput < Error; end
@@ -42,7 +42,7 @@ class ImageProc
     
     # Tries to detect the best engine available
     def detect_engine
-      if (`which convert` =~ /^\// )
+      if ImageProcConvert.available?
         ImageProcConvert
       elsif RUBY_PLATFORM =~ /darwin/i
         ImageProcSips
@@ -267,13 +267,38 @@ end
 
 ImageProc.keep_quiet do
   class ImageProcConvert < ImageProc
+    class << self
+      attr_accessor :convert_bin
+      
+      def available?
+        paths = %w( /usr/local/bin /opt/local/bin /usr/bin /bin)
+        begin
+          result_path = `which convert`.strip
+          return false unless result_path =~ /^\//
+          
+          self.convert_bin = File.dirname(result_path)
+          return true
+        rescue Errno::ENOENT # Path might be not munged
+          paths.each do | p |
+            if File.exist?(File.join(p, 'convert'))
+              self.convert_bin = p
+              return true
+            end
+          end
+        end
+        
+        return false #nope, not avaliable?
+      end
+      
+    end
+    
     HARMLESS = [/unknown field with tag/]
     def process_exact
-      wrap_stderr("convert -filter Gaussian -resize #{@target_w}x#{@target_h}! #{@source} #{@dest}")
+      wrap_stderr("#{self.class.convert_bin}/convert -filter Gaussian -resize #{@target_w}x#{@target_h}! #{@source} #{@dest}")
     end
   
     def get_bounds(of)
-      wrap_stderr("identify #{of}").scan(/(\d+)x(\d+)/)[0].map{|e| e.to_i }
+      wrap_stderr("#{self.class.convert_bin}/identify #{of}").scan(/(\d+)x(\d+)/)[0].map{|e| e.to_i }
     end
   end
 end

data/test/test_image_proc.rb

@@ -100,10 +100,15 @@ if(`which convert`)
   class TestImageProcConvert < Test::Unit::TestCase
     def setup
       super
+      ImageProcConvert.available?
       @processor = ImageProcConvert.new
     end
   
     include ResizeTestHelper
+    
+    def test_avail
+      assert ImageProcConvert.available?
+    end
   end
 end
 

metadata

@@ -2,7 +2,7 @@
 name: image_proc
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors: 
 - Julik
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-04 00:00:00 Z
+date: 2011-07-18 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: hoe
@@ -18,9 +18,9 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: 2.9.4
+        version: "2.10"
   type: :development
   version_requirements: *id001
 description: A no-frills image resizer, with pluggable backends. No extra software required on OS X