cairo 1.15.13-x86-mingw32 → 1.15.14-x86-mingw32

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

data/vendor/local/bin/libpng-config

@@ -11,7 +11,7 @@
 
 # Modeled after libxml-config.
 
-version="1.6.34"
+version="1.6.35"
 prefix="/home/vagrant/rcairo/vendor/local"
 exec_prefix="${prefix}"
 libdir="${exec_prefix}/lib"

data/vendor/local/bin/libpng16-config

@@ -11,7 +11,7 @@
 
 # Modeled after libxml-config.
 
-version="1.6.34"
+version="1.6.35"
 prefix="/home/vagrant/rcairo/vendor/local"
 exec_prefix="${prefix}"
 libdir="${exec_prefix}/lib"