mini_magick 2.0.0 → 2.1

data/VERSION

@@ -1 +1 @@
-2.0.0
+2.1

data/lib/mini_magick.rb

@@ -141,21 +141,15 @@ module MiniMagick
     # If an unknown method is called then it is sent through the morgrify program
     # Look here to find all the commands (http://www.imagemagick.org/script/mogrify.php)
     def method_missing(symbol, *args)
-      guessed_command_name = symbol.to_s.gsub('_','-')
-
-      if MOGRIFY_COMMANDS.include?(guessed_command_name)
-        args.push(@path) # push the path onto the end
-        run_command("mogrify", "-#{guessed_command_name}", *args)
-        self
-      else
-        super(symbol, *args)
+      combine_options do |c|
+        c.method_missing(symbol, *args)
       end
     end
 
     # You can use multiple commands together using this method
     def combine_options(&block)
       c = CommandBuilder.new('mogrify')
-      block.call c
+      block.call(c)
       c << @path
       run(c)
     end
@@ -185,7 +179,7 @@ module MiniMagick
 
     # Outputs a carriage-return delimited format string for Unix and Windows
     def format_option(format)
-      windows? ? "#{format}\\n" : "#{format}\\\\n"
+      windows? ? "\"#{format}\\n\"" : "\"#{format}\\\\n\""
     end
 
     def run_command(command, *args)
@@ -207,7 +201,7 @@ module MiniMagick
         else
           # TODO: should we do something different if the command times out ...?
           # its definitely better for logging.. otherwise we dont really know
-          raise Error, "Command (#{command.inspect}) failed: #{{:status_code => sub.exitstatus, :output => sub.output}.inspect}"
+          raise Error, "Command (#{command.inspect.gsub("\\", "")}) failed: #{{:status_code => sub.exitstatus, :output => sub.output}.inspect}"
         end
       else
         sub.output
@@ -239,33 +233,33 @@ module MiniMagick
     def initialize(command, *options)
       @command = command
       @args = []
-  
-      options.each { |val| push(val) }
+      options.each { |arg| push(arg) }
     end
     
     def command
       "#{MiniMagick.processor} #{@command} #{@args.join(' ')}".strip
     end
     
-    def method_missing(symbol, *args)
+    def method_missing(symbol, *options)
       guessed_command_name = symbol.to_s.gsub('_','-')
-      if MOGRIFY_COMMANDS.include?(guessed_command_name)
-        # This makes sure we always quote if we are passed a single
-        # arguement with spaces in it
-        if (args.size == 1) && (args.first.to_s.include?(' '))
-          push("-#{guessed_command_name}")
-          push(args.join(" "))
-        else
-          push("-#{guessed_command_name} #{args.join(" ")}")
-        end
+      if guessed_command_name == "format"
+        raise Error, "You must call 'format' on the image object directly!"
+      elsif MOGRIFY_COMMANDS.include?(guessed_command_name)
+        add(guessed_command_name, *options)
       else
         super(symbol, *args)
       end
     end
     
-    def push(value)
-      # args can contain characters like '>' so we must escape them, but don't quote switches
-      @args << ((value !~ /^[\+\-]/) ? "\"#{value}\"" : value.to_s.strip)
+    def add(command, *options)
+      push "-#{command}"
+      if options.any?
+        push "\"#{options.join(" ")}\""
+      end
+    end
+    
+    def push(arg)
+      @args << arg.strip
     end
     alias :<< :push
 

data/test/command_builder_test.rb

@@ -8,7 +8,7 @@ class CommandBuilderTest < Test::Unit::TestCase
   def test_basic
     c = CommandBuilder.new("test")
     c.resize "30x40"
-    assert_equal "-resize 30x40", c.args.join(" ")
+    assert_equal "-resize \"30x40\"", c.args.join(" ")
   end
 
   def test_complicated
