gobject-introspection 3.3.6 → 3.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 00b3cb89e6856b82bf64ac65e776f8a6881a0e2d6e8b14b2eff708b75f72ee22
-  data.tar.gz: ab04989918760421ce712721a251b368dcceb1b206ad932df789d646c58694d6
+  metadata.gz: 4ef3e45ea2b6d4e28b1843c528a1ba4aee03b1df923327f2942fd6d1b377eee5
+  data.tar.gz: 1032fca067c089c9706d919e74db6c5c5385ec8a14278fbe3256d72532df7784
 SHA512:
-  metadata.gz: bfe9bf4ac5f2c3bc7878d32dc6fa9c4e0c2dc3f4c24257d5ceaa61d53ba5d51338ba6975e95dbbbd53307752861484af2f6a345e641c1d514a4705b0370e04ab
-  data.tar.gz: '0466383df2a3d193cd280a7b728ada56841dcf5fe502bc5766203aeab628054dc30dfb9f1d2aab6945debd9073a740184eb72587381139bf7e1e1ccaeac57ead'
+  metadata.gz: '09846692d8fc65661b11d2972720eed395e5500544bf8bd2af186da930d92751e76db258db7b78bbd388191c6ce012d218bf7b3a356ff8688aeb1574b939169d'
+  data.tar.gz: 7c4cd440d50656c99d8472087a5599eaea262289daae2e00ca8f2c383c2ab934eb5420487a1090a100a9aaefcdc2ce4e74f4c6bd2a9904c84df8838f0a57b367

data/ext/gobject-introspection/extconf.rb

@@ -59,6 +59,7 @@ unless required_pkg_config_package(package_id,
   exit(false)
 end
 
+# TODO: Remove this when we dropped support for GObject Introspection < 1.60
 make_version_header("GI", package_id, ".")
 
 gi_headers = ["girepository.h"]

data/ext/gobject-introspection/rb-gi-argument.c

@@ -3223,6 +3223,280 @@ rb_gi_value_argument_from_ruby_gslist(GIArgument *argument,
     }
 }
 
