rmagick 3.1.0 → 3.2.0

data/test/lib/internal/Geometry.rb

@@ -0,0 +1,98 @@
+#!/usr/bin/env ruby -w
+
+require 'rmagick'
+require 'test/unit'
+require 'test/unit/ui/console/testrunner'
+
+class LibGeometryUT < Test::Unit::TestCase
+  def test_constants
+    assert_kind_of(Magick::GeometryValue, Magick::PercentGeometry)
+    assert_equal('PercentGeometry', Magick::PercentGeometry.to_s)
+    assert_equal(1, Magick::PercentGeometry.to_i)
+
+    assert_kind_of(Magick::GeometryValue, Magick::AspectGeometry)
+    assert_equal('AspectGeometry', Magick::AspectGeometry.to_s)
+    assert_equal(2, Magick::AspectGeometry.to_i)
+
+    assert_kind_of(Magick::GeometryValue, Magick::LessGeometry)
+    assert_equal('LessGeometry', Magick::LessGeometry.to_s)
+    assert_equal(3, Magick::LessGeometry.to_i)
+
+    assert_kind_of(Magick::GeometryValue, Magick::GreaterGeometry)
+    assert_equal('GreaterGeometry', Magick::GreaterGeometry.to_s)
+    assert_equal(4, Magick::GreaterGeometry.to_i)
+
+    assert_kind_of(Magick::GeometryValue, Magick::AreaGeometry)
+    assert_equal('AreaGeometry', Magick::AreaGeometry.to_s)
+    assert_equal(5, Magick::AreaGeometry.to_i)
+
+    assert_kind_of(Magick::GeometryValue, Magick::MinimumGeometry)
+    assert_equal('MinimumGeometry', Magick::MinimumGeometry.to_s)
+    assert_equal(6, Magick::MinimumGeometry.to_i)
+  end
+
+  def test_initialize
+    assert_raise(ArgumentError) { Magick::Geometry.new(Magick::PercentGeometry) }
+    assert_raise(ArgumentError) { Magick::Geometry.new(0, Magick::PercentGeometry) }
+    assert_raise(ArgumentError) { Magick::Geometry.new(0, 0, Magick::PercentGeometry) }
+    assert_raise(ArgumentError) { Magick::Geometry.new(0, 0, 0, Magick::PercentGeometry) }
+
+    assert_raise(ArgumentError) { Magick::Geometry.new(-1) }
+    assert_raise(ArgumentError) { Magick::Geometry.new(0, -1) }
+
+    geometry = Magick::Geometry.new
+    assert_equal(0, geometry.width)
+    assert_equal(0, geometry.height)
+    assert_equal(0, geometry.x)
+    assert_equal(0, geometry.y)
+    assert_nil(geometry.flag)
+
+    geometry = Magick::Geometry.new(10, 20, 30, 40)
+    assert_equal(10, geometry.width)
+    assert_equal(20, geometry.height)
+    assert_equal(30, geometry.x)
+    assert_equal(40, geometry.y)
+  end
+
+  def test_to_s
+    assert_equal('', Magick::Geometry.new.to_s)
+    assert_equal('10x', Magick::Geometry.new(10).to_s)
+    assert_equal('10x20', Magick::Geometry.new(10, 20).to_s)
+    assert_equal('10x20+30+0', Magick::Geometry.new(10, 20, 30).to_s)
+    assert_equal('10x20+30+40', Magick::Geometry.new(10, 20, 30, 40).to_s)
+    assert_equal('x20+30+40', Magick::Geometry.new(0, 20, 30, 40).to_s)
+    assert_equal('+30+40', Magick::Geometry.new(0, 0, 30, 40).to_s)
+    assert_equal('+0+40', Magick::Geometry.new(0, 0, 0, 40).to_s)
+
+    assert_equal('10%x20%+30+40', Magick::Geometry.new(10, 20, 30, 40, Magick::PercentGeometry).to_s)
+    assert_equal('x20%+30+40', Magick::Geometry.new(0, 20, 30, 40, Magick::PercentGeometry).to_s)
+
+    assert_equal('10.20x20.50+30+40', Magick::Geometry.new(10.2, 20.5, 30, 40).to_s)
+    assert_equal('10.20%x20.50%+30+40', Magick::Geometry.new(10.2, 20.5, 30, 40, Magick::PercentGeometry).to_s)
+  end
+
+  def test_from_s
+    assert_equal('', Magick::Geometry.from_s('').to_s)
+    assert_equal('', Magick::Geometry.from_s('x').to_s)
+    assert_equal('10x', Magick::Geometry.from_s('10').to_s)
+    assert_equal('10x', Magick::Geometry.from_s('10x').to_s)
+    assert_equal('10x20', Magick::Geometry.from_s('10x20').to_s)
+    assert_equal('10x20+30+40', Magick::Geometry.from_s('10x20+30+40').to_s)
+    assert_equal('x20+30+40', Magick::Geometry.from_s('x20+30+40').to_s)
+    assert_equal('+30+40', Magick::Geometry.from_s('+30+40').to_s)
+    assert_equal('+0+40', Magick::Geometry.from_s('+0+40').to_s)
+    assert_equal('+30+0', Magick::Geometry.from_s('+30').to_s)
+
+    assert_equal('10%x20%+30+40', Magick::Geometry.from_s('10%x20%+30+40').to_s)
+    assert_equal('x20%+30+40', Magick::Geometry.from_s('x20%+30+40').to_s)
+
+    assert_equal('10.20x20.50+30+40', Magick::Geometry.from_s('10.2x20.5+30+40').to_s)
+    assert_equal('10.20%x20.50%+30+40', Magick::Geometry.from_s('10.2%x20.500%+30+40').to_s)
+
+    assert_raise(ArgumentError) { Magick::Geometry.from_s('10x20+') }
+    assert_raise(ArgumentError) { Magick::Geometry.from_s('+30.000+40') }
+    assert_raise(ArgumentError) { Magick::Geometry.from_s('+30.000+40.000') }
+    assert_raise(ArgumentError) { Magick::Geometry.from_s('10x20+30.000+40') }
+    assert_raise(ArgumentError) { Magick::Geometry.from_s('10x20+30.000+40.000') }
+  end
+end

