quick_magick 0.3.0 → 0.4.0

data/Rakefile

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'rake'
 require 'echoe'
  
-Echoe.new('quick_magick', '0.3.0') do |p|
+Echoe.new('quick_magick', '0.4.0') 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.rb

@@ -1,9 +1,19 @@
+# Define quick magick error
+module QuickMagick
+  class QuickMagickError < RuntimeError; end
+end
+
 # check if ImageMagick is installed
-status = `identify --version`
-raise QuickMagick::QuickMagickError "ImageMagick not installed" if status.empty?
+begin
+  x = `identify --version 2>&1`
+  raise(QuickMagick::QuickMagickError, "ImageMagick not installed") unless x.index('ImageMagick') 
+rescue Errno::ENOENT
+  # For Windows machines
+  raise(QuickMagick::QuickMagickError, "ImageMagick not installed")
+end
 
 module QuickMagick
-  class QuickMagickError < RuntimeError; end
+  # Different geometry flags
   PercentGeometry = "%"
   AspectGeometry  = "!"
   LessGeometry = "<"
@@ -11,22 +21,36 @@ module QuickMagick
   AreaGeometry = "@"
   MinimumGeometry = "^"
   
+  # Command for solid color
   SolidColor = "xc"
+  # Command for linear gradient
   LinearGradient = "gradient"
+  # Command for radial gradient
   RadialGradient = "radial-gradient"
 
+  # Different possible patterns
   Patterns = %w{bricks checkboard circles crosshatch crosshatch30 crosshatch45 fishscales} +
     (0..20).collect {|level| "gray#{level}" } +
     %w{hexagons horizontal horizontalsaw hs_bdiagonal hs_cross hs_diagcross hs_fdiagonal hs_horizontal
     hs_vertical left30 left45 leftshingle octagons right30 right45 rightshingle smallfishscales
     vertical verticalbricks verticalleftshingle verticalrightshingle verticalsaw}
   
-  # generate a random string of specified length
+  # Generate a random string of specified length.
+  # Used to generate random names for temp files
   def self.random_string(length=10)
     @@CHARS ||= ("a".."z").to_a + ("1".."9").to_a 
     Array.new(length, '').collect{@@CHARS[rand(@@CHARS.size)]}.join
   end
 end
 
+# For backward compatibility with ruby < 1.8.7
+unless "".respond_to? :start_with?
+  class String
+    def start_with?(x)
+      self.index(x) == 0
+    end
+  end
+end
+
 require 'quick_magick/image'
 require 'quick_magick/image_list'

data/lib/quick_magick/image.rb

@@ -8,6 +8,7 @@ module QuickMagick
       # create an array of images from the given blob data
       def from_blob(blob, &proc)
         file = Tempfile.new(QuickMagick::random_string)
+        file.binmode
         file.write(blob)
         file.close
         self.read(file.path, &proc)
@@ -28,7 +29,7 @@ module QuickMagick
             images << Image.new("#{filename}[#{i.to_s}]", info_line)
           end
         end
-        images.collect!(&proc)
+        images.collect!(&proc) if block_given?
         return images
       end
       
@@ -124,7 +125,7 @@ module QuickMagick
 
     # fills a rectangle with a solid color
     def floodfill(width, height=nil, x=nil, y=nil, flag=nil, color=nil)
-      # TODO do a special method for floodfill
+      append_to_operators "floodfill", QuickMagick::Image.retrieve_geometry(width, height, x, y, flag), color
     end
 
     # methods that are called with (=)
@@ -363,10 +364,10 @@ module QuickMagick
       if $?.success?
         return result 
       else
-        error_message = <<-ERROR
+        error_message = <<-ERRORMSG
           Error executing command: mogrify #{command_line}
           Result is: #{result}
-        ERROR
+        ERRORMSG
         raise QuickMagick::QuickMagickError, error_message
       end
     end

data/quick_magick.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{quick_magick}
-  s.version = "0.3.0"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ahmed ElDawy"]
-  s.date = %q{2009-07-30}
+  s.date = %q{2009-08-05}
   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"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: quick_magick
 version: !ruby/object:Gem::Version 
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Ahmed ElDawy
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-30 00:00:00 +03:00
+date: 2009-08-05 00:00:00 +03:00
 default_executable: 
 dependencies: []