mojo_magick 0.5.7 → 0.6.5

data/lib/mojo_magick/version.rb

@@ -1,3 +1,3 @@
 module MojoMagick
-  VERSION = '0.5.7'.freeze
+  VERSION = "0.6.5"
 end

data/mojo_magick.gemspec

@@ -1,7 +1,7 @@
-$:.push File.expand_path('lib', __dir__)
-require 'mojo_magick/version'
+$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!
 
@@ -10,29 +10,32 @@ post_install_message = <<~EOF
   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       = ['science@misuse.org', 'jon@rcode5.com']
-  s.homepage    = 'http://github.com/rcode5/mojo_magick'
+  s.authors     = ["Steve Midgley", "Elliot Nelson", "Jon Rogers"]
+  s.email       = ["science@misuse.org", "jon@rcode5.com"]
+  s.homepage    = "http://github.com/rcode5/mojo_magick"
   s.summary     = "mojo_magick-#{MojoMagick::VERSION}"
-  s.description = '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.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('minitest')
-  s.add_development_dependency('rake')
-  s.add_development_dependency('rspec-expectations')
-  s.add_development_dependency('simplecov')
+  s.require_paths = ["lib"]
+  s.add_development_dependency("bundle-audit")
+  s.add_development_dependency("bundler")
+  s.add_development_dependency("minitest")
+  s.add_development_dependency("rake")
+  s.add_development_dependency("rubocop")
+  s.add_development_dependency("rubocop-performance")
 
   s.post_install_message = post_install_message
 end

data/test/{parser_test.rb → font_parser_test.rb}

@@ -1,6 +1,6 @@
-require File.join(File.dirname(__FILE__), 'test_helper')
+require_relative "test_helper"
 
-IDENTIFY_FONT_RESPONSE = <<~EOF.freeze
+IDENTIFY_FONT_RESPONSE = <<~EOFONT
 
   Font: Zapf-Dingbats
       family: Zapf Dingbats
@@ -17,13 +17,13 @@ IDENTIFY_FONT_RESPONSE = <<~EOF.freeze
       glyphs: /Library/Fonts/Zapfino.ttf
 
 
-EOF
+EOFONT
 
-class ParserTest < MiniTest::Test
+class FontParserTest < MiniTest::Test
   def test_parse_fonts
-    parser = MojoMagick::Util::Parser.new
-    parsed_fonts = parser.parse_fonts(IDENTIFY_FONT_RESPONSE)
+    parser = MojoMagick::Util::FontParser.new(IDENTIFY_FONT_RESPONSE)
+    parsed_fonts = parser.parse
     assert_equal parsed_fonts.length, 2
-    assert_equal parsed_fonts[1].style, 'Italic'
+    assert_equal parsed_fonts[1].style, "Italic"
   end
 end

data/test/font_test.rb

@@ -1,6 +1,6 @@
-require File.join(File.dirname(__FILE__), 'test_helper')
+require_relative "test_helper"
 
-IDENTIFY_FONT_RESPONSE = <<~EOF.freeze
+IDENTIFY_FONT_RESPONSE = <<~EO_FONTS
   Font: Zapf-Dingbats
       family: Zapf Dingbats
       style: Normal
@@ -13,7 +13,7 @@ IDENTIFY_FONT_RESPONSE = <<~EOF.freeze
       stretch: Normal
       weight: 400
       glyphs: /Library/Fonts/Zapfino.ttf
-EOF
+EO_FONTS
 
 class FontTest < MiniTest::Test
   def test_font
@@ -21,8 +21,8 @@ class FontTest < MiniTest::Test
     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
   end

data/test/mojo_magick_test.rb

@@ -1,24 +1,27 @@
-require File.join(File.dirname(__FILE__), 'test_helper')
+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')
+    @fixtures_path = File.expand_path(File.join(File.dirname(__FILE__), "fixtures"))
+    @working_path = File.join(@fixtures_path, "tmp")
+
+    reset_images
+
+    @test_image = File.join(@working_path, "5742.jpg")
+    @out_image = File.join(@working_path, "out1.jpg")
   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|
+    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)
@@ -28,11 +31,10 @@ class MojoMagickTest < MiniTest::Test
 
   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_temp = Tempfile.new("mojo_test")
     size_test = size_test_temp.path
-    retval = MojoMagick.resize(@test_image, size_test, {width: 100, height: 100})
+    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
@@ -41,18 +43,17 @@ class MojoMagickTest < MiniTest::Test
     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})
+    retval = MojoMagick.resize(@test_image, @test_image, { width: 150, height: 150 })
     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]
+    assert_equal 150, new_dimensions[:height]
+    assert_equal 100, 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})
+    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|
@@ -62,10 +63,9 @@ class MojoMagickTest < MiniTest::Test
 
   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_temp = Tempfile.new("mojo_test")
     size_test = size_test_temp.path
-    retval = MojoMagick.shrink(@test_image, size_test, {width: 1000, height: 1000})
+    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]
@@ -73,9 +73,8 @@ class MojoMagickTest < MiniTest::Test
   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})
