glib2 3.4.3 → 3.4.4

data/test/test-unicode.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2015  Ruby-GNOME2 Project Team
+# Copyright (C) 2015-2021  Ruby-GNOME Project Team
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -13,7 +13,7 @@
 # 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
- 
+
 class TestGLibUnicode < Test::Unit::TestCase
   include GLibTestUtils
 
@@ -113,7 +113,6 @@ class TestGLibUnicode < Test::Unit::TestCase
   end
 
   def test_unichar_wide_cjk?
-    only_glib_version(2, 12, 0)
     assert(GLib::UniChar.wide_cjk?(unichar("あ")))
     assert(GLib::UniChar.wide_cjk?(0xD55C)) # HANGUL SYLLABLE HAN
     assert(!GLib::UniChar.wide_cjk?(unichar("a")))
@@ -176,17 +175,28 @@ class TestGLibUnicode < Test::Unit::TestCase
                  GLib::Unicode.canonical_ordering(utf8_to_utf32(original)))
   end
 
-  def test_unicode_canonical_decomposition
+  def test_unichar_compose
+    a_with_acute = 0x00E1
+    assert_equal(a_with_acute,
+                 GLib::UniChar.compose(unichar("a"), 0x0301))
+
+    hiragana_ga = 0x304C
+    hiragana_ka = 0x304B
+    assert_equal(hiragana_ga,
+                 GLib::UniChar.compose(hiragana_ka, 0x3099))
+  end
+
+  def test_unichar_decompose
     a_with_acute = 0x00E1
     expected = [unichar("a"), 0x0301].pack("U*")
     assert_equal(utf8_to_utf32(expected),
-                 GLib::Unicode.canonical_decomposition(a_with_acute))
+                 GLib::UniChar.decompose(a_with_acute))
 
     hiragana_ga = 0x304C
     hiragana_ka = 0x304B
     expected = [hiragana_ka, 0x3099].pack("U*")
     assert_equal(utf8_to_utf32(expected),
-                 GLib::Unicode.canonical_decomposition(hiragana_ga))
+                 GLib::UniChar.decompose(hiragana_ga))
   end
 
   def test_unichar_get_mirror_char
@@ -196,7 +206,6 @@ class TestGLibUnicode < Test::Unit::TestCase
   end
 
   def test_unichar_get_script
-    only_glib_version(2, 14, 0)
     assert_equal(GLib::Unicode::SCRIPT_HIRAGANA,
                  GLib::UniChar.get_script(unichar("あ")))
   end
@@ -261,14 +270,12 @@ class TestGLibUnicode < Test::Unit::TestCase
   end
 
   def test_utf8_collate
-    only_glib_version(2, 16, 0)
     assert_operator(0, :>, GLib::UTF8.collate("あ", "い"))
     assert_operator(0, :<, GLib::UTF8.collate("い", "あ"))
     assert_equal(0, GLib::UTF8.collate("あ", "あ"))
   end
 
   def test_utf8_collate_key
-    only_glib_version(2, 16, 0)
     assert_operator(0, :>,
                     GLib::UTF8.collate_key("あ") <=>
                     GLib::UTF8.collate_key("い"))
@@ -340,20 +347,17 @@ class TestGLibUnicode < Test::Unit::TestCase
   end
 
   def test_unichar_combining_class
-    only_glib_version(2, 14, 0)
     assert_equal(0, GLib::UniChar.combining_class(unichar("a")))
     assert_equal(230, GLib::UniChar.combining_class(unichar("́")))
   end
 
   def test_unichar_mark?
-    only_glib_version(2, 14, 0)
     assert(!GLib::UniChar.mark?(unichar("a")))
     assert(!GLib::UniChar.mark?(0x200E)) # LEFT-TO-RIGHT MARK
     assert(GLib::UniChar.mark?(0x1DC3)) # COMBINING SUSPENSION MARK
   end
 
   def test_unichar_zero_width?
-    only_glib_version(2, 14, 0)
     assert(!GLib::UniChar.zero_width?(unichar("a")))
     assert(GLib::UniChar.zero_width?(0x200B)) # ZERO WIDTH SPACE
   end

data/test/test-utils.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2015  Ruby-GNOME2 Project Team
+# Copyright (C) 2015-2021  Ruby-GNOME Project Team
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -13,37 +13,31 @@
 # 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
- 
+
 class TestGLibUtils < Test::Unit::TestCase
   include GLibTestUtils
 
   def test_user_cache_dir
-    only_glib_version(2, 6, 0)
     assert_kind_of(String, GLib.user_cache_dir)
   end
 
   def test_user_data_dir
-    only_glib_version(2, 6, 0)
     assert_kind_of(String, GLib.user_data_dir)
   end
 
   def test_user_config_dir
-    only_glib_version(2, 6, 0)
     assert_kind_of(String, GLib.user_config_dir)
   end
 
   def test_system_data_dirs
-    only_glib_version(2, 6, 0)
     assert_kind_of(Array, GLib.system_data_dirs)
   end
 
   def test_system_config_dirs
-    only_glib_version(2, 6, 0)
     assert_kind_of(Array, GLib.system_config_dirs)
   end
 
   def test_get_user_special_dir
-    only_glib_version(2, 14, 0)
     assert_nothing_raised do
       GLib.get_user_special_dir(GLib::UserDirectory::DESKTOP)
     end

