quick_magick 0.7.4 → 0.8.0

data/Rakefile

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'rake'
 require 'echoe'
  
-Echoe.new('quick_magick', '0.7.4') do |p|
+Echoe.new('quick_magick', '0.8.0') do |p|
   p.description    = "QuickMagick allows you to access ImageMagick command line functions using Ruby interface."
   p.summary        = "A gem build by BadrIT to access ImageMagick command line functions easily and quickly"
   p.url            = "http://quickmagick.rubyforge.org/"

data/lib/quick_magick.rb

@@ -153,7 +153,7 @@ module QuickMagick
     # Escapes possible special chracters in command line
     # by surrounding it with double quotes
     def escape_commandline(str)
-      str =~ /^(\w|\s|\.)*$/ ? str : "\"#{str}\""
+      str =~ /^(\w|\.)*$/ ? str : "\"#{str}\""
     end
     
     alias c escape_commandline

data/lib/quick_magick/image.rb

@@ -16,11 +16,11 @@ module QuickMagick
       
       # create an array of images from the given file
       def read(filename, &proc)
-        info = identify(%Q<"#{filename}">)
+        info = identify(filename)
         info_lines = info.split(/[\r\n]/)
         images = []
         info_lines.each_with_index do |info_line, i|
-          images << Image.new("#{filename}", i, info_line)
+          images << Image.new(filename, i, info_line)
         end
         images.each(&proc) if block_given?
         return images
@@ -449,6 +449,38 @@ module QuickMagick
       result =~ /Histogram:\s*\d+:\s*\(\s*(\d+),\s*(\d+),\s*(\d+)\)/
       return [$1.to_i, $2.to_i, $3.to_i]
     end
+
+    # Returns details of the image as found by "identify -verbose" command
+    def details
+      str_details = QuickMagick.exec3("identify -verbose #{QuickMagick.c image_filename}[#@index]")
+      # This is something like breadcrumb for hashes visited at any time
+      hash_stack = []
+      # Current indentation. Used to infer nesting using indentation
+      current_indent = ""
+      # Last key inserted in the hash. Used to determine which key is the parent of a nested hash
+      last_key = nil
+      # Start with top level empty hash
+      hash_stack.push({})
+      str_details.each_line do |line|
+        key, value = line.split(":", 2)
+        key_indent = key[/^\s*/]
+        if key_indent.length < current_indent.length
+          # Must go one level up
+          hash_stack.pop
+        elsif key_indent.length > current_indent.length
+          # Must go one level deeper using last key
+          hash_stack.last[last_key] = {}
+          hash_stack.push hash_stack.last[last_key]
+        end
+        current_indent = key_indent
+
+        key = key.strip
+        value = value.strip
+        hash_stack.last[key] = value
+        last_key = key
+      end
+      hash_stack.first
+    end
     
     # displays the current image as animated image
     def animate

data/quick_magick.gemspec

@@ -2,28 +2,28 @@
 
 Gem::Specification.new do |s|
   s.name = %q{quick_magick}
-  s.version = "0.7.4"
+  s.version = "0.8.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ahmed ElDawy"]
-  s.date = %q{2010-05-06}
+  s.date = %q{2010-10-28}
   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.rdoc", "lib/quick_magick.rb", "lib/quick_magick/image.rb", "lib/quick_magick/image_list.rb"]
