cairo 1.10.0 → 1.10.1

data/Gemfile

@@ -0,0 +1,14 @@
+# -*- mode: ruby; coding: utf-8 -*-
+
+source "http://rubygems.org/"
+
+group :development, :test do
+  gem 'pkg-config'
+  gem "test-unit"
+  gem "test-unit-notify"
+  gem "rake"
+  gem "rake-compiler"
+  gem "jeweler"
+  gem "yard"
+  gem "packnga"
+end

data/NEWS

@@ -1,3 +1,36 @@
+Release 1.10.1 (2011-10-12) Kouhei Sutou <kou@cozmixng.org>)
+============================================================
+
+Features
+--------
+
+  * Accepted Cairo::EXTEND_PAD as extend value.
+  * Suppressed a warning. [Stefan Salewski]
+  * Bound CAIRO_SURFACE_TYPE_XLIB and CAIRO_SURFACE_TYPE_XCB.
+  * Supported cairo 1.10.2.
+  * Fixed recording surface test. #4 [Mamoru Tasaka]
+  * AcceptedCairo::OPERATOR_HSL_LUMINDSITY as operator value.
+    #6 [Matt Bramlage]
+  * Suppressed warnings on Windows. [Nikolai Weibull]
+  * Added --without-vendor-override options to extconf.rb.
+    [Nikolai Weibull]
+
+Thanks
+------
+
+  * Stefan Salewski
+  * Mamoru Tasaka
+  * Matt Bramlage
+  * Nikolai Weibull
+
+Release 1.10.0 (2010-09-12) Kouhei Sutou <kou@cozmixng.org>)
+===========================================================
+
+Features
+--------
+
+  * Support cairo 1.10.0.
+
 Release 1.8.5 (2010-08-28) Kouhei Sutou <kou@cozmixng.org>)
 ===========================================================
 

data/README.rdoc

@@ -0,0 +1,115 @@
+= README
+
+== Name
+
+rcairo
+
+== Description
+
+Ruby bindings for cairo // cairo extension for Ruby
+
+http://cairographics.org/
+
+== Dependencies
+
+* ruby >= 1.8 (1.9.2 also supported!)
+* cairo >= 1.2.0 (1.10.0 also supported!)
+
+== Install
+
+=== Package
+
+This way is recommended.
+
+  # gem install cairo
+
+=== Self build
+
+For experimental users.
+
+Download rcairo-X.Y.Z.tar.gz from http://cairographics.org/releases/
+
+Extracting:
+  % tar xvzf rcairo-X.Y.Z.tar.gz
+
+Compiling:
+  % cd rcairo-X.Y.Z
+  % ruby extconf.rb    # to check for dependencies and create Makefiles
+  % make               # to compile
+
+  # 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-mswin32.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
+
+== Documents
+
+* Reference manual:
+  http://cairo.rubyforge.org/doc/
+* Repository of the reference manual:
+  http://github.com/rcairo/doc
+* An article for rcairo on Rubyst Magazine a.k.a. RubiMa (in Japanese):
+  http://jp.rubyist.net/magazine/?0019-cairo
+
+== Source
+
+There is the rcairo repository at GitHub:
+http://github.com/rcairo/rcairo
+
+== Mailing list
+
+If you have trouble with cairo or rcairo, or you have some ideas for how
+it could be improved, please feel free to send a message to the cairo
+mailinglist at cairo@cairographics.org , which is archived at
+
+http://cairographics.org/cgi-bin/mailman/listinfo/cairo
+
+== Thanks
+
+* Yoshinao Muramatsu: win32 surface support patch.
+* NANKI Haruo: some bug fix patches.
+* Paul van Tilburg:
+  * some patches that support ruby 1.9.
+  * some suggestions.
+* Binzo: some bug reports and fixed that.
+* kimura wataru:
+  * some advices for RubyCocoa.
+  * reports a bug.
+* OBATA Akio:
+  * reports a bug.
+  * some suggestions.
+* James Healy: reports bugs.
+* Carsten Bormann: A suggestion.
+* Davide Rambaldi: A suggestion.
+* Yusuke ENDOH: reports a bug.
+* Yuta Taniguchi: a bug fix patch.
+* kimura wataru:
+  * reports a bug.
+  * some patches.
+* Masayas TARUI:
+  * Windows support.
+* Stefan Salewski: reports a bug.
+* Mamoru Tasaka: reports a bug.
+* Nikolai Weibull: reports problems.

data/Rakefile

@@ -5,13 +5,13 @@ require 'English'
 require 'find'
 require 'fileutils'
 require 'rubygems'
-require 'hoe'
+require 'rubygems/package_task'
+require 'yard'
+require 'jeweler'
 require 'rake/extensiontask'
+require 'packnga'
 
 base_dir = File.join(File.dirname(__FILE__))
