atk 3.1.1 → 3.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f09a744695f4474474cf82a87fec00fb70306302
-  data.tar.gz: 74b39b6737d52bb372ae0ba895f92e3742bc3a63
+  metadata.gz: 92ab659ac675fcf3fa2e7a524dd9660bebf5f6f2
+  data.tar.gz: 429d6f1756605f4eaa7b2e6187cb8fa071918fd4
 SHA512:
-  metadata.gz: 9f28d64e4ca9041df8921812be9e97e9966df920ea08d413977f8f58618cbcc341d4b7ed83197bd69a5b5c21d923b3a5675417e7ce7b6048e3ccf429af948557
-  data.tar.gz: 39b1ecafb64204bec6c6b5e01c18241182e5e6f1b249af0a3b68d47ae045a806c4507c18ceb5d2138f5c8a12484b808f1d8ca5ea3990aef737dd58b5d218efad
+  metadata.gz: 29019280b50ec87e3c0d0b6a4418810c369610fa8d6e5411d89733384baf97ec8885cfd45fe1e7c004c4ef28028970bfc2bb4736feb96b95664fe861070583a9
+  data.tar.gz: f4af0cee02bcbdbe3f8e5a96dc775dd8ee21131f281d5d84b193f90ef1802cef4a7362bda115b7122eebcb89f35ddc8e4ffd18e0804e97f25ce4e4485446cd55

data/Rakefile

@@ -1,8 +1,25 @@
 # -*- ruby -*-
+#
+# Copyright (C) 2017  Ruby-GNOME2 Project Team
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 $LOAD_PATH.unshift("./../glib2/lib")
 require "gnome2/rake/package-task"
 
+
 package_task = GNOME2::Rake::PackageTask.new do |package|
   package.summary = "Ruby/ATK is a Ruby binding of ATK-1.0.x."
   package.description = "Ruby/ATK is a Ruby binding of ATK-1.0.x."
@@ -15,7 +32,7 @@ package_task = GNOME2::Rake::PackageTask.new do |package|
       :name => "atk",
       :download_site => :gnome,
       :label => "atk",
