cairo 1.8.5 → 1.10.0

data/samples/blur.rb

@@ -1,9 +1,8 @@
 #!/usr/bin/env ruby
 
 top = File.expand_path(File.join(File.dirname(__FILE__), ".."))
-src = File.join(top, "src")
-$LOAD_PATH.unshift src
-$LOAD_PATH.unshift File.join(src, "lib")
+$LOAD_PATH.unshift File.join(top, "ext", "cairo")
+$LOAD_PATH.unshift File.join(top, "lib")
 
 require 'cairo'
 

data/samples/{pac2.rb → pac-nomralize.rb}

@@ -1,13 +1,12 @@
 =begin
-  pac2.rb - rcairo sample script with #scale and #translate.
+  pac-normalize.rb - rcairo sample script with #scale and #translate.
 
   Original: pac.rb in http://www.artima.com/rubycs/articles/pdf_writer3.html
 =end
 
 top = File.expand_path(File.join(File.dirname(__FILE__), ".."))
-src = File.join(top, "src")
-$LOAD_PATH.unshift src
-$LOAD_PATH.unshift File.join(src, "lib")
+$LOAD_PATH.unshift File.join(top, "ext", "cairo")
+$LOAD_PATH.unshift File.join(top, "lib")
 
 require "cairo"
 
@@ -152,13 +151,13 @@ paper = Cairo::Paper.parse(:a4_landscape)
 size_in_points = paper.size("pt")
 Cairo::ImageSurface.new(*size_in_points) do |surface|
   cr = pac(surface, *size_in_points)
-  cr.target.write_to_png("pac2.png")
+  cr.target.write_to_png("pac-normalize.png")
 end
 
 scalable_surface_output = Proc.new do |surface_class_name, suffix|
   if Cairo.const_defined?(surface_class_name)
     surface_class = Cairo.const_get(surface_class_name)
-    surface_class.new("pac2.#{suffix}", paper) do |surface|
+    surface_class.new("pac-normalize.#{suffix}", paper) do |surface|
       pac(surface, *size_in_points)
     end
   else

data/samples/pac-tee.rb