-truncate_base_dir = Proc.new do |x|
-  x.gsub(/^#{Regexp.escape(base_dir + File::SEPARATOR)}/, '')
-end
 
 cairo_ext_dir = File.join(base_dir, 'ext', 'cairo')
 cairo_lib_dir = File.join(base_dir, 'lib')
@@ -19,79 +19,67 @@ $LOAD_PATH.unshift(cairo_ext_dir)
 $LOAD_PATH.unshift(cairo_lib_dir)
 ENV["RUBYLIB"] = "#{cairo_lib_dir}:#{cairo_ext_dir}:#{ENV['RUBYLIB']}"
 
-def guess_rcairo_version
-  require 'cairo'
-  Cairo.bindings_version
-end
-
-manifest = File.join(base_dir, "Manifest.txt")
-manifest_contents = []
-base_dir_included_components = %w(AUTHORS COPYING ChangeLog GPL
-                                  NEWS README.doc Rakefile
-                                  extconf.rb pkg-config.rb)
-excluded_components = %w(.cvsignore .gdb_history CVS depend Makefile pkg
-                         .test-result .gitignore .git vendor)
-excluded_suffixes = %w(.png .ps .pdf .o .so .a .txt .~ .log)
-Find.find(base_dir) do |target|
-  target = truncate_base_dir[target]
-  components = target.split(File::SEPARATOR)
-  if components.size == 1 and !File.directory?(target)
-    next unless base_dir_included_components.include?(components[0])
+def guess_rcairo_version(cairo_ext_dir)
+  version = {}
+  File.open(File.join(cairo_ext_dir, "rb_cairo.h")) do |rb_cairo_h|
+    rb_cairo_h.each_line do |line|
+      case line
+      when /\A#define RB_CAIRO_VERSION_([A-Z]+) (\d+)/
+        version[$1.downcase] = $2
+      end
+    end
   end
-  Find.prune if (excluded_components - components) != excluded_components
-  next if excluded_suffixes.include?(File.extname(target))
-  manifest_contents << target if File.file?(target)
+  [version["major"], version["minor"], version["micro"]].join(".")
 end
 
-File.open(manifest, "w") do |f|
-  f.puts manifest_contents.sort.join("\n")
-end
-
-# For Hoe's no user friendly default behavior. :<
-File.open("README.txt", "w") {|file| file << "= Dummy README\n== XXX\n"}
-FileUtils.cp("NEWS", "History.txt")
-at_exit do
-  FileUtils.rm_f("README.txt")
-  FileUtils.rm_f("History.txt")
-  FileUtils.rm_f(manifest)
-end
-
-ENV["VERSION"] ||= guess_rcairo_version
-version = ENV["VERSION"]
-project = Hoe.spec('cairo') do |project|
-  project.version = version
-  project.rubyforge_name = 'cairo'
+ENV["VERSION"] ||= guess_rcairo_version(cairo_ext_dir)
+version = ENV["VERSION"].dup
+spec = nil
+Jeweler::Tasks.new do |_spec|
+  spec = _spec
+  spec.name = "cairo"
+  spec.version = version
+  spec.rubyforge_project = 'cairo'
+  spec.homepage = 'http://cairographics.org/rcairo'
   authors = File.join(base_dir, "AUTHORS")
-  project.author = File.readlines(authors).collect do |line|
+  spec.authors = File.readlines(authors).collect do |line|
     if /\s*<[^<>]*>$/ =~ line
       $PREMATCH
     else
       nil
     end
   end.compact
-  project.email = ['cairo@cairographics.org']
-  project.summary = 'Ruby bindings for cairo'
-  project.url = 'http://cairographics.org/rcairo'
-  project.test_globs = []
-  project.spec_extras = {
-    :extensions => ['ext/cairo/extconf.rb'],
-    :require_paths => ['lib'],
-    :has_rdoc => false,
-  }
-  project.extra_deps << ['pkg-config', '>= 0']
-  platform = ENV["FORCE_PLATFORM"]
-  project.spec_extras[:platform] = platform if platform
-  news = File.join(base_dir, "NEWS")
-  project.changes = File.read(news).gsub(/\n+^Release(?m:.*)/, '')
-  project.description = "Ruby bindings for cairo"
-  project.need_tar = false
-  project.remote_rdoc_dir = "doc"
+  spec.email = ['cairo@cairographics.org']
+  spec.summary = 'Ruby bindings for cairo'
+  spec.description = "Ruby bindings for cairo"
+  spec.license = "Ruby's"
+  spec.files = FileList["{lib,samples}/**/*.rb",
+                        "ext/**/{*.def,depend,*.rb,*.c,*.h}",
+                        "AUTHORS", "COPYING", "GPL", "Gemfile",
+                        "NEWS", "README.rdoc", "Rakefile"]
+  spec.test_files = FileList["test/**/*.rb"]
 end
 
-project.spec.dependencies.delete_if {|dependency| dependency.name == "hoe"}
+Rake::Task["release"].prerequisites.clear
+Jeweler::RubygemsDotOrgTasks.new do
+end
+
+Gem::PackageTask.new(spec) do |pkg|
+  pkg.need_tar_gz = true
+end
+
+document_task = Packnga::DocumentTask.new(spec) do |t|
+  t.yard do |yard_task|
+    yard_task.files += FileList["ext/**/*.c"]
+    # yard_task.options += ["--markup", "textile"]
+  end
+end
+
+Packnga::ReleaseTask.new(spec) do |task|
+end
 
 binary_dir = File.join("vendor", "local")
-Rake::ExtensionTask.new("cairo", project.spec) do |ext|
+Rake::ExtensionTask.new("cairo", spec) do |ext|
   ext.cross_compile = true
   ext.cross_compiling do |spec|
     if /mingw|mswin/ =~ spec.platform.to_s
@@ -111,8 +99,7 @@ task 'cross' => "download_windows_binaries"
 def download_windows_binaries(binary_dir)
   base_url = "http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies/"
   dependencies = [
-                  ["cairo", "1.10.0-1"],
-                  ["cairo-dev", "1.10.0-1"],
+                  ["cairo", "1.10.2-1"],
                   ["libpng", "1.4.3-1"],
                   ["zlib", "1.2.5-2"],
                   ["expat", "2.0.1-1"],
@@ -120,15 +107,24 @@ def download_windows_binaries(binary_dir)
                   ["freetype", "2.4.2-1"],
                  ]
   dependencies.each do |name, version|
-    file_name = "#{name}_#{version}_win32.zip"
-    full_file_name = File.join(binary_dir, file_name)
-    next if File.exist?(full_file_name)
-    open("#{base_url}#{file_name}", "rb") do |input|
-      File.open(full_file_name, "wb") do |output|
-        output.print(input.read)
+    ["", "-dev"].each do |suffix|
+      file_name = "#{name}#{suffix}_#{version}_win32.zip"
+      full_file_name = File.join(binary_dir, file_name)
+      next if File.exist?(full_file_name)
+      open("#{base_url}#{file_name}", "rb") do |input|
+        File.open(full_file_name, "wb") do |output|
+          output.print(input.read)
+        end
       end
+      sh("unzip", "-o", full_file_name, "-d", binary_dir)
+    end
+  end
+  Dir.glob("#{binary_dir}/lib/pkgconfig/*.pc") do |pc_path|
+    pc = File.read(pc_path)
+    pc = pc.gsub(/\Aprefix=.+$/) {"prefix=#{File.expand_path(binary_dir)}"}
+    File.open(pc_path, "w") do |pc_file|
+      pc_file.print(pc)
     end
-    sh("unzip", full_file_name, "-d", binary_dir)
   end
 end
 
@@ -140,17 +136,10 @@ task "download_windows_binaries" do
   end
 end
 
-# fix Hoe's incorrect guess.
-project.spec.executables.clear
-
-task(:release).prerequisites.reject! {|name| name == "clean"}
-task(:release_to_rubyforge).prerequisites.reject! {|name| name == "clean"}
-
 # for releasing
-task :dist => [:docs] do
+task :dist do
   sh "./dist.sh", version
 end
-task :gem => [:docs]
 
 # for documentation
 langs = [

data/ext/cairo/cairo.def

@@ -51,7 +51,7 @@ EXPORTS
     rb_cCairo_GLDevice        DATA
     rb_cCairo_ScriptDevice    DATA
     rb_cCairo_XCBDevice       DATA
-    rb_cCairo_XlibtDevice     DATA
+    rb_cCairo_XlibDevice      DATA
     rb_cCairo_XMLDevice       DATA
 
     rb_mCairo_Operator        DATA

data/ext/cairo/depend

@@ -0,0 +1,2 @@
+install-so:
+	$(INSTALL_DATA) $(srcdir)/rb_cairo.h $(RUBYARCHDIR)

data/ext/cairo/extconf.rb

@@ -34,11 +34,13 @@ checking_for(checking_message("Win32 OS")) do
     import_library_name = "libruby-#{module_name}.a"
     $DLDFLAGS << " -Wl,--out-implib=#{import_library_name}"
     $cleanfiles << import_library_name
-    binary_base_dir = base_dir + "vendor" + "local"
-    $CFLAGS += " -I#{binary_base_dir}/include"
-    pkg_config_dir = binary_base_dir + "lib" + "pkgconfig"
-    PKGConfig.add_path(pkg_config_dir.to_s)
-    PKGConfig.set_override_variable("prefix", binary_base_dir.to_s)
+    if with_config('vendor-override', true)
+      binary_base_dir = base_dir + "vendor" + "local"
+      $CFLAGS += " -I#{binary_base_dir}/include"
+      pkg_config_dir = binary_base_dir + "lib" + "pkgconfig"
+      PKGConfig.add_path(pkg_config_dir.to_s)
+      PKGConfig.set_override_variable("prefix", binary_base_dir.to_s)
+    end
     true
   else
     false

data/ext/cairo/rb_cairo.c

@@ -76,7 +76,10 @@ Init_cairo ()
 
   rb_define_const (rb_mCairo, "BINDINGS_VERSION",
                    rb_ary_new3 (4,
-                                INT2FIX (1), INT2FIX (10), INT2FIX (0), Qnil));
+                                INT2FIX (RB_CAIRO_VERSION_MAJOR),
+                                INT2FIX (RB_CAIRO_VERSION_MINOR),
+                                INT2FIX (RB_CAIRO_VERSION_MICRO),
+                                Qnil));
 
   rb_define_module_function (rb_mCairo, "satisfied_version?",
                              rb_cairo_satisfied_version, -1);