+typedef struct {
+    VALUE rb_value;
+    GType gtype;
+    const gchar *context;
+} RubyToCData;
+
+typedef gpointer (*RubyToCFunc)(RubyToCData *data);
+
+static gpointer
+ruby_to_c_utf8(RubyToCData *data)
+{
+    return g_strdup(RVAL2CSTR(data->rb_value));
+}
+
+static gpointer
+ruby_to_c_interface_enum(RubyToCData *data)
+{
+    gint32 value;
+    if (data->gtype == G_TYPE_NONE) {
+        value = NUM2INT(data->rb_value);
+    } else {
+        value = RVAL2GENUM(data->rb_value, data->gtype);
+    }
+    return GINT_TO_POINTER(value);
+}
+
+typedef struct {
+    GIArgument *argument;
+    GITypeInfo *type_info;
+    VALUE rb_argument;
+    VALUE self;
+} ArgumentFromRubyData;
+
+typedef struct {
+    GHashTable *hash_table;
+    RubyToCFunc key_ruby_to_c_func;
+    RubyToCData *key_ruby_to_c_data;
+    RubyToCFunc value_ruby_to_c_func;
+    RubyToCData *value_ruby_to_c_data;
+} ArgumentFromRubyGHashData;
+
+static int
+rb_gi_value_argument_from_ruby_ghash_convert(VALUE rb_key,
+                                             VALUE rb_value,
+                                             VALUE user_data)
+{
+    ArgumentFromRubyGHashData *data = (ArgumentFromRubyGHashData *)user_data;
+    gpointer key;
+    gpointer value;
+    data->key_ruby_to_c_data->rb_value = rb_key;
+    key = data->key_ruby_to_c_func(data->key_ruby_to_c_data);
+    data->value_ruby_to_c_data->rb_value = rb_value;
+    value = data->key_ruby_to_c_func(data->value_ruby_to_c_data);
+    g_hash_table_insert(data->hash_table, key, value);
+    return ST_CONTINUE;
+}
+
+static VALUE
+rb_gi_value_argument_from_ruby_ghash_body(VALUE value_data)
+{
+    ArgumentFromRubyData *data = (ArgumentFromRubyData *)value_data;
+    GIArgument *argument = data->argument;
+    GITypeInfo *type_info = data->type_info;
+    VALUE rb_argument = data->rb_argument;
+    GHashFunc hash_func = NULL;
+    GEqualFunc equal_func = NULL;
+    GDestroyNotify key_destroy_func = NULL;
+    GDestroyNotify value_destroy_func = NULL;
+    GITypeInfo *key_type_info;
+    GITypeTag key_type_tag;
+    GIInfoType key_interface_type = GI_INFO_TYPE_INVALID;
+    RubyToCFunc key_ruby_to_c_func = NULL;
+    RubyToCData key_ruby_to_c_data;
+    GITypeInfo *value_type_info;
+    GITypeTag value_type_tag;
+    GIInfoType value_interface_type = GI_INFO_TYPE_INVALID;
+    RubyToCFunc value_ruby_to_c_func = NULL;
+    RubyToCData value_ruby_to_c_data;
+    ArgumentFromRubyGHashData convert_data;
+
+    key_type_info = g_type_info_get_param_type(type_info, 0);
+    key_type_tag = g_type_info_get_tag(key_type_info);
+    key_ruby_to_c_data.gtype = G_TYPE_NONE;
+    if (key_type_tag == GI_TYPE_TAG_INTERFACE) {
+        GIBaseInfo *interface_info;
+        interface_info = g_type_info_get_interface(key_type_info);
+        key_ruby_to_c_data.gtype =
+            g_registered_type_info_get_g_type(interface_info);
+        key_interface_type = g_base_info_get_type(interface_info);
+        g_base_info_unref(interface_info);
+    }
+    g_base_info_unref(key_type_info);
+
+    value_type_info = g_type_info_get_param_type(type_info, 1);
+    value_type_tag = g_type_info_get_tag(value_type_info);
+    value_ruby_to_c_data.gtype = G_TYPE_NONE;
+    if (value_type_tag == GI_TYPE_TAG_INTERFACE) {
+        GIBaseInfo *interface_info;
+        interface_info = g_type_info_get_interface(value_type_info);
+        value_ruby_to_c_data.gtype =
+            g_registered_type_info_get_g_type(interface_info);
+        value_interface_type = g_base_info_get_type(interface_info);
+        g_base_info_unref(interface_info);
+    }
+    g_base_info_unref(value_type_info);
+
+    switch (key_type_tag) {
+      case GI_TYPE_TAG_VOID:
+      case GI_TYPE_TAG_BOOLEAN:
+      case GI_TYPE_TAG_INT8:
+      case GI_TYPE_TAG_UINT8:
+      case GI_TYPE_TAG_INT16:
+      case GI_TYPE_TAG_UINT16:
+      case GI_TYPE_TAG_INT32:
+      case GI_TYPE_TAG_UINT32:
+      case GI_TYPE_TAG_INT64:
+      case GI_TYPE_TAG_UINT64:
+      case GI_TYPE_TAG_FLOAT:
+      case GI_TYPE_TAG_DOUBLE:
+      case GI_TYPE_TAG_GTYPE:
+        rb_raise(rb_eNotImpError,
+                 "TODO: Ruby -> GIArgument(GHash)[key][%s]",
+                 g_type_tag_to_string(key_type_tag));
+        break;
+      case GI_TYPE_TAG_UTF8:
+        hash_func = g_str_hash;
+        equal_func = g_str_equal;
+        key_destroy_func = g_free;
+        key_ruby_to_c_func = ruby_to_c_utf8;
+        key_ruby_to_c_data.context = "Ruby -> GIArgument(GHash)[key][utf8]";
+        break;
+      case GI_TYPE_TAG_FILENAME:
+      case GI_TYPE_TAG_ARRAY:
+      case GI_TYPE_TAG_INTERFACE:
+      case GI_TYPE_TAG_GLIST:
+      case GI_TYPE_TAG_GSLIST:
+      case GI_TYPE_TAG_GHASH:
+      case GI_TYPE_TAG_ERROR:
+      case GI_TYPE_TAG_UNICHAR:
+        rb_raise(rb_eNotImpError,
+                 "TODO: Ruby -> GIArgument(GHash)[key][%s]",
+                 g_type_tag_to_string(key_type_tag));
+        break;
+      default:
+        g_assert_not_reached();
+        break;
+    }
+
+    switch (value_type_tag) {
+      case GI_TYPE_TAG_VOID:
+      case GI_TYPE_TAG_BOOLEAN:
+      case GI_TYPE_TAG_INT8:
+      case GI_TYPE_TAG_UINT8:
+      case GI_TYPE_TAG_INT16:
+      case GI_TYPE_TAG_UINT16:
+      case GI_TYPE_TAG_INT32:
+      case GI_TYPE_TAG_UINT32:
+      case GI_TYPE_TAG_INT64:
+      case GI_TYPE_TAG_UINT64:
+      case GI_TYPE_TAG_FLOAT:
+      case GI_TYPE_TAG_DOUBLE:
+      case GI_TYPE_TAG_GTYPE:
+      case GI_TYPE_TAG_UTF8:
+      case GI_TYPE_TAG_FILENAME:
+      case GI_TYPE_TAG_ARRAY:
+        rb_raise(rb_eNotImpError,
+                 "TODO: Ruby -> GIArgument(GHash)[value][%s]",
+                 g_type_tag_to_string(value_type_tag));
+        break;
+      case GI_TYPE_TAG_INTERFACE:
+        switch (value_interface_type) {
+          case GI_INFO_TYPE_INVALID:
+          case GI_INFO_TYPE_FUNCTION:
+          case GI_INFO_TYPE_CALLBACK:
+          case GI_INFO_TYPE_STRUCT:
+          case GI_INFO_TYPE_BOXED:
+            rb_raise(rb_eNotImpError,
+                     "TODO: Ruby -> GIArgument(GHash)[value][%s][%s]",
+                     g_type_tag_to_string(value_type_tag),
+                     g_info_type_to_string(value_interface_type));
+            break;
+          case GI_INFO_TYPE_ENUM:
+            value_destroy_func = NULL;
+            value_ruby_to_c_func = ruby_to_c_interface_enum;
+            value_ruby_to_c_data.context =
+                "Ruby -> GIArgument(GHash)[value][interface]";
+            break;
+          case GI_INFO_TYPE_FLAGS:
+          case GI_INFO_TYPE_OBJECT:
+          case GI_INFO_TYPE_INTERFACE:
+          case GI_INFO_TYPE_CONSTANT:
+          case GI_INFO_TYPE_INVALID_0:
+          case GI_INFO_TYPE_UNION:
+          case GI_INFO_TYPE_VALUE:
+          case GI_INFO_TYPE_SIGNAL:
+          case GI_INFO_TYPE_VFUNC:
+          case GI_INFO_TYPE_PROPERTY:
+          case GI_INFO_TYPE_FIELD:
+          case GI_INFO_TYPE_ARG:
+          case GI_INFO_TYPE_TYPE:
+          case GI_INFO_TYPE_UNRESOLVED:
+            rb_raise(rb_eNotImpError,
+                     "TODO: Ruby -> GIArgument(GHash)[value][%s][%s]",
+                     g_type_tag_to_string(value_type_tag),
+                     g_info_type_to_string(value_interface_type));
+            break;
+          default:
+            g_assert_not_reached();
+            break;
+        }
+        break;
+      case GI_TYPE_TAG_GLIST:
+      case GI_TYPE_TAG_GSLIST:
+      case GI_TYPE_TAG_GHASH:
+      case GI_TYPE_TAG_ERROR:
+      case GI_TYPE_TAG_UNICHAR:
+        rb_raise(rb_eNotImpError,
+                 "TODO: Ruby -> GIArgument(GHash)[value][%s]",
+                 g_type_tag_to_string(value_type_tag));
+        break;
+      default:
+        g_assert_not_reached();
+        break;
+    }
+
+    argument->v_pointer = g_hash_table_new_full(hash_func,
+                                                equal_func,
+                                                key_destroy_func,
+                                                value_destroy_func);
+    convert_data.hash_table = argument->v_pointer;
+    convert_data.key_ruby_to_c_func = key_ruby_to_c_func;
+    convert_data.key_ruby_to_c_data = &key_ruby_to_c_data;
+    convert_data.value_ruby_to_c_func = value_ruby_to_c_func;
+    convert_data.value_ruby_to_c_data = &value_ruby_to_c_data;
+    rb_hash_foreach(rb_argument,
+                    rb_gi_value_argument_from_ruby_ghash_convert,
+                    (VALUE)&convert_data);
+
+    return Qnil;
+}
+
+static VALUE
+rb_gi_value_argument_from_ruby_ghash_rescue(VALUE value_data,
+                                            VALUE exception)
+{
+    ArgumentFromRubyData *data = (ArgumentFromRubyData *)value_data;
+    GIArgument *argument = data->argument;
+
+    if (argument->v_pointer) {
+        g_hash_table_unref(argument->v_pointer);
+        argument->v_pointer = NULL;
+    }
+
+    rb_exc_raise(exception);
+
+    return Qnil;
+}
+
+static void
+rb_gi_value_argument_from_ruby_ghash(GIArgument *argument,
+                                     GITypeInfo *type_info,
+                                     VALUE rb_argument,
+                                     VALUE self)
+{
+    ArgumentFromRubyData data;
+    argument->v_pointer = NULL;
+    data.argument = argument;
+    data.type_info = type_info;
+    data.rb_argument = rb_argument;
+    data.self = self;
+    rb_rescue(rb_gi_value_argument_from_ruby_ghash_body, (VALUE)&data,
+              rb_gi_value_argument_from_ruby_ghash_rescue, (VALUE)&data);
+}
+
 static void
 rb_gi_value_argument_from_ruby_void(GIArgument *argument, GITypeInfo *type_info,
                                     VALUE rb_argument)
