cairo 1.15.13 → 1.15.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 872d797ea9046334f26dea74fdf385c09f64fdaa8ec808730f54295a8f395a47
-  data.tar.gz: 4d7b4fb50859438dfc8c6fbaf23cf40b37e76cdab1279d2b36efe0327eeb8e8b
+  metadata.gz: 4d4c77ff394eb0630d50c862e6ad09609b79896d3d3e69fa229e3e574a62692a
+  data.tar.gz: d9c69f792f6ca09fbd1e64d6746d0143b83d4075880337010a8982397757ebb6
 SHA512:
-  metadata.gz: c4ee0593dfac55f08f8746c8bf25ea7c77d1d02ceb1960e30b653971440956bb694ad117e9807d9ba044be5856d9bf8fc96850beefbca7098d50d5909037a4a2
-  data.tar.gz: 11c1ae52aeca7cb823a9d5e87d83f389425e6d1ec6fbc8dac662fd4c218e2294928351f14ed5fb6010f092b674094ea34379a24ca5d23a52b5472ceba45fd97b
+  metadata.gz: 7759358f7a76eb72918c6fa912033af6b4309d956599f00b30324b485a4073843c3e33dbb2d2c4cf423169a68a9e8a80996ce58b5ab6f20944637e7b7c8600fb
+  data.tar.gz: 6f5d4929fcd61116f2b8c50bbd2d29864f8f4d41696dbf236c2f859201f394f5ad99ee5707ce47ee17fc1234ade7faba90639c08abe55359f1b25a7582782169

data/NEWS

@@ -1,3 +1,27 @@
+Release 1.15.14 (2018-08-20) Kouhei Sutou <kou@cozmixng.org>
+============================================================
+
+Improvements
+------------
+
+  * Added Cairo::Surface.create {}. Cairo::Surface.new {} is deprecated.
+
+  * Added Cairo::Context.create {}. Cairo::Context.new {} is deprecated.
+
+  * Windows: Added support for installing a normal gem (not fat gem)
+    by "gem install --platform ruby". If you use Bundler, use "bundle
+    config --local force_ruby_platform true" and "bundle exec ruby -rdevkit".
+
+  * Changed to use SPDX license ID in gemspec.
+
+Fixes
+-----
+
+  * Fixed a bug that CRFONTOPTIOSN2RVAL() doesn't copy the target
+    options.
+    * Other CR*2RVAL() copy or refer the target objects. So
+      CRFONTOPTIONS2RVAL() must copy for consistency.
+
 Release 1.15.13 (2018-05-01) Kouhei Sutou <kou@cozmixng.org>
 ============================================================
 

data/README.rdoc

@@ -8,12 +8,12 @@ rcairo
 
 Ruby bindings for cairo // cairo extension for Ruby
 
-http://cairographics.org/
+https://cairographics.org/
 
 == Dependencies
 
-* ruby >= 1.9.3 (2.2 also supported!)
-* cairo >= 1.2.0 (1.12.0 also supported!)
+* ruby >= 2.2.1
+* cairo >= 1.2.0
 
 == Install
 
@@ -27,56 +27,27 @@ This way is recommended.
 
 For experimental users.
 
-Download rcairo-X.Y.Z.tar.gz from http://cairographics.org/releases/
+Add the following to your Gemfile:
 
-Extracting:
-  % tar xvzf rcairo-X.Y.Z.tar.gz
+  gem "cairo", github: "rcairo/rcairo"
 
-Compiling:
-  % cd rcairo-X.Y.Z
-  % ruby extconf.rb    # to check for dependencies and create Makefiles
-  % make               # to compile
+Then run the following command:
 
-  # make install       # to install the cairo extension.
-                       # The samples in the samples folder should be able
-                       # to run before installation except text-on-path.rb
-                       # and text2.rb. They uses Ruby/Pango with rcairo
-                       # support. So you need to install rcairo and build
-                       # Ruby/Pango with it before you run them.
-
-Options to extconf.rb:
-
-  * --without-vendor-override: Use system libraries instead of those found in
-                               vendor/local for compiling
-
-== Windows
-
-cairo-X.Y.Z-x86-mingw32.gem includes cairo related binaries.
-
-* cairo related binaries:
-  http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies/
-
-  * cairo-X.Y.Z-a_win32.zip
-  * cairo-dev-X.Y.Z-a_win32.zip
-  * libpng-X.Y.Z-a_win32.zip
-  * zlib-X.Y.Z-a_win32.zip
-  * expat_X.Y.Z-a_win32.zip
-  * fontconfig_X.Y.Z-a_win32.zip
-  * freetype_X.Y.Z-a_win32.zip
+  % bundle install
 
 == Documents
 
 * Reference manual:
-  http://rcairo.github.io/doc/
+  https://rcairo.github.io/doc/
 * Repository of the reference manual:
-  http://github.com/rcairo/doc
+  https://github.com/rcairo/doc
 * An article for rcairo on Rubyst Magazine a.k.a. RubiMa (in Japanese):
-  http://jp.rubyist.net/magazine/?0019-cairo
+  https://magazine.rubyist.net/articles/0019/0019-cairo.html
 
 == Source
 
 There is the rcairo repository at GitHub:
-http://github.com/rcairo/rcairo
+https://github.com/rcairo/rcairo
 
 == Mailing list
 

data/Rakefile

@@ -54,6 +54,8 @@ Rake::ExtensionTask.new("cairo", spec) do |ext|
   ext.cross_compile = true
   ext.cross_compiling do |_spec|
     if /mingw|mswin/ =~ _spec.platform.to_s
+      _spec.metadata.delete("msys2_mingw_dependencies")
+
       binary_files = []
       Find.find(binary_dir) do |name|
         next unless File.file?(name)
@@ -440,8 +442,8 @@ end
 
 windows_task = WindowsTask.new(spec) do |task|
   zlib_version = "1.2.11"
-  libpng_version = "1.6.34"
-  freetype_version = "2.8.1"
+  libpng_version = "1.6.35"
+  freetype_version = "2.9.1"
   task.packages = [
     {
       # We should use the same version as Ruby Installer.

data/ext/cairo/rb_cairo.h

@@ -73,7 +73,7 @@ RB_CAIRO_BEGIN_DECLS
 
 #define RB_CAIRO_VERSION_MAJOR 1
 #define RB_CAIRO_VERSION_MINOR 15
-#define RB_CAIRO_VERSION_MICRO 13
+#define RB_CAIRO_VERSION_MICRO 14
 
 RB_CAIRO_VAR VALUE rb_mCairo;
 RB_CAIRO_VAR VALUE rb_cCairo_Context;

data/ext/cairo/rb_cairo_context.c

@@ -5,7 +5,7 @@
  * $Author: kou $
  * $Date: 2008-09-26 13:52:08 $
  *
- * Copyright 2005-2016 Kouhei Sutou <kou@cozmixng.org>
+ * Copyright 2005-2018 Kouhei Sutou <kou@cozmixng.org>
  * Copyright 2005 Øyvind Kolås <pippin@freedesktop.org>
  * Copyright 2004-2005 MenTaLguY <mental@rydia.com>
  *
@@ -25,6 +25,7 @@
 
 VALUE rb_cCairo_Context;
 
+static ID cr_id_new;
 static ID cr_id_surface, cr_id_source;
 static ID cr_id_plus, cr_id_minus, cr_id_multi, cr_id_div;
 static cairo_user_data_key_t cr_object_holder_key;
@@ -141,6 +142,22 @@ cr_get_reference_count (VALUE self)
   return UINT2NUM (reference_count);
 }
 
+static VALUE
+cr_s_create (int argc, VALUE *argv, VALUE klass)
+{
+  VALUE rb_cr;
+  rb_cr = rb_funcallv (klass, cr_id_new, argc, argv);
+  if (rb_block_given_p ())
+    {
+      return rb_ensure (rb_yield, rb_cr,
+                        cr_destroy_with_destroy_check, rb_cr);
+    }
+  else
+    {
+      return rb_cr;
+    }
+}
+
 static VALUE
 cr_s_wrap (VALUE self, VALUE pointer)
 {
@@ -1230,11 +1247,22 @@ cr_set_font_options (VALUE self, VALUE options)
 static VALUE
 cr_get_font_options (VALUE self)
 {
-  cairo_font_options_t *options = cairo_font_options_create ();
+  cairo_font_options_t *options;
+  VALUE rb_options;
+
+  options = cairo_font_options_create ();
   rb_cairo_check_status (cairo_font_options_status (options));
+
+  /* TODO: Use rb_ensure() */
+  rb_options = CRFONTOPTIONS2RVAL (options);
+  cairo_font_options_destroy (options);
+
+  options = RVAL2CRFONTOPTIONS (rb_options);
   cairo_get_font_options (_SELF, options);
+  cr_check_status (_SELF);
   rb_cairo_check_status (cairo_font_options_status (options));
-  return CRFONTOPTIONS2RVAL (options);
+
+  return rb_options;
 }
 
 static VALUE
@@ -1663,6 +1691,8 @@ cr_destroy_all_guarded_contexts_at_end (VALUE data)
 void
 Init_cairo_context (void)
 {
+  cr_id_new = rb_intern ("new");
+
   cr_id_surface = rb_intern ("surface");
   cr_id_source = rb_intern ("source");
 
@@ -1679,6 +1709,8 @@ Init_cairo_context (void)
   rb_cairo__initialize_gc_guard_holder_class (rb_cCairo_Context);
   rb_set_end_proc(cr_destroy_all_guarded_contexts_at_end, Qnil);
 
+  rb_define_singleton_method (rb_cCairo_Context, "create", cr_s_create, -1);
+
   /* For integrate other libraries such as a FFI based library. */
   rb_define_singleton_method (rb_cCairo_Context, "wrap", cr_s_wrap, 1);
 

data/ext/cairo/rb_cairo_font_options.c

@@ -50,8 +50,11 @@ rb_cairo_font_options_to_ruby_object (cairo_font_options_t *options)
 {
   if (options)
     {
+      cairo_font_options_t *copied_options;
+      copied_options = cairo_font_options_copy (options);
+      cr_options_check_status (copied_options);
       return Data_Wrap_Struct (rb_cCairo_FontOptions, NULL,
-                               cr_options_free, options);
+                               cr_options_free, copied_options);
     }
   else
     {
@@ -79,11 +82,7 @@ cr_options_create (VALUE self)
 static VALUE
 cr_options_copy (VALUE self)
 {
-  cairo_font_options_t *options;
-
-  options = cairo_font_options_copy (_SELF (self));
-  cr_options_check_status (options);
-  return CRFONTOPTIONS2RVAL (options);
+  return CRFONTOPTIONS2RVAL (_SELF (self));
 }
 
 static VALUE

data/ext/cairo/rb_cairo_private.h

@@ -5,7 +5,7 @@
  * $Author: kou $
  * $Date: 2008-08-17 07:21:42 $
  *
- * Copyright 2005-2014 Kouhei Sutou <kou@cozmixng.org>
+ * Copyright 2005-2018 Kouhei Sutou <kou@cozmixng.org>
  *
  * This file is made available under the same terms as Ruby
  *
@@ -126,6 +126,6 @@ VALUE rb_cairo__invoke_callback (cr_callback_func_t func, VALUE user_data);
 
 extern VALUE rb_cairo__cFFIPointer;
 
-void rb_cairo__surface_yield_and_finish (VALUE self);
+VALUE rb_cairo__surface_yield_and_finish (VALUE self);
 
 #endif

data/ext/cairo/rb_cairo_scaled_font.c

@@ -181,12 +181,21 @@ static VALUE
 cr_scaled_font_get_font_options (VALUE self)
 {
   cairo_font_options_t *options;
+  VALUE rb_options;
 
-  options = cairo_font_options_create();
+  options = cairo_font_options_create ();
+  rb_cairo_check_status (cairo_font_options_status (options));
+
+  /* TODO: Use rb_ensure() */
+  rb_options = CRFONTOPTIONS2RVAL (options);
+  cairo_font_options_destroy (options);
+
+  options = RVAL2CRFONTOPTIONS (rb_options);
   cairo_scaled_font_get_font_options (_SELF (self), options);
   cr_scaled_font_check_status (_SELF (self));
   rb_cairo_check_status (cairo_font_options_status (options));
-  return CRFONTOPTIONS2RVAL (options);
+
+  return rb_options;
 }
 
 #if CAIRO_CHECK_VERSION(1, 7, 2)

data/ext/cairo/rb_cairo_surface.c

@@ -2,7 +2,7 @@
 /*
  * Ruby Cairo Binding
  *
- * Copyright 2005-2017 Kouhei Sutou <kou@cozmixng.org>
+ * Copyright 2005-2018 Kouhei Sutou <kou@cozmixng.org>
  * Copyright 2014 Patrick Hanevold <patrick.hanevold@gmail.com>
  * Copyright 2005 Øyvind Kolås <pippin@freedesktop.org>
  * Copyright 2004-2005 MenTaLguY <mental@rydia.com>
@@ -90,6 +90,7 @@ VALUE rb_cCairo_SkiaSurface = Qnil;
 VALUE rb_cCairo_SubSurface = Qnil;
 VALUE rb_cCairo_CoglSurface = Qnil;
 
+static ID cr_id_new;
 static ID cr_id_parse;
 static ID cr_id_size;
 static ID cr_id_set_unit;
@@ -217,6 +218,67 @@ cr_surface_get_klass (cairo_surface_t *surface)
   return klass;
 }
 
+static void
+rb_cairo_surface_adjust_memory_usage (cairo_surface_t *surface,
+                                      cairo_bool_t new)
+{
+#ifdef HAVE_RB_GC_ADJUST_MEMORY_USAGE
+  if (cairo_surface_get_type (surface) == CAIRO_SURFACE_TYPE_IMAGE)
+    {
+      ssize_t memory_usage_diff;
+      memory_usage_diff =
+        cairo_image_surface_get_stride (surface) *
+        cairo_image_surface_get_height (surface);
+      if (!new)
+        memory_usage_diff = -memory_usage_diff;
+      rb_gc_adjust_memory_usage (memory_usage_diff);
+    }
+#endif
+}
+
+static void
+cr_surface_destroy_raw (cairo_surface_t *surface)
+{
+  rb_cairo_surface_adjust_memory_usage (surface, CR_FALSE);
+  cairo_surface_destroy (surface);
+}
+
+static VALUE
+cr_surface_destroy (VALUE self)
+{
+  cairo_surface_t *surface;
+
+  surface = _SELF;
+  cr_surface_destroy_raw (surface);
+  DATA_PTR (self) = NULL;
+
+  return self;
+}
+
+static VALUE
+cr_surface_destroy_with_destroy_check (VALUE self)
+{
+  if (_SELF)
+    cr_surface_destroy (self);
+  return Qnil;
+}
+
+static VALUE
+cr_surface_create (int argc, VALUE *argv, VALUE klass)
+{
+  VALUE rb_surface;
+  rb_surface = rb_funcallv (klass, cr_id_new, argc, argv);
+  if (rb_block_given_p ())
+    {
+      return rb_ensure (rb_cairo__surface_yield_and_finish, rb_surface,
+                        cr_surface_destroy_with_destroy_check, rb_surface);
+    }
+  else
+    {
+      return rb_surface;
+    }
+}
+
 static VALUE
 cr_surface_image_supported_p (VALUE klass)
 {
@@ -349,24 +411,6 @@ cr_surface_xml_supported_p (VALUE klass)
 #endif
 }
 
-static void
-rb_cairo_surface_adjust_memory_usage (cairo_surface_t *surface,
-                                      cairo_bool_t new)
-{
-#ifdef HAVE_RB_GC_ADJUST_MEMORY_USAGE
-  if (cairo_surface_get_type (surface) == CAIRO_SURFACE_TYPE_IMAGE)
-    {
-      ssize_t memory_usage_diff;
-      memory_usage_diff =
-        cairo_image_surface_get_stride (surface) *
-        cairo_image_surface_get_height (surface);
-      if (!new)
-        memory_usage_diff = -memory_usage_diff;
-      rb_gc_adjust_memory_usage (memory_usage_diff);
-    }
-#endif
-}
-
 /* constructor/de-constructor */
 cairo_surface_t *
 rb_cairo_surface_from_ruby_object (VALUE obj)
@@ -402,9 +446,7 @@ cr_surface_free (void *ptr)
   if (!surface)
     return;
 
-  rb_cairo_surface_adjust_memory_usage (surface, CR_FALSE);
-
-  cairo_surface_destroy (surface);
+  cr_surface_destroy_raw (surface);
 }
 
 VALUE
@@ -453,18 +495,6 @@ cr_surface_initialize (int argc, VALUE *argv, VALUE self)
 }
 
 /* Surface manipulation */
-static VALUE
-cr_surface_destroy (VALUE self)
-{
-  cairo_surface_t *surface;
-
-  surface = _SELF;
-  cairo_surface_destroy (surface);
-  DATA_PTR (self) = NULL;
-
-  return self;
-}
-
 static VALUE
 cr_surface_get_reference_count (VALUE self)
 {
@@ -497,20 +527,25 @@ cr_surface_finish (VALUE self)
   return self;
 }
 
-void
+VALUE
 rb_cairo__surface_yield_and_finish (VALUE self)
 {
+  VALUE rb_result;
   cairo_surface_t *surface;
 
-  rb_yield (self);
+  rb_result = rb_yield (self);
 
   surface = _SELF;
+  if (!surface)
+    return rb_result;
   if (cairo_surface_status (surface) != CAIRO_STATUS_SUCCESS)
-    return;
+    return rb_result;
   if (cairo_surface_get_user_data (surface, &cr_finished_key))
-    return;
+    return rb_result;
 
   cr_surface_finish (self);
+
+  return rb_result;
 }
 
 static VALUE
@@ -632,14 +667,6 @@ cr_surface_unmap_image (VALUE self, VALUE rb_mapped_image)
 #endif
 
 #if CAIRO_CHECK_VERSION(1, 10, 0)
-static VALUE
-cr_surface_destroy_with_destroy_check (VALUE self)
-{
-  if (DATA_PTR (self))
-    cr_surface_destroy (self);
-  return Qnil;
-}
-
 static VALUE
 cr_surface_create_sub_rectangle_surface (VALUE self, VALUE x, VALUE y,
                                          VALUE width, VALUE height)
@@ -782,11 +809,22 @@ cr_surface_supported_mime_type_p (VALUE self, VALUE rb_mime_type)
 static VALUE
 cr_surface_get_font_options (VALUE self)
 {
-  cairo_font_options_t *options = cairo_font_options_create();
+  cairo_font_options_t *options;
+  VALUE rb_options;
+
+  options = cairo_font_options_create ();
+  rb_cairo_check_status (cairo_font_options_status (options));
+
+  /* TODO: Use rb_ensure() */
+  rb_options = CRFONTOPTIONS2RVAL (options);
+  cairo_font_options_destroy (options);
+
+  options = RVAL2CRFONTOPTIONS (rb_options);
   cairo_surface_get_font_options (_SELF, options);
   rb_cairo_surface_check_status (_SELF);
   rb_cairo_check_status (cairo_font_options_status (options));
-  return CRFONTOPTIONS2RVAL (options);
+
+  return rb_options;
 }
 
 static VALUE
@@ -1967,6 +2005,7 @@ cr_finish_all_guarded_surfaces_at_end (VALUE data)
 void
 Init_cairo_surface (void)
 {
+  cr_id_new = rb_intern ("new");
   cr_id_parse = rb_intern ("parse");
   cr_id_size = rb_intern ("size");
   cr_id_set_unit = rb_intern ("unit=");
@@ -1982,6 +2021,8 @@ Init_cairo_surface (void)
   rb_cairo__initialize_gc_guard_holder_class (rb_cCairo_Surface);
   rb_set_end_proc(cr_finish_all_guarded_surfaces_at_end, Qnil);
 
+  rb_define_singleton_method (rb_cCairo_Surface, "create",
+                              cr_surface_create, -1);
   rb_define_singleton_method (rb_cCairo_Surface, "image_supported?",
                               cr_surface_image_supported_p, 0);
   rb_define_singleton_method (rb_cCairo_Surface, "pdf_supported?",

data/test/{cairo-test-utils.rb → helper.rb}

@@ -1,9 +1,8 @@
-require 'cairo'
-require 'poppler'
-require 'stringio'
-require 'test/unit/notify'
+require "cairo"
+require "poppler"
+require "stringio"
 
-module CairoTestUtils
+module Helper
   private
   def only_cairo_version(major, minor, micro=nil)
     unless Cairo.satisfied_version?(major, minor, micro)

data/test/run-test.rb

@@ -11,19 +11,12 @@ if system("which make >/dev/null 2>&1")
   end
 end
 
-require 'rubygems'
-require 'bundler/setup'
-require 'test-unit'
+require "test-unit"
 
 $LOAD_PATH.unshift(base_dir)
 $LOAD_PATH.unshift(ext_dir)
 $LOAD_PATH.unshift(lib_dir)
 
-$LOAD_PATH.unshift(test_dir)
-require 'cairo-test-utils'
+require_relative "helper"
 
-Dir.glob("test/**/test_*.rb") do |file|
-  require file.sub(/\.rb$/, '')
-end
-
-exit Test::Unit::AutoRunner.run(false)
+exit Test::Unit::AutoRunner.run(true, test_dir)

data/test/test_context.rb

@@ -1,5 +1,5 @@
 class ContextTest < Test::Unit::TestCase
-  include CairoTestUtils
+  include Helper
 
   def setup
     @output = StringIO.new
@@ -14,17 +14,17 @@ class ContextTest < Test::Unit::TestCase
     assert_equal("%%EOF\n", @output.string[-6..-1])
   end
 
-  def test_new_with_block
-    Cairo::Context.new(@surface) do |context|
+  def test_create_with_block
+    Cairo::Context.create(@surface) do |context|
       @surface.destroy
       assert_not_equal("%%EOF\n", @output.string[-6..-1])
     end
     assert_equal("%%EOF\n", @output.string[-6..-1])
   end
 
-  def test_new_with_block_and_destroy
+  def test_create_with_block_and_destroy
     assert_nothing_raised do
-      Cairo::Context.new(@surface) do |context|
+      Cairo::Context.create(@surface) do |context|
         context.destroy
       end
     end
@@ -106,7 +106,7 @@ class ContextTest < Test::Unit::TestCase
     end
 
     test("LINK") do
-      Cairo::Context.new(@surface) do |context|
+      Cairo::Context.create(@surface) do |context|
         context.tag(Cairo::Tag::LINK, "uri='http://localhost/'") do
           context.show_text("localhost")
         end

data/test/test_font_extents.rb

@@ -1,7 +1,7 @@
 require 'cairo'
 
 class FontExtentsTest < Test::Unit::TestCase
-  include CairoTestUtils
+  include Helper
 
   def test_new
     extents = Cairo::FontExtents.new

data/test/test_font_face.rb

@@ -1,7 +1,7 @@
 require 'cairo'
 
 class FontFaceTest < Test::Unit::TestCase
-  include CairoTestUtils
+  include Helper
 
   sub_test_case("FreeTypeFontFace") do
     setup do

data/test/test_font_options.rb

@@ -1,7 +1,7 @@
 require 'cairo'
 
 class FontOptionsTest < Test::Unit::TestCase
-  include CairoTestUtils
+  include Helper
 
   def setup
     @options = Cairo::FontOptions.new

data/test/test_image_surface.rb

@@ -1,7 +1,7 @@
 require 'cairo'
 
 class ImageSurfaceTest < Test::Unit::TestCase
-  include CairoTestUtils
+  include Helper
 
   def test_cloned_data
     width = 10
@@ -15,7 +15,7 @@ class ImageSurfaceTest < Test::Unit::TestCase
                                              :a1, width, height,
                                              original_surface.stride)
 
-    Cairo::Context.new(cloned_surface) do |context|
+    Cairo::Context.create(cloned_surface) do |context|
       context.set_source_rgb(255, 255, 255)
       context.scale(width, height)
       context.move_to(0, 0)

data/test/test_pdf_surface.rb

@@ -1,5 +1,5 @@
 class PDFSurfaceTest < Test::Unit::TestCase
-  include CairoTestUtils
+  include Helper
 
   def create_pdf
     pdf = StringIO.new

data/test/test_quartz_image_surface.rb

@@ -1,5 +1,5 @@
 class QuartzImageSurfaceTest < Test::Unit::TestCase
-  include CairoTestUtils
+  include Helper
 
   def setup
     only_surface("QuartzImage")

data/test/test_raster_source_pattern.rb

@@ -2,15 +2,15 @@ require "cairo"
 require "tempfile"
 
 class RasterSourcePatternTest < Test::Unit::TestCase
-  include CairoTestUtils
+  include Helper
 
   def setup
     only_pattern("RasterSource")
   end
 
   def test_acquire_and_release
-    Cairo::ImageSurface.new(100, 100) do |surface|
-      Cairo::Context.new(surface) do |context|
+    Cairo::ImageSurface.create(100, 100) do |surface|
+      Cairo::Context.create(surface) do |context|
         context.set_source(1, 1, 1)
         context.paint
 
@@ -20,7 +20,7 @@ class RasterSourcePatternTest < Test::Unit::TestCase
           called << :acquire
           red_image = target.create_similar_image(extents.width, extents.height)
           red_image.set_device_offset(extents.x, extents.y)
-          Cairo::Context.new(red_image) do |red_image_context|
+          Cairo::Context.create(red_image) do |red_image_context|
             red_image_context.set_source(1, 0, 0)
             red_image_context.paint
           end
@@ -46,8 +46,8 @@ class RasterSourcePatternTest < Test::Unit::TestCase
     end
 
     def test_success
-      Cairo::RecordingSurface.new(0, 0, 100, 100) do |surface|
-        Cairo::Context.new(surface) do |context|
+      Cairo::RecordingSurface.create(0, 0, 100, 100) do |surface|
+        Cairo::Context.create(surface) do |context|
           called = []
           raster_source = Cairo::RasterSourcePattern.new(100, 100)
           raster_source.snapshot do |pattern|
@@ -63,8 +63,8 @@ class RasterSourcePatternTest < Test::Unit::TestCase
     end
 
     def test_error
-      Cairo::RecordingSurface.new(0, 0, 100, 100) do |surface|
-        Cairo::Context.new(surface) do |context|
+      Cairo::RecordingSurface.create(0, 0, 100, 100) do |surface|
+        Cairo::Context.create(surface) do |context|
           called = []
           raster_source = Cairo::RasterSourcePattern.new(100, 100)
           raster_source.snapshot do |pattern|
@@ -92,8 +92,8 @@ class RasterSourcePatternTest < Test::Unit::TestCase
     def test_success
       output = StringIO.new
       device = Cairo::ScriptDevice.new(output)
-      Cairo::ScriptSurface.new(device, 100, 200) do |surface|
-        Cairo::Context.new(surface) do |context|
+      Cairo::ScriptSurface.create(device, 100, 200) do |surface|
+        Cairo::Context.create(surface) do |context|
           called = []
 
           raster_source = Cairo::RasterSourcePattern.new(100, 100)
@@ -102,7 +102,7 @@ class RasterSourcePatternTest < Test::Unit::TestCase
             red_image = target.create_similar_image(extents.width,
                                                     extents.height)
             red_image.set_device_offset(extents.x, extents.y)
-            Cairo::Context.new(red_image) do |red_image_context|
+            Cairo::Context.create(red_image) do |red_image_context|
               red_image_context.set_source(1, 0, 0)
               red_image_context.paint
             end
@@ -129,8 +129,8 @@ class RasterSourcePatternTest < Test::Unit::TestCase
     def test_error
       output = StringIO.new
       device = Cairo::ScriptDevice.new(output)
-      Cairo::ScriptSurface.new(device, 100, 200) do |surface|
-        Cairo::Context.new(surface) do |context|
+      Cairo::ScriptSurface.create(device, 100, 200) do |surface|
+        Cairo::Context.create(surface) do |context|
           called = []
 
           raster_source = Cairo::RasterSourcePattern.new(100, 100)

data/test/test_recording_surface.rb

@@ -1,5 +1,5 @@
 class RecordingSurfaceTest < Test::Unit::TestCase
-  include CairoTestUtils
+  include Helper
 
   def setup
     only_surface("Recording")
@@ -10,7 +10,7 @@ class RecordingSurfaceTest < Test::Unit::TestCase
     only_cairo_version(1, 12, 0)
     surface = Cairo::RecordingSurface.new(10, 20, 300, 400)
     assert_equal([0.0, 0.0, 0.0, 0.0], surface.ink_extents)
-    Cairo::Context.new(surface) do |context|
+    Cairo::Context.create(surface) do |context|
       context.move_to(15, 30)
       context.line_to(80, 100)
       context.stroke

data/test/test_region.rb

@@ -1,5 +1,5 @@
 class RegionTest < Test::Unit::TestCase
-  include CairoTestUtils
+  include Helper
 
   def setup
     only_cairo_version(1, 10, 0)

data/test/test_scaled_font.rb

@@ -2,7 +2,7 @@ require 'cairo'
 require 'stringio'
 
 class ScaledFontTest < Test::Unit::TestCase
-  include CairoTestUtils
+  include Helper
 
   def test_scale_matrix
     only_cairo_version(1, 7, 2)

data/test/test_script_device.rb

@@ -2,7 +2,7 @@ require 'cairo'
 require 'stringio'
 
 class ScriptDeviceTest < Test::Unit::TestCase
-  include CairoTestUtils
+  include Helper
 
   def setup
     only_device("Script")

data/test/test_script_surface.rb

@@ -1,5 +1,5 @@
 class ScriptSurfaceTest < Test::Unit::TestCase
-  include CairoTestUtils
+  include Helper
 
   def setup
     only_surface("Script")

data/test/test_surface.rb

@@ -2,7 +2,7 @@ require 'cairo'
 require 'stringio'
 
 class SurfaceTest < Test::Unit::TestCase
-  include CairoTestUtils
+  include Helper
 
   def test_new
     output = StringIO.new
@@ -12,17 +12,17 @@ class SurfaceTest < Test::Unit::TestCase
     assert_equal("%%EOF\n", output.string[-6..-1])
   end
 
-  def test_new_with_block
+  def test_create_with_block
     output = StringIO.new
-    Cairo::PDFSurface.new(output, 10, 10) do |surface|
+    Cairo::PDFSurface.create(output, 10, 10) do |surface|
       assert_not_equal("%%EOF\n", output.string[-6..-1])
     end
     assert_equal("%%EOF\n", output.string[-6..-1])
   end
 
-  def test_new_with_block_and_finish
+  def test_create_with_block_and_finish
     assert_nothing_raised do
-      Cairo::PDFSurface.new(StringIO.new, 10, 10) do |surface|
+      Cairo::PDFSurface.create(StringIO.new, 10, 10) do |surface|
         surface.finish
       end
     end

data/test/test_svg_surface.rb

@@ -1,5 +1,5 @@
 class SVGSurfaceTest < Test::Unit::TestCase
-  include CairoTestUtils
+  include Helper
 
   def test_new_with_nil_target
     surface = Cairo::SVGSurface.new(nil, 10, 20)

data/test/test_tee_surface.rb

@@ -1,5 +1,5 @@
 class TeeSurfaceTest < Test::Unit::TestCase
-  include CairoTestUtils
+  include Helper
 
   def setup
     only_surface("Tee")
@@ -16,7 +16,7 @@ class TeeSurfaceTest < Test::Unit::TestCase
 
     surface = Cairo::TeeSurface.new(surface1)
     surface << surface2
-    Cairo::Context.new(surface) do |context|
+    Cairo::Context.create(surface) do |context|
       context.move_to(15, 30)
       context.line_to(80, 100)
       context.stroke

data/test/test_text_cluster.rb

@@ -1,7 +1,7 @@
 require 'cairo'
 
 class TextClusterTest < Test::Unit::TestCase
-  include CairoTestUtils
+  include Helper
 
   def test_new
     only_cairo_version(1, 7, 2)

data/test/test_text_extents.rb

@@ -1,7 +1,7 @@
 require 'cairo'
 
 class TextExtentsTest < Test::Unit::TestCase
-  include CairoTestUtils
+  include Helper
 
   def test_new
     extents = Cairo::TextExtents.new

data/test/test_text_to_glyphs_data.rb

@@ -1,7 +1,7 @@
 require 'cairo'
 
 class TextToGlyphsDataTest < Test::Unit::TestCase
-  include CairoTestUtils
+  include Helper
 
   def test_new
     only_cairo_version(1, 7, 6)

data/test/test_xml_device.rb

@@ -1,5 +1,5 @@
 class XMLDeviceTest < Test::Unit::TestCase
-  include CairoTestUtils
+  include Helper
 
   def setup
     only_device("XML")

data/test/test_xml_surface.rb

@@ -1,5 +1,5 @@
 class XMLSurfaceTest < Test::Unit::TestCase
-  include CairoTestUtils
+  include Helper
 
   def setup
     only_surface("XML")
@@ -10,7 +10,7 @@ class XMLSurfaceTest < Test::Unit::TestCase
     output = StringIO.new
     device = Cairo::XMLDevice.new(output)
     surface = Cairo::XMLSurface.new(device, 100, 200)
-    Cairo::Context.new(surface) do |context|
+    Cairo::Context.create(surface) do |context|
       context.move_to(15, 30)
       context.line_to(80, 100)
       context.stroke

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cairo
 version: !ruby/object:Gem::Version
-  version: 1.15.13
+  version: 1.15.14
 platform: ruby
 authors:
 - Kouhei Sutou
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-01 00:00:00.000000000 Z
+date: 2018-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pkg-config
@@ -53,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: test-unit-notify
+  name: test-unit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -180,7 +180,7 @@ files:
 - samples/scalable.rb
 - samples/text-on-path.rb
 - samples/text2.rb
-- test/cairo-test-utils.rb
+- test/helper.rb
 - test/run-test.rb
 - test/test_color.rb
 - test/test_constants.rb
@@ -207,10 +207,11 @@ files:
 - test/test_text_to_glyphs_data.rb
 - test/test_xml_device.rb
 - test/test_xml_surface.rb
-homepage: http://cairographics.org/rcairo
+homepage: https://rcairo.github.io/
 licenses:
-- Ruby's
-metadata: {}
+- Ruby
+metadata:
+  msys2_mingw_dependencies: cairo
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -227,7 +228,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.0.beta1
 signing_key: 
 specification_version: 4
 summary: Ruby bindings for cairo
@@ -240,9 +241,9 @@ test_files:
 - test/test_svg_surface.rb
 - test/test_script_device.rb
 - test/test_xml_device.rb
-- test/cairo-test-utils.rb
 - test/test_script_surface.rb
 - test/test_context.rb
+- test/helper.rb
 - test/test_font_face.rb
 - test/test_raster_source_pattern.rb
 - test/test_image_surface.rb