glib2 3.4.6 → 3.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5cc0f7e879583c78a16beaf5bd526103aff1c1cd8ed38795bcd78279cac04f60
-  data.tar.gz: e8a36e9d680bd8e7678b9c42fde7048e64d21e34231b9b6d852a295e7faa4663
+  metadata.gz: cffba9b11672f9cdf8f80f4a9df6fad0227fd33c0a884a1de7bacaa4c8e51a9c
+  data.tar.gz: e1bc46a3573d04e5e2dc2d13063837e957da5649d326d255d0417ef13d57c1ea
 SHA512:
-  metadata.gz: dd7c4bfa0c976dd0a99b5082c6758a7a0e3ffc899bf5c4449d2e874e71e0dbc1e9527c2a0260d91f8a9618d9cc62ebccf9605b8095ce9f5febdcb8fafd04ca6d
-  data.tar.gz: 5aa55268dd1afe305f289fbed40e758392d553fdf09260b3e072c7944574b462bbc1167a9720daa20786bbe742cbf68163b7c586512bd106dca4b7adf7b7198b
+  metadata.gz: b639b7b657da8950b889c91c6ab6617876ad92b0d6949e28f5d3cb727f5e9808a39d53c7a802217fde933d1d78c29bde0010f2a79c8cfdf965066275c5dbfd3c
+  data.tar.gz: 80b94efc748df78da77c809904256be846f7cbc2b85406de9e753d65ca0f79548d19d3c72ece9604b369ba291444c1a4e00786feb32e042b4d1d8a24cbf2a947

data/ext/glib2/rbglib.h

@@ -33,7 +33,7 @@ G_BEGIN_DECLS
 
 #define RBGLIB_MAJOR_VERSION 3
 #define RBGLIB_MINOR_VERSION 4
-#define RBGLIB_MICRO_VERSION 6
+#define RBGLIB_MICRO_VERSION 7
 
 #ifndef RB_ZALLOC
 #  ifdef ZALLOC

data/ext/glib2/rbglib_error.c