@@ -0,0 +1,170 @@
+=begin
+  pac-tee.rb - rcairo sample script with TeeSurface.
+
+  Original: pac.rb in http://www.artima.com/rubycs/articles/pdf_writer3.html
+=end
+
+top = File.expand_path(File.join(File.dirname(__FILE__), ".."))
+$LOAD_PATH.unshift File.join(top, "ext", "cairo")
+$LOAD_PATH.unshift File.join(top, "lib")
+
+require "cairo"
+
+def pac(surface, width, height)
+  cr = Cairo::Context.new(surface)
+
+  # NOTE: You may need to set line width when use Cairo::Context#scale
+  cr.set_line_width(cr.line_width / [width, height].max)
+
+  cr.scale(width, height)
+
+  cr.save do
+    cr.set_source_color(:black)
+    cr.rectangle(0, 0, 1, 1)
+    cr.fill
+  end
+
+  # Wall
+  wall_width = 0.89
+  wall_height = 0.03
+  wall_space = 0.5
+  wall_x = 0.02
+  wall1_y = 1 - 0.86
+  wall2_y = wall1_y + wall_space
+  wall_radius = 0.01
+
+  cr.set_source_color(:magenta)
+  cr.rounded_rectangle(wall_x, wall1_y, wall_width, wall_height, wall_radius)
+  cr.fill
+  cr.set_source_color(:cyan)
+  cr.rounded_rectangle(wall_x, wall1_y, wall_width, wall_height, wall_radius)
+  cr.stroke
+
+  cr.set_source_color(:magenta)
+  cr.rounded_rectangle(wall_x, wall2_y, wall_width, wall_height, wall_radius)
+  cr.fill
+  cr.set_source_color(:cyan)
+  cr.rounded_rectangle(wall_x, wall2_y, wall_width, wall_height, wall_radius)
+  cr.stroke
+
+  # Body
+  body_x = 0.17
+  body_y = 1 - 0.58
+  body_width = 0.23
+  body_height = 0.33
+
+  cr.save do
+    cr.translate(body_x, body_y)
+    cr.set_source_color(:yellow)
+    cr.scale(body_width, body_height)
+    cr.arc(0, 0, 0.5, 30 * (Math::PI / 180), 330 * (Math::PI / 180))
+    cr.line_to(0, 0)
+    cr.close_path
+    cr.fill
+  end
+
+  # Dot
+  dot_width = 0.02
+  dot_height = 0.03
+  small_dot_width = 0.01
+  small_dot_height = 0.015
+  dot_x = 0.29
+  dot_y = 1 - 0.58
+  dot_step = 0.05
+
+  cr.save do
+    cr.set_source_color(:yellow)
+    cr.save do
+      cr.translate(dot_x, dot_y)
+      cr.scale(dot_width, dot_height)
+      cr.circle(0, 0, 1).fill
+    end
+
+    4.times do |i|
+      cr.save do
+        cr.translate(dot_x + dot_step * (i + 1), dot_y)
+        cr.scale(small_dot_width, small_dot_height)
+        cr.circle(0, 0, 1).fill
+      end
+    end
+   end
+
+  # Ghost
+  ghost_x = 0.59
+  ghost_x_step = 0.03
+  ghost_y = 1 - 0.42
+  ghost_y_step = 0.04
+  ghost_width = 0.18
+  ghost_height = 0.29
+  ghost_radius= 0.08
+  cr.move_to(ghost_x, ghost_y)
+  cr.line_to(ghost_x, ghost_y - ghost_height)
+  cr.curve_to(ghost_x + ghost_width / 3.0,
+              ghost_y - ghost_height - ghost_radius,
+              ghost_x + ghost_width * (2.0 / 3.0),
+              ghost_y - ghost_height - ghost_radius,
+              ghost_x + ghost_width,
+              ghost_y - ghost_height)
+  cr.line_to(ghost_x + ghost_width, ghost_y)
+  i = 0
+  (ghost_x + ghost_width).step(ghost_x, -ghost_x_step) do |x|
+    cr.line_to(x, ghost_y + -ghost_y_step * (i % 2))
+    i += 1
+  end
+  cr.close_path
+
+  cr.set_source_color(:blue)
+  cr.fill_preserve
+  cr.set_source_color(:cyan)
+  cr.stroke
+
+  # Ghost Eyes
+  eye_x = 0.62
+  eye_y = 1 - 0.63
+  eye_space = 0.06
+  white_eye_width = 0.03
+  white_eye_height = 0.04
+  black_eye_width = 0.01
+  black_eye_height = 0.02
+
+  cr.set_source_color(:white)
+  cr.rectangle(eye_x, eye_y - white_eye_height,
+               white_eye_width, white_eye_height)
+  cr.fill
+  cr.rectangle(eye_x + eye_space, eye_y - white_eye_height,
+               white_eye_width, white_eye_height)
+  cr.fill
+
+  cr.set_source_color(:black)
+  cr.rectangle(eye_x, eye_y - black_eye_height,
+               black_eye_width, black_eye_height)
+  cr.fill
+  cr.rectangle(eye_x + eye_space, eye_y - black_eye_height,
+               black_eye_width, black_eye_height)
+  cr.fill
+
+  cr.show_page
+end
+
+paper = Cairo::Paper.parse(:a4_landscape)
+
+size_in_points = paper.size("pt")
+image_surface = Cairo::ImageSurface.new(*size_in_points)
+
+tee_surface = Cairo::TeeSurface.new(image_surface)
+
+add_scalable_surface = Proc.new do |surface_class_name, suffix|
+  if Cairo.const_defined?(surface_class_name)
+    surface_class = Cairo.const_get(surface_class_name)
+    tee_surface << surface_class.new("pac-tee.#{suffix}", paper)
+  else
+    puts("#{surface_class_name} isn't supported.")
+  end
+end
+
+add_scalable_surface.call("PSSurface", "ps")
+add_scalable_surface.call("PDFSurface", "pdf")
+add_scalable_surface.call("SVGSurface", "svg")
+
+pac(tee_surface, *size_in_points)
+image_surface.write_to_png("pac-tee.png")

data/samples/pac.rb

@@ -5,9 +5,8 @@
 =end
 
 top = File.expand_path(File.join(File.dirname(__FILE__), ".."))
-src = File.join(top, "src")
-$LOAD_PATH.unshift src
-$LOAD_PATH.unshift File.join(src, "lib")
+$LOAD_PATH.unshift File.join(top, "ext", "cairo")
+$LOAD_PATH.unshift File.join(top, "lib")
 
 require "cairo"
 

data/samples/png.rb

@@ -1,9 +1,8 @@
 #!/usr/bin/env ruby
 
 top = File.expand_path(File.join(File.dirname(__FILE__), ".."))
-src = File.join(top, "src")
-$LOAD_PATH.unshift src
-$LOAD_PATH.unshift File.join(src, "lib")
+$LOAD_PATH.unshift File.join(top, "ext", "cairo")
+$LOAD_PATH.unshift File.join(top, "lib")
 
 require 'cairo'
 

data/samples/scalable.rb

@@ -1,9 +1,8 @@
 #!/usr/bin/env ruby
 
 top = File.expand_path(File.join(File.dirname(__FILE__), ".."))
-src = File.join(top, "src")
-$LOAD_PATH.unshift src
-$LOAD_PATH.unshift File.join(src, "lib")
+$LOAD_PATH.unshift File.join(top, "ext", "cairo")
+$LOAD_PATH.unshift File.join(top, "lib")
 
 require 'cairo'
 require 'stringio'