data/test/lib/internal/Magick.rb

@@ -0,0 +1,40 @@
+#!/usr/bin/env ruby -w
+
+require 'rmagick'
+require 'test/unit'
+require 'test/unit/ui/console/testrunner'
+
+class LibMagickUT < Test::Unit::TestCase
+  def test_formats
+    assert_instance_of(Hash, Magick.formats)
+    Magick.formats.each do |f, v|
+      assert_instance_of(String, f)
+      assert_match(/[\*\+\srw]+/, v)
+    end
+
+    Magick.formats do |f, v|
+      assert_instance_of(String, f)
+      assert_match(/[\*\+\srw]+/, v)
+    end
+  end
+
+  def test_trace_proc
+    Magick.trace_proc = proc do |which, description, id, method|
+      assert(which == :c)
+      assert_instance_of(String, description)
+      assert_instance_of(String, id)
+      assert_equal(:initialize, method)
+    end
+    img = Magick::Image.new(20, 20)
+
+    Magick.trace_proc = proc do |which, description, id, method|
+      assert(which == :d)
+      assert_instance_of(String, description)
+      assert_instance_of(String, id)
+      assert_equal(:"destroy!", method)
+    end
+    img.destroy!
+  ensure
+    Magick.trace_proc = nil
+  end
+end

data/test/test_all_basic.rb

@@ -7,15 +7,10 @@ FILES = Dir[IMAGES_DIR + '/Button_*.gif'].sort
 FLOWER_HAT = IMAGES_DIR + '/Flower_Hat.jpg'
 IMAGE_WITH_PROFILE = IMAGES_DIR + '/image_with_profile.jpg'
 
+require 'simplecov'
 require 'test/unit'
-if RUBY_VERSION < '1.9'
-  require 'test/unit/ui/console/testrunner'
-  $LOAD_PATH.push(root_dir)
-else
-  require 'simplecov'
-  $LOAD_PATH.unshift(File.join(root_dir, 'lib'))
-  $LOAD_PATH.unshift(File.join(root_dir, 'test'))
-end
+$LOAD_PATH.unshift(File.join(root_dir, 'lib'))
+$LOAD_PATH.unshift(File.join(root_dir, 'test'))
 
 require 'rmagick'
 
@@ -25,13 +20,15 @@ abort 'Unable to get ImageMagick version' unless Regexp.last_match(1) && Regexp.
 IM_VERSION = Gem::Version.new(Regexp.last_match(1))
 IM_REVISION = Gem::Version.new(Regexp.last_match(2))
 
