quick_magick 0.5.4 → 0.6.0

data/README

@@ -176,6 +176,9 @@ QuickMagick supports also ImageList s
 	i.draw_text(30, 30, "Hello world!", :rotate=>45)
 	i.save 'hello.jpg'
 
+... you can then convert it to blob using
+  i.to_blob
+
 For more information on drawing API visit:
 http://www.imagemagick.org/Usage/draw/
 

data/Rakefile

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

@@ -56,7 +56,7 @@ module QuickMagick
     vertical verticalbricks verticalleftshingle verticalrightshingle verticalsaw}
   
   
-  class <<self
+  class << self
     # Generate a random string of specified length.
     # Used to generate random names for temp files
     def random_string(length=10)

data/lib/quick_magick/image.rb

@@ -3,7 +3,7 @@ require "tempfile"
 module QuickMagick
   
   class Image
-    class <<self
+    class << self
       
       # create an array of images from the given blob data
       def from_blob(blob, &proc)
@@ -392,6 +392,24 @@ module QuickMagick
 
     alias write! save!
     alias mogrify! save!
+    
+    def to_blob
+    	tmp_file = Tempfile.new(QuickMagick::random_string)
+    	if command_line =~ /-format\s(\S+)\s/
+    		# use format set up by user
+    		blob_format = $1
+    	elsif !@pseudo_image
+    		# use original image format
+    		blob_format = self.format
+    	else
+		  	# default format is jpg
+		  	blob_format = 'jpg'
+    	end
+    	save "#{blob_format}:#{tmp_file.path}"
+    	blob = nil
+    	File.open(tmp_file.path, 'rb') { |f| blob = f.read}
+    	blob
+    end
 
     # image file format
     def format

data/quick_magick.gemspec

@@ -2,27 +2,26 @@
 
 Gem::Specification.new do |s|
   s.name = %q{quick_magick}
-  s.version = "0.5.4"
+  s.version = "0.6.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-08-26}
+  s.date = %q{2009-09-16}
   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"]
   s.files = ["README", "Rakefile", "lib/quick_magick/image.rb", "lib/quick_magick/image_list.rb", "lib/quick_magick.rb", "Manifest", "quick_magick.gemspec", "test/image_test.rb", "test/badfile.xxx", "test/multipage.tif", "test/image_list_test.rb", "test/test_magick.rb", "test/9.gif"]
-  s.has_rdoc = true
   s.homepage = %q{http://quickmagick.rubyforge.org/}
-  s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Quick_magick", "--main", "README"]
+  s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Quick_magick", "--main", "README~"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{quickmagick}
-  s.rubygems_version = %q{1.3.1}
+  s.rubygems_version = %q{1.3.5}
   s.summary = %q{QuickMagick allows you to access ImageMagick command line functions using Ruby interface.}
   s.test_files = ["test/image_test.rb", "test/image_list_test.rb", "test/test_magick.rb"]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 2
+    s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
     else

data/test/image_test.rb

@@ -228,6 +228,34 @@ class ImageTest < Test::Unit::TestCase
     File.delete(out_filename) if out_filename && File.exists?(out_filename)
   end
   
+  def test_to_blob_default_format
+    i = QuickMagick::Image.solid(100, 100)
+    i.draw_line(0,0,20,20)
+    i.draw_circle(30,30,20,20)
+    blob = i.to_blob
+    i2 = QuickMagick::Image.from_blob(blob).first
+    assert_equal 100, i2.width
+    assert_equal 100, i2.height
+    assert_equal 'JPEG', i2.format
+  end
+  
+  def test_to_blob_with_custom_format
+    i = QuickMagick::Image.solid(100, 100)
+    i.draw_line(0,0,20,20)
+    i.draw_circle(30,30,20,20)
+    i.format = 'gif'
+    blob = i.to_blob
+    i2 = QuickMagick::Image.from_blob(blob).first
+    assert_equal 'GIF', i2.format
+  end
+  
+  def test_to_blob_with_original_format
+    i = QuickMagick::Image.read(@logo_filename).first
+    blob = i.to_blob
+    i2 = QuickMagick::Image.from_blob(blob).first
+    assert_equal 'PNG', i2.format
+  end
+  
   def test_colors
     assert_equal "#00ff00ff", QuickMagick::rgb_color(0, 255, 0)
     assert_equal "#00007fff", QuickMagick::rgb_color(0, 0, 0.5)
@@ -252,6 +280,8 @@ class ImageTest < Test::Unit::TestCase
     i2 = QuickMagick::Image.read(out_filename).first
     assert_equal 640, i2.width
     assert_equal 480, i2.height
+  ensure
+	  File.delete out_filename if File.exists?(out_filename)
   end
   
   def test_image_converted_from_pseudo_to_normal

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: quick_magick
 version: !ruby/object:Gem::Version 
-  version: 0.5.4
+  version: 0.6.0
 platform: ruby
 authors: 
 - Ahmed ElDawy
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-26 00:00:00 +03:00
+date: 2009-09-16 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -40,6 +40,8 @@ files:
 - test/9.gif
 has_rdoc: true
 homepage: http://quickmagick.rubyforge.org/
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --line-numbers
@@ -47,7 +49,7 @@ rdoc_options:
 - --title
 - Quick_magick
 - --main
-- README
+- README~
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -65,9 +67,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: quickmagick
-rubygems_version: 1.3.1
+rubygems_version: 1.3.5
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: QuickMagick allows you to access ImageMagick command line functions using Ruby interface.
 test_files: 
 - test/image_test.rb