data/samples/text-on-path.rb

@@ -1,9 +1,8 @@
 #!/usr/bin/env ruby
 
 top = File.expand_path(File.join(File.dirname(__FILE__), ".."))
-src = File.join(top, "src")
-$LOAD_PATH.unshift src
-$LOAD_PATH.unshift File.join(src, "lib")
+$LOAD_PATH.unshift File.join(top, "ext", "cairo")
+$LOAD_PATH.unshift File.join(top, "lib")
 
 require 'cairo'
 require 'pango'

data/samples/text2.rb

@@ -1,9 +1,8 @@
 #!/usr/bin/env ruby
 
 top = File.expand_path(File.join(File.dirname(__FILE__), ".."))
-src = File.join(top, "src")
-$LOAD_PATH.unshift src
-$LOAD_PATH.unshift File.join(src, "lib")
+$LOAD_PATH.unshift File.join(top, "ext", "cairo")
+$LOAD_PATH.unshift File.join(top, "lib")
 
 require 'optparse'
 require 'ostruct'

data/test/cairo-test-utils.rb

@@ -1,4 +1,5 @@
 require 'cairo'
+require 'stringio'
 
 module CairoTestUtils
   private
@@ -15,4 +16,18 @@ module CairoTestUtils
   def win32?
     /cygwin|mingw|mswin32|bccwin32/.match(RUBY_PLATFORM) ? true : false
   end
+
+  def only_device(name)
+    device_class = "#{name}Device"
+    unless Cairo.const_defined?(device_class)
+      omit("Only for #{device_class} device available")
+    end
+  end
+
+  def only_surface(name)
+    surface_class = "#{name}Surface"
+    unless Cairo.const_defined?(surface_class)
+      omit("Only for #{surface_class} surface available")
+    end
+  end
 end

data/test/run-test.rb

@@ -1,17 +1,18 @@
 #!/usr/bin/env ruby
 
 base_dir = File.expand_path(File.join(File.dirname(__FILE__), ".."))
-test_unit_dir = File.join(base_dir, "test-unit", "lib")
 ext_dir = File.join(base_dir, "ext", "cairo")
 lib_dir = File.join(base_dir, "lib")
 test_dir = File.join(base_dir, "test")
 
 if system("which make > /dev/null")
-  system("cd #{base_dir.dump} && make > /dev/null") or exit(1)
+  Dir.chdir(base_dir) do
+    system("make > /dev/null") or exit(1)
+  end
 end
 
-$LOAD_PATH.unshift(test_unit_dir)
-
+require 'rubygems'
+gem 'test-unit'
 require 'test/unit'
 
 $LOAD_PATH.unshift(base_dir)

data/test/test_context.rb

@@ -12,17 +12,17 @@ class ContextTest < Test::Unit::TestCase
   def test_new_and_destroy
     context = Cairo::Context.new(@surface)
     @surface.destroy
-    assert_no_match(/%%EOF\s*\z/m, @output.string)
+    assert_not_equal("%%EOF\n", @output.string[-6..-1])
     context.destroy
-    assert_match(/%%EOF\s*\z/m, @output.string)
+    assert_equal("%%EOF\n", @output.string[-6..-1])
   end
 
   def test_new_with_block
     Cairo::Context.new(@surface) do |context|
       @surface.destroy
-      assert_no_match(/%%EOF\s*\z/m, @output.string)
+      assert_not_equal("%%EOF\n", @output.string[-6..-1])
     end
-    assert_match(/%%EOF\s*\z/m, @output.string)
+    assert_equal("%%EOF\n", @output.string[-6..-1])
   end
 
   def test_new_with_block_and_destroy

data/test/test_font_face.rb