+    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]
@@ -83,9 +82,8 @@ class MojoMagickTest < MiniTest::Test
   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})
+    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]
@@ -94,8 +92,8 @@ class MojoMagickTest < MiniTest::Test
 
   def test_expand_with_small_dim
     # image shouldn't resize if we specify small dimensions and expand_only
-    reset_images
-    retval = MojoMagick.expand(@test_image, @test_image, {width: 10, height: 10})
+    _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]
@@ -103,9 +101,8 @@ class MojoMagickTest < MiniTest::Test
   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})
+    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]
@@ -114,26 +111,26 @@ class MojoMagickTest < MiniTest::Test
 
   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')}
+    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})
+    @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})
+    @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]
@@ -141,25 +138,23 @@ class MojoMagickTest < MiniTest::Test
 
   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'
+    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')
+    out_image = File.join(@working_path, "label_test.png")
 
     MojoMagick.convert do |c|
-      c.label 'rock the house'
+      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')
+    out_image = File.join(@working_path, "label_test.png")
 
     MojoMagick.convert do |c|
       c.label 'rock "the house'
@@ -168,18 +163,16 @@ class MojoMagickTest < MiniTest::Test
   end
 
   def test_label_with_apostrophe
-    reset_images
-    out_image = File.join(@working_path, 'label_test.png')
+    out_image = File.join(@working_path, "label_test.png")
 
     MojoMagick.convert do |c|
-      c.label 'rock \'the house'
+      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')
+    out_image = File.join(@working_path, "label_test.png")
 
     MojoMagick.convert do |c|
       c.label 'this is "it!"'
@@ -189,89 +182,107 @@ class MojoMagickTest < MiniTest::Test
 
   def test_bad_command
     MojoMagick.convert do |c|
-      c.unknown_option 'fail'
-      c.file 'boogabooga.whatever'
+      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'
+    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 = (16.times.map { [rand > 0.5 ? 0 : 255] * 3 }).flatten
-    bdata = data.pack 'C' * data.size
-    out = 'out.png'
+  def test_blob_rgb
+    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'
+      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
+  def test_convert
     MojoMagick.convert do |c|
-      c.file test_image
-      c.crop '92x64+0+0'
+      c.file @test_image
+      c.crop "92x64+0+0"
       c.repage!
-      c.file out_image
+      c.file @out_image
     end
-    retval = MojoMagick.get_image_size(out_image)
+    retval = MojoMagick.get_image_size(@out_image)
     assert_equal 92, retval[:width]
     assert_equal 64, retval[:height]
+  end
 
+  def test_mogrify
+    MojoMagick.convert do |c|
+      c.file @test_image
+      c.file @out_image
+    end
     # Simple mogrify test
     MojoMagick.mogrify do |m|
-      m.crop '32x32+0+0'
+      m.crop "32x32+0+0"
       m.repage!
-      m.file out_image
+      m.file @out_image
     end
-    retval = MojoMagick.get_image_size(out_image)
+    retval = MojoMagick.get_image_size(@out_image)
     assert_equal 32, retval[:width]
     assert_equal 32, retval[:height]
+  end
 
-    # Convert test, using file shortcuts
-    MojoMagick.convert(test_image, out_image) do |c|
-      c.crop '100x100+0+0'
+  def test_convert_crop_and_repage
+    MojoMagick.convert(@test_image, @out_image) do |c|
+      c.crop "100x100+0+0"
       c.repage!
     end
-    retval = MojoMagick.get_image_size(out_image)
+    retval = MojoMagick.get_image_size(@out_image)
     assert_equal 100, retval[:width]
     assert_equal 100, retval[:height]
+  end
 
-    # Mogrify test, using file shortcut
-    MojoMagick.mogrify(out_image) { |m| m.shave('25x25').repage! }
-    retval = MojoMagick.get_image_size(out_image)
+  def test_mogrify_with_shave_and_repage
+    MojoMagick.convert do |c|
+      c.file @test_image
+      c.crop "100x100+0+0"
+      c.file @out_image
+    end
+    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]
+  end
 
-    # RGB8 test
-    bdata = 'aaaaaabbbbbbccc'
-    out = 'out.png'
+  def test_convert_rgb
+    bdata = "aaaaaabbbbbbccc"
+    out = "out.png"
     MojoMagick.convert do |c|
-      c.blob bdata, format: :rgb, depth: 8, size: '5x1'
+      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
+  end
 
-    bdata = '1111222233334444'
-    out = 'out.png'
+  def test_convert_rgba
+    bdata = "1111222233334444"
+    out = "out.png"
     MojoMagick.convert do |c|
-      c.blob bdata, format: :rgba, depth: 8, size: '4x1'
+      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
+
+  def test_available_fonts
+    fonts = MojoMagick.available_fonts
+    assert fonts.is_a? Array
+    assert fonts.length > 1
+    assert fonts.first.name
+    assert(fonts.first.name.is_a?(String))
+  end
 end