-  s.files = ["Manifest", "README.rdoc", "Rakefile", "lib/quick_magick.rb", "lib/quick_magick/image.rb", "lib/quick_magick/image_list.rb", "quick_magick.gemspec", "test/9.gif", "test/badfile.xxx", "test/image_list_test.rb", "test/image_test.rb", "test/multipage.tif", "test/test_magick.rb", "test/warnings.tiff"]
+  s.files = ["Manifest", "README.rdoc", "Rakefile", "lib/quick_magick.rb", "lib/quick_magick/image.rb", "lib/quick_magick/image_list.rb", "quick_magick.gemspec", "test/9.gif", "test/badfile.xxx", "test/image_list_test.rb", "test/image_test.rb", "test/multipage.tif", "test/test_magick.rb", "test/warnings.tiff", "test/test_quick_magick.rb"]
   s.homepage = %q{http://quickmagick.rubyforge.org/}
-  s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Quick_magick", "--main", "README.rdoc~"]
+  s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Quick_magick", "--main", "README.rdoc"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{quickmagick}
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{A gem build by BadrIT to access ImageMagick command line functions easily and quickly}
-  s.test_files = ["test/image_test.rb", "test/image_list_test.rb", "test/test_magick.rb"]
+  s.test_files = ["test/test_quick_magick.rb", "test/image_test.rb", "test/test_magick.rb", "test/image_list_test.rb"]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
     else
     end
   else

data/test/image_list_test.rb

@@ -1,15 +1,15 @@
 require 'test/unit'
 require 'quick_magick'
-require 'ftools'
+require 'fileutils'
 
 $base_dir = File.dirname(File.expand_path(__FILE__))
 
 class ImageTest < Test::Unit::TestCase
   def setup
     @logo_filename = File.join($base_dir, "imagemagick-logo.png")
-    `convert magick:logo #{@logo_filename}`
+    `convert magick:logo "#{@logo_filename}"`
     @small_logo_filename = File.join($base_dir, "logo-small.jpg")
-    `convert magick:logo -resize 100x100! #{@small_logo_filename}`
+    `convert magick:logo -resize 100x100! "#{@small_logo_filename}"`
   end
   
   def teardown
@@ -111,4 +111,4 @@ class ImageTest < Test::Unit::TestCase
     File.delete(out_filename1) if out_filename1 && File.exists?(out_filename1)
     File.delete(out_filename2) if out_filename2 && File.exists?(out_filename2)
   end
-end
+end

data/test/image_test.rb

@@ -7,9 +7,9 @@ class ImageTest < Test::Unit::TestCase
   
   def setup
     @logo_filename = File.join($base_dir, "imagemagick-logo.png")
-    `convert magick:logo #{@logo_filename}`
+    `convert magick:logo "#{@logo_filename}"`
     @small_logo_filename = File.join($base_dir, "logo-small.jpg")
-    `convert magick:logo -resize 100x100! #{@small_logo_filename}`
+    `convert magick:logo -resize 100x100! "#{@small_logo_filename}"`
   end
   
   def teardown
@@ -326,4 +326,11 @@ class ImageTest < Test::Unit::TestCase
   	image = QuickMagick::Image.read(image_filename)[1]
   	assert_equal [234,43,44], image.get_pixel(256,73)
   end
+
+  def test_details
+    image_details = QuickMagick::Image.read(@logo_filename)[0].details
+    assert_equal Hash, image_details.class
+    assert_equal ["Image"], image_details.keys
+    assert_equal "228.364 (0.895545)", image_details["Image"]["Channel statistics"]["Red"]["mean"]
+  end
 end

data/test/test_quick_magick.rb

@@ -0,0 +1,17 @@
+require 'test/unit'
+require 'quick_magick'
+
+$base_dir = File.dirname(File.expand_path(__FILE__))
+
+class QuickMagickTest < Test::Unit::TestCase
+  def test_escape_commandline
+    [
+      ["good_file_name.png", "good_file_name.png"],
+      ["filename with spaces.png", '"filename with spaces.png"'],
+      ["filename_with_$pec!als.jpg", '"filename_with_$pec!als.jpg"']
+    ].each do |filename, escaped_filename|
+      assert_equal escaped_filename, QuickMagick::c(filename)
+    end
+    
+  end
+end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 7
-  - 4
-  version: 0.7.4
+  - 8
+  - 0
+  version: 0.8.0
 platform: ruby
 authors: 
 - Ahmed ElDawy
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-06 00:00:00 +03:00
+date: 2010-10-28 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
@@ -44,6 +44,7 @@ files:
 - test/multipage.tif
 - test/test_magick.rb
 - test/warnings.tiff
+- test/test_quick_magick.rb
 has_rdoc: true
 homepage: http://quickmagick.rubyforge.org/
 licenses: []
@@ -55,10 +56,11 @@ rdoc_options:
 - --title
 - Quick_magick
 - --main
-- README.rdoc~
+- README.rdoc
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -66,6 +68,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -76,11 +79,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: quickmagick
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: A gem build by BadrIT to access ImageMagick command line functions easily and quickly
 test_files: 
+- test/test_quick_magick.rb
 - test/image_test.rb
-- test/image_list_test.rb
 - test/test_magick.rb
+- test/image_list_test.rb