@@ -93,15 +93,18 @@ class FontFaceTest < Test::Unit::TestCase
                                         Cairo::FontOptions.new)
     result = scaled_font.text_to_glyphs(0, 0, "text")
     assert_equal([[[Cairo::ScaledFont, Cairo::Context, Cairo::FontExtents]],
-                  [[Cairo::ScaledFont, ?t, Cairo::Context, Cairo::TextExtents],
-                   [Cairo::ScaledFont, ?e, Cairo::Context, Cairo::TextExtents],
-                   [Cairo::ScaledFont, ?x, Cairo::Context, Cairo::TextExtents]],
+                  [[Cairo::ScaledFont, codepoint("t"),
+                    Cairo::Context, Cairo::TextExtents],
+                   [Cairo::ScaledFont, codepoint("e"),
+                    Cairo::Context, Cairo::TextExtents],
+                   [Cairo::ScaledFont, codepoint("x"),
+                    Cairo::Context, Cairo::TextExtents]],
                   [[Cairo::ScaledFont, "text",
                     Cairo::UserFontFace::TextToGlyphsData]],
-                  [[Cairo::ScaledFont, ?t],
-                   [Cairo::ScaledFont, ?e],
-                   [Cairo::ScaledFont, ?x],
-                   [Cairo::ScaledFont, ?t]],
+                  [[Cairo::ScaledFont, codepoint("t")],
+                   [Cairo::ScaledFont, codepoint("e")],
+                   [Cairo::ScaledFont, codepoint("x")],
+                   [Cairo::ScaledFont, codepoint("t")]],
                   [[], [], Cairo::TextClusterFlag::BACKWARD]],
                  [classify_cairo_object(init_args),
                   classify_cairo_object(render_glyph_args),
@@ -155,15 +158,18 @@ class FontFaceTest < Test::Unit::TestCase
                                         Cairo::FontOptions.new)
     result = scaled_font.text_to_glyphs(0, 0, "text")
     assert_equal([[[Cairo::ScaledFont, Cairo::Context, Cairo::FontExtents]],
-                  [[Cairo::ScaledFont, ?t, Cairo::Context, Cairo::TextExtents],
-                   [Cairo::ScaledFont, ?e, Cairo::Context, Cairo::TextExtents],
-                   [Cairo::ScaledFont, ?x, Cairo::Context, Cairo::TextExtents]],
+                  [[Cairo::ScaledFont, codepoint("t"),
+                    Cairo::Context, Cairo::TextExtents],
+                   [Cairo::ScaledFont, codepoint("e"),
+                    Cairo::Context, Cairo::TextExtents],
+                   [Cairo::ScaledFont, codepoint("x"),
+                    Cairo::Context, Cairo::TextExtents]],
                   [[Cairo::ScaledFont, "text",
                     Cairo::UserFontFace::TextToGlyphsData]],
-                  [[Cairo::ScaledFont, ?t],
-                   [Cairo::ScaledFont, ?e],
-                   [Cairo::ScaledFont, ?x],
-                   [Cairo::ScaledFont, ?t]],
+                  [[Cairo::ScaledFont, codepoint("t")],
+                   [Cairo::ScaledFont, codepoint("e")],
+                   [Cairo::ScaledFont, codepoint("x")],
+                   [Cairo::ScaledFont, codepoint("t")]],
                   [[], [], Cairo::TextClusterFlag::BACKWARD]],
                  [classify_cairo_object(face.init_args),
                   classify_cairo_object(face.render_glyph_args),
@@ -207,15 +213,18 @@ class FontFaceTest < Test::Unit::TestCase
                                         Cairo::FontOptions.new)
     result = scaled_font.text_to_glyphs(0, 0, "text")
     assert_equal([[[Cairo::ScaledFont, Cairo::Context, Cairo::FontExtents]],
-                  [[Cairo::ScaledFont, ?t, Cairo::Context, Cairo::TextExtents],
-                   [Cairo::ScaledFont, ?e, Cairo::Context, Cairo::TextExtents],
-                   [Cairo::ScaledFont, ?x, Cairo::Context, Cairo::TextExtents]],
+                  [[Cairo::ScaledFont, codepoint("t"),
+                    Cairo::Context, Cairo::TextExtents],
+                   [Cairo::ScaledFont, codepoint("e"),
+                    Cairo::Context, Cairo::TextExtents],
+                   [Cairo::ScaledFont, codepoint("x"),
+                    Cairo::Context, Cairo::TextExtents]],
                   [[Cairo::ScaledFont, "text",
                     Cairo::UserFontFace::TextToGlyphsData]],
-                  [[Cairo::ScaledFont, ?t],
-                   [Cairo::ScaledFont, ?e],
-                   [Cairo::ScaledFont, ?x],
-                   [Cairo::ScaledFont, ?t]],
+                  [[Cairo::ScaledFont, codepoint("t")],
+                   [Cairo::ScaledFont, codepoint("e")],
+                   [Cairo::ScaledFont, codepoint("x")],
+                   [Cairo::ScaledFont, codepoint("t")]],
                   [],
                   [],
                   [],
@@ -241,4 +250,8 @@ class FontFaceTest < Test::Unit::TestCase
       object
     end
   end
+
+  def codepoint(character)
+    character.unpack("U")[0]
+  end
 end

data/test/test_recording_surface.rb

@@ -0,0 +1,18 @@
+class RecordingSurfaceTest < Test::Unit::TestCase
+  include CairoTestUtils
+
+  def setup
+    only_surface("Recording")
+  end
+
+  def test_new
+    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|
+      context.move_to(15, 30)
+      context.line_to(80, 100)
+      context.stroke
+    end
+    assert_equal([10.0, 20.0, 99.0, 109.0], surface.ink_extents)
+  end
+end