mojo_magick 0.4.8 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d35aee21b9f981adc52c8299fbac9468e89267a3
-  data.tar.gz: 583961066b7f1a2051b7b0605f0735d03531b939
+  metadata.gz: 4f0bc8c31a0b6f8b9f8c5b217cc6dda15b83bf89
+  data.tar.gz: cb03f8a740c020b47cd58ed663c7f4ed15a1a590
 SHA512:
-  metadata.gz: 83320f5d139053ea95ebc9e08e3564789dcc47fc68d1a7a086efc9e03f5a146f6c98ff628e565be16dff36291f40605a06c80873f6c3206bb764400ce14c5cac
-  data.tar.gz: 057bda821e46d29639e1a711b469e9f87f59572b778d88e4f063d5cdbc3391a33be0f07d38dd8bf8183ece8021348a061278a079a55abc9833777d53b94f993c
+  metadata.gz: 6b18a88bd6d774ae1b4a7e0f14de462856d1e6ca4db78785dab40d6ea7475e13133bdfdc32ce83b2b197aa7429ed2b027071e9545728bf8053f050db0f0fd431
+  data.tar.gz: 374987fcec84b5b2a54e67bdd0dd4ff2c3d65efc6b992c7d1055377d809f01827b7add75314d905c3ceaffd196110267f384933318202017162648958a3b4a35

data/.gitignore

@@ -4,5 +4,7 @@ fixtures/tmp
 coverage/
 .bundle/
 .\#*
+\#*
 out.png
 out.html
+*.gem

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    mojo_magick (0.4.8)
+    mojo_magick (0.5.1)
 
 GEM
   remote: https://rubygems.org/

data/LICENSE.txt

@@ -0,0 +1,23 @@
+MojoMagick is released under the MIT license
+
+The MIT License (MIT)
+
+Copyright (c) 2013 Jon Rogers, Steve Magley & Elliott Nelson
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

data/README.md

@@ -2,9 +2,9 @@ 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.
+module methods that make it somewhat more convenient than calling ImageMagick by hand.
 
-The main reason to use MojoMagick is that you should consolidate your ImageScience calls into
+The main reason to use MojoMagick is that you should consolidate your ImageMagick 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-
@@ -132,7 +132,7 @@ complex commands.
 
 ### Create a new image with text
 
-Note: Use with care.  If you don't have fonts installed ImageMagick can spin off wildly leaving MojoMagick not knowing what to do.  For Unix/MacOSX, you should install freetype and ghostscript.
+Note: Use with care.  If you don't have fonts installed ImageMagick can spin off wildly leaving MojoMagick not knowing what to do.  For Unix/MacOSX, you should install `freetype` and `ghostscript`.
 
     MojoMagick::convert(nil, fname) do |c|
       c.background 'black'
@@ -143,14 +143,52 @@ Note: Use with care.  If you don't have fonts installed ImageMagick can spin off
       c.label 'the bird is the word'
     end
 
+### Generate a composite
+
+    MojoMagick::convert(nil, 'composite_out.png') do |c|
+      c.size '200x200'
+      c.image_block do # first layer
+        c.background 'blue'
+        c.fill 'white'
+        c.gravity 'northwest'
+        c.label 'NW'
+      end
+      c.image_block do # second layer
+        c.background 'transparent'
+        c.fill 'red'
+        c.gravity 'southeast'
+        c.label 'SE'
+      end
+      c.composite
+    end
+
+
 Availablility
 =============
