mojo_magick 0.3.0 → 0.4.0

data/.gitignore

@@ -0,0 +1,2 @@
+fixtures/tmp
+*~

data/README.md

@@ -0,0 +1,146 @@
+MojoMagick
+==========
+
+MojoMagick is a "dog simple, do very little" image library. It is basically a couple of stateless
+module methods that make it somewhat more convenient than calling ImageScience by hand.
+
+The main reason to use MojoMagick is that you should consolidate your ImageScience calls into
+one place, so why not do it here? If you improve on this tool, send me the patch.
+
+This tool came about because I wanted a fast, simple, lightweight, nothing-goes-wrong-with-it-
+because-it's-too-simple-to-break image tool.
+
+Examples
+========
+
+## Image Resizing
+
+### Obtain the size of an image (assuming image is "120wx222h")
+
+    dimensions = MojoMagick::get_image_size(test_image)
+    # ==> dimensions now holds a hash: {:height => 120, :width => 222}
+
+### Resize an image so that it fits within a 100w x 200h bounding box
+(Note: this will scale an image either up or down to fit these dimensions which may not be what you want.)
+In this example, we overwrite our image, but if you pass in a different file for the second file name, a new file will be created with the resized dimensions
+
+    MojoMagick::resize('/img/test.jpg', '/img/test.jpg', {:width=>100, :height=>200})
+
+### Resize an image so that it fills a 100 x 100 bounding box
+
+After this transformation, your image's short side will be 100px. This will preserve the aspect ratio.
+
+    MojoMagick::resize('/img/infile.jpg', '/img/outfile.jpg', {:width=>100, :height=>100, :fill => true})
+
+### Resize an image so that it fills and is cropped to a 100 x 100 bounding box
+
+After this transformation, your image will be 100x100.  But it does not distort the images.  It crops out of the Center.
+
+    MojoMagick::resize('/img/infile.jpg', '/img/outfile.jpg', {:width=>100, :height=>100, :fill => true, :crop => true})
+
+### Code sample of how to shrink all jpg's in a folder
+
+    require 'mojo_magick'
+    
+    image_folder = '/tmp/img'
+    Dir::glob(File::join(image_folder, '*.jpg')).each do |image|
+      begin
+        # shrink all the images *in place* to no bigger than 60pix x 60pix
+        MojoMagick::shrink(image, image, {:width => 60, :height => 60})
+        puts "Shrunk: #{image}"
+      rescue MojoMagick::MojoFailed => e
+        STDERR.puts "Unable to shrink image '#{image}' - probably an invalid image\n#{e.message}"
+      rescue MojoMagick::MojoMagickException => e
+        STDERR.puts "Unknown exception on image '#{image}'\n#{e.message}"
+      end
+    end
+
+## Setting Memory/Resource limits for ImageMagick
+Be sure you're upgraded to the current release of ImageMagick.
+
+set limits on disk, area, map and ram usage
+obtain/print a hash of default limits:
+
+    puts MojoMagick::get_default_limits.inspect
+
+current\_limits shows same values:
+
+    puts MojoMagick::get_current_limits.inspect
+
+    MojoMagick::set_limits(:area => '32mb', :disk => '0', :memory => '64mb', :map => '32mb')
+    puts MojoMagick::get_current_limits.inspect
+
+As of ImageMagick 6.6, you also have the ability to set `:threads` and `:time`.  Read [ImageMagick docs on limits](http://www.imagemagick.org/script/command-line-options.php#limit) for more info.
+
+## For more complex operations (thanks to Elliot Nelson for adding this code to the system)
+
+Two command-line builders, #convert and #mogrify, have been added to simplify
+complex commands.
+
+### using #convert
+
+    MojoMagick::convert('source.jpg', 'dest.jpg') do |c|
+      c.crop '250x250+0+0'
+      c.repage!
+      c.strip
+      c.set 'comment', 'my favorite file'
+    end
+    
+    # Equivalent to:
+    MojoMagick::raw_command('convert', 'source.jpg -crop 250x250+0+0 +repage -strip -set comment "my favorite file" dest.jpg')
+
+
+### using #mogrify
+
+    MojoMagick::mogrify('image.jpg') {|i| i.shave '10x10'}
+
+    # Equivalent to:
+
+    MojoMagick::raw_command('mogrify', '-shave 10x10 image.jpg')
+
+    # Example showing some additional options:
+    # assuming binary data that is rgb, 8bit depth and 10x20 pixels, :format => :rgb, :depth => 8, :size => '10x20'OAu
+    
+    MojoMagick::convert do |c|
+      c.file 'source.jpg'
+      c.blob my_binary_data, :format => :rgb, :depth => 8, :size => '10x20'
+      c.append
+      c.crop '256x256+0+0'
+      c.repage!
+      c.file 'output.jpg'
+    end
+    
+    # Use .file to specify file names, .blob to create and include a tempfile. The
+    # bang (!) can be appended to command names to use the '+' versions
+    # instead of '-' versions.
+
+### Create a brand new image from data
+
+    binary_data = '1111222233334444'
+    MojoMagick::convert do |c|
+      c.rgba8 binary_data, :format => :rgba, :depth => 8, :size => '2x2'
+      c.file 'output.jpg'
+    end
+
+Availablility
+=============
+
+ * [SVN Repo access](http://trac.misuse.org/science/wiki/MojoMagick)
+ * Concact the author or discuss MojoMagick : [misuse.org](http://www.misuse.org/science/2008/01/30/mojomagick-ruby-image-library-for-imagemagick/)
+
+
+#### Updates by Jon Rogers Aug 2011 (http://github.com/bunnymatic)
+* added gemspec for building gem with bundler
+* updated tests for ImageMagick 6.6
+* added ability to do fill + crop resizing
+* bumped version to 0.3.0
+* [new github repo](https://github.com/bunnymatic/mojo_magick)
+
+
+References
+==========
+
+* [ImageMagick](http://www.imagemagick.org/)
+
+Copyright (c) 2008 Steve Midgley, released under the MIT license
+ Credit to Elliot Nelson for significant code contributions. Thanks Elliot!

data/lib/mojo_magick/version.rb

@@ -0,0 +1,3 @@
+module MojoMagick
+  VERSION = '0.4.0'
+end

data/lib/mojo_magick.rb

@@ -52,8 +52,6 @@ require 'tempfile'
 #
 module MojoMagick
 
-  VERSION = "0.2.0"
-
   class MojoMagickException < StandardError; end
   class MojoError < MojoMagickException; end
   class MojoFailed < MojoMagickException; end
@@ -118,8 +116,8 @@ module MojoMagick
       raise MojoMagickError, "Unknown options for method resize: #{options.inspect}"
     end
     if !options[:fill].nil? && !options[:crop].nil?
+      extras << "-gravity Center"
       extras << "-extent #{geometry}"
-      extras << "-gravity center"
     end
     retval = raw_command("convert", "\"#{source_file}\" -resize #{geometry}#{scale_options} #{extras.join(' ')} \"#{dest_file}\"")
     dest_file
@@ -154,6 +152,23 @@ module MojoMagick
     raw_command('mogrify', opts.to_s)
   end
 
+  
+  def MojoMagick::tempfile(*opts)
+    begin
+      data = opts[0]
+      rest = opts[1]
+      ext = rest && rest[:format]
+      file = Tempfile.new(["mojo", ext ? '.' + ext.to_s : ''])
+      file.binmode
+      file.write(data)
+      file.path
+    rescue Exception => ex
+      raise
+    end
+  ensure
+    file.close
+  end
+
   # Option builder used in #convert and #mogrify helpers.
   class OptBuilder
     def initialize
@@ -180,8 +195,13 @@ module MojoMagick
     alias files file
 
     # Create a temporary file for the given image and add to command line
-    def blob(arg)
-      file MojoMagick::tempfile(arg)
+    def blob(*args)
+      data = args[0]
+      opts = args[1] || {}
+      [:format, :depth, :size].each do |opt|
+        self.send(opt, opts[opt].to_s) if opts[opt]
+      end
+      file MojoMagick::tempfile(data, opts)
     end
 
     # Generic commands. Arguments will be formatted if necessary
@@ -211,15 +231,6 @@ module MojoMagick
       end
     end
   end
-
-  def MojoMagick::tempfile(data)
-    file = Tempfile.new("mojo")
-    file.binmode
-    file.write(data)
-    file.path
-  ensure
-    file.close
-  end
     
 end # MojoMagick
 

data/mojo_magick.gemspec

@@ -0,0 +1,21 @@
+$:.push File.expand_path("../lib", __FILE__)
+require "mojo_magick/version"
+
+Gem::Specification.new do |s|
+  s.name        = "mojo_magick"
+  s.version     = MojoMagick::VERSION
+  s.platform    = Gem::Platform::RUBY
+  s.authors     = ["Steve Midgley", "Elliot Nelson", "Jon Rogers"]
+  s.email       = ["public@misuse.org", "j@2rye.com"]
+  s.homepage    = "http://github.com/bunnymatic/mojo_magick"
+  s.summary     = "mojo_magick-#{MojoMagick::VERSION}"
+  s.description = %q{Simple Ruby stateless module interface to imagemagick.}
+
+  s.rubyforge_project = "mojo_magick"
+  
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ["lib"]
+  s.add_development_dependency('rake')
+end

data/test/mojo_magick_test.rb

@@ -78,7 +78,6 @@ class MojoMagickTest < Test::Unit::TestCase
     assert_equal 1000, new_dimensions[:height]
     assert_equal 666, new_dimensions[:width]
 
-
     # test bad images
     bad_image = File::join(@working_path, 'not_an_image.jpg')
     zero_image = File::join(@working_path, 'zero_byte_image.jpg')
@@ -87,6 +86,26 @@ class MojoMagickTest < Test::Unit::TestCase
     assert_raise(MojoMagick::MojoFailed) {MojoMagick::get_image_size('/file_does_not_exist_here_ok.jpg')}
   end
 
+  def test_resize_with_fill
+    reset_images
+    test_image = File::join(@working_path, '5742.jpg')
+    orig_image_size = File::size(test_image)
+    MojoMagick::resize(test_image, test_image, {:fill => true, :width => 100, :height => 100})
+    dim = MojoMagick::get_image_size(test_image)
+    assert_equal 100, dim[:width] 
+    assert_equal 150, dim[:height] 
+  end
+
+  def test_resize_with_fill_and_crop
+    reset_images
+    test_image = File::join(@working_path, '5742.jpg')
+    orig_image_size = File::size(test_image)
+    MojoMagick::resize(test_image, test_image, {:fill => true, :crop => true, :width => 150, :height => 120})
+    dim = MojoMagick::get_image_size(test_image)
+    assert_equal 150, dim[:width]
+    assert_equal 120, dim[:height] 
+  end
+
   def test_resource_limits
     orig_limits = MojoMagick::get_default_limits
     assert_equal 7, orig_limits.size
@@ -202,6 +221,7 @@ class MojoMagickTest < Test::Unit::TestCase
     File.open(filename, 'rb') do |f|
       assert_equal f.read, 'binary data'
     end
+        
   end
 
   def test_command_helpers
@@ -244,5 +264,27 @@ class MojoMagickTest < Test::Unit::TestCase
     retval = MojoMagick::get_image_size(out_image)
     assert_equal 50, retval[:width]
     assert_equal 50, retval[:height]
+
+    # RGB8 test
+    bdata = 'aaaaaabbbbbbccc'
+    out = 'out.png'
+    MojoMagick::convert do |c|
+      c.blob bdata, :format => :rgb, :depth => 8, :size => '5x1'
+      c.file out
+    end
+    r = MojoMagick::get_image_size(out)
+    assert r[:height] == 1
+    assert r[:width] == 5
+
+    bdata = '1111222233334444'
+    out = 'out.png'
+    MojoMagick::convert do |c|
+      c.blob bdata, :format => :rgba, :depth => 8, :size => '4x1'
+      c.file out
+    end
+    r = MojoMagick::get_image_size(out)
+    assert r[:height] == 1
+    assert r[:width] == 4
+    
   end
 end

metadata

@@ -2,7 +2,7 @@
 name: mojo_magick
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Steve Midgley
@@ -12,9 +12,19 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-28 00:00:00 Z
-dependencies: []
-
+date: 2012-03-18 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: rake
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  version_requirements: *id001
 description: Simple Ruby stateless module interface to imagemagick.
 email: 
 - public@misuse.org
@@ -26,15 +36,15 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- README
+- .gitignore
+- README.md
 - init.rb
 - lib/image_resources.rb
 - lib/mojo_magick.rb
+- lib/mojo_magick/version.rb
+- mojo_magick.gemspec
 - test/fixtures/5742.jpg
 - test/fixtures/not_an_image.jpg
-- test/fixtures/tmp/5742.jpg
-- test/fixtures/tmp/not_an_image.jpg
-- test/fixtures/tmp/zero_byte_image.jpg
 - test/fixtures/zero_byte_image.jpg
 - test/mojo_magick_test.rb
 homepage: http://github.com/bunnymatic/mojo_magick
@@ -60,15 +70,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: mojo_magick
-rubygems_version: 1.8.5
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
-summary: mojo_magick-0.3.0
+summary: mojo_magick-0.4.0
 test_files: 
 - test/fixtures/5742.jpg
 - test/fixtures/not_an_image.jpg
-- test/fixtures/tmp/5742.jpg
-- test/fixtures/tmp/not_an_image.jpg
-- test/fixtures/tmp/zero_byte_image.jpg
 - test/fixtures/zero_byte_image.jpg
 - test/mojo_magick_test.rb

data/README

@@ -1,112 +0,0 @@
-MojoMagick
-==========
-
-MojoMagick is a "dog simple, do very little" image library. It is basically a couple of stateless
-module methods that make it somewhat more convenient than calling ImageScience by hand.
-
-The main reason to use MojoMagick is that you should consolidate your ImageScience calls into
-one place, so why not do it here? If you improve on this tool, send me the patch.
-
-This tool came about because I wanted a fast, simple, lightweight, nothing-goes-wrong-with-it-
-because-it's-too-simple-to-break image tool.
-
-Examples
-========
-
-# Obtain the size of an image (assuming image is "120wx222h")
-dimensions = MojoMagick::get_image_size(test_image)
- # ==> dimensions now holds a hash: {:height => 120, :width => 222}
-
-# Resize an image so that it fits within a 100w x 200h bounding box
-# (Note: this will scale an image either up or down to fit these dimensions
-#        which may not be what you want.)
-# In this example, we overwrite our image, but if you pass in a different file for the
-# second file name, a new file will be created with the resized dimensions
-MojoMagick::resize('/img/test.jpg', '/img/test.jpg', {:width=>100, :height=>200})
-
-## Code sample of how to shrink all jpg's in a folder
-{{{
-require 'mojo_magick'
-
-image_folder = '/tmp/img'
-Dir::glob(File::join(image_folder, '*.jpg')).each do |image|
-  begin
-    # shrink all the images *in place* to no bigger than 60pix x 60pix
-    MojoMagick::shrink(image, image, {:width => 60, :height => 60})
-    puts "Shrunk: #{image}"
-  rescue MojoMagick::MojoFailed => e
-    STDERR.puts "Unable to shrink image '#{image}' - probably an invalid image\n#{e.message}"
-  rescue MojoMagick::MojoMagickException => e
-    STDERR.puts "Unknown exception on image '#{image}'\n#{e.message}"
-  end
-end
-}}}
-
-## More Code on setting memory limits for imagemagick
-# (Be sure you�re upgraded to the current release of ImageMagick.)
-
-# set limits on disk, area, map and ram usage
-# obtain/print a hash of default limits:
-puts MojoMagick::get_default_limits.inspect
-# current_limits shows same values:
-puts MojoMagick::get_current_limits.inspect
-
-MojoMagick::set_limits(:area => '32mb', :disk => '0', :memory => '64mb', :map => '32mb')
-puts MojoMagick::get_current_limits.inspect
-
-### More sample code (thanks to Elliot Nelson for adding this code to the system)
-# Two command-line builders, #convert and #mogrify, have been added to simplify
-# complex commands. Examples included below.
-
-# Example #convert usage:
-
-MojoMagick::convert('source.jpg', 'dest.jpg') do |c|
-  c.crop '250x250+0+0'
-  c.repage!
-  c.strip
-  c.set 'comment', 'my favorite file'
-end
-
-# Equivalent to:
-
-MojoMagick::raw_command('convert', 'source.jpg -crop 250x250+0+0 +repage -strip -set comment "my favorite file" dest.jpg')
-
-# Example #mogrify usage:
-
-MojoMagick::mogrify('image.jpg') {|i| i.shave '10x10'}
-
-# Equivalent to:
-
-MojoMagick::raw_command('mogrify', '-shave 10x10 image.jpg')
-
-# Example showing some additional options:
-
-MojoMagick::convert do |c|
-  c.file 'source.jpg'
-  c.blob my_binary_data
-  c.append
-  c.crop '256x256+0+0'
-  c.repage!
-  c.file 'output.jpg'
-end
-
-# Use .file to specify file names, .blob to create and include a tempfile. The
-# bang (!) can be appended to command names to use the '+' versions
-# instead of '-' versions.
-
-Availablility
-=============
-SVN Repo access from here: http://trac.misuse.org/science/wiki/MojoMagick
-Contact author or discuss MojoMagick here: http://www.misuse.org/science/2008/01/30/mojomagick-ruby-image-library-for-imagemagick/
-
-
-Updates by Jon Rogers (jon@2rye.com)
-------------------------------------
-# added gemspec for building gem with bundler
-# updated tests for ImageMagick 6.6
-# added ability to do fill + crop resizing
-# bumped version to 0.3.0
-
-
-Copyright (c) 2008 Steve Midgley, released under the MIT license
- Credit to Elliot Nelson for significant code contributions. Thanks Elliot!