Changed :image_magick_path to :command_path, deprecated :image_magick_path

lib/paperclip.rb

@@ -43,18 +43,23 @@ module Paperclip
     # Provides configurability to Paperclip. There are a number of options available, such as:
     # Provides configurability to Paperclip. There are a number of options available, such as:
     # * whiny_thumbnails: Will raise an error if Paperclip cannot process thumbnails of 
     # * whiny_thumbnails: Will raise an error if Paperclip cannot process thumbnails of 
     #   an uploaded image. Defaults to true.
     #   an uploaded image. Defaults to true.
-    # * image_magick_path: Defines the path at which to find the +convert+ and +identify+ 
+    # * command_path: Defines the path at which to find the command line
     #   programs if they are not visible to Rails the system's search path. Defaults to 
     #   programs if they are not visible to Rails the system's search path. Defaults to 
-    #   nil, which uses the first executable found in the search path.
+    #   nil, which uses the first executable found in the user's search path.
+    # * image_magick_path: Deprecated alias of command_path.
     def options
     def options
       @options ||= {
       @options ||= {
         :whiny_thumbnails  => true,
         :whiny_thumbnails  => true,
-        :image_magick_path => nil
+        :image_magick_path => nil,
+        :command_path      => nil
       }
       }
     end
     end
 
 
     def path_for_command command #:nodoc:
     def path_for_command command #:nodoc:
-      path = [options[:image_magick_path], command].compact
+      if options[:image_magick_path]
+        ActiveSupport::Deprecation.warn(":image_magick_path is deprecated and will be removed. Use :command_path instead")
+      end
+      path = [options[:image_magick_path] || options[:command_path], command].compact
       File.join(*path)
       File.join(*path)
     end
     end
 
 
@@ -124,8 +129,8 @@ module Paperclip
     #     has_attached_file :avatar, :styles => { :normal => "100x100#" },
     #     has_attached_file :avatar, :styles => { :normal => "100x100#" },
     #                       :default_style => :normal
     #                       :default_style => :normal
     #     user.avatar.url # => "/avatars/23/normal_me.png"
     #     user.avatar.url # => "/avatars/23/normal_me.png"
-    # * +whiny_thumbnails+: Will raise an error if Paperclip cannot process thumbnails of an
-    #   uploaded image. This will ovrride the global setting for this attachment. 
+    # * +whiny_thumbnails+: Will raise an error if Paperclip cannot post_process an uploaded file due
+    #   to a command line error. This will override the global setting for this attachment. 
     #   Defaults to true. 
     #   Defaults to true. 
     # * +convert_options+: When creating thumbnails, use this free-form options
     # * +convert_options+: When creating thumbnails, use this free-form options
     #   field to pass in various convert command options.  Typical options are "-strip" to
     #   field to pass in various convert command options.  Typical options are "-strip" to

lib/paperclip/attachment.rb

@@ -35,7 +35,7 @@ module Paperclip
       @storage           = options[:storage]
       @storage           = options[:storage]
       @whiny             = options[:whiny_thumbnails]
       @whiny             = options[:whiny_thumbnails]
       @convert_options   = options[:convert_options] || {}
       @convert_options   = options[:convert_options] || {}
-      @processors        = [:thumbnail]
+      @processors        = options[:processors] || [:thumbnail]
       @options           = options
       @options           = options
       @queued_for_delete = []
       @queued_for_delete = []
       @queued_for_write  = {}
       @queued_for_write  = {}

test/paperclip_test.rb

 require 'test/helper'
 require 'test/helper'
 
 
 class PaperclipTest < Test::Unit::TestCase
 class PaperclipTest < Test::Unit::TestCase
-  context "Calling Paperclip.run" do
+  [:image_magick_path, :convert_path].each do |path|
+    context "Calling Paperclip.run with an #{path} specified" do
+      setup do
+        Paperclip.options[:image_magick_path] = nil
+        Paperclip.options[:convert_path]      = nil
+        Paperclip.options[path]               = "/usr/bin"
+      end
+
       should "execute the right command" do
       should "execute the right command" do
         Paperclip.expects(:path_for_command).with("convert").returns("/usr/bin/convert")
         Paperclip.expects(:path_for_command).with("convert").returns("/usr/bin/convert")
         Paperclip.expects(:bit_bucket).returns("/dev/null")
         Paperclip.expects(:bit_bucket).returns("/dev/null")
@@ -9,6 +16,21 @@ class PaperclipTest < Test::Unit::TestCase
         Paperclip.run("convert", "one.jpg two.jpg")
         Paperclip.run("convert", "one.jpg two.jpg")
       end
       end
     end
     end
+  end
+
+  context "Calling Paperclip.run with no path specified" do
+    setup do
+      Paperclip.options[:image_magick_path] = nil
+      Paperclip.options[:convert_path]      = nil
+    end
+
+    should "execute the right command" do
+      Paperclip.expects(:path_for_command).with("convert").returns("convert")
+      Paperclip.expects(:bit_bucket).returns("/dev/null")
+      Paperclip.expects(:"`").with("convert one.jpg two.jpg 2>/dev/null")
+      Paperclip.run("convert", "one.jpg two.jpg")
+    end
+  end
 
 
   should "return nil when sent #processor and the name of a class that doesn't exist" do
   should "return nil when sent #processor and the name of a class that doesn't exist" do
     assert_nil Paperclip.processor(:boogey_man)
     assert_nil Paperclip.processor(:boogey_man)