@@ -3340,6 +3614,9 @@ rb_gi_value_argument_from_ruby(GIArgument *argument, GITypeInfo *type_info,
                                               rb_argument, self);
         break;
     case GI_TYPE_TAG_GHASH:
+        rb_gi_value_argument_from_ruby_ghash(argument, type_info,
+                                             rb_argument, self);
+        break;
     case GI_TYPE_TAG_ERROR:
         rb_raise(rb_eNotImpError,
                  "TODO: Ruby -> GIArgument(%s)",

data/ext/gobject-introspection/rb-gi-private.h

@@ -28,7 +28,9 @@
 #include <girffi.h>
 #include "gobject-introspection-enum-types.h"
 
-#include "rbgiversion.h"
+#ifndef GI_CHECK_VERSION
+#  include "rbgiversion.h"
+#endif
 
 #include "rb-gi-types.h"
 #include "rb-gi-conversions.h"

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: gobject-introspection
 version: !ruby/object:Gem::Version
-  version: 3.3.6
+  version: 3.3.7
 platform: ruby
 authors:
 - The Ruby-GNOME2 Project Team
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-21 00:00:00.000000000 Z
+date: 2019-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: glib2
@@ -16,14 +15,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.3.6
+        version: 3.3.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.3.6
+        version: 3.3.7
 description: Ruby/GObjectIntrospection provides bindings of GObject Introspection
   and a loader module that can generate dynamically Ruby bindings of any GObject C
   libraries