glib2 3.5.1 → 4.0.0

data/ext/glib2/rbgobj_typeinstance.c

@@ -125,7 +125,7 @@ void
 Init_gobject_typeinstance(void)
 {
     /* should be renamed to GLib::Instance? */
-    RG_TARGET_NAMESPACE = rb_define_class_under(mGLib, "Instantiatable", rb_cObject);
+    RG_TARGET_NAMESPACE = rb_define_class_under(rbg_mGLib(), "Instantiatable", rb_cObject);
     rb_extend_object(RG_TARGET_NAMESPACE, mMetaInterface);
 
     rb_define_alloc_func(RG_TARGET_NAMESPACE, (VALUE(*)_((VALUE)))instantiatable_s_allocate);

data/ext/glib2/rbgobj_typeinterface.c

@@ -107,7 +107,7 @@ rg_property(VALUE self, VALUE property_name)
         rb_raise(rb_eTypeError, "%s isn't interface module", rb_class2name(self));
     /* XXX: g_type_default_interface_ref(G_TYPE_INTERFACE) causes SEGV. */
     if (gtype == G_TYPE_INTERFACE) {
-        rb_raise(rb_const_get(mGLib, rb_intern("NoPropertyError")),
+        rb_raise(rb_const_get(rbg_mGLib(), rb_intern("NoPropertyError")),
                  "No such property: %s", name);
     }
 
@@ -115,7 +115,7 @@ rg_property(VALUE self, VALUE property_name)
     prop = g_object_interface_find_property(ginterface, name);
     if (!prop){
         g_type_default_interface_unref(ginterface);
-        rb_raise(rb_const_get(mGLib, rb_intern("NoPropertyError")),
+        rb_raise(rb_const_get(rbg_mGLib(), rb_intern("NoPropertyError")),
                  "No such property: %s", name);
     }
     result = GOBJ2RVAL(prop);
@@ -173,7 +173,7 @@ rbgobj_init_interface(VALUE interf)
 void
 Init_gobject_typeinterface(void)
 {
-    RG_TARGET_NAMESPACE = rb_define_module_under(mGLib, "MetaInterface");
+    RG_TARGET_NAMESPACE = rb_define_module_under(rbg_mGLib(), "MetaInterface");
     rbg_define_method(RG_TARGET_NAMESPACE, "gtype", generic_s_gtype, 0);
     RG_DEF_METHOD(append_features, 1);
     RG_DEF_METHOD(included, 1);
@@ -181,5 +181,5 @@ Init_gobject_typeinterface(void)
     RG_DEF_METHOD(property, 1);
     RG_DEF_METHOD(properties, -1);
 
-    rbgobj_mInterface = G_DEF_INTERFACE(G_TYPE_INTERFACE, "Interface", mGLib);
+    rbgobj_mInterface = G_DEF_INTERFACE(G_TYPE_INTERFACE, "Interface", rbg_mGLib());
 }

data/ext/glib2/rbgobj_typemodule.c

@@ -64,7 +64,7 @@ void     g_type_module_add_interface (GTypeModule           *module,
 void
 Init_gobject_gtypemodule(void)
 {
-    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(G_TYPE_TYPE_MODULE, "TypeModule", mGLib);
+    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(G_TYPE_TYPE_MODULE, "TypeModule", rbg_mGLib());
     RG_DEF_METHOD(use, 0);
     RG_DEF_METHOD(unuse, 0);
     RG_DEF_METHOD(name, 0);

data/ext/glib2/rbgobj_typeplugin.c

@@ -51,7 +51,7 @@ void    g_type_plugin_complete_interface_info  (GTypePlugin     *plugin,
 void
 Init_gobject_gtypeplugin(void)
 {
-    VALUE RG_TARGET_NAMESPACE = G_DEF_INTERFACE(G_TYPE_TYPE_PLUGIN, "TypePlugin", mGLib);
+    VALUE RG_TARGET_NAMESPACE = G_DEF_INTERFACE(G_TYPE_TYPE_PLUGIN, "TypePlugin", rbg_mGLib());
     RG_DEF_METHOD(use, 0);
     RG_DEF_METHOD(unuse, 0);
 }

data/ext/glib2/rbgobj_value.c

@@ -422,7 +422,7 @@ Init_gobject_gvalue(void)
     qRValueToGValueFunc = g_quark_from_static_string("__ruby_r2g_func__");
     qGValueToRValueFunc = g_quark_from_static_string("__ruby_g2r_func__");
 
-    RG_TARGET_NAMESPACE = G_DEF_CLASS(G_TYPE_VALUE, "Value", mGLib);
+    RG_TARGET_NAMESPACE = G_DEF_CLASS(G_TYPE_VALUE, "Value", rbg_mGLib());
     RG_DEF_METHOD(initialize, -1);
     RG_DEF_METHOD(type, 0);
     RG_DEF_METHOD(value, 0);

data/ext/glib2/rbgobj_valuetypes.c

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2011-2020  Ruby-GNOME Project Team
+ *  Copyright (C) 2011-2022  Ruby-GNOME Project Team
  *  Copyright (C) 2002,2003  Masahiro Sakai
  *
  *  This library is free software; you can redistribute it and/or
@@ -22,11 +22,21 @@
 #include "rbgprivate.h"
 #include "rbgobject.h"
 
+static const rb_data_type_t rbg_pointer_type = {
+    "GLib::Poitner",
+    {
+        NULL,
+        NULL,
+    },
+    NULL,
+    NULL,
+    RUBY_TYPED_FREE_IMMEDIATELY,
+};
 
 VALUE
 rbgobj_ptr_new(GType type, gpointer ptr)
 {
-    return Data_Wrap_Struct(GTYPE2CLASS(type), NULL, NULL, ptr);
+    return TypedData_Wrap_Struct(GTYPE2CLASS(type), &rbg_pointer_type, ptr);
 }
 
 gpointer
@@ -34,7 +44,7 @@ rbgobj_ptr2cptr(VALUE ptr)
 {
     gpointer dest;
     if (rb_obj_is_kind_of(ptr, GTYPE2CLASS(G_TYPE_POINTER))){
-        Data_Get_Struct(ptr, void, dest);
+        TypedData_Get_Struct(ptr, void, &rbg_pointer_type, dest);
     } else if (rb_obj_is_kind_of(ptr, rb_cObject)){
         dest = (gpointer)ptr;
     } else{
@@ -58,7 +68,7 @@ ptr_gtype(VALUE self)
 static void
 Init_gtype_pointer(void)
 {
-    VALUE cPtr = G_DEF_CLASS(G_TYPE_POINTER, "Pointer", mGLib);
+    VALUE cPtr = G_DEF_CLASS(G_TYPE_POINTER, "Pointer", rbg_mGLib());
     rbg_define_singleton_method(cPtr, "gtype", ptr_s_gtype, 1);
     rbg_define_method(cPtr, "gtype", ptr_gtype, 1);
 }

data/ext/glib2/rbgobject.c

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2003-2021  Ruby-GNOME Project Team
+ *  Copyright (C) 2003-2022  Ruby-GNOME Project Team
  *  Copyright (C) 2002,2003  Masahiro Sakai
  *  Copyright (C) 1998-2000  Yukihiro Matsumoto,
  *                           Daisuke Kanda,
@@ -179,12 +179,7 @@ rbgobj_ruby_object_from_instance_with_unref(gpointer instance)
 void
 rbgobj_add_relative(VALUE obj, VALUE relative)
 {
-    static VALUE mGLibObject = Qnil;
-    if (NIL_P(mGLibObject)) {
-        mGLibObject = rb_const_get(mGLib, rb_intern("Object"));
-    }
-
-    if (rb_obj_is_kind_of(obj, mGLibObject)) {
+    if (rb_obj_is_kind_of(obj, rbg_cGLibObject())) {
         rbgobj_object_add_relative(obj, relative);
     } else {
         VALUE rb_gc_marker = Qnil;
@@ -212,13 +207,8 @@ rbgobj_invalidate_relatives(VALUE obj)
 void
 rbgobj_add_relative_removable(VALUE obj, VALUE relative, ID obj_ivar_id, VALUE hash_key)
 {
-    static VALUE cGLibObject = Qnil;
-    if (NIL_P(cGLibObject)) {
-        cGLibObject = rb_const_get(mGLib, rb_intern("Object"));
-    }
-
     if (obj_ivar_id == rbgobj_id_children &&
-        rb_obj_is_kind_of(obj, cGLibObject)) {
+        rb_obj_is_kind_of(obj, rbg_cGLibObject())) {
         rbgobj_object_add_relative(obj, hash_key);
     } else {
         VALUE hash = Qnil;
@@ -251,17 +241,12 @@ rbgobj_get_relative_removable(VALUE obj, ID obj_ivar_id, VALUE hash_key)
 void
 rbgobj_remove_relative(VALUE obj, ID obj_ivar_id, VALUE relative)
 {
-    static VALUE cGLibObject = Qnil;
-    if (NIL_P(cGLibObject)) {
-        cGLibObject = rb_const_get(mGLib, rb_intern("Object"));
-    }
-
     if (obj_ivar_id == (ID)0) {
         obj_ivar_id = id_relatives;
     }
 
     if ((obj_ivar_id == id_relatives || obj_ivar_id == rbgobj_id_children) &&
-        rb_obj_is_kind_of(obj, cGLibObject)) {
+        rb_obj_is_kind_of(obj, rbg_cGLibObject())) {
         rbgobj_object_remove_relative(obj, relative);
     } else {
         VALUE rb_gc_marker = Qnil;
@@ -343,7 +328,7 @@ rbgobj_define_property_accessors(VALUE klass)
 
         if (pspec->flags & G_PARAM_READABLE){
             g_string_append_printf(
-                source, 
+                source,
                 "def %s%s; get_property('%s'); end\n",
                 prop_name,
                 (G_PARAM_SPEC_VALUE_TYPE(pspec) == G_TYPE_BOOLEAN) ? "?" : "",
@@ -361,11 +346,12 @@ rbgobj_define_property_accessors(VALUE klass)
         g_free(buf);
     }
 
-    if (source->len > 0)
+    if (source->len > 0) {
         rb_funcall(klass, id_module_eval, 3,
                    rb_str_new2(source->str),
                    rb_str_new2(__FILE__),
                    INT2NUM(__LINE__));
+    }
     g_string_free(source, TRUE);
 }
 

data/ext/glib2/rbgobject.h

@@ -237,6 +237,7 @@ extern GClosure* g_rclosure_new_call(VALUE callback_proc,
                                      VALUE extra_args,
                                      RGClosureCallFunc func);
 extern void g_rclosure_attach(GClosure *closure, VALUE object);
+extern void g_rclosure_attach_gobject(GClosure *closure, VALUE object);
 extern void g_rclosure_set_tag(GClosure *closure, const gchar *tag);
 
 /* rbgobj_value.c */

data/ext/glib2/rbgprivate.h

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2007-2021  Ruby-GNOME Project Team
+ *  Copyright (C) 2007-2022  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
@@ -22,12 +22,15 @@
 
 /*
  * CentOS 7: GLib 2.50
- * CentOS 8: GLib 2.56
- * Ubuntu 16.04: GLib 2.48
+ * AlmaLinux 8: GLib 2.56
+ * AlmaLinux 9: GLib 2.68
  * Ubuntu 18.04: GLib 2.56
  * Ubuntu 20.04: GLib 2.64
+ * Ubuntu 22.04: GLib 2.72
  */
-#define GLIB_VERSION_MIN_REQUIRED GLIB_VERSION_2_48
+#define GLIB_VERSION_MIN_REQUIRED GLIB_VERSION_2_50
+
+#define G_LOG_DOMAIN "Ruby/GLib2"
 
 #include "rbgobject.h"
 

data/ext/glib2/rbgutil.c

@@ -46,6 +46,25 @@ rbg_define_method(VALUE klass, const char *name, VALUE (*func)(ANYARGS), int arg
                INT2NUM(__LINE__));
 }
 
+void
+rbg_define_private_method(VALUE klass,
+                          const char *name,
+                          VALUE (*func)(ANYARGS),
+                          int argc)
+{
+    rb_define_private_method(klass, name, func, argc);
+    if ((argc != 1) || strncmp(name, "set_", 4))
+        return;
+
+    name += 4;
+    rb_funcall(klass, rbgutil_id_module_eval, 3,
+               CSTR2RVAL_FREE(g_strdup_printf("def %s=(val); set_%s(val); val; end\n"
+                                              "private :%s=\n",
+                                              name, name, name)),
+               rb_str_new2(__FILE__),
+               INT2NUM(__LINE__));
+}
+
 void
 rbg_define_singleton_method(VALUE obj, const char *name, VALUE (*func)(ANYARGS), int argc)
 {
@@ -84,7 +103,7 @@ rbgutil_set_properties(VALUE self, VALUE hash)
 VALUE
 rbgutil_def_setters(VALUE klass)
 {
-    return rb_funcall(mGLib, id_add_one_arg_setter, 1, klass);
+    return rb_funcall(rbg_mGLib(), id_add_one_arg_setter, 1, klass);
 }
 
 void

data/ext/glib2/rbgutil.h

@@ -55,6 +55,8 @@ G_BEGIN_DECLS
 #define RG_DEF_ATTR(attr, read, write, ex) \
         rb_attr(RG_TARGET_NAMESPACE, rb_intern(attr), read, write, ex)
 #define RG_DEF_ALIAS(new, old) rb_define_alias(RG_TARGET_NAMESPACE, new, old)
+#define RG_DEF_PRIVATE_METHOD(method, argc) \
+        rbg_define_private_method(RG_TARGET_NAMESPACE, #method, rg_ ## method, argc)
 
 #define RG_REG_GLIBID_SETTER(name) \
         rbgobj_register_property_setter(CLASS2GTYPE(RG_TARGET_NAMESPACE), name, rbgutil_glibid_r2g_func)
@@ -88,6 +90,7 @@ G_BEGIN_DECLS
     (rbgutil_string_set_utf8_encoding(string))
 
 extern void rbg_define_method(VALUE klass, const char *name, VALUE (*func)(ANYARGS), int argc);
+extern void rbg_define_private_method(VALUE klass, const char *name, VALUE (*func)(ANYARGS), int argc);
 extern void rbg_define_singleton_method(VALUE obj, const char *name, VALUE (*func)(ANYARGS), int argc);
 extern VALUE rbgutil_def_setters(VALUE klass);
 extern void rbgutil_set_properties(VALUE self, VALUE hash);

data/ext/glib2/rbgutil_callback.c

@@ -56,7 +56,7 @@ rbgutil_protect(VALUE (*func) (VALUE), VALUE data)
 void
 rbgutil_on_callback_error(VALUE error)
 {
-    rb_funcall(mGLib, id_exit_application, 2, error, INT2NUM(EXIT_FAILURE));
+    rb_funcall(rbg_mGLib(), id_exit_application, 2, error, INT2NUM(EXIT_FAILURE));
 }
 
 /**********************************************************************/
@@ -228,13 +228,13 @@ rbgutil_start_callback_dispatch_thread(void)
     VALUE callback_dispatch_thread;
 
     g_mutex_lock(&callback_dispatch_thread_mutex);
-    callback_dispatch_thread = rb_ivar_get(mGLib, id_callback_dispatch_thread);
+    callback_dispatch_thread = rb_ivar_get(rbg_mGLib(), id_callback_dispatch_thread);
     if (NIL_P(callback_dispatch_thread)) {
         if (pipe(callback_pipe_fds) == -1)
             rb_sys_fail("pipe()");
 
         callback_dispatch_thread = rb_thread_create(mainloop, NULL);
-        rb_ivar_set(mGLib, id_callback_dispatch_thread,
+        rb_ivar_set(rbg_mGLib(), id_callback_dispatch_thread,
                     callback_dispatch_thread);
     }
     g_mutex_unlock(&callback_dispatch_thread_mutex);
@@ -248,10 +248,10 @@ rbgutil_stop_callback_dispatch_thread(void)
     VALUE callback_dispatch_thread;
 
     g_mutex_lock(&callback_dispatch_thread_mutex);
-    callback_dispatch_thread = rb_ivar_get(mGLib, id_callback_dispatch_thread);
+    callback_dispatch_thread = rb_ivar_get(rbg_mGLib(), id_callback_dispatch_thread);
     if (!NIL_P(callback_dispatch_thread)) {
         queue_callback_request(NULL);
-        rb_ivar_set(mGLib, id_callback_dispatch_thread, Qnil);
+        rb_ivar_set(rbg_mGLib(), id_callback_dispatch_thread, Qnil);
     }
     g_mutex_unlock(&callback_dispatch_thread_mutex);
 #endif
@@ -262,12 +262,12 @@ Init_gutil_callback(void)
 {
     id_exit_application = rb_intern("exit_application");
     rbgutil_eGLibCallbackNotInitializedError =
-        rb_define_class_under(mGLib, "CallbackNotInitializedError",
+        rb_define_class_under(rbg_mGLib(), "CallbackNotInitializedError",
                               rb_eRuntimeError);
 
 #ifdef HAVE_NATIVETHREAD
     id_callback_dispatch_thread = rb_intern("callback_dispatch_thread");
-    rb_ivar_set(mGLib, id_callback_dispatch_thread, Qnil);
+    rb_ivar_set(rbg_mGLib(), id_callback_dispatch_thread, Qnil);
 
     callback_request_queue = g_async_queue_new();
     g_mutex_init(&callback_dispatch_thread_mutex);

data/lib/glib2/date-time.rb

@@ -0,0 +1,35 @@
+# Copyright (C) 2022  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
+
+module GLib
+  class DateTime
+    class << self
+      def try_convert(value)
+        case value
+        when ::Time
+          new(year: value.year,
+              month: value.month,
+              day: value.day,
+              hour: value.hour,
+              minute: value.min,
+              second: value.sec + (value.nsec / 1_000_000_000.0))
+        else
+          nil
+        end
+      end
+    end
+  end
+end

data/lib/glib2/variant.rb

@@ -0,0 +1,25 @@
+# Copyright (C) 2022  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
+
+module GLib
+  class Variant
+    def inspect
+      super.gsub(/>\z/) do
+        " type=#{type} value=#{value.inspect}>"
+      end
+    end
+  end
+end

data/lib/glib2.rb

@@ -335,8 +335,13 @@ GLib::Log.set_log_domain(GLib::Thread::LOG_DOMAIN)
 GLib::Log.set_log_domain(GLib::Module::LOG_DOMAIN)
 
 require "glib2/version"
-require "glib2/regex"
+
 require "glib2/deprecated"
+
+require "glib2/date-time"
+require "glib2/regex"
+require "glib2/variant"
+
 =begin
 Don't we need this?
 ObjectSpace.define_finalizer(GLib) {

data/lib/mkmf-gnome.rb

@@ -191,12 +191,12 @@ end
 
 def add_depend_package_path(target_name, target_source_dir, target_build_dir)
   if File.exist?(target_source_dir)
-    $INCFLAGS = "-I#{target_source_dir} #{$INCFLAGS}"
+    $INCFLAGS = "-I#{target_source_dir}".quote + " #{$INCFLAGS}"
   end
 
   return unless File.exist?(target_build_dir)
   if target_source_dir != target_build_dir
-    $INCFLAGS = "-I#{target_build_dir} #{$INCFLAGS}"
+    $INCFLAGS = "-I#{target_build_dir}".quote + " #{$INCFLAGS}"
   end
 
   library_base_name = File.basename(target_source_dir).gsub(/-/, "_")

data/test/test-date-time.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2016-2021  Ruby-GNOME Project Team
+# Copyright (C) 2016-2022  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
@@ -24,7 +24,6 @@ class TestDateTime < Test::Unit::TestCase
   end
 
   sub_test_case "new" do
-
     test "unix: :local" do
       time = Time.now
       format = "%Y-%m-%d-%H-%M"
@@ -111,4 +110,17 @@ class TestDateTime < Test::Unit::TestCase
       assert_equal(time.sec, datetime.second)
     end
   end
+
+  def test_format_iso8601
+    only_glib_version(2, 66, 0)
+    datetime = GLib::DateTime.new(year: 2022,
+                                  month: 7,
+                                  day: 18,
+                                  hour: 23,
+                                  minute: 24,
+                                  second: 4.9,
+                                  timezone: GLib::TimeZone.utc)
+    assert_equal("2022-07-18T23:24:04.900000Z",
+                 datetime.format_iso8601)
+  end
 end

data/test/test-glib2.rb

@@ -1,6 +1,6 @@
 # coding: ascii-8bit
 #
-# Copyright (C) 2015-2019  Ruby-GNOME2 Project Team
+# Copyright (C) 2015-2022  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
@@ -130,17 +130,19 @@ class TestGLib < Test::Unit::TestCase
   end
 
   def test_signal_handler_disconnect_and_gc
-    obj = GLib::Object.new
+    object = GLib::Object.new
     klass = Class.new
-    1000.times {
-      a = klass.new
-      id = obj.signal_connect("notify") { p a }
-      obj.signal_handler_disconnect(id)
+    n_tries = 100
+    n_tries.times {
+      garbage_collected_object = klass.new
+      id = object.signal_connect("notify") { p garbage_collected_object }
+      object.signal_handler_disconnect(id)
     }
     GC.start
-    ary = []
-    ObjectSpace.each_object(klass) { |a| ary.push(a) }
-    assert_operator(ary.size, :<, 1000)
+    n_alive_objects = ObjectSpace.each_object(klass) {}
+    assert do
+      n_alive_objects < n_tries
+    end
   end
 
   def test_gtype
@@ -150,4 +152,14 @@ class TestGLib < Test::Unit::TestCase
     obj = GLib::Object.new
     assert_equal(obj.gtype, GLib::Object.gtype)
   end
+
+  def test_malloc
+    address = GLib.malloc(29)
+    GLib.free(address)
+  end
+
+  def test_malloc0
+    address = GLib.malloc0(29)
+    GLib.free(address)
+  end
 end

data/test/test-variant.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2018  Ruby-GNOME2 Project Team
+# Copyright (C) 2018-2022  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
@@ -17,6 +17,31 @@
 class TestGLibVariant < Test::Unit::TestCase
   include GLibTestUtils
 
+  sub_test_case ".parse" do
+    test "no type" do
+      variant = GLib::Variant.parse("'hello'")
+      assert_equal([GLib::VariantType::STRING, "hello"],
+                   [variant.type, variant.value])
+    end
+
+    test "type" do
+      variant = GLib::Variant.parse("29", "y")
+      assert_equal([GLib::VariantType::BYTE, 29],
+                   [variant.type, variant.value])
+    end
+
+    test "garbage" do
+      message = <<-MESSAGE
+expected end of input:
+  29 hello
+     ^    
+      MESSAGE
+      assert_raise(GLib::VariantParseError::InputNotAtEnd.new(message)) do
+        GLib::Variant.parse("29 hello", "y")
+      end
+    end
+  end
+
   sub_test_case "#initialize" do
     test "type: string" do
       variant = GLib::Variant.new("hello", "s")
@@ -24,4 +49,22 @@ class TestGLibVariant < Test::Unit::TestCase
                    [variant.type, variant.value])
     end
   end
+
+  sub_test_case "#to_s" do
+    test "default" do
+      variant = GLib::Variant.new(29, "y")
+      assert_equal("0x1d", variant.to_s)
+    end
+
+    test "type_annotate:" do
+      variant = GLib::Variant.new(29, "y")
+      assert_equal("byte 0x1d", variant.to_s(type_annotate: true))
+    end
+  end
+
+  test "#inspect" do
+    variant = GLib::Variant.new(29, "y")
+    assert_equal("#<GLib::Variant:0x00 type=y value=29>",
+                 variant.inspect.gsub(/0x\h+/, "0x00"))
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glib2
 version: !ruby/object:Gem::Version
-  version: 3.5.1
+  version: 4.0.0
 platform: ruby
 authors:
 - The Ruby-GNOME Project Team
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-17 00:00:00.000000000 Z
+date: 2022-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pkg-config
@@ -65,8 +65,6 @@ files:
 - Rakefile
 - ext/glib2/depend
 - ext/glib2/extconf.rb
-- ext/glib2/glib-enum-types.c
-- ext/glib2/glib-enum-types.h
 - ext/glib2/glib2.def
 - ext/glib2/rbgcompat.h
 - ext/glib2/rbglib-bytes.c
@@ -145,9 +143,11 @@ files:
 - glib2.gemspec
 - lib/glib-mkenums.rb
 - lib/glib2.rb
+- lib/glib2/date-time.rb
 - lib/glib2/deprecatable.rb
 - lib/glib2/deprecated.rb
 - lib/glib2/regex.rb
+- lib/glib2/variant.rb
 - lib/glib2/version.rb
 - lib/gnome2-raketask.rb
 - lib/gnome2/rake/external-package.rb
@@ -207,7 +207,7 @@ licenses:
 - LGPL-2.1+
 metadata:
   msys2_mingw_dependencies: glib2
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -223,7 +223,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.4.0.dev
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Ruby/GLib2 is a Ruby binding of GLib-2.x.
 test_files: []