rmagick 2.14.0 → 2.15.0

data/ext/RMagick/rmutil.c

@@ -585,13 +585,15 @@ rm_fuzz_to_dbl(VALUE fuzz_arg)
 Quantum
 rm_app2quantum(VALUE obj)
 {
-    volatile VALUE v = obj;
+    VALUE v = obj;
 
     if (TYPE(obj) == T_FLOAT)
     {
         v = rb_funcall(obj, rm_ID_to_i, 0);
     }
 
+    RB_GC_GUARD(v);
+
     return NUM2QUANTUM(v);
 }
 
@@ -661,7 +663,7 @@ rm_pixelpacket_to_color_name_info(Info *info, PixelPacket *color)
 {
     Image *image;
     Info *my_info;
-    volatile VALUE color_name;
+    VALUE color_name;
 
     my_info = info ? info : CloneImageInfo(NULL);
 
@@ -674,6 +676,8 @@ rm_pixelpacket_to_color_name_info(Info *info, PixelPacket *color)
         (void) DestroyImageInfo(my_info);
     }
 
+    RB_GC_GUARD(color_name);
+
     return color_name;
 }
 
@@ -699,7 +703,7 @@ rm_write_temp_image(Image *image, char *temp_name)
 
     MagickBooleanType okay;
     ExceptionInfo *exception;
-    volatile VALUE id_value;
+    VALUE id_value;
     int id;
 
     exception = AcquireExceptionInfo();
@@ -730,6 +734,7 @@ rm_write_temp_image(Image *image, char *temp_name)
         rb_raise(rb_eRuntimeError, "SetImageRegistry failed.");
     }
 
+    RB_GC_GUARD(id_value);
 }
 
 
@@ -789,13 +794,17 @@ rm_not_implemented(void)
 void
 rm_magick_error(const char *msg, const char *loc)
 {
-    volatile VALUE exc, mesg, extra;
+    VALUE exc, mesg, extra;
 
     mesg = rb_str_new2(msg);
     extra = loc ? rb_str_new2(loc) : Qnil;
 
     exc = rb_funcall(Class_ImageMagickError, rm_ID_new, 2, mesg, extra);
     (void) rb_funcall(rb_cObject, rb_intern("raise"), 1, exc);
+
+    RB_GC_GUARD(exc);
+    RB_GC_GUARD(mesg);
+    RB_GC_GUARD(extra);
 }
 
 
@@ -820,7 +829,7 @@ ImageMagickError_initialize(int argc, VALUE *argv, VALUE self)
 {
     VALUE super_argv[1] = {(VALUE)0};
     int super_argc = 0;
-    volatile VALUE extra = Qnil;
+    VALUE extra = Qnil;
 
     switch(argc)
     {
@@ -838,6 +847,7 @@ ImageMagickError_initialize(int argc, VALUE *argv, VALUE self)
     (void) rb_call_super(super_argc, (const VALUE *)super_argv);
     (void) rb_iv_set(self, "@"MAGICK_LOC, extra);
 
+    RB_GC_GUARD(extra);
 
     return self;
 }
@@ -922,21 +932,24 @@ void rm_set_user_artifact(Image *images, Info *info)
 void
 rm_get_optional_arguments(VALUE img)
 {
-  volatile VALUE OptionalMethodArguments;
-  volatile VALUE opt_args;
-  VALUE argv[1];
-
-  // opt_args = Magick::OptionalMethodArguments.new(img)
-  // opt_args.instance_eval { block }
-  if (rb_block_given_p())
-  {
-      OptionalMethodArguments = rb_const_get_from(Module_Magick, rb_intern("OptionalMethodArguments"));
-      argv[0] = img;
-      opt_args = rb_class_new_instance(1, argv, OptionalMethodArguments);
-      (void) rb_obj_instance_eval(0, NULL, opt_args);
-  }
-
-  return;
+    VALUE optional_method_arguments;
+    VALUE opt_args;
+    VALUE argv[1];
+
+    // opt_args = Magick::OptionalMethodArguments.new(img)
+    // opt_args.instance_eval { block }
+    if (rb_block_given_p())
+    {
+        optional_method_arguments = rb_const_get_from(Module_Magick, rb_intern("OptionalMethodArguments"));
+        argv[0] = img;
+        opt_args = rb_class_new_instance(1, argv, optional_method_arguments);
+        (void) rb_obj_instance_eval(0, NULL, opt_args);
+    }
+
+    RB_GC_GUARD(optional_method_arguments);
+    RB_GC_GUARD(opt_args);
+
+    return;
 }
 
 
@@ -1159,7 +1172,7 @@ rm_exif_by_entry(Image *image)
     const char *property, *value;
     char *str;
     size_t len = 0, property_l, value_l;
-    volatile VALUE v;
+    VALUE v;
 
     (void) GetImageProperty(image, "exif:*");
     ResetImagePropertyIterator(image);
@@ -1223,6 +1236,9 @@ rm_exif_by_entry(Image *image)
 
     v = rb_str_new(str, len);
     xfree(str);
+
+    RB_GC_GUARD(v);
+
     return v;
 }
 
