test/simple-minus.gif @@ -143,7 +143,7 @@ module MiniMagick def run_command(command, *args) args.collect! do |arg| # args can contain characters like '>' so we must escape them, but don't quote switches - if arg !~ /^\+|\-/ + if arg !~ /^[\+\-]/ "\"#{arg}\"" else arg.to_s lib/mini_magick.rb @@ -7,6 +7,7 @@ class ImageTest < Test::Unit::TestCase CURRENT_DIR = File.dirname(File.expand_path(__FILE__)) + "/" SIMPLE_IMAGE_PATH = CURRENT_DIR + "simple.gif" + MINUS_IMAGE_PATH = CURRENT_DIR + "simple-minus.gif" TIFF_IMAGE_PATH = CURRENT_DIR + "leaves.tiff" NOT_AN_IMAGE_PATH = CURRENT_DIR + "not_an_image.php" GIF_WITH_JPG_EXT = CURRENT_DIR + "actually_a_gif.jpg" @@ -105,6 +106,15 @@ class ImageTest < Test::Unit::TestCase assert_equal 30, image[:height] assert_match(/^gif$/i, image[:format]) end + + def test_image_combine_options_with_filename_with_minusses_in_it + image = Image.from_file(SIMPLE_IMAGE_PATH) + assert_nothing_raised do + image.combine_options do |c| + c.draw "image Over 0,0 10,10 '#{MINUS_IMAGE_PATH}'" + end + end + end def test_exif image = Image.from_file(EXIF_IMAGE_PATH) test/image_test.rb 9596bdc4fafaa77b88d3fdcdce26d0df5861adac Jan Krutisch jan@krutisch.de http://github.com/probablycorey/mini_magick/commit/63af4ba4f02432673f80388912d31a24c8bedc9c 63af4ba4f02432673f80388912d31a24c8bedc9c 2009-08-05T11:15:28-07:00 2009-07-29T05:09:17-07:00 run_command was using a wrong regular expression to check for switches The regex /^\+|\-/ unfortunately does match as soon as the whole given options contain any - in it, because the ^ in the given regex only counts for the +, but not for the -. This broke our code in a place where we were overlaying an image with another image and the given image had minuesses in it. I added a test to explain both the problem and the fix. Signed-off-by: Corey <probablycorey@gmail.com> 9f6aa6d77bd852c26a87f4f2e3ca5c5175fd4110 Corey probablycorey@gmail.com