data/test/test-variant-type.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2015  Ruby-GNOME2 Project Team
+# Copyright (C) 2015-2021  Ruby-GNOME Project Team
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -111,7 +111,6 @@ class TestGLibVariantType < Test::Unit::TestCase
     end
 
     test "OBJECT_PATH_ARRAY" do
-      only_glib_version(2, 30, 0)
       assert_equal("ao", GLib::VariantType::OBJECT_PATH_ARRAY.to_s)
     end
 
@@ -124,7 +123,6 @@ class TestGLibVariantType < Test::Unit::TestCase
     end
 
     test "VARDICT" do
-      only_glib_version(2, 30, 0)
       assert_equal("a{sv}", GLib::VariantType::VARDICT.to_s)
     end
   end

data/test/test-win32.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2015  Ruby-GNOME2 Project Team
+# Copyright (C) 2015-2021  Ruby-GNOME Project Team
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -13,15 +13,15 @@
 # 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
- 
+
 class TestGLibWin32 < Test::Unit::TestCase
   include GLibTestUtils
 
   def test_get_package_install_directory_of_module
-    only_win32
-    only_glib_version(2, 16, 0)
+    only_windows
 
-    assert_equal("FIXME",
-                 GLib::Win32.get_package_installation_directory_of_module)
+    expected = Pathname(RbConfig.ruby).parent.parent.to_s
+    actual = GLib::Win32.get_package_installation_directory_of_module
+    assert_equal(expected, normalize_path(actual))
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glib2
 version: !ruby/object:Gem::Version
-  version: 3.4.3
+  version: 3.4.4
 platform: ruby
 authors:
 - The Ruby-GNOME Project Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-10 00:00:00.000000000 Z
+date: 2021-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pkg-config
@@ -128,7 +128,6 @@ files:
 - ext/glib2/rbgobj_typemodule.c
 - ext/glib2/rbgobj_typeplugin.c
 - ext/glib2/rbgobj_value.c
-- ext/glib2/rbgobj_valuearray.c
 - ext/glib2/rbgobj_valuetypes.c
 - ext/glib2/rbgobject.c
 - ext/glib2/rbgobject.h
@@ -170,7 +169,6 @@ files:
 - sample/type-register.rb
 - sample/type-register2.rb
 - sample/utils.rb
-- test/glib-test-init.rb
 - test/glib-test-utils.rb
 - test/run-test.rb
 - test/test-binding.rb
@@ -221,7 +219,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.0.pre1
+rubygems_version: 3.3.0.dev
 signing_key: 
 specification_version: 4
 summary: Ruby/GLib2 is a Ruby binding of GLib-2.x.

data/ext/glib2/rbgobj_valuearray.c

@@ -1,100 +0,0 @@
-/* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/*
- *  Copyright (C) 2011-2019  Ruby-GNOME Project Team
- *  Copyright (C) 2006  Sjoerd Simons
- *
- *  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
- */
-
-#include "rbgprivate.h"
-
-static VALUE
-value_array_to_ruby(const GValue *from)
-{
-    VALUE ary;
-    guint i;
-
-    GValueArray *array = (GValueArray *)g_value_get_boxed(from);
-    if (array == NULL)
-        return Qnil;
-  
-    ary = rb_ary_new();
-    for (i = 0; i < array->n_values; i++)
-        rb_ary_push(ary, GVAL2RVAL(g_value_array_get_nth(array, i)));
-
-    return ary;
-}
-
-struct value_array_from_ruby_args {
-    VALUE ary;
-    long n;
-    GValueArray *result;
-};
-
-static VALUE
-value_array_from_ruby_body(VALUE value)
-{
-    long i;
-    struct value_array_from_ruby_args *args = (struct value_array_from_ruby_args *)value;
-
-    for (i = 0; i < args->n; i++) {
-        GValue v = G_VALUE_INIT;
-
-        g_value_init(&v, RVAL2GTYPE(RARRAY_PTR(args->ary)[i]));
-        rbgobj_rvalue_to_gvalue(RARRAY_PTR(args->ary)[i], &v);
-
-        g_value_array_append(args->result, &v);
-    }
-
-    return Qnil;
-}
-
-static G_GNUC_NORETURN VALUE
-value_array_from_ruby_rescue(VALUE value, VALUE error)
-{
-    g_value_array_free(((struct value_array_from_ruby_args *)value)->result);
-
-    rb_exc_raise(error);
-}
-
-static void
-value_array_from_ruby(const VALUE from, GValue *to)
-{
-    struct value_array_from_ruby_args args;
-
-    if (NIL_P(from)) {
-        g_value_set_boxed(to, NULL);
-
-        return;
-    }
-
-    args.ary = rb_ary_to_ary(from);
-    args.n = RARRAY_LEN(args.ary);
-    args.result = g_value_array_new((guint)args.n);
-
-    rb_rescue(value_array_from_ruby_body, (VALUE)&args,
-              value_array_from_ruby_rescue, (VALUE)&args);
-
-    g_value_set_boxed(to, args.result);
-}
-
-void
-Init_gobject_value_array(void)
-{
-    /* ValueArray is treated as Array */
-    rbgobj_register_g2r_func(G_TYPE_VALUE_ARRAY, value_array_to_ruby);
-    rbgobj_register_r2g_func(G_TYPE_VALUE_ARRAY, value_array_from_ruby);
-}

data/test/glib-test-init.rb

@@ -1,19 +0,0 @@
-# Copyright (C) 2015-2020  Ruby-GNOME 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
-
-$VERBOSE = true
-
-require "test-unit"