data/ext/cairo/rb_cairo.h

@@ -71,6 +71,10 @@ RB_CAIRO_BEGIN_DECLS
 #  define RB_CAIRO_VAR extern
 #endif
 
+#define RB_CAIRO_VERSION_MAJOR 1
+#define RB_CAIRO_VERSION_MINOR 10
+#define RB_CAIRO_VERSION_MICRO 1
+
 RB_CAIRO_VAR VALUE rb_mCairo;
 RB_CAIRO_VAR VALUE rb_cCairo_Context;
 RB_CAIRO_VAR VALUE rb_cCairo_Point;

data/ext/cairo/rb_cairo_constants.c

@@ -41,7 +41,11 @@ VALUE rb_mCairo_MimeType = Qnil;
 VALUE rb_mCairo_RegionOverlap = Qnil;
 
 #define CAIRO_OPERATOR_MIN CAIRO_OPERATOR_CLEAR
-#define CAIRO_OPERATOR_MAX CAIRO_OPERATOR_SATURATE
+#if CAIRO_CHECK_VERSION(1, 10, 0)
+#  define CAIRO_OPERATOR_MAX CAIRO_OPERATOR_HSL_LUMINOSITY
+#else
+#  define CAIRO_OPERATOR_MAX CAIRO_OPERATOR_SATURATE
+#endif
 
 #define CAIRO_ANTIALIAS_MIN CAIRO_ANTIALIAS_DEFAULT
 #define CAIRO_ANTIALIAS_MAX CAIRO_ANTIALIAS_SUBPIXEL
