mojo_magick 0.4.3 → 0.4.4

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: e8d7e7a6d4e6182e2f6dfe239a5ea6479e18c23d
+  data.tar.gz: a29fb27bbd8ffaef8acccd892abbf3245368b6c6
+SHA512:
+  metadata.gz: 48608b32f529b88428d4f4d65d88af56a8d26f3e89c7e90d6a957d02ede0ca23d2fc2d05299fdd50a2234457316e7559d431b42ff4e0ba982ba1daeca5708b94
+  data.tar.gz: 187989b5dec6e00b1e43d17b64c9cfa7321ff43c36996aca7030775dd58fa664538f0016159c140762e1f9d3047931dc384423f150945b2b4e7044930b215995

data/.gitignore

@@ -1,2 +1,8 @@
-fixtures/tmp
 *~
+test/fixtures/tmp
+fixtures/tmp
+coverage/
+.bundle/
+.\#*
+out.png
+out.html

data/.ruby-version

@@ -0,0 +1 @@
+2.0.0-p247

data/Gemfile

@@ -1,2 +1,3 @@
-source :rubygems
-gem 'rake'
+source 'https://rubygems.org'
+
+gemspec

data/Gemfile.lock

@@ -0,0 +1,26 @@
+PATH
+  remote: .
+  specs:
+    mojo_magick (0.4.4)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    diff-lcs (1.2.4)
+    multi_json (1.8.2)
+    rake (0.9.2.2)
+    rspec-expectations (2.14.3)
+      diff-lcs (>= 1.1.3, < 2.0)
+    simplecov (0.7.1)
+      multi_json (~> 1.0)
+      simplecov-html (~> 0.7.1)
+    simplecov-html (0.7.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  mojo_magick!
+  rake
+  rspec-expectations
+  simplecov

data/README.md

@@ -41,7 +41,7 @@ After this transformation, your image will be 100x100.  But it does not distort
 ### 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
@@ -85,7 +85,7 @@ complex commands.
       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')
 
@@ -100,7 +100,7 @@ complex commands.
 
     # 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'
@@ -109,7 +109,7 @@ complex commands.
       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.
@@ -122,6 +122,19 @@ complex commands.
       c.file 'output.jpg'
     end
 
+### 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.
+
+    MojoMagick::convert(nil, fname) do |c|
+      c.background 'black'
+      c.fill 'white'
+      c.gravity 'center'
+      c.pointsize 80
+      c.size '200x200'
+      c.label 'the bird is the word'
+    end
+
 Availablility
 =============
 

data/Rakefile

@@ -4,6 +4,8 @@ task 'default' => :test
 
 desc "Default: run tests"
 task :test do
+  require 'simplecov'
+  SimpleCov.start
   require 'rake/runtest'
   files = Dir.glob(File.join(File.dirname(__FILE__), 'test/*_test.rb'))
   files.each do |f|

data/lib/image_resources.rb

@@ -115,8 +115,9 @@ module ImageMagickResources
     # that contains all the limit constraints
     def get_limits_as_params
       retval = ''
+      # we upcase the value here for newer versions of ImageMagick (>=6.8.x)
       @@resource_limits.each do |type, value|
-        retval += " -limit #{type.to_s} #{value} "
+        retval += " -limit #{type.to_s} #{value.upcase} "
       end
       retval
     end

data/lib/mojo_magick/opt_builder.rb

@@ -0,0 +1,77 @@
+# Option builder used in #convert and #mogrify helpers.
+module MojoMagick
+  class OptBuilder
+    def initialize
+      @opts = []
+    end
+
+    # Add command-line options with no processing
+    def <<(arg)
+      if arg.is_a?(Array)
+        @opts += arg
+      else
+        @opts << arg
+      end
+      self
+    end
+
+    # Add files to command line, formatted if necessary
+    def file(*args)
+      args.each do |arg|
+        add_formatted arg
+      end
+      self
+    end
+    alias files file
+
+    def label(*args)
+      @opts << "label:#{quoted_arg(args.join)}"
+    end
+
+    # Create a temporary file for the given image and add to command line
+    def format(*args)
+      @opts << '-format'
+      args.each do |arg|
+        add_formatted arg
+      end
+    end
+
+    def blob(*args)
+      data = args[0]
+      opts = args[1] || {}
+      opts.each do |k,v|
+        send(k.to_s,v.to_s)
+      end
+      tmpfile = MojoMagick::tempfile(data, opts)
+      file tmpfile
+    end
+
+    # Generic commands. Arguments will be formatted if necessary
+    def method_missing(command, *args)
+      if command.to_s[-1, 1] == '!'
+        @opts << "+#{command.to_s.chop}"
+      else
+        @opts << "-#{command}"
+      end
+      args.each do |arg|
+        add_formatted arg
+      end
+      self
+    end
+
+    def to_s
+      @opts.join ' '
+    end
+
+    protected
+    def add_formatted(arg)
+      # Quote anything that would cause problems on *nix or windows
+      @opts << quoted_arg(arg)
+    end
+
+    def quoted_arg(arg)
+      return arg unless arg =~ /[<>^|&();` ]/
+      [ '"', arg.gsub('"', '\"'), '"'].join
+    end
+  end
+end

data/lib/mojo_magick/version.rb

@@ -1,3 +1,3 @@
 module MojoMagick
-  VERSION = '0.4.3'
+  VERSION = '0.4.4'
 end

data/lib/mojo_magick.rb

@@ -1,6 +1,9 @@
-require File::expand_path(File::join(File::dirname(__FILE__), 'image_resources'))
+cwd = File::dirname(__FILE__)
+require File::join(cwd, 'image_resources')
+require File::join(cwd, 'mojo_magick/opt_builder')
 require 'tempfile'
 
+
 # MojoMagick is a stateless set of module methods which present a convient interface
 # for accessing common tasks for ImageMagick command line library.
 #
@@ -22,7 +25,7 @@ require 'tempfile'
 #     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')
@@ -32,7 +35,7 @@ require 'tempfile'
 #   MojoMagick::mogrify('image.jpg') {|i| i.shave '10x10'}
 #
 # Equivalent to:
-# 
+#
 #   MojoMagick::raw_command('mogrify', '-shave 10x10 image.jpg')
 #
 # Example showing some additional options:
@@ -106,7 +109,7 @@ module MojoMagick
     scale_options << "!" unless options[:absolute_aspect].nil?
     scale_options << "^" unless options[:fill].nil?
     scale_options = scale_options.join
-    
+
     extras = []
     if !options[:width].nil? && !options[:height].nil?
       geometry = "#{options[:width]}X#{options[:height]}"
@@ -152,7 +155,7 @@ module MojoMagick
     raw_command('mogrify', opts.to_s)
   end
 
-  
+
   def MojoMagick::tempfile(*opts)
     begin
       data = opts[0]
@@ -169,77 +172,4 @@ module MojoMagick
     file.close
   end
 
-  # Option builder used in #convert and #mogrify helpers.
-  class OptBuilder
-    def initialize
-      @opts = []
-    end
-
-    # Add command-line options with no processing
-    def <<(arg)
-      if arg.is_a?(Array)
-        @opts += arg
-      else
-        @opts << arg
-      end
-      self
-    end
-
-    # Add files to command line, formatted if necessary
-    def file(*args)
-      args.each do |arg|
-        add_formatted arg
-      end
-      self
-    end
-    alias files file
-
-    # Create a temporary file for the given image and add to command line
-    def format(*args)
-      @opts << '-format' 
-      args.each do |arg|
-        add_formatted arg
-      end
-    end
-      
-    def blob(*args)
-      data = args[0]
-      opts = args[1] || {}
-      opts.each do |k,v|
-        send(k.to_s,v.to_s)
-      end
-      tmpfile = MojoMagick::tempfile(data, opts)
-      file tmpfile
-    end
-
-    # Generic commands. Arguments will be formatted if necessary
-    def method_missing(command, *args)
-      if command.to_s[-1, 1] == '!'
-        @opts << "+#{command.to_s.chop}"
-      else
-        @opts << "-#{command}"
-      end
-      args.each do |arg|
-        add_formatted arg
-      end 
-      self
-    end
-
-    def to_s
-      @opts.join ' '
-    end
-
-    protected
-    def add_formatted(arg)
-      # Quote anything that would cause problems on *nix or windows
-      if arg =~ /[<>^|&();` ]/
-        @opts << "\"#{arg.gsub('"', '\"')}\""
-      else
-        @opts << arg
-      end
-    end
-  end
-    
 end # MojoMagick
-
-

data/mojo_magick.gemspec

@@ -1,6 +1,17 @@
 $:.push File.expand_path("../lib", __FILE__)
 require "mojo_magick/version"
 
+post_install_message = <<EOF
+
+Thanks for installing MojoMagick - keepin it simple!
+
+*** To make this gem work, you need a few binaries!
+Make sure you've got ImageMagick available.  http://imagemagick.org
+If you plan to build images with text (using the "label" method) you'll need freetype and ghostscript as well.
+Check out http://www.freetype.org and http://ghostscript.com respectively for installation info.
+
+EOF
+
 Gem::Specification.new do |s|
   s.name        = "mojo_magick"
   s.version     = MojoMagick::VERSION
@@ -12,10 +23,14 @@ Gem::Specification.new do |s|
   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')
+  s.add_development_dependency('simplecov')
+  s.add_development_dependency('rspec-expectations')
+
+  s.post_install_message = post_install_message
 end

data/test/mojo_magick_test.rb

@@ -1,7 +1,4 @@
-require 'test/unit'
-require File::expand_path(File::join(File::dirname(__FILE__), '..', 'init'))
-require 'fileutils'
-require 'tempfile'
+require File::join(File::dirname(__FILE__), 'test_helper')
 
 class MojoMagickTest < Test::Unit::TestCase
 
@@ -121,8 +118,8 @@ class MojoMagickTest < Test::Unit::TestCase
     @test_image = File::join(@working_path, '5742.jpg')
     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] 