@@ -16,7 +16,7 @@ class CommandBuilderTest < Test::Unit::TestCase
     c.resize "30x40"
     c.alpha 1, 3, 4
     c.resize "mome fingo"
-    assert_equal "-resize 30x40 -alpha 1 3 4 -resize \"mome fingo\"", c.args.join(" ")
+    assert_equal "-resize \"30x40\" -alpha \"1 3 4\" -resize \"mome fingo\"", c.args.join(" ")
   end
   
   def test_valid_command
@@ -28,14 +28,6 @@ class CommandBuilderTest < Test::Unit::TestCase
       assert true
     end
   end
-  
-  def test_full_command
-    c = CommandBuilder.new("test")
-    c.resize "30x40"
-    c.alpha 1, 3, 4
-    c.resize "mome fingo"
-    assert_equal "test -resize 30x40 -alpha 1 3 4 -resize \"mome fingo\"", c.command
-  end
 
   def test_dashed
     c = CommandBuilder.new("test")

data/test/image_test.rb

@@ -77,19 +77,6 @@ class ImageTest < Test::Unit::TestCase
     image.destroy!
   end
 
-  # def test_animation_pages
-  #   image = Image.from_file(ANIMATION_PATH)
-  #   image.format "png", 0
-  #   assert_equal "png", image[:format].downcase
-  #   image.destroy!
-  # end
-
-  # def test_animation_size
-  #   image = Image.from_file(ANIMATION_PATH)
-  #   assert_equal image[:size], 76631
-  #   image.destroy!
-  # end
-
   def test_gif_with_jpg_format
     image = Image.new(GIF_WITH_JPG_EXT)
     assert_equal "gif", image[:format].downcase
@@ -120,7 +107,7 @@ class ImageTest < Test::Unit::TestCase
     image = Image.from_file(SIMPLE_IMAGE_PATH)
     image.combine_options do |c|
       c.resize "20x30!"
-      c.blur 50
+      c.blur "50"
     end
 
     assert_equal 20, image[:width]
@@ -131,9 +118,12 @@ class ImageTest < Test::Unit::TestCase
   
   def test_image_combine_options_with_filename_with_minusses_in_it
     image = Image.from_file(SIMPLE_IMAGE_PATH)
+    background = "#000000"
     assert_nothing_raised do
       image.combine_options do |c|
         c.draw "image Over 0,0 10,10 '#{MINUS_IMAGE_PATH}'"
+        c.thumbnail "300x500>"
+        c.background background
       end
     end
     image.destroy!
@@ -195,11 +185,25 @@ class ImageTest < Test::Unit::TestCase
     end
     assert `diff -s #{result.path} test/composited.jpg`.include?("identical")
   end
-
-  # def test_mini_magick_error_when_referencing_not_existing_page
-  #   image = Image.from_file(ANIMATION_PATH)
-  #   image.format('png')
-  #   assert_equal image[:format], 'PNG'
-  #   image.destroy!
-  # end
+  
+  def test_issue_8
+    image = Image.from_file(SIMPLE_IMAGE_PATH)
+    assert_nothing_raised do
+      image.combine_options do |c|
+        c.sample "50%"
+        c.rotate "-90>"
+      end
+    end
+    image.destroy!
+  end
+  
+  def test_throw_format_error
+    image = Image.from_file(SIMPLE_IMAGE_PATH)
+    assert_raise MiniMagick::Error do
+      image.combine_options do |c|
+        c.format "png"
+      end
+    end
+    image.destroy!
+  end
 end

metadata

@@ -1,12 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: mini_magick
 version: !ruby/object:Gem::Version 
+  hash: 1
   prerelease: false
   segments: 
   - 2
-  - 0
-  - 0
-  version: 2.0.0
+  - 1
+  version: "2.1"
 platform: ruby
 authors: 
 - Corey Johnson
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-17 00:00:00 +01:00
+date: 2010-08-28 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,6 +27,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 23
         segments: 
         - 0
         - 0
@@ -76,6 +77,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -84,6 +86,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"