-      :version => "2.22.0",
+      :version => "2.24.0",
       :compression_method => "xz",
       :windows => {
         :configure_args => [
@@ -28,4 +45,3 @@ package_task = GNOME2::Rake::PackageTask.new do |package|
   ]
 end
 package_task.define
-

data/dependency-check/Rakefile

@@ -0,0 +1,44 @@
+# Copyright (C) 2017  Ruby-GNOME2 Project Team
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+require "pkg-config"
+require "native-package-installer"
+
+case RUBY_PLATFORM
+when /mingw|mswin/
+  task :default => "nothing"
+else
+  task :default => "dependency:check"
+end
+
+task :nothing do
+end
+
+namespace :dependency do
+  desc "Check dependency"
+  task :check do
+    unless PKGConfig.check_version?("atk")
+      unless NativePackageInstaller.install(:altlinux => "libatk-devel",
+                                            :debian => "libatk1.0-dev",
+                                            :redhat => "atk-devel",
+                                            :arch => "atk",
+                                            :homebrew => "atk",
+                                            :macports => "atk")
+        exit(false)
+      end
+    end
+  end
+end

data/lib/atk.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2015  Ruby-GNOME2 Project Team
+# Copyright (C) 2017  Ruby-GNOME2 Project Team
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -14,39 +14,47 @@
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
-require 'glib2'
+require "gobject-introspection"
 
 base_dir = Pathname.new(__FILE__).dirname.dirname.expand_path
 vendor_dir = base_dir + "vendor" + "local"
 vendor_bin_dir = vendor_dir + "bin"
 GLib.prepend_dll_path(vendor_bin_dir)
-begin
-  major, minor, _ = RUBY_VERSION.split(/\./)
-  require "#{major}.#{minor}/atk.so"
-rescue LoadError
-  require 'atk.so'
-end
+vendor_girepository_dir = vendor_dir + "lib" + "girepository-1.0"
+GObjectIntrospection.prepend_typelib_path(vendor_girepository_dir)
+
+module Atk
+  LOG_DOMAIN = "Atk"
+  GLib::Log.set_log_domain(LOG_DOMAIN)
 
-if vendor_dir.exist?
-  begin
-    require "gobject-introspection"
-    vendor_girepository_dir = vendor_dir + "lib" + "girepository-1.0"
-    GObjectIntrospection.prepend_typelib_path(vendor_girepository_dir)
-  rescue LoadError
+  class Loader < GObjectIntrospection::Loader
+  end
+
+  loader = Loader.new(self)
+  loader.load("Atk")
+
+  class TextRectangle
+    def initialize(x=nil, y=nil, width=nil, height=nil)
+      super()
+      self.x = x if x
+      self.y = y if y
+      self.width = width if width
+      self.height = height if height
+    end
   end
-end
 
-module Atk
   module Version
-    MAJOR, MINOR, MICRO = Atk::BUILD_VERSION
-    STRING = Atk::BUILD_VERSION.join(".")
+    MAJOR = MAJOR_VERSION
+    MINOR = MINOR_VERSION
+    MICRO = MICRO_VERSION
+    STRING = "#{MAJOR_VERSION}.#{MINOR_VERSION}.#{MICRO_VERSION}"
     class << self
       def or_later?(major, minor, micro=nil)
         micro ||= 0
         version = [
-          MAJOR,
-          MINOR,
-          MICRO,
+          MAJOR_VERSION,
+          MINOR_VERSION,
+          MICRO_VERSION,
         ]
         (version <=> [major, minor, micro]) >= 0
       end

data/test/atk-test-utils.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013  Ruby-GNOME2 Project Team
+# Copyright (C) 2017  Ruby-GNOME2 Project Team
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public

data/test/run-test.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 #
-# Copyright (C) 2013-2015  Ruby-GNOME2 Project Team
+# Copyright (C) 2017  Ruby-GNOME2 Project Team
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -20,14 +20,17 @@ ruby_gnome2_base = File.join(File.dirname(__FILE__), "..", "..")
 ruby_gnome2_base = File.expand_path(ruby_gnome2_base)
 
 glib_base = File.join(ruby_gnome2_base, "glib2")
+gobject_introspection_base = File.join(ruby_gnome2_base, "gobject-introspection")
 atk_base = File.join(ruby_gnome2_base, "atk")
 
 modules = [
   [glib_base, "glib2"],
+  [gobject_introspection_base, "gobject-introspection"],
   [atk_base, "atk"]
 ]
 modules.each do |target, module_name|
-  if system("which make > /dev/null")
+  makefile = File.join(target, "Makefile")
+  if File.exist?(makefile) and system("which make > /dev/null")
     `make -C #{target.dump} > /dev/null` or exit(false)
   end
   $LOAD_PATH.unshift(File.join(target, "ext", module_name))

data/test/test-text-rectangle.rb

@@ -1,6 +1,4 @@
-# -*- coding: utf-8 -*-
-#
-# Copyright (C) 2013  Ruby-GNOME2 Project Team
+# Copyright (C) 2017  Ruby-GNOME2 Project Team
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -16,11 +14,14 @@
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
-class TestAtkRectangle < Test::Unit::TestCase
+class TestAtkTextRectangle < Test::Unit::TestCase
   include AtkTestUtils
 
   def test_width
     rectangle = Atk::TextRectangle.new(0, 10, 20, 30)
+    assert_equal(0, rectangle.x)
+    assert_equal(10, rectangle.y)
     assert_equal(20, rectangle.width)
+    assert_equal(30, rectangle.height)
   end
 end

data/test/test-version.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2015  Ruby-GNOME2 Project Team
+# Copyright (C) 2017  Ruby-GNOME2 Project Team
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: atk
 version: !ruby/object:Gem::Version
-  version: 3.1.1
+  version: 3.1.2
 platform: ruby
 authors:
 - The Ruby-GNOME2 Project Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-26 00:00:00.000000000 Z
+date: 2017-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: glib2
@@ -16,60 +16,23 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.1
+        version: 3.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.1
+        version: 3.1.2
 description: Ruby/ATK is a Ruby binding of ATK-1.0.x.
 email: ruby-gnome2-devel-en@lists.sourceforge.net
 executables: []
 extensions:
-- ext/atk/extconf.rb
+- dependency-check/Rakefile
 extra_rdoc_files: []
 files:
-- README
 - Rakefile
-- ext/atk/atk.def
-- ext/atk/depend
-- ext/atk/extconf.rb
-- ext/atk/rbatk.c
-- ext/atk/rbatk.h
-- ext/atk/rbatkaction.c
-- ext/atk/rbatkcomponent.c
-- ext/atk/rbatkconversions.h
-- ext/atk/rbatkdocument.c
-- ext/atk/rbatkeditabletext.c
-- ext/atk/rbatkgobjectaccessible.c
-- ext/atk/rbatkhyperlink.c
-- ext/atk/rbatkhypertext.c
-- ext/atk/rbatkimage.c
-- ext/atk/rbatkimplementor.c
-- ext/atk/rbatknoopobject.c
-- ext/atk/rbatknoopobjectfactory.c
-- ext/atk/rbatkobject.c
-- ext/atk/rbatkobjectfactory.c
-- ext/atk/rbatkobjectrole.c
-- ext/atk/rbatkprivate.h
-- ext/atk/rbatkregistry.c
-- ext/atk/rbatkrelation.c
-- ext/atk/rbatkrelationset.c
-- ext/atk/rbatkrelationtype.c
-- ext/atk/rbatkselection.c
-- ext/atk/rbatkstate.c
-- ext/atk/rbatkstateset.c
-- ext/atk/rbatkstreamablecontent.c
-- ext/atk/rbatktable.c
-- ext/atk/rbatktext.c
-- ext/atk/rbatktextattribute.c
-- ext/atk/rbatktextrange.c
-- ext/atk/rbatktextrectangle.c
-- ext/atk/rbatkutil.c
-- ext/atk/rbatkvalue.c
-- extconf.rb
+- dependency-check/Rakefile
 - lib/atk.rb
 - test/atk-test-utils.rb
 - test/run-test.rb
@@ -77,7 +40,7 @@ files:
 - test/test-version.rb
 homepage: http://ruby-gnome2.sourceforge.jp/
 licenses:
-- LGPLv2.1+
+- LGPL-2.1+
 metadata: {}
 post_install_message: 
 rdoc_options: []

data/README

@@ -1,30 +0,0 @@
-Ruby/ATK
-===============
-Ruby/ATK is a Ruby binding of ATK-1.12.x or later.
-
-Requirements
-------------
-   Ruby: http://www.ruby-lang.org/
-   GLib: http://www.gtk.org/
-   ATK: http://developer.gnome.org/projects/gap
-   Ruby/GLib2: http://ruby-gnome2.sourceforge.net/
-
-Install
--------
-   0. install ruby-1.9.x or later, GLib, ATK, Ruby/GLib2.
-   1. ruby extconf.rb
-   2. make
-   3. su
-   4. make install
-
-Copying
--------
-   Copyright (c) 2003-2005 Ruby-GNOME2 Project Team
-
-   This program is free software.
-   You can distribute/modify this program under the terms of
-   the GNU LESSER GENERAL PUBLIC LICENSE Version 2.1.
-
-Project Website
----------------
-   http://ruby-gnome2.sourceforge.jp/

data/ext/atk/atk.def

@@ -1,2 +0,0 @@
-EXPORTS
-	Init_atk

data/ext/atk/depend

@@ -1,11 +0,0 @@
-install-so: install-headers
-install-headers:
-	$(INSTALL_DATA) $(srcdir)/rbatk.h $(RUBYARCHDIR)
-	$(INSTALL_DATA) rbatkversion.h $(RUBYARCHDIR)
-
-install: install-pc
-install-pc:
-	if test -n "$(pkgconfigdir)"; then			\
-	  $(MAKEDIRS) $(pkgconfigdir);				\
-	  $(INSTALL_DATA) ruby-atk.pc $(pkgconfigdir);		\
-	fi

data/ext/atk/extconf.rb

@@ -1,83 +0,0 @@
-=begin
-extconf.rb for Ruby/Atk extention library
-=end
-
-require 'pathname'
-
-base_dir = Pathname(__FILE__).dirname.parent.parent.expand_path
-top_dir = base_dir.parent
-top_build_dir = Pathname(".").parent.parent.parent.expand_path
-
-mkmf_gnome2_dir = top_dir + "glib2" + 'lib'
-version_suffix = ""
-unless mkmf_gnome2_dir.exist?
-  if /(-\d+\.\d+\.\d+)(?:\.\d+)?\z/ =~ base_dir.basename.to_s
-    version_suffix = $1
-    mkmf_gnome2_dir = top_dir + "glib2#{version_suffix}" + 'lib'
-  end
-end
-
-$LOAD_PATH.unshift(mkmf_gnome2_dir.to_s)
-
-module_name = "atk"
-package_id = "atk"
-
-begin
-  require 'mkmf-gnome2'
-rescue LoadError
-  require 'rubygems'
-  gem 'glib2'
-  require 'mkmf-gnome2'
-end
-
-ruby_header = 'ruby.h'
-have_func 'rb_errinfo', ruby_header
-
-["glib2"].each do |package|
-  directory = "#{package}#{version_suffix}"
-  build_dir = "#{directory}/tmp/#{RUBY_PLATFORM}/#{package}/#{RUBY_VERSION}"
-  add_depend_package(package, "#{directory}/ext/#{package}",
-                     top_dir.to_s,
-                     :top_build_dir => top_build_dir.to_s,
-                     :target_build_dir => build_dir)
-end
-
-setup_windows(module_name, base_dir)
-
-unless required_pkg_config_package([package_id, 1, 12, 0],
-                                   :altlinux => "libatk-devel",
-                                   :debian => "libatk1.0-dev",
-                                   :redhat => "atk-devel",
-                                   :arch => "atk",
-                                   :homebrew => "atk",
-                                   :macports => "atk")
-  exit(false)
-end
-
-atk_header = "atk/atk.h"
-have_func('atk_action_get_localized_name', atk_header)
-have_func('atk_hyperlink_is_inline', atk_header)
-have_func('atk_object_add_relationship', atk_header)
-have_func('atk_object_remove_relationship', atk_header)
-have_func('atk_component_get_layer', atk_header)
-have_func('atk_component_get_mdi_zorder', atk_header)
-have_func('atk_hyperlink_is_selected_link', atk_header)
-have_func('atk_text_get_bounded_ranges', atk_header)
-have_func('atk_role_get_localized_name', atk_header)
-have_func('atk_text_clip_type_get_type', atk_header)
-
-have_func('atk_text_free_ranges', atk_header)
-
-make_version_header("ATK", package_id, ".")
-
-create_pkg_config_file("Ruby/ATK", package_id)
-$defs << " -DRUBY_ATK_COMPILATION"
-create_makefile(module_name)
-
-pkg_config_dir = with_config("pkg-config-dir")
-if pkg_config_dir.is_a?(String)
-  File.open("Makefile", "ab") do |makefile|
-    makefile.puts
-    makefile.puts("pkgconfigdir=#{pkg_config_dir}")
-  end
-end