@@ -109,9 +109,13 @@ rbgerr_define_gerror(GQuark domain, const gchar *name, VALUE module, VALUE paren
 {
     VALUE error_class;
     VALUE code_classes;
+    VALUE rb_domain = rb_str_new_cstr(g_quark_to_string(domain));
+    rbgutil_string_set_utf8_encoding(rb_domain);
 
     error_class = rb_define_class_under(module, name, parent);
-    rb_include_module(error_class, error_info);
+    rb_ivar_set(error_class, id_code, Qnil);
+    rb_ivar_set(error_class, id_domain, rb_domain);
+    rb_prepend_module(error_class, error_info);
 
     rb_hash_aset(gerror_table, UINT2NUM(domain), error_class);
 
@@ -142,6 +146,8 @@ rbgerr_define_gerror(GQuark domain, const gchar *name, VALUE module, VALUE paren
                                                code_class_name,
                                                error_class);
             g_free(code_class_name);
+            rb_ivar_set(code_class, id_code, INT2NUM(entry->value));
+            rb_ivar_set(code_class, id_domain, rb_domain);
             rb_hash_aset(code_classes, INT2NUM(entry->value), code_class);
         }
 
@@ -151,6 +157,15 @@ rbgerr_define_gerror(GQuark domain, const gchar *name, VALUE module, VALUE paren
     return error_class;
 }
 
+static VALUE
+rg_initialize(int argc, VALUE *argv, VALUE self)
+{
+    VALUE klass = rb_obj_class(self);
+    rb_ivar_set(self, id_code, rb_ivar_get(klass, id_code));
+    rb_ivar_set(self, id_domain, rb_ivar_get(klass, id_domain));
+    return rb_call_super(argc, argv);
+}
+
 static VALUE
 rbg_error_to_ruby(const GValue *from)
 {
@@ -168,9 +183,11 @@ Init_glib_error(void)
     gerror_table = rb_hash_new();
     rb_global_variable(&gerror_table);
 
+#define RG_TARGET_NAMESPACE error_info
     error_info = rb_define_module_under(mGLib, "ErrorInfo");
     rb_define_attr(error_info, "code", TRUE, FALSE);
     rb_define_attr(error_info, "domain", TRUE, FALSE);
+    RG_DEF_METHOD(initialize, -1);
 
     generic_error = rb_define_class_under(mGLib, "Error", rb_eRuntimeError);
     rb_include_module(generic_error, error_info);

data/ext/glib2/rbglib_messages.c

@@ -70,11 +70,10 @@ rbglib_log_handler(const gchar *log_domain, GLogLevelFlags log_level, const gcha
         if (rb_during_gc()) {
             g_printerr("\tfrom %s:%d\n", rb_sourcefile(), rb_sourceline());
         } else {
-            VALUE backtrace;
-
-            backtrace = rb_funcall(rb_mKernel, rb_intern("caller"), 0);
-            rb_iterate(rb_each, backtrace,
-                       rbg_printerr, Qnil);
+            VALUE backtrace = rb_funcall(rb_mKernel, rb_intern("caller"), 0);
+            ID id_each;
+            CONST_ID(id_each, "each");
+            rb_block_call(backtrace, id_each, 0, NULL, rbg_printerr, Qnil);
         }
     } else {
         g_log_default_handler(log_domain, log_level, message, user_data);

data/ext/glib2/rbgobj_object.c

@@ -364,7 +364,9 @@ static VALUE
 gobj_new_body(VALUE rb_arg)
 {
     struct param_setup_arg *arg = (struct param_setup_arg *)rb_arg;
-    rb_iterate(rb_each, (VALUE)arg->params_hash, _params_setup, (VALUE)arg);
+    ID id_each;
+    CONST_ID(id_each, "each");
+    rb_block_call(arg->params_hash, id_each, 0, NULL, _params_setup, (VALUE)arg);
     return (VALUE)g_object_newv(G_TYPE_FROM_CLASS(arg->gclass),
                                 arg->param_size, arg->params);
 }

data/ext/glib2/rbgobj_signal.c

@@ -719,7 +719,7 @@ gobj_s_signal_handler_attach(VALUE klass,
 {
     const RGObjClassInfo *cinfo = rbgobj_lookup_class(klass);
     guint signal_id = rbgobj_signal_get_raw(rb_signal)->signal_id;
-    VALUE handler_name = RVAL2CSTR(rb_handler_name);
+    const gchar *handler_name = RVAL2CSTR(rb_handler_name);
     VALUE proc = rb_block_proc();
     GClosure* rclosure = g_rclosure_new(proc,
                                         Qnil,

data/test/test-error.rb

@@ -0,0 +1,41 @@
+# Copyright (C) 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
+# 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
+
+class TestError < Test::Unit::TestCase
+  sub_test_case("error class") do
+    def test_code
+      assert_equal(nil,
+                   GLib::BookmarkFileError.new.code)
+    end
+
+    def test_domain
+      assert_equal("g-bookmark-file-error-quark",
+                   GLib::BookmarkFileError.new.domain)
+    end
+  end
+
+  sub_test_case("error code class") do
+    def test_code
+      assert_equal(GLib::BookmarkFileError::READ,
+                   GLib::BookmarkFileError::Read.new.code)
+    end
+
+    def test_domain
+      assert_equal("g-bookmark-file-error-quark",
+                   GLib::BookmarkFileError::Read.new.domain)
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glib2
 version: !ruby/object:Gem::Version
-  version: 3.4.6
+  version: 3.4.7
 platform: ruby
 authors:
 - The Ruby-GNOME Project Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-16 00:00:00.000000000 Z
+date: 2021-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pkg-config
@@ -177,6 +177,7 @@ files:
 - test/test-bytes.rb
 - test/test-date-time.rb
 - test/test-enum.rb
+- test/test-error.rb
 - test/test-file-utils.rb
 - test/test-flags.rb
 - test/test-glib2.rb