+    assert_equal 100, dim[:width]
+    assert_equal 150, dim[:height]
   end
 
   def test_resize_with_fill_and_crop
@@ -131,7 +128,7 @@ class MojoMagickTest < Test::Unit::TestCase
     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] 
+    assert_equal 120, dim[:height]
   end
 
   def test_resource_limits
@@ -174,84 +171,6 @@ class MojoMagickTest < Test::Unit::TestCase
     end
   end
 
-  # 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.
-  def test_option_builder
-    # Passing in basic commands produces a string
-    b = MojoMagick::OptBuilder.new
-    b.strip
-    b.repage
-    assert_equal '-strip -repage', b.to_s
-
-    # Chaining commands works
-    b = MojoMagick::OptBuilder.new.strip.repage
-    assert_equal '-strip -repage', b.to_s
-
-    # Bang (!) indicates the plus version of commands
-    b = MojoMagick::OptBuilder.new
-    b.repage
-    b.repage!
-    assert_equal '-repage +repage', b.to_s
-
-    # Accepts raw data as-is
-    b = MojoMagick::OptBuilder.new
-    b.opt1
-    b << 'a ! b !'
-    b.opt2
-    assert_equal '-opt1 a ! b ! -opt2', b.to_s
-
-    # Treats an array of raw data as different arguments
-    b = MojoMagick::OptBuilder.new
-    b << ['leave this data','alone']
-    assert_equal 'leave this data alone', b.to_s
-
-    # String includes command arguments
-    b = MojoMagick::OptBuilder.new
-    b.extent '256x256+0+0'
-    b.crop '64x64'
-    assert_equal '-extent 256x256+0+0 -crop 64x64', b.to_s
-
-    # Arguments are quoted (doublequote) if appropriate
-    b = MojoMagick::OptBuilder.new
-    b.comment 'white space'
-    b.comment 'w&b'
-    b.crop '6x6^'
-    assert_equal '-comment "white space" -comment "w&b" -crop "6x6^"', b.to_s
-
-    # Existing doublequotes are escaped
-    b = MojoMagick::OptBuilder.new
-    b.comment 'Fred "Woot" Rook'
-    assert_equal '-comment "Fred \"Woot\" Rook"', b.to_s
-
-    # Multi-argument commands should not be quoted together
-    b = MojoMagick::OptBuilder.new
-    b.set 'comment', 'the "best" comment'
-    assert_equal '-set comment "the \"best\" comment"', b.to_s
-
-    # File and files are helper methods
-    b = MojoMagick::OptBuilder.new
-    b.files 'source.jpg', 'source2.jpg'
-    b.append
-    b.crop '64x64'
-    b.file 'dest%d.jpg'
-    assert_equal 'source.jpg source2.jpg -append -crop 64x64 dest%d.jpg', b.to_s
-
-    # Files are quoted (doublequote) if appropriate
-    b = MojoMagick::OptBuilder.new
-    b.file 'probably on windows.jpg'
-    assert_equal '"probably on windows.jpg"', b.to_s
-   
-    # Blob is a shortcut for the #tempfile helper method
-    b = MojoMagick::OptBuilder.new
-    b.blob 'binary data'
-    filename = b.to_s
-    File.open(filename, 'rb') do |f|
-      assert_equal f.read, 'binary data'
-    end
-        
-  end
-
   def test_command_helpers
     reset_images
     test_image = File::join(@working_path, '5742.jpg')