@@ -80,7 +84,7 @@ VALUE rb_mCairo_RegionOverlap = Qnil;
 #define CAIRO_FORMAT_MAX CAIRO_FORMAT_RGB16_565
 
 #define CAIRO_EXTEND_MIN CAIRO_EXTEND_NONE
-#define CAIRO_EXTEND_MAX CAIRO_EXTEND_REFLECT
+#define CAIRO_EXTEND_MAX CAIRO_EXTEND_PAD
 
 #define CAIRO_FILTER_MIN CAIRO_FILTER_FAST
 #define CAIRO_FILTER_MAX CAIRO_FILTER_GAUSSIAN

data/ext/cairo/rb_cairo_context.c

@@ -1450,12 +1450,13 @@ static VALUE
 cr_get_target (VALUE self)
 {
   cairo_surface_t *surface;
-  VALUE rb_surface;
+  VALUE rb_surface = Qnil;
 
   surface = cairo_get_target (_SELF);
   rb_cairo_check_status (cairo_surface_status (surface));
 
-  rb_surface = rb_ivar_get (self, cr_id_surface);
+  if (RTEST (rb_ivar_defined (self, cr_id_surface)))
+      rb_surface = rb_ivar_get (self, cr_id_surface);
   if (NIL_P (rb_surface) || RVAL2CRSURFACE (rb_surface) != surface)
     {
       rb_surface = CRSURFACE2RVAL (surface);

data/ext/cairo/rb_cairo_device.c

@@ -22,6 +22,10 @@
 #  include <cairo-xml.h>
 #endif
 
+#if defined(CAIRO_HAS_SCRIPT_SURFACE) || defined(CAIRO_HAS_XML_SURFACE)
+#  define NEED_DEFINE_OUTPUT_INITIALIZE 1
+#endif
+
 VALUE rb_cCairo_Device = Qnil;
 VALUE rb_cCairo_DRMDevice = Qnil;
 VALUE rb_cCairo_GLDevice = Qnil;
@@ -97,6 +101,7 @@ rb_cairo_device_from_ruby_object (VALUE obj)
   return device;
 }
 
+#ifdef NEED_DEFINE_OUTPUT_INITIALIZE
 static rb_cairo__object_holder_t *
 cr_object_holder_new (VALUE object)
 {
@@ -108,6 +113,7 @@ cr_object_holder_free (void *ptr)
 {
   rb_cairo__object_holder_free (rb_cCairo_Device, ptr);
 }
+#endif
 
 static void
 cr_device_free (void *ptr)
@@ -227,6 +233,7 @@ cr_finish_all_guarded_devices_at_end (VALUE data)
                    Qnil);
 }
 
+#ifdef NEED_DEFINE_OUTPUT_INITIALIZE
 static void
 yield_and_finish (VALUE self)
 {
@@ -238,6 +245,7 @@ yield_and_finish (VALUE self)
   if (!cairo_device_get_user_data (device, &cr_finished_key))
     cr_device_finish (self);
 }
+#endif
 
 #define DEFINE_OUTPUT_INITIALIZE(type)                                  \
 static VALUE                                                            \

data/ext/cairo/rb_cairo_font_face.c