+ * [Github Repo](http://github.com/rcode5/mojo_magick) This is the current canonical branch.
+ * Issues/Pull Requests can be submitted through the above repository.
+
+Recent Changes
+==============
+
+#### Version 0.5.1
 
- * [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/)
+* add `LICENSE.txt` and update README
+* add `examples/` directory
+* add support for fonts
+* add support for building multi-layer images with image blocks (no explicit temp file creation)
+* [Moved repo to rcode5](http://github.com/rcode5/mojo_magick) Current support and maintenance is happening here.
+* added `simplecov` for test coverage reports
 
+#### Versions 0.4.x
 
-#### Updates by Jon Rogers Aug 2011 (http://github.com/bunnymatic)
+* Add rake tasks for gem building and tests
+* code cleanup
+* better handling of `gravity` parameter
+
+#### Version 0.3.0
+
+* Add new github repo
 * added gemspec for building gem with bundler
 * updated tests for ImageMagick 6.6
 * added ability to do fill + crop resizing
@@ -158,10 +196,15 @@ Availablility
 * [new github repo](https://github.com/bunnymatic/mojo_magick)
 
 
+
 References
 ==========
 
+* [Original SVN MojoMagick repository](http://www.misuse.org/science/2008/01/30/mojomagick-ruby-image-library-for-imagemagick/) - Initiated and developed by Steve Midgley
 * [ImageMagick](http://www.imagemagick.org/)
+* [FreeType](http://www.freetype.org)
+* [Ghostscript](http://www.ghostscript.com/)
 
-Copyright (c) 2008 Steve Midgley, released under the MIT license
- Credit to Elliot Nelson for significant code contributions. Thanks Elliot!
+Copyright (c) 2013 Jon Rogers
+Copyright (c) 2008 Steve Midgley, released under the [MIT license](LICENSE.txt)
+Credit to Elliot Nelson for significant code contributions. Thanks Elliot!

data/examples/animated_gif.rb

@@ -0,0 +1,22 @@
+#!/usr/bin/env ruby
+#
+
+require 'mojo_magick'
+
+MojoMagick::convert(nil, 'animated.gif') do |c|
+  c.size '200x200'
+  c.delay 100
+  c.image_block do # first layer
+    c.background 'blue'
+    c.fill 'white'
+    c.gravity 'northwest'
+    c.label 'NW'
+  end
+  c.image_block do # second layer
+    c.background 'transparent'
+    c.fill 'red'
+    c.gravity 'southeast'
+    c.label 'SE'
+  end
+end
+

data/examples/composite.rb

@@ -0,0 +1,23 @@
+#!/usr/bin/env ruby
+#
+
+require 'mojo_magick'
+
+MojoMagick::convert(nil, 'composite_out.png') do |c|
+  c.size '200x200'
+  c.delay 100
+  c.image_block do # first layer
+    c.background 'blue'
+    c.fill 'white'
+    c.gravity 'northwest'
+    c.label 'NW'
+  end
+  c.image_block do # second layer
+    c.background 'transparent'
+    c.fill 'red'
+    c.gravity 'southeast'
+    c.label 'SE'
+  end
+  c.composite
+end
+

data/lib/mojo_magick/opt_builder.rb

@@ -46,6 +46,13 @@ module MojoMagick
       file tmpfile
     end
 
+    def image_block(&block)
+      @opts << '\('
+      yield block
+      @opts << '\)'
+      self
+    end
+
     # Generic commands. Arguments will be formatted if necessary
     def method_missing(command, *args)
       if command.to_s[-1, 1] == '!'

data/lib/mojo_magick/version.rb

@@ -1,3 +1,3 @@
 module MojoMagick
-  VERSION = '0.4.8'
+  VERSION = '0.5.1'
 end

data/mojo_magick.gemspec

@@ -17,8 +17,8 @@ Gem::Specification.new do |s|
   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.email       = ["public@misuse.org", "jon@rcode5.com"]
+  s.homepage    = "http://github.com/rcode5/mojo_magick"
   s.summary     = "mojo_magick-#{MojoMagick::VERSION}"
   s.description = %q{Simple Ruby stateless module interface to imagemagick.}
 

data/test/mojo_magick_test.rb

@@ -51,6 +51,17 @@ class MojoMagickTest < Test::Unit::TestCase
     assert_equal 67, new_dimensions[:width]
   end
 
+  def test_image_resize_with_percentage
+    reset_images
+    original_size = MojoMagick::get_image_size(@test_image)
+    retval = MojoMagick::resize(@test_image, @test_image, {:percent => 50})
+    assert_equal @test_image, retval
+    new_dimensions = MojoMagick::get_image_size(@test_image)
+    [:height, :width].each do |dim|
+      assert_equal (original_size[dim]/2.0).ceil, new_dimensions[dim]
+    end
+  end
+
   def test_shrink_with_big_dimensions
     # image shouldn't resize if we specify very large dimensions and specify "shrink_only"
     reset_images

data/test/opt_builder_test.rb

@@ -4,7 +4,19 @@ class MojoMagickOptBuilderTest < Test::Unit::TestCase
 
   # These tests make the assumption that if we call #raw_command with the
   # correct strings, ImageMagick itself will operate correctly. We're only
-  # verifying that the option builder produces the correct strings.
+  # verifying that the option builder produces the correct strings
+  def test_option_builder_with_blocks
+    # Passing in basic commands produces a string
+    b = MojoMagick::OptBuilder.new
+    b.image_block do
+      b.background 'red'
+    end
+    b.image_block do
+      b.background 'blue'
+    end
+    assert_equal '\( -background red \) \( -background blue \)', b.to_s
+  end
+
   def test_option_builder
     # Passing in basic commands produces a string
     b = MojoMagick::OptBuilder.new

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mojo_magick
 version: !ruby/object:Gem::Version
-  version: 0.4.8
+  version: 0.5.1
 platform: ruby
 authors:
 - Steve Midgley
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-23 00:00:00.000000000 Z
+date: 2013-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -57,7 +57,7 @@ dependencies:
 description: Simple Ruby stateless module interface to imagemagick.
 email:
 - public@misuse.org
-- j@2rye.com
+- jon@rcode5.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -66,8 +66,11 @@ files:
 - .ruby-version
 - Gemfile
 - Gemfile.lock
+- LICENSE.txt
 - README.md
 - Rakefile
+- examples/animated_gif.rb
+- examples/composite.rb
 - init.rb
 - lib/image_magick/fonts.rb
 - lib/image_magick/resource_limits.rb
@@ -89,7 +92,7 @@ files:
 - test/parser_test.rb
 - test/resource_limits_test.rb
 - test/test_helper.rb
-homepage: http://github.com/bunnymatic/mojo_magick
+homepage: http://github.com/rcode5/mojo_magick
 licenses: []
 metadata: {}
 post_install_message: |2+
@@ -119,7 +122,7 @@ rubyforge_project: mojo_magick
 rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
-summary: mojo_magick-0.4.8
+summary: mojo_magick-0.5.1
 test_files:
 - test/fixtures/5742.jpg
 - test/fixtures/not_an_image.jpg