@@ -266,7 +185,7 @@ class MojoMagickTest < Test::Unit::TestCase
     end
     retval = MojoMagick::get_image_size(out_image)
     assert_equal 92, retval[:width]
-    assert_equal 64, retval[:height]    
+    assert_equal 64, retval[:height]
 
     # Simple mogrify test
     MojoMagick::mogrify do |m|
@@ -313,6 +232,6 @@ class MojoMagickTest < Test::Unit::TestCase
     r = MojoMagick::get_image_size(out)
     assert r[:height] == 1
     assert r[:width] == 4
-    
+
   end
 end

data/test/opt_builder_test.rb

@@ -0,0 +1,92 @@
+require File::join(File::dirname(__FILE__), 'test_helper')
+
+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.
+  def test_option_builder
+    # Passing in basic commands produces a string
+    b = MojoMagick::OptBuilder.new
+    b.strip
+    b.repage
+    assert_equal '-strip -repage', b.to_s
+
+    # Chaining commands works
+    b = MojoMagick::OptBuilder.new.strip.repage
+    assert_equal '-strip -repage', b.to_s
+
+    # Bang (!) indicates the plus version of commands
+    b = MojoMagick::OptBuilder.new
+    b.repage
+    b.repage!
+    assert_equal '-repage +repage', b.to_s
+
+    # Accepts raw data as-is
+    b = MojoMagick::OptBuilder.new
+    b.opt1
+    b << 'a ! b !'
+    b.opt2
+    assert_equal '-opt1 a ! b ! -opt2', b.to_s
+
+    # Treats an array of raw data as different arguments
+    b = MojoMagick::OptBuilder.new
+    b << ['leave this data','alone']
+    assert_equal 'leave this data alone', b.to_s
+
+    # String includes command arguments
+    b = MojoMagick::OptBuilder.new
+    b.extent '256x256+0+0'
+    b.crop '64x64'
+    assert_equal '-extent 256x256+0+0 -crop 64x64', b.to_s
+
+    # Arguments are quoted (doublequote) if appropriate
+    b = MojoMagick::OptBuilder.new
+    b.comment 'white space'
+    b.comment 'w&b'
+    b.crop '6x6^'
+    assert_equal '-comment "white space" -comment "w&b" -crop "6x6^"', b.to_s
+
+    # Existing doublequotes are escaped
+    b = MojoMagick::OptBuilder.new
+    b.comment 'Fred "Woot" Rook'
+    assert_equal '-comment "Fred \"Woot\" Rook"', b.to_s
+
+    # Multi-argument commands should not be quoted together
+    b = MojoMagick::OptBuilder.new
+    b.set 'comment', 'the "best" comment'
+    assert_equal '-set comment "the \"best\" comment"', b.to_s
+
+    # File and files are helper methods
+    b = MojoMagick::OptBuilder.new
+    b.files 'source.jpg', 'source2.jpg'
+    b.append
+    b.crop '64x64'
+    b.file 'dest%d.jpg'
+    assert_equal 'source.jpg source2.jpg -append -crop 64x64 dest%d.jpg', b.to_s
+
+    # Files are quoted (doublequote) if appropriate
+    b = MojoMagick::OptBuilder.new
+    b.file 'probably on windows.jpg'
+    assert_equal '"probably on windows.jpg"', b.to_s
+
+    # Blob is a shortcut for the #tempfile helper method
+    b = MojoMagick::OptBuilder.new
+    b.blob 'binary data'
+    filename = b.to_s
+    File.open(filename, 'rb') do |f|
+      assert_equal f.read, 'binary data'
+    end
+
+    #label for text should use 'label:"the string"' if specified
+    [[ 'mylabel', 'mylabel' ],
+     [ 'Rock it', '"Rock it"'],
+     [ '#$%^&*', '"#$%^&*"']].each do |labels|
+
+      b = MojoMagick::OptBuilder.new
+      b.label labels[0]
+      expect(b.to_s).to eql "label:#{labels[1]}"
+    end
+
+  end
+end