@@ -211,7 +211,7 @@ cr_user_font_face_invoke_rescue (VALUE user_data, VALUE exception)
   data = (cr_user_font_face_invoke_data_t *)user_data;
   *(data->status) = rb_cairo__exception_to_status (exception);
 
-  if (*(data->status) == -1)
+  if (*(data->status) == (cairo_status_t)-1)
     rb_exc_raise (exception);
 
   return Qnil;

data/ext/cairo/rb_cairo_surface.c

@@ -62,6 +62,8 @@ VALUE rb_cCairo_Surface;
 VALUE rb_cCairo_ImageSurface;
 VALUE rb_cCairo_PDFSurface = Qnil;
 VALUE rb_cCairo_PSSurface = Qnil;
+VALUE rb_cCairo_XLibSurface = Qnil;
+VALUE rb_cCairo_XCBSurface = Qnil;
 VALUE rb_cCairo_SVGSurface = Qnil;
 VALUE rb_cCairo_Win32Surface = Qnil;
 VALUE rb_cCairo_Win32PrintingSurface = Qnil;
@@ -129,6 +131,12 @@ cr_surface_get_klass (cairo_surface_t *surface)
     case CAIRO_SURFACE_TYPE_PS:
       klass = rb_cCairo_PSSurface;
       break;
+    case CAIRO_SURFACE_TYPE_XLIB:
+      klass = rb_cCairo_XLibSurface;
+      break;
+    case CAIRO_SURFACE_TYPE_XCB:
+      klass = rb_cCairo_XCBSurface;
+      break;
     case CAIRO_SURFACE_TYPE_QUARTZ:
       klass = rb_cCairo_QuartzSurface;
       break;
@@ -978,6 +986,24 @@ cr_pdf_surface_restrict_to_version (VALUE self, VALUE version)
 #  endif
 #endif
 
+#ifdef CAIRO_HAS_XLIB_SURFACE
+static VALUE
+cr_xlib_surface_initialize (int argc, VALUE *argv, VALUE self)
+{
+  rb_notimplement();
+  return Qnil;
+}
+#endif
+
+#ifdef CAIRO_HAS_XCB_SURFACE
+static VALUE
+cr_xcb_surface_initialize (int argc, VALUE *argv, VALUE self)
+{
+  rb_notimplement();
+  return Qnil;
+}
+#endif
+
 #ifdef CAIRO_HAS_SVG_SURFACE
 /* SVG-surface functions */
 DEFINE_SURFACE(svg)
@@ -1720,6 +1746,20 @@ Init_cairo_surface (void)
   RB_CAIRO_DEF_SETTERS (rb_cCairo_PDFSurface);
 #endif
 
+#ifdef CAIRO_HAS_XLIB_SURFACE
+  /* XLib-surface */
+  INIT_SURFACE(xlib, XLib)
+
+  RB_CAIRO_DEF_SETTERS (rb_cCairo_XLibSurface);
+#endif
+
+#ifdef CAIRO_HAS_XCB_SURFACE
+  /* XLib-surface */
+  INIT_SURFACE(xcb, XCB)
+
+  RB_CAIRO_DEF_SETTERS (rb_cCairo_XCBSurface);
+#endif
+
 #ifdef CAIRO_HAS_SVG_SURFACE
   /* SVG-surface */
   INIT_SURFACE(svg, SVG)

data/lib/cairo.rb

@@ -12,7 +12,7 @@ if /mingw|mswin|mswin32/ =~ RUBY_PLATFORM
   else
     require 'rbconfig'
     ENV['PATH'] = %w(bin lib).collect do |dir|
-      "#{Config::CONFIG["prefix"]}\\lib\\GTK\\#{dir};"
+      "#{RbConfig::CONFIG["prefix"]}\\lib\\GTK\\#{dir};"
     end.join('') + ENV['PATH']
   end
 end
@@ -40,7 +40,7 @@ require 'cairo/color'
 require 'cairo/paper'
 
 begin
-  major, minor, micro, = RUBY_VERSION.split(/\./)
+  major, minor, _ = RUBY_VERSION.split(/\./)
   require "#{major}.#{minor}/cairo.so"
 rescue LoadError
   require 'cairo.so'
@@ -128,7 +128,7 @@ module Cairo
     def rotate(radians); dup.rotate!(radians); end
     def invert; dup.invert!; end
     def multiply(other); dup.multiply!(other); end
-    alias * multiply
+    alias_method :*, :multiply
   end
 
   class FontOptions

data/lib/cairo/color.rb

@@ -11,7 +11,7 @@ module Cairo
         when :hsv, :hsva
           HSV.new(*value[1..-1])
         else
-          type, *value = value if [:rgb, :rgba].include?(value.first)
+          _, *value = value if [:rgb, :rgba].include?(value.first)
           RGB.new(*value)
         end
       when /\A#/ #
@@ -35,11 +35,11 @@ module Cairo
     def parse_hex_color(value)
       case value
       when /\A#((?:#{HEX_RE}){3,4})\z/ #