-FreezeError = if RUBY_VERSION > '2.5'
-                FrozenError
-              elsif RUBY_VERSION > '1.9'
-                RuntimeError
-              else
-                TypeError
-              end
+FreezeError = RUBY_VERSION > '2.5' ? FrozenError : RuntimeError
+
+Dir.glob(File.join(__dir__, 'lib/**/*.rb')) do |file|
+  require file
+end
+
+Dir.glob(File.join(__dir__, 'appearance/**/*.rb')) do |file|
+  require file
+end
 
 require 'Draw.rb'
 require 'Enum.rb'
@@ -43,8 +40,10 @@ require 'ImageList1.rb'
 require 'ImageList2.rb'
 require 'Image_attributes.rb'
 require 'Import_Export.rb'
+require 'Info.rb'
+require 'KernelInfo.rb'
+require 'Magick.rb'
 require 'Pixel.rb'
 require 'PolaroidOptions.rb'
 require 'Preview.rb'
-require 'Info.rb'
-require 'Magick.rb'
+require 'Struct.rb'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rmagick
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.2.0
 platform: ruby
 authors:
 - Tim Hunter
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-14 00:00:00.000000000 Z
+date: 2019-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -138,6 +138,9 @@ files:
 - Rakefile
 - before_install_linux.sh
 - before_install_osx.sh
+- benchmarks/memory/README.md
+- benchmarks/memory/image_new.rb
+- benchmarks/memory/rmagick.gnuplot
 - deprecated/RMagick.rb
 - doc/.cvsignore
 - doc/comtasks.html
@@ -267,18 +270,18 @@ files:
 - doc/ex/images/Button_Y.gif
 - doc/ex/images/Button_Z.gif
 - doc/ex/images/Cheetah.jpg
-- doc/ex/images/Coffee.wmf
+- doc/ex/images/Coffee.png
 - doc/ex/images/Flower_Hat.jpg
 - doc/ex/images/Gold_Statue.jpg
 - doc/ex/images/Hot_Air_Balloons.jpg
 - doc/ex/images/Hot_Air_Balloons_H.jpg
 - doc/ex/images/Leaf.miff
-- doc/ex/images/No.wmf
+- doc/ex/images/No.png
 - doc/ex/images/Polynesia.jpg
 - doc/ex/images/Red_Rocks.jpg
 - doc/ex/images/Rocks_On_Beach.miff
 - doc/ex/images/Shorts.jpg
-- doc/ex/images/Snake.wmf
+- doc/ex/images/Snake.png
 - doc/ex/images/Violin.jpg
 - doc/ex/images/Yellow_Rose.miff
 - doc/ex/images/big-duck.gif
@@ -469,6 +472,7 @@ files:
 - ext/RMagick/rmpixel.c
 - ext/RMagick/rmstruct.c
 - ext/RMagick/rmutil.c
+- lib/obsolete.rb
 - lib/rmagick.rb
 - lib/rmagick/version.rb
 - lib/rmagick_internal.rb
@@ -511,11 +515,20 @@ files:
 - test/Image_attributes.rb
 - test/Import_Export.rb
 - test/Info.rb
+- test/KernelInfo.rb
 - test/Magick.rb
 - test/Pixel.rb
 - test/PolaroidOptions.rb
 - test/Preview.rb
+- test/Struct.rb
+- test/appearance/Montage.rb
+- test/appearance/appearance_assertion.rb
+- test/appearance/expected/montage_border_color.jpg
 - test/cmyk.icm
+- test/lib/Obsolete.rb
+- test/lib/internal/Draw.rb
+- test/lib/internal/Geometry.rb
+- test/lib/internal/Magick.rb
 - test/srgb.icm
 - test/test_all_basic.rb
 - test/tmpnam_test.rb
@@ -571,11 +584,20 @@ test_files:
 - test/Image_attributes.rb
 - test/Import_Export.rb
 - test/Info.rb
+- test/KernelInfo.rb
 - test/Magick.rb
 - test/Pixel.rb
 - test/PolaroidOptions.rb
 - test/Preview.rb
+- test/Struct.rb
+- test/appearance/Montage.rb
+- test/appearance/appearance_assertion.rb
+- test/appearance/expected/montage_border_color.jpg
 - test/cmyk.icm
+- test/lib/Obsolete.rb
+- test/lib/internal/Draw.rb
+- test/lib/internal/Geometry.rb
+- test/lib/internal/Magick.rb
 - test/srgb.icm
 - test/test_all_basic.rb
 - test/tmpnam_test.rb