mojo_magick 0.5.3 → 0.6.0

data/lib/mojo_magick/command_status.rb

@@ -0,0 +1,11 @@
+module MojoMagick
+  CommandStatus = Struct.new(:command, :return_value, :error, :system_status) do
+    def success?
+      system_status.success?
+    end
+
+    def exit_code
+      system_status.exitstatus || "unknown"
+    end
+  end
+end

data/lib/mojo_magick/errors.rb

@@ -0,0 +1,5 @@
+module MojoMagick
+  class MojoMagickException < StandardError; end
+  class MojoError < MojoMagickException; end
+  class MojoFailed < MojoMagickException; end
+end

data/lib/mojo_magick/font.rb

@@ -1,23 +1,21 @@
 module MojoMagick
-
   class Font
-
     attr_accessor :name, :family, :style, :stretch, :weight, :glyphs
 
     def valid?
-      !(name.nil?)
+      !name.nil?
     end
 
     def initialize(property_hash = {})
       property_hash.symbolize_keys!
-      [:name, :family, :style, :stretch, :weight, :glyphs].each do |f|
+      %i[name family style stretch weight glyphs].each do |f|
         setter = "#{f}="
-        self.send(setter, property_hash[f])
+        send(setter, property_hash[f])
       end
     end
 
     def self.all
-      ImageMagick::Font.all.map{|font_info| Font.new(font_info)}
+      ImageMagick::Font.all.map { |font_info| Font.new(font_info) }
     end
   end
 end

data/lib/mojo_magick/opt_builder.rb

@@ -17,9 +17,7 @@ module MojoMagick
 
     # Add files to command line, formatted if necessary
     def file(*args)
-      args.each do |arg|
-        add_formatted arg
-      end
+      @opts << args
       self
     end
     alias files file
@@ -30,31 +28,25 @@ module MojoMagick
 
     # annotate takes non-standard args
     def annotate(*args)
-      @opts << '-annotate'
+      @opts << "-annotate"
       arguments = args.join.split
-      if arguments.length == 1
-        arguments.unshift '0'
-      end
-      arguments.each do |arg|
-        add_formatted arg
-      end
+      arguments.unshift "0" if arguments.length == 1
+      @opts << arguments
     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
+      @opts << "-format"
+      @opts << args
     end
 
     def blob(*args)
       data = args[0]
       opts = args[1] || {}
-      opts.each do |k,v|
-        send(k.to_s,v.to_s)
+      opts.each do |k, v|
+        send(k.to_s, v.to_s)
       end
-      tmpfile = MojoMagick::tempfile(data, opts)
+      tmpfile = MojoMagick.tempfile(data, opts)
       file tmpfile
     end
 
@@ -67,30 +59,29 @@ module MojoMagick
 
     # 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
+      @opts << if command.to_s[-1, 1] == "!"
+                 "+#{command.to_s.chop}"
+               else
+                 "-#{command}"
+               end
+      @opts << args
       self
     end
 
     def to_s
-      @opts.join ' '
+      to_a.join " "
     end
 
-    protected
-    def add_formatted(arg)
-      # Quote anything that would cause problems on *nix or windows
-      @opts << quoted_arg(arg)
+    def to_a
+      @opts.flatten
     end
 
+    protected
+
     def quoted_arg(arg)
