quick_magick 0.5.0 → 0.5.2

data/README

@@ -23,7 +23,7 @@ These are some situation when QuickMagick will be useful for you:
 
 == How to install
 First, you should install ImageMagick (http://www.imagemagick.org/) on your machine.
-Command lines of ImageMagick must be in your system path.
+Command line tools of ImageMagick must be in your system path.
 You can check this by running the command:
   identify --version
 Now to install QuickMagick just type at your command line:

data/Rakefile

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'rake'
 require 'echoe'
  
-Echoe.new('quick_magick', '0.5.0') do |p|
+Echoe.new('quick_magick', '0.5.2') do |p|
   p.description    = "QuickMagick allows you to access ImageMagick command line functions using Ruby interface."
   p.url            = "http://quickmagick.rubyforge.org/"
   p.author         = "Ahmed ElDawy"

data/lib/quick_magick/image.rb

@@ -29,7 +29,7 @@ module QuickMagick
             images << Image.new("#{filename}[#{i.to_s}]", info_line)
           end
         end
-        images.collect!(&proc) if block_given?
+        images.each(&proc) if block_given?
         return images
       end
       
@@ -74,6 +74,7 @@ module QuickMagick
     # append the given option, value pair to the settings of the current image
     def append_to_settings(arg, value="")
       @arguments << %Q<-#{arg} "#{value}" >
+      @last_is_draw = false
       self
     end
 
@@ -92,12 +93,13 @@ module QuickMagick
 
     # append the given option, value pair to the args for the current image
     def append_to_operators(arg, value="")
-      if @last_is_draw
+      is_draw = (arg == 'draw')
+      if @last_is_draw && is_draw
         @arguments.insert(@arguments.rindex('"'), " #{value}")
       else
         @arguments << %Q<-#{arg} "#{value}" >
       end
-      @last_is_draw = arg == 'draw'
+      @last_is_draw = is_draw
       self
     end
     
@@ -351,6 +353,11 @@ module QuickMagick
     def save(output_filename)
       result = `convert #{command_line} "#{output_filename}" 2>&1`
       if $?.success?
+      	if @pseudo_image
+      		# since it's been saved, convert it to normal image (not pseudo)
+      		initialize(output_filename)
+		    	revert!
+      	end
         return result 
       else
         error_message = <<-ERROR

data/quick_magick.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{quick_magick}
-  s.version = "0.5.0"
+  s.version = "0.5.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ahmed ElDawy"]
-  s.date = %q{2009-08-12}
+  s.date = %q{2009-08-18}
   s.description = %q{QuickMagick allows you to access ImageMagick command line functions using Ruby interface.}
   s.email = %q{ahmed.eldawy@badrit.com}
   s.extra_rdoc_files = ["README", "lib/quick_magick/image.rb", "lib/quick_magick/image_list.rb", "lib/quick_magick.rb"]

data/test/image_test.rb

@@ -74,6 +74,23 @@ class ImageTest < Test::Unit::TestCase
     File.delete(out_filename) if out_filename && File.exists?(out_filename)
   end
   
+  def test_read_with_initialize
+    i = QuickMagick::Image.read(@logo_filename) do |image|
+      image.resize("300x300!")
+      image.colors = 2
+    end.first
+    out_filename = File.join($base_dir, "imagemagick-resized.png")
+    File.delete out_filename if File.exists?(out_filename)
+    i.save(out_filename)
+    assert File.exists?(out_filename)
+    i2 = QuickMagick::Image.read(out_filename).first
+    assert_equal 300, i2.width
+    assert_equal 300, i2.height
+  ensure
+    # clean up
+    File.delete(out_filename) if out_filename && File.exists?(out_filename)
+  end
+  
   def test_crop_image
     i = QuickMagick::Image.read(@logo_filename).first
     i.crop("300x200+0+0")
@@ -150,8 +167,22 @@ class ImageTest < Test::Unit::TestCase
   end
   
   def test_line_and_circle
+    i = QuickMagick::Image.solid(100, 100)
+    i.draw_line(0,0,20,20)
+    i.draw_circle(30,30,20,20)
+    assert_equal %Q{ "(" -size "100x100" -draw " line 0,0 20,20  circle 30,30 20,20"  "xc:" ")" }, i.command_line
+    out_filename = File.join($base_dir, "draw_test.gif")
+    i.save out_filename
+  ensure
+    # clean up
+    File.delete(out_filename) if out_filename && File.exists?(out_filename)
+  end
+  
+  def test_lines_with_colors
     i = QuickMagick::Image.solid(100, 100, :white)
+    i.stroke = "red"
     i.draw_line(0,0,20,20)
+    i.stroke = "blue"
     i.draw_circle(30,30,20,20)
     out_filename = File.join($base_dir, "draw_test.gif")
     i.save out_filename
@@ -185,4 +216,17 @@ class ImageTest < Test::Unit::TestCase
     assert_equal 640, i2.width
     assert_equal 480, i2.height
   end
-end
+  
+  def test_image_converted_from_pseudo_to_normal
+    i = QuickMagick::Image.solid(100, 100, :white)
+    i.stroke = "red"
+    i.draw_line(0,0,20,20)
+    out_filename = File.join($base_dir, "draw_test.gif")
+    assert_raises QuickMagick::QuickMagickError do
+      i.save!
+    end
+    i.save out_filename
+    # Now it's non pseudo
+    i.save!
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: quick_magick
 version: !ruby/object:Gem::Version 
-  version: 0.5.0
+  version: 0.5.2
 platform: ruby
 authors: 
 - Ahmed ElDawy
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-12 00:00:00 +03:00
+date: 2009-08-18 00:00:00 +03:00
 default_executable: 
 dependencies: []