-        RGB.new(*$1.scan(/./).collect {|value| value.hex / 15.0})
+        RGB.new(*$1.scan(/./).collect {|part| part.hex / 15.0})
       when /\A#((?:#{HEX_RE}{2,2}){3,4})\z/ #
-        RGB.new(*$1.scan(/.{2,2}/).collect {|value| value.hex / 255.0})
+        RGB.new(*$1.scan(/.{2,2}/).collect {|part| part.hex / 255.0})
       when /\A#((?:#{HEX_RE}{4,4}){3,4})\z/ #
-        RGB.new(*$1.scan(/.{4,4}/).collect {|value| value.hex / 65535.0})
+        RGB.new(*$1.scan(/.{4,4}/).collect {|part| part.hex / 65535.0})
       else
         message = "invalid hex color format: #{value} should be "
         message << "#RGB, #RGBA, #RRGGBB, #RRGGBBAA, #RRRRGGGGBBBB "

data/lib/cairo/context/path.rb

@@ -25,7 +25,8 @@ module Cairo
           d = x
           i = -1
           type = points = nil
-          path.each do |type, points|
+          path.each do |_type, _points|
+            type, points = _type, _points
             i += 1
             break if d < parameterized_path[i]
             d -= parameterized_path[i]

data/test/run-test.rb

@@ -5,7 +5,7 @@ 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")
+if system("which make >/dev/null 2>&1")
   Dir.chdir(base_dir) do
     system("make > /dev/null") or exit(1)
   end

data/test/test_context.rb

@@ -74,7 +74,7 @@ class ContextTest < Test::Unit::TestCase
     face = context.font_face
     default_font_family = ""
     # default_font_family = "Helvetica" if quartz?