-      return arg unless arg =~ /[#'<>^|&();` ]/
-      [ '"', arg.gsub('"', '\"').gsub("'", "\'"), '"'].join
+      return arg unless /[#'<>^|&();` ]/.match?(arg)
+
+      ['"', arg.gsub('"', '\"').tr("'", "\'"), '"'].join
     end
   end
 end

data/lib/mojo_magick/util/parser.rb

@@ -1,69 +1,28 @@
+# rubocop:disable Lint/AssignmentInCondition
 module MojoMagick
   module Util
     class Parser
       # handle parsing outputs from ImageMagick commands
 
       def parse_fonts(raw_fonts)
-        font = nil
         fonts = {}
         enumerator = raw_fonts.split(/\n/).each
         name = nil
-        while (begin; line = enumerator.next; rescue StopIteration; line=nil; end) do
+        while begin; line = enumerator.next; rescue StopIteration; line = nil; end
           line.chomp!
           line = enumerator.next if line.nil? || line.empty? || (/^\s+$/ =~ line)
-          if m = /^\s*Font:\s+(.*)$/.match(line)
+          m = /^\s*Font:\s+(.*)$/.match(line)
+          if m
             name = m[1].strip
-            fonts[name] = {:name => name}
+            fonts[name] = { name: name }
           else
             key_val = line.split(/:/).map(&:strip)
             k = key_val[0].downcase.to_sym
             v = key_val[1]
-            if k && name
-              fonts[name][k] = key_val[1]
-            end
+            fonts[name][k] = v if k && name
           end
         end
-        fonts.values.map{|f| MojoMagick::Font.new f}
-      end
-
-      def parse_limits(raw_limits)
-
-        row_limits = raw_limits.split("\n")
-        header = row_limits[0].chomp
-        data = row_limits[2].chomp
-        resources = header.strip.split
-        limits = data.strip.split
-
-        actual_values = {}
-        readable_values = {}
-
-        resources.each_index do |i|
-          resource = resources[i].downcase.to_sym
-          scale = limits[i].match(%r{[a-z]+$}) || []
-          value = limits[i].match(%r{^[0-9]+})
-          unscaled_value = value ? value[0].to_i : -1
-          case scale[0]
-          when 'eb'
-            scaled_value = unscaled_value * (2 ** 60)
-          when 'pb'
-            scaled_value = unscaled_value * (2 ** 50)
-          when 'tb'
-            scaled_value = unscaled_value * (2 ** 40)
-          when 'gb'
-            scaled_value = unscaled_value * (2 ** 30)
-          when 'mb'
-            scaled_value = unscaled_value * (2 ** 20)
-          when 'kb'
-            scaled_value = unscaled_value * (2 ** 10)
-          when 'b'
-            scaled_value = unscaled_value
-          else
-            scaled_value = unscaled_value
-          end
-          actual_values[resource] = scaled_value
-          readable_values[resource] = limits[i]
-        end
-        [actual_values, readable_values]
+        fonts.values.map { |f| MojoMagick::Font.new f }
       end
     end
   end

data/lib/mojo_magick/version.rb

@@ -1,3 +1,3 @@
 module MojoMagick
-  VERSION = '0.5.3'
+  VERSION = "0.6.0"
 end

data/mojo_magick.gemspec

@@ -1,37 +1,42 @@
-$:.push File.expand_path("../lib", __FILE__)
+$LOAD_PATH.push File.expand_path("lib", __dir__)
 require "mojo_magick/version"
 
-post_install_message = <<EOF
+post_install_message = <<~EOPOST_INSTALL
 
-Thanks for installing MojoMagick - keepin it simple!
+  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.
+  *** 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
+EOPOST_INSTALL
 
 Gem::Specification.new do |s|
-  s.name        = "mojo_magick"
-  s.license  = 'MIT'
+  s.name = "mojo_magick"
+  s.license = "MIT"
   s.version     = MojoMagick::VERSION
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Steve Midgley", "Elliot Nelson", "Jon Rogers"]
-  s.email       = ["public@misuse.org", "jon@rcode5.com"]
+  s.email       = ["science@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.}
+  s.description = "Simple Ruby stateless module interface to imagemagick."
+  s.required_ruby_version = ">= 2.6.0"
 
   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.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.add_development_dependency("bundler")
+  s.add_development_dependency("bundle-audit")
+  s.add_development_dependency("minitest")
+  s.add_development_dependency("rake")
+  s.add_development_dependency("rspec-expectations")
+  s.add_development_dependency("rubocop")
+  s.add_development_dependency("rubocop-performance")
 
   s.post_install_message = post_install_message
 end

data/test/font_test.rb

@@ -1,35 +1,29 @@
-
-require File::join(File::dirname(__FILE__), 'test_helper')
-
-IDENTIFY_FONT_RESPONSE =<<EOF
-Font: Zapf-Dingbats
-    family: Zapf Dingbats
-    style: Normal
-    stretch: Normal
-    weight: 400
-    glyphs: /System/Library/Fonts/ZapfDingbats.ttf
-  Font: Zapfino
-    family: Zapfino
-    style: Italic
-    stretch: Normal
-    weight: 400
-    glyphs: /Library/Fonts/Zapfino.ttf
-EOF
-
-class FontTest < MiniTest::Unit::TestCase
-
+require_relative "test_helper"
+
+IDENTIFY_FONT_RESPONSE = <<~EO_FONTS
+  Font: Zapf-Dingbats
+      family: Zapf Dingbats
+      style: Normal
+      stretch: Normal
+      weight: 400
+      glyphs: /System/Library/Fonts/ZapfDingbats.ttf
+    Font: Zapfino
+      family: Zapfino
+      style: Italic
+      stretch: Normal
+      weight: 400
+      glyphs: /Library/Fonts/Zapfino.ttf
+EO_FONTS
+
+class FontTest < MiniTest::Test
   def test_font
     f = MojoMagick::Font.new
-    assert_equal f.name, nil
+    assert_nil f.name
     assert_equal f.valid?, false
 
-    f = MojoMagick::Font.new(:name => "Zapfino", :weight => 400)
-    assert_equal f.name, 'Zapfino'
+    f = MojoMagick::Font.new(name: "Zapfino", weight: 400)
+    assert_equal f.name, "Zapfino"
     assert_equal f.valid?, true
-    assert_equal f.weight,  400
-
+    assert_equal f.weight, 400
   end
-
 end
-
-

data/test/fonts_test.rb

@@ -1,12 +1,11 @@
-require File::join(File::dirname(__FILE__), 'test_helper')
-
-class FontsTest < MiniTest::Unit::TestCase
+require_relative "test_helper"
 
+class FontsTest < MiniTest::Test
   def test_get_fonts
-    fonts = MojoMagick::get_fonts
+    fonts = MojoMagick.get_fonts
     assert fonts.is_a? Array
     assert fonts.length > 1
     assert fonts.first.name
-    assert (fonts.first.name.is_a? String)
+    assert(fonts.first.name.is_a?(String))
   end
 end

data/test/mojo_magick_test.rb

@@ -1,256 +1,282 @@
-require File::join(File::dirname(__FILE__), 'test_helper')
-
-class MojoMagickTest < MiniTest::Unit::TestCase
-
-  # we keep a fixtures path and a working path so that we can easily test image
-  # manipulation routines without tainting the original images
-  def setup
-    @fixtures_path = File.expand_path(File::join(File.dirname(__FILE__), 'fixtures'))
-    @working_path = File::join(@fixtures_path, 'tmp')
-  end
-
-  def reset_images
-    FileUtils::rm_r(@working_path) if File::exists?(@working_path)
-    FileUtils::mkdir(@working_path)
-    Dir::glob(File::join(@fixtures_path, '*')).each do |file|
-      FileUtils::cp(file, @working_path) if File::file?(file)
-    end
-    @test_image = File::join(@working_path, '5742.jpg')
-
-  end
-
-  def test_get_image_size
-    reset_images
-    orig_image_size = File::size(@test_image)
-    retval = MojoMagick::get_image_size(@test_image)
-    assert_equal orig_image_size, File::size(@test_image)
-    assert_equal 500, retval[:height]
-    assert_equal 333, retval[:width]
-  end
-
-  def test_image_resize
-    # test basic resizing
-    reset_images
-    orig_image_size = File::size(@test_image)
-    size_test_temp = Tempfile::new('mojo_test')
-    size_test = size_test_temp.path
-    retval = MojoMagick::resize(@test_image, size_test, {:width=>100, :height=>100})
-    assert_equal size_test, retval
-    assert_equal orig_image_size, File::size(@test_image)
-    assert_equal retval, size_test
-    new_dimensions = MojoMagick::get_image_size(size_test)
-    assert_equal 100, new_dimensions[:height]
-    assert_equal 67, new_dimensions[:width]
-
-    # we should be able to resize image right over itself
-    retval = MojoMagick::resize(@test_image, @test_image, {:width=>100, :height=>100})
-    assert_equal @test_image, retval
-    refute_equal orig_image_size, File::size(@test_image)
-    new_dimensions = MojoMagick::get_image_size(@test_image)
-    assert_equal 100, new_dimensions[:height]
-    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
-    size_test_temp = Tempfile::new('mojo_test')
-    size_test = size_test_temp.path
-    retval = MojoMagick::shrink(@test_image, size_test, {:width=>1000, :height=>1000})
-    assert_equal size_test, retval
-    new_dimensions = MojoMagick::get_image_size(@test_image)
-    assert_equal 500, new_dimensions[:height]
-    assert_equal 333, new_dimensions[:width]
-  end
-
-  def test_shrink
-    reset_images
-    # image should resize if we specify small dimensions and shrink_only
-    retval = MojoMagick::shrink(@test_image, @test_image, {:width=>1000, :height=>100})
-    assert_equal @test_image, retval
-    new_dimensions = MojoMagick::get_image_size(@test_image)
-    assert_equal 100, new_dimensions[:height]
-    assert_equal 67, new_dimensions[:width]
-  end
-
-  def test_resize_with_shrink_only_options
-    reset_images
-    # image should resize if we specify small dimensions and shrink_only
-    retval = MojoMagick::resize(@test_image, @test_image, {:shrink_only => true, :width=>400, :height=>400})
-    assert_equal @test_image, retval
-    new_dimensions = MojoMagick::get_image_size(@test_image)
-    assert_equal 400, new_dimensions[:height]
-    assert_equal 266, new_dimensions[:width]
-  end
-
-  def test_expand_with_small_dim
-    # image shouldn't resize if we specify small dimensions and expand_only
-    reset_images
-    orig_image_size = File::size(@test_image)
-    retval = MojoMagick::expand(@test_image, @test_image, {:width=>10, :height=>10})
-    assert_equal @test_image, retval
-    new_dimensions = MojoMagick::get_image_size(@test_image)
-    assert_equal 500, new_dimensions[:height]
-    assert_equal 333, new_dimensions[:width]
-  end
-
-  def test_expand
-    reset_images
-    # image should resize if we specify large dimensions and expand_only
-    retval = MojoMagick::expand(@test_image, @test_image, {:width=>1000, :height=>1000})
-    assert_equal @test_image, retval
-    new_dimensions = MojoMagick::get_image_size(@test_image)
-    assert_equal 1000, new_dimensions[:height]
-    assert_equal 666, new_dimensions[:width]
-  end
-
-  def test_invalid_images
-    # test bad images
-    bad_image = File::join(@working_path, 'not_an_image.jpg')
-    zero_image = File::join(@working_path, 'zero_byte_image.jpg')
-    assert_raises(MojoMagick::MojoFailed) {MojoMagick::get_image_size(bad_image)}
-    assert_raises(MojoMagick::MojoFailed) {MojoMagick::get_image_size(zero_image)}
-    assert_raises(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')
-    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')
-    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_tempfile
-    # Create a tempfile and return the path
-    filename = MojoMagick::tempfile('binary data')
-    File.open(filename, 'rb') do |f|
-      assert_equal f.read, 'binary data'
-    end
-  end
-
-  def test_label
-    reset_images
-    out_image = File::join(@working_path, 'label_test.png')
-
-    MojoMagick::convert do |c|
-      c.label 'rock the house'
-      c.file out_image
-    end
-  end
-
-  def test_label_with_quote
-    reset_images
-    out_image = File::join(@working_path, 'label_test.png')
-
-    MojoMagick::convert do |c|
-      c.label 'rock "the house'
-      c.file out_image
-    end
-  end
-
-  def test_label_with_apostrophe
-    reset_images
-    out_image = File::join(@working_path, 'label_test.png')
-
-    MojoMagick::convert do |c|
-      c.label 'rock \'the house'
-      c.file out_image
-    end
-  end
-
-  def test_label_with_quotes
-    reset_images
-    out_image = File::join(@working_path, 'label_test.png')
-
-    MojoMagick::convert do |c|
-      c.label 'this is "it!"'
-      c.file out_image
-    end
-  end
-
-  def test_command_helpers
-    reset_images
-    test_image = File::join(@working_path, '5742.jpg')
-    out_image = File::join(@working_path, 'out1.jpg')
-
-    # Simple convert test
-    MojoMagick::convert do |c|
-      c.file test_image
-      c.crop '92x64+0+0'
-      c.repage!
-      c.file out_image
-    end
-    retval = MojoMagick::get_image_size(out_image)
-    assert_equal 92, retval[:width]
-    assert_equal 64, retval[:height]
-
-    # Simple mogrify test
-    MojoMagick::mogrify do |m|
-      m.crop '32x32+0+0'
-      m.repage!
-      m.file out_image
-    end
-    retval = MojoMagick::get_image_size(out_image)
-    assert_equal 32, retval[:width]
-    assert_equal 32, retval[:height]
-
-    # Convert test, using file shortcuts
-    MojoMagick::convert(test_image, out_image) do |c|
-      c.crop '100x100+0+0'
-      c.repage!
-    end
-    retval = MojoMagick::get_image_size(out_image)
-    assert_equal 100, retval[:width]
-    assert_equal 100, retval[:height]
-
-    # Mogrify test, using file shortcut
-    MojoMagick::mogrify(out_image) { |m| m.shave('25x25').repage! }
-    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
+require_relative "test_helper"
+
+class MojoMagickTest < MiniTest::Test
+  # we keep a fixtures path and a working path so that we can easily test image
+  # manipulation routines without tainting the original images
+  def setup
+    @fixtures_path = File.expand_path(File.join(File.dirname(__FILE__), "fixtures"))
+    @working_path = File.join(@fixtures_path, "tmp")
+  end
+
+  def reset_images
+    FileUtils.rm_r(@working_path) if File.exist?(@working_path)
+    FileUtils.mkdir(@working_path)
+    Dir.glob(File.join(@fixtures_path, "*")).each do |file|
+      FileUtils.cp(file, @working_path) if File.file?(file)
+    end
+    @test_image = File.join(@working_path, "5742.jpg")
+  end
+
+  def test_get_image_size
+    reset_images
+    orig_image_size = File.size(@test_image)
+    retval = MojoMagick.get_image_size(@test_image)
+    assert_equal orig_image_size, File.size(@test_image)
+    assert_equal 500, retval[:height]
+    assert_equal 333, retval[:width]
+  end
+
+  def test_image_resize
+    # test basic resizing
+    reset_images
+    orig_image_size = File.size(@test_image)
+    size_test_temp = Tempfile.new("mojo_test")
+    size_test = size_test_temp.path
+    retval = MojoMagick.resize(@test_image, size_test, { width: 100, height: 100 })
+    assert_equal size_test, retval
+    assert_equal orig_image_size, File.size(@test_image)
+    assert_equal retval, size_test
+    new_dimensions = MojoMagick.get_image_size(size_test)
+    assert_equal 100, new_dimensions[:height]
+    assert_equal 67, new_dimensions[:width]
+
+    # we should be able to resize image right over itself
+    retval = MojoMagick.resize(@test_image, @test_image, { width: 100, height: 100 })
+    assert_equal @test_image, retval
+    refute_equal orig_image_size, File.size(@test_image)
+    new_dimensions = MojoMagick.get_image_size(@test_image)
+    assert_equal 100, new_dimensions[:height]
+    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)
+    %i[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
+    size_test_temp = Tempfile.new("mojo_test")
+    size_test = size_test_temp.path
+    retval = MojoMagick.shrink(@test_image, size_test, { width: 1000, height: 1000 })
+    assert_equal size_test, retval
+    new_dimensions = MojoMagick.get_image_size(@test_image)
+    assert_equal 500, new_dimensions[:height]
+    assert_equal 333, new_dimensions[:width]
+  end
+
+  def test_shrink
+    reset_images
+    # image should resize if we specify small dimensions and shrink_only
+    retval = MojoMagick.shrink(@test_image, @test_image, { width: 1000, height: 100 })
+    assert_equal @test_image, retval
+    new_dimensions = MojoMagick.get_image_size(@test_image)
+    assert_equal 100, new_dimensions[:height]
+    assert_equal 67, new_dimensions[:width]
+  end
+
+  def test_resize_with_shrink_only_options
+    reset_images
+    # image should resize if we specify small dimensions and shrink_only
+    retval = MojoMagick.resize(@test_image, @test_image, { shrink_only: true, width: 400, height: 400 })
+    assert_equal @test_image, retval
+    new_dimensions = MojoMagick.get_image_size(@test_image)
+    assert_equal 400, new_dimensions[:height]
+    assert_equal 266, new_dimensions[:width]
+  end
+
+  def test_expand_with_small_dim
+    # image shouldn't resize if we specify small dimensions and expand_only
+    reset_images
+    _orig_image_size = File.size(@test_image)
+    retval = MojoMagick.expand(@test_image, @test_image, { width: 10, height: 10 })
+    assert_equal @test_image, retval
+    new_dimensions = MojoMagick.get_image_size(@test_image)
+    assert_equal 500, new_dimensions[:height]
+    assert_equal 333, new_dimensions[:width]
+  end
+
+  def test_expand
+    reset_images
+    # image should resize if we specify large dimensions and expand_only
+    retval = MojoMagick.expand(@test_image, @test_image, { width: 1000, height: 1000 })
+    assert_equal @test_image, retval
+    new_dimensions = MojoMagick.get_image_size(@test_image)
+    assert_equal 1000, new_dimensions[:height]
+    assert_equal 666, new_dimensions[:width]
+  end
+
+  def test_invalid_images
+    # test bad images
+    bad_image = File.join(@working_path, "not_an_image.jpg")
+    zero_image = File.join(@working_path, "zero_byte_image.jpg")
+    assert_raises(MojoMagick::MojoFailed) { MojoMagick.get_image_size(bad_image) }
+    assert_raises(MojoMagick::MojoFailed) { MojoMagick.get_image_size(zero_image) }
+    assert_raises(MojoMagick::MojoFailed) do
+      MojoMagick.get_image_size("/file_does_not_exist_here_ok.jpg")
+    end
+  end
+
+  def test_resize_with_fill
+    reset_images
+    @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]
+  end
+
+  def test_resize_with_fill_and_crop
+    reset_images
+    @test_image = File.join(@working_path, "5742.jpg")
+    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_tempfile
+    # Create a tempfile and return the path
+    filename = MojoMagick.tempfile("binary data")
+    File.open(filename, "rb") do |f|
+      assert_equal f.read, "binary data"
+    end
+  end
+
+  def test_label
+    reset_images
+    out_image = File.join(@working_path, "label_test.png")
+
+    MojoMagick.convert do |c|
+      c.label "rock the house"
+      c.file out_image
+    end
+  end
+
+  def test_label_with_quote
+    reset_images
+    out_image = File.join(@working_path, "label_test.png")
+
+    MojoMagick.convert do |c|
+      c.label 'rock "the house'
+      c.file out_image
+    end
+  end
+
+  def test_label_with_apostrophe
+    reset_images
+    out_image = File.join(@working_path, "label_test.png")
+
+    MojoMagick.convert do |c|
+      c.label "rock 'the house"
+      c.file out_image
+    end
+  end
+
+  def test_label_with_quotes
+    reset_images
+    out_image = File.join(@working_path, "label_test.png")
+
+    MojoMagick.convert do |c|
+      c.label 'this is "it!"'
+      c.file out_image
+    end
+  end
+
+  def test_bad_command
+    MojoMagick.convert do |c|
+      c.unknown_option "fail"
+      c.file "boogabooga.whatever"
+    end
+  rescue MojoMagick::MojoFailed => e
+    assert e.message.include?("unrecognized option"),
+           "Unable to find ImageMagick commandline error in the message"
+    assert e.message.include?("convert.c/ConvertImageCommand"),
+           "Unable to find ImageMagick commandline error in the message"
+  end
+
+  def test_blob
+    reset_images
+
+    # RGB8 test
+    data = (Array.new(16) { [rand > 0.5 ? 0 : 255] * 3 }).flatten
+    bdata = data.pack "C" * data.size
+    out = "out.png"
+    MojoMagick.convert(nil, "png:#{out}") do |c|
+      c.blob bdata, format: :rgb, depth: 8, size: "4x4"
+    end
+    r = MojoMagick.get_image_size(out)
+    assert r[:height] == 4
+    assert r[:width] == 4
+  end
+
+  def test_command_helpers
+    reset_images
+    test_image = File.join(@working_path, "5742.jpg")
+    out_image = File.join(@working_path, "out1.jpg")
+
+    # Simple convert test
+    MojoMagick.convert do |c|
+      c.file test_image
+      c.crop "92x64+0+0"
+      c.repage!
+      c.file out_image
+    end
+    retval = MojoMagick.get_image_size(out_image)
+    assert_equal 92, retval[:width]
+    assert_equal 64, retval[:height]
+
+    # Simple mogrify test
+    MojoMagick.mogrify do |m|
+      m.crop "32x32+0+0"
+      m.repage!
+      m.file out_image
+    end
+    retval = MojoMagick.get_image_size(out_image)
+    assert_equal 32, retval[:width]
+    assert_equal 32, retval[:height]
+
+    # Convert test, using file shortcuts
+    MojoMagick.convert(test_image, out_image) do |c|
+      c.crop "100x100+0+0"
+      c.repage!
+    end
+    retval = MojoMagick.get_image_size(out_image)
+    assert_equal 100, retval[:width]
+    assert_equal 100, retval[:height]
+
+    # Mogrify test, using file shortcut
+    MojoMagick.mogrify(out_image) { |m| m.shave("25x25").repage! }
+    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