@@ -1245,7 +1261,7 @@ rm_exif_by_number(Image *image)
     const char *property, *value;
     char *str;
     size_t len = 0, property_l, value_l;
-    volatile VALUE v;
+    VALUE v;
 
     (void) GetImageProperty(image, "exif:!");
     ResetImagePropertyIterator(image);
@@ -1309,6 +1325,9 @@ rm_exif_by_number(Image *image)
 
     v = rb_str_new(str, len);
     xfree(str);
+
+    RB_GC_GUARD(v);
+
     return v;
 }
 
@@ -1426,8 +1445,8 @@ rm_progress_monitor(
     const MagickSizeType sp,
     void *client_data)
 {
-    volatile VALUE rval;
-    volatile VALUE method, offset, span;
+    VALUE rval;
+    VALUE method, offset, span;
 
     tag = tag;      // defeat gcc message
 
@@ -1443,6 +1462,11 @@ rm_progress_monitor(
 
     rval = rb_funcall((VALUE)client_data, rm_ID_call, 3, method, offset, span);
 
+    RB_GC_GUARD(rval);
+    RB_GC_GUARD(method);
+    RB_GC_GUARD(offset);
+    RB_GC_GUARD(span);
+
     return RTEST(rval) ? MagickTrue : MagickFalse;
 }
 

data/lib/rmagick/version.rb

@@ -1,5 +1,5 @@
 module Magick
-  VERSION = '2.14.0'
+  VERSION = '2.15.0'
   MIN_RUBY_VERSION = '1.8.5'
   MIN_IM_VERSION = '6.4.9'
 end

data/lib/rmagick_internal.rb

@@ -30,12 +30,15 @@ module Magick
 
     # remove reference to the proc at exit
     def trace_proc=(p)
-      if @trace_proc.nil? && !p.nil? && !@exit_block_set_up
-        at_exit { @trace_proc = nil }
-        @exit_block_set_up = true
-      end
+      m = Mutex.new
+      m.synchronize do
+        if @trace_proc.nil? && !p.nil? && !@exit_block_set_up
+          at_exit { @trace_proc = nil }
+          @exit_block_set_up = true
+        end
 
-      @trace_proc = p
+        @trace_proc = p
+      end
     end
   end
 

data/rmagick.gemspec

@@ -30,12 +30,13 @@ Gem::Specification.new do |s|
   s.required_ruby_version = ">= #{Magick::MIN_RUBY_VERSION}"
   s.requirements << "ImageMagick #{Magick::MIN_IM_VERSION} or later"
   s.add_development_dependency 'rake-compiler'
+  s.add_development_dependency 'rspec', '~> 3.2.0'
 
-  if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('1.9.2')
-    s.add_development_dependency 'rubocop', '~> 0.26.1'
+  if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('1.9.2')
+    s.add_development_dependency 'rubocop'
   end
 
-  if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.2.0')
+  if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.2.0')
     s.add_development_dependency 'test-unit', '~> 2'
   end
 end

data/spec/rmagick/draw_spec.rb

@@ -0,0 +1,156 @@
+class Magick::Draw
+  def self._dummy_img_
+    @@_dummy_img_
+  end
+end
+
+RSpec.describe Magick::Draw do
+  let(:draw) { Magick::Draw.new }
+
+  describe '._dummy_img_' do
+    it 'works' do
+      # initially this variable is not defined.
+      expect { Magick::Draw._dummy_img_ }.to raise_error(NameError)
+
+      # cause it to become defined. save the object id.
+      draw.get_type_metrics('ABCDEF')
+      dummy = nil
+      expect { dummy = Magick::Draw._dummy_img_ }.not_to raise_error
+
+      expect(dummy).to be_instance_of(Magick::Image)
+
+      # ensure that it is always the same object
+      draw.get_type_metrics('ABCDEF')
+      dummy2 = nil
+      expect { dummy2 = Magick::Draw._dummy_img_ }.not_to raise_error
+      expect(dummy).to eq dummy2
+    end
+  end
+
+  describe '#kerning=' do
+    it 'assigns without raising an error' do
+      expect { draw.kerning = 1 }.not_to raise_error
+    end
+  end
+
+  describe '#kerning' do
+    it 'accepts a valid parameter without raising an error' do
+      expect { draw.kerning(1) }.not_to raise_error
+    end
+
+    it 'raises an error when given an invalid parameter' do
+      expect { draw.kerning('a') }.to raise_error(ArgumentError)
+      expect { draw.kerning([]) }.to raise_error(TypeError)
+    end
+  end
+
+  describe '#interline_spacing=' do
+    it 'assigns without raising an error' do
+      expect { draw.interline_spacing = 1 }.not_to raise_error
+    end
+  end
+
+  describe '#interline_spacing' do
+    it 'accepts a valid parameter without raising an error' do
+      expect { draw.interline_spacing(1) }.not_to raise_error
+    end
+
+    it 'raises an error when given an invalid parameter' do
+      expect { draw.interline_spacing('a') }.to raise_error(ArgumentError)
+      expect { draw.interline_spacing([]) }.to raise_error(TypeError)
+    end
+  end
+
+  describe '#interword_spacing=' do
+    it 'assigns without raising an error' do
+      expect { draw.interword_spacing = 1 }.not_to raise_error
+    end
+  end
+
+  describe '#interword_spacing' do
+    it 'accepts a valid parameter without raising an error' do
+      expect { draw.interword_spacing(1) }.not_to raise_error
+    end
+
+    it 'raises an error when given an invalid parameter' do
+      expect { draw.interword_spacing('a') }.to raise_error(ArgumentError)
+      expect { draw.interword_spacing([]) }.to raise_error(TypeError)
+    end
+  end
+
+  describe '#marshal_dump', '#marshal_load' do
+    it 'marshals without an error' do
+      skip 'this spec fails on some versions of ImageMagick'
+      rose = Magick::Image.read('rose:').first
+      granite = Magick::Image.read('granite:').first
+      s = granite.to_blob { self.format = 'miff' }
+      granite = Magick::Image.from_blob(s).first
+      blue_stroke = Magick::Image.new(20,20) { self.background_color = 'blue' }
+      s = blue_stroke.to_blob { self.format = 'miff' }
+      blue_stroke = Magick::Image.from_blob(s).first
+
+      draw.affine = Magick::AffineMatrix.new(1, 2, 3, 4, 5, 6)
+      draw.decorate = Magick::LineThroughDecoration
+      draw.encoding = 'AdobeCustom'
+      draw.gravity = Magick::CenterGravity
+      draw.fill = Magick::Pixel.from_color('red')
+      draw.stroke = Magick::Pixel.from_color('blue')
+      draw.stroke_width = 5
+      draw.fill_pattern = granite
+      draw.stroke_pattern = blue_stroke
+      draw.text_antialias = true
+      draw.font = 'Arial-Bold'
+      draw.font_family = 'arial'
+      draw.font_style = Magick::ItalicStyle
+      draw.font_stretch = Magick::CondensedStretch
+      draw.font_weight = Magick::BoldWeight
+      draw.pointsize = 12
+      draw.density = '72x72'
+      draw.align = Magick::CenterAlign
+      draw.undercolor = Magick::Pixel.from_color('green')
+      draw.kerning = 10.5
+      draw.interword_spacing = 3.75
+
+      draw.circle(20, 25, 20, 28)
+      dumped = nil
+      expect { dumped = Marshal.dump(draw) }.not_to raise_error
+      expect { Marshal.load(dumped) }.not_to raise_error
+    end
+  end
+
+  describe '#fill_pattern' do
+    it 'accepts an Image argument' do
+      img = Magick::Image.new(20,20)
+      expect { draw.fill_pattern = img }.not_to raise_error
+    end
+
+    it 'accepts an ImageList argument' do
+      img = Magick::Image.new(20,20)
+      ilist = Magick::ImageList.new
+      ilist << img
+      expect { draw.fill_pattern = ilist }.not_to raise_error
+    end
+
+    it 'does not accept arbitrary arguments' do
+      expect { draw.fill_pattern = 1 }.to raise_error(NoMethodError)
+    end
+  end
+
+  describe '#stroke_pattern' do
+    it 'accepts an Image argument' do
+      img = Magick::Image.new(20,20)
+      expect { draw.stroke_pattern = img }.not_to raise_error
+    end
+
+    it 'accepts an ImageList argument' do
+      img = Magick::Image.new(20,20)
+      ilist = Magick::ImageList.new
+      ilist << img
+      expect { draw.stroke_pattern = ilist }.not_to raise_error
+    end
+
+    it 'does not accept arbitrary arguments' do
+      expect { draw.stroke_pattern = 1 }.to raise_error(NoMethodError)
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1 @@
+require 'rmagick'

data/test/Magick.rb

@@ -51,7 +51,6 @@ class Magick_UT < Test::Unit::TestCase
         ary = Magick::AlphaChannelType.enumerators
       end
       assert_instance_of(Array, ary)
-      assert_equal(11, ary.length)
 
       assert_nothing_raised do
         ary = Magick::AlignType.enumerators

data/test/test_all_basic.rb

@@ -36,4 +36,3 @@ require 'Pixel.rb'
 require 'Preview.rb'
 require 'Info.rb'
 require 'Magick.rb'
-require 'Draw.rb'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rmagick
 version: !ruby/object:Gem::Version
-  version: 2.14.0
+  version: 2.15.0
 platform: ruby
 authors:
 - Tim Hunter
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-31 00:00:00.000000000 Z
+date: 2015-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -28,19 +28,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.26.1
+        version: 3.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.26.1
+        version: 3.2.0
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  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: RMagick is an interface between Ruby and ImageMagick.
 email: github@benjaminfleischer.com
 executables: []
@@ -50,9 +64,11 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".hound.yml"
+- ".rspec"
 - ".rubocop.yml"
 - ".simplecov"
 - ".travis.yml"
+- CODE_OF_CONDUCT.md
 - CONTRIBUTING.md
 - ChangeLog
 - Doxyfile
@@ -410,7 +426,8 @@ files:
 - lib/rvg/transformable.rb
 - lib/rvg/units.rb
 - rmagick.gemspec
-- test/Draw.rb
+- spec/rmagick/draw_spec.rb
+- spec/spec_helper.rb
 - test/Image1.rb
 - test/Image2.rb
 - test/Image3.rb
@@ -454,7 +471,8 @@ signing_key:
 specification_version: 4
 summary: Ruby binding to ImageMagick
 test_files:
-- test/Draw.rb
+- spec/rmagick/draw_spec.rb
+- spec/spec_helper.rb
 - test/Image1.rb
 - test/Image2.rb
 - test/Image3.rb