-    # default_font_family = "Arial" if win32?
+    default_font_family = "Arial" if win32?
     assert_equal([default_font_family,
                   Cairo::FONT_SLANT_NORMAL,
                   Cairo::FONT_WEIGHT_NORMAL],

data/test/test_font_face.rb

@@ -9,7 +9,7 @@ class FontFaceTest < Test::Unit::TestCase
     face = Cairo::ToyFontFace.new
     default_font_family = ""
     # default_font_family = "Helvetica" if quartz?
-    # default_font_family = "Arial" if win32?
+    default_font_family = "Arial" if win32?
     assert_equal([default_font_family,
                   Cairo::FONT_SLANT_NORMAL,
                   Cairo::FONT_WEIGHT_NORMAL],

data/test/test_recording_surface.rb

@@ -13,6 +13,9 @@ class RecordingSurfaceTest < Test::Unit::TestCase
       context.line_to(80, 100)
       context.stroke
     end
-    assert_equal([10.0, 20.0, 99.0, 109.0], surface.ink_extents)
+    # https://bugs.freedesktop.org/show_bug.cgi?id=24688
+    # causes expected value change. It is introduced between
+    # cairo 1.10.0 and 1.10.2.
+    assert_equal([14.0, 29.0, 67.0, 72.0], surface.ink_extents)
   end
 end

data/test/test_xml_surface.rb

@@ -24,7 +24,8 @@ class XMLSurfaceTest < Test::Unit::TestCase
   <source-pattern>
     <solid>0 0 0 1</solid>
   </source-pattern>
-  <path> 15 30 m 80 100 l  </path>  <tolerance>0.1</tolerance>
+  <path> 15 30 m 80 100 l</path>
+  <tolerance>0.1</tolerance>
   <antialias>ANTIALIAS_DEFAULT</antialias>
 </stroke>
 EOX

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cairo
 version: !ruby/object:Gem::Version 
-  hash: 63
-  prerelease: false
+  hash: 61
+  prerelease: 
   segments: 
   - 1
   - 10
-  - 0
-  version: 1.10.0
+  - 1
+  version: 1.10.1
 platform: ruby
 authors: 
 - Evan Marin
@@ -18,13 +18,66 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-12 00:00:00 +09:00
-default_executable: 
+date: 2011-10-12 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   name: pkg-config
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  type: :development
+  requirement: *id001
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  name: test-unit
+  prerelease: false
+  type: :development
+  requirement: *id002
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  name: test-unit-notify
+  prerelease: false
+  type: :development
+  requirement: *id003
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  name: rake
+  prerelease: false
+  type: :development
+  requirement: *id004
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -33,24 +86,52 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :runtime
-  version_requirements: *id001
+  name: rake-compiler
+  prerelease: false
+  type: :development
+  requirement: *id005
 - !ruby/object:Gem::Dependency 
-  name: rubyforge
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  name: jeweler
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  type: :development
+  requirement: *id006
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 3
         segments: 
-        - 2
         - 0
-        - 4
-        version: 2.0.4
+        version: "0"
+  name: yard
+  prerelease: false
   type: :development
-  version_requirements: *id002
+  requirement: *id007
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  name: packnga
+  prerelease: false
+  type: :development
+  requirement: *id008
 description: Ruby bindings for cairo
 email: 
 - cairo@cairographics.org
@@ -58,15 +139,18 @@ executables: []
 
 extensions: 
 - ext/cairo/extconf.rb
-extra_rdoc_files: []
-
+extra_rdoc_files: 
+- README.rdoc
 files: 
 - AUTHORS
 - COPYING
 - GPL
+- Gemfile
 - NEWS
+- README.rdoc
 - Rakefile
 - ext/cairo/cairo.def
+- ext/cairo/depend
 - ext/cairo/extconf.rb
 - ext/cairo/rb_cairo.c
 - ext/cairo/rb_cairo.h
@@ -90,7 +174,6 @@ files:
 - ext/cairo/rb_cairo_surface.c
 - ext/cairo/rb_cairo_text_cluster.c
 - ext/cairo/rb_cairo_text_extents.c
-- extconf.rb
 - lib/cairo.rb
 - lib/cairo/color.rb
 - lib/cairo/colors.rb
@@ -106,8 +189,6 @@ files:
 - lib/cairo/papers.rb
 - lib/cairo/path.rb
 - lib/cairo/point.rb
-- misc/update-colors.rb
-- samples/agg/README
 - samples/agg/aa_test.rb
 - samples/blur.rb
 - samples/pac-nomralize.rb
@@ -117,36 +198,34 @@ files:
 - samples/scalable.rb
 - samples/text-on-path.rb
 - samples/text2.rb
-- test/cairo-test-utils.rb
-- test/run-test.rb
-- test/test_color.rb
-- test/test_constants.rb
-- test/test_context.rb
-- test/test_exception.rb
-- test/test_font_extents.rb
-- test/test_font_face.rb
-- test/test_font_options.rb
-- test/test_paper.rb
-- test/test_recording_surface.rb
-- test/test_region.rb
-- test/test_scaled_font.rb
-- test/test_script_device.rb
-- test/test_script_surface.rb
 - test/test_surface.rb
+- test/test_scaled_font.rb
+- test/test_recording_surface.rb
+- test/test_text_to_glyphs_data.rb
+- test/test_font_extents.rb
 - test/test_tee_surface.rb
-- test/test_text_cluster.rb
 - test/test_text_extents.rb
-- test/test_text_to_glyphs_data.rb
+- test/test_paper.rb
+- test/test_context.rb
+- test/cairo-test-utils.rb
 - test/test_xml_device.rb
+- test/run-test.rb
+- test/test_script_surface.rb
+- test/test_region.rb
+- test/test_font_face.rb
+- test/test_script_device.rb
 - test/test_xml_surface.rb
-has_rdoc: true
+- test/test_exception.rb
+- test/test_text_cluster.rb
+- test/test_color.rb
+- test/test_font_options.rb
+- test/test_constants.rb
 homepage: http://cairographics.org/rcairo
-licenses: []
-
+licenses: 
+- Ruby's
 post_install_message: 
-rdoc_options: 
-- --main
-- README.txt
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -170,9 +249,30 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: cairo
-rubygems_version: 1.3.7
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Ruby bindings for cairo
-test_files: []
-
+test_files: 
+- test/test_surface.rb
+- test/test_scaled_font.rb
+- test/test_recording_surface.rb
+- test/test_text_to_glyphs_data.rb
+- test/test_font_extents.rb
+- test/test_tee_surface.rb
+- test/test_text_extents.rb
+- test/test_paper.rb
+- test/test_context.rb
+- test/cairo-test-utils.rb
+- test/test_xml_device.rb
+- test/run-test.rb
+- test/test_script_surface.rb
+- test/test_region.rb
+- test/test_font_face.rb
+- test/test_script_device.rb
+- test/test_xml_surface.rb
+- test/test_exception.rb
+- test/test_text_cluster.rb
+- test/test_color.rb
+- test/test_font_options.rb
+- test/test_constants.rb

data/extconf.rb

@@ -1,45 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'pathname'
-require 'mkmf'
-require 'rbconfig'
-require 'fileutils'
-
-base_dir = Pathname(__FILE__).dirname.expand_path
-ext_dir = base_dir + "ext" + "cairo"
-
-ruby = File.join(RbConfig::CONFIG['bindir'],
-                 RbConfig::CONFIG['ruby_install_name'] +
-                 RbConfig::CONFIG["EXEEXT"])
-
-Dir.chdir(ext_dir.to_s) do
-  system(ruby, "extconf.rb", *ARGV) || exit(false)
-end
-
-create_makefile("cairo")
-FileUtils.mv("Makefile", "Makefile.lib")
-
-File.open("Makefile", "w") do |makefile|
-  makefile.puts(<<-EOM)
-all:
-	(cd ext/cairo && $(MAKE))
-	$(MAKE) -f Makefile.lib
-
-install:
-	(cd ext/cairo && $(MAKE) install)
-	$(MAKE) -f Makefile.lib install
-
-site-install:
-	(cd ext/cairo && $(MAKE) site-install)
-	$(MAKE) -f Makefile.lib site-install
-
-clean:
-	(cd ext/cairo && $(MAKE) clean)
-	$(MAKE) -f Makefile.lib clean
-
-distclean:
-	(cd ext/cairo && $(MAKE) distclean)
-	$(MAKE) -f Makefile.lib distclean
-	@rm -f Makefile.lib
-EOM
-end

data/misc/update-colors.rb

@@ -1,143 +0,0 @@
-#!/usr/bin/env ruby
-
-begin
-  require 'scrapi'
-rescue LoadError
-  require 'rubygems'
-  require 'scrapi'
-end
-
-def collect_popular_colors(src=nil)
-  src ||= URI("http://en.wikipedia.org/wiki/List_of_colors")
-
-  row = Scraper.define do
-    process "th > a:first-child", :name => :text
-    process "td:nth-child(3)", :hex_triplet => :text
-    process "td:nth-child(4)", :red => :text
-    process "td:nth-child(5)", :green => :text
-    process "td:nth-child(6)", :blue => :text
-    result :name, :hex_triplet, :red, :green, :blue
-  end
-
-  scraper = Scraper.define do
-    process "table > tr", "rows[]" => row
-    result :rows
-  end
-
-  scraper.scrape(src)
-end
-
-def collect_x11_colors(src=nil)
-  src ||= URI("http://en.wikipedia.org/wiki/X11_color_names")
-
-  row = Scraper.define do
-    process "th", :name => :text
-    process "td:nth-child(2)", :hex_triplet => "@bgcolor"
-    process "td:nth-child(6)", :red => :text
-    process "td:nth-child(7)", :green => :text
-    process "td:nth-child(8)", :blue => :text
-    result :name, :hex_triplet, :red, :green, :blue
-  end
-
-  scraper = Scraper.define do
-    process "table > tr", "rows[]" => row
-    result :rows
-  end
-
-  x11_colors = scraper.scrape(src)
-  x11_colors.collect do |color|
-    if color.name
-      color.name = color.name.gsub(/([a-z]|[A-Z]+)([A-Z])/, "\\1 \\2")
-    end
-    color
-  end
-end
-
-def constanize_color_name(name)
-  names = name.gsub(/é/, "e").upcase.split(/(?:\s*\(|\)\s*)/)
-  names = names.collect {|name| name.gsub(/[ \-]/, "_")}
-  if names[1] and ["WEB", "COLOR_WHEEL", "X11"].include?(names[1])
-    real_names = [names.join("_")]
-    if names == ["ORANGE", "COLOR_WHEEL"]
-      real_names << names.first
-    end
-    names = real_names
-  end
-  names
-end
-
-colors = collect_popular_colors
-x11_colors = collect_x11_colors
-
-top_dir = File.expand_path(File.join(File.dirname(__FILE__), ".."))
-colors_rb = File.join(top_dir, "src", "lib", "cairo", "colors.rb")
-File.open(colors_rb, "w") do |rb|
-  rb.puts <<-HEADER
-require 'cairo/color'
-
-module Cairo
-  module Color
-HEADER
-
-  [
-   [colors, nil],
-   [x11_colors, "X11"]
-  ].each do |colors, mod|
-    indent = "  " * 2
-    if mod
-      rb.puts("#{indent}module #{mod}")
-      indent << "  "
-    end
-    colors.each do |color|
-      if color.name and color.hex_triplet and
-          color.red and color.green and color.blue
-        begin
-          names = constanize_color_name(color.name)
-
-          hexes = color.hex_triplet.scan(/[\da-f]{2,2}/i)
-          red_hex, green_hex, blue_hex = hexes.collect {|hex| hex.hex}
-
-          red = Integer(color.red)
-          green = Integer(color.green)
-          blue = Integer(color.blue)
-
-          if [red_hex, green_hex, blue_hex] != [red, green, blue]
-            warning_message = "Hex triplet(#{color.hex_triplet}) of "
-            warning_message << "#{color.name} is difference from RGB"
-            warning_message << "(#{red}, #{green}, #{blue}). "
-            if ["Alice Blue", "Old Rose"].include?(color.name)
-              warning_message << "Use hex triplet value."
-              red, green, blue = red_hex, green_hex, blue_hex
-            else
-              warning_message << "Use RGB value."
-            end
-            puts warning_message
-          end
-
-          r, g, b = [red, green, blue].collect {|v| v / 255.0}
-
-          rb.puts("#{indent}# #{color.name}: #{color.hex_triplet}")
-          name, *alias_names = names
-          rb.puts("#{indent}#{name} = RGB.new(#{r}, #{g}, #{b})")
-          alias_names.each do |alias_name|
-              rb.puts("#{indent}#{alias_name} = #{name}")
-            end
-        rescue ArgumentError
-          next
-        end
-      end
-    end
-
-    if mod
-      indent = indent[0..-3]
-      rb.puts("#{indent}end")
-      rb.puts("#{indent}include #{mod}")
-      rb.puts
-    end
-  end
-
-  rb.puts <<-FOOTER
-  end
-end
-FOOTER
-end

data/samples/agg/README

@@ -1,4 +0,0 @@
-There are many samples ported from Anti-Grain Geometry (AGG:
-http://www.antigrain.com/)
-
-They use Ruby/GTK+ for GUI.