data/test/test_helper.rb

@@ -0,0 +1,6 @@
+require 'test/unit'
+require File::expand_path(File::join(File::dirname(__FILE__), '..', 'init'))
+require 'fileutils'
+require 'tempfile'
+require 'rspec/expectations'
+

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mojo_magick
 version: !ruby/object:Gem::Version
-  version: 0.4.3
-  prerelease: 
+  version: 0.4.4
 platform: ruby
 authors:
 - Steve Midgley
@@ -11,22 +10,48 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-08 00:00:00.000000000 Z
+date: 2013-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec-expectations
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Simple Ruby stateless module interface to imagemagick.
@@ -38,45 +63,58 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
-- .rvmrc
+- .ruby-version
 - Gemfile
+- Gemfile.lock
 - README.md
 - Rakefile
 - init.rb
 - lib/image_resources.rb
 - lib/mojo_magick.rb
+- lib/mojo_magick/opt_builder.rb
 - lib/mojo_magick/version.rb
 - mojo_magick.gemspec
 - test/fixtures/5742.jpg
 - test/fixtures/not_an_image.jpg
 - test/fixtures/zero_byte_image.jpg
 - test/mojo_magick_test.rb
+- test/opt_builder_test.rb
+- test/test_helper.rb
 homepage: http://github.com/bunnymatic/mojo_magick
 licenses: []
-post_install_message: 
+metadata: {}
+post_install_message: |2+
+
+  Thanks for installing MojoMagick - keepin it simple!
+
+  *** To make this gem work, you need a few binaries!
+  Make sure you've got ImageMagick available.  http://imagemagick.org
+  If you plan to build images with text (using the "label" method) you'll need freetype and ghostscript as well.
+  Check out http://www.freetype.org and http://ghostscript.com respectively for installation info.
+
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: mojo_magick
-rubygems_version: 1.8.24
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
-summary: mojo_magick-0.4.3
+specification_version: 4
+summary: mojo_magick-0.4.4
 test_files:
 - test/fixtures/5742.jpg
 - test/fixtures/not_an_image.jpg
 - test/fixtures/zero_byte_image.jpg
 - test/mojo_magick_test.rb
+- test/opt_builder_test.rb
+- test/test_helper.rb

data/.rvmrc

@@ -1 +0,0 @@
-rvm --create use ruby-1.9.2-p318@mojo_magick