gobject-introspection 3.1.8 → 3.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4386d429bf37ac770fa9a6c4b96675872e24715e
-  data.tar.gz: dc49de3b9438371496177dbe4fd732db1433a9d6
+  metadata.gz: 7600f4505e9b541f1599e76e10711438487a9ab2
+  data.tar.gz: 9e00b3aec282ba5bbf005dea71c1eb0d17a64c1b
 SHA512:
-  metadata.gz: bc66cb8e0a0e7af892b3c7a76fb9f40a7315e2ebf7a2619973371a0a7606945ca0203fc5508a18f0f29b94213ae22a626fa7b24c381bf2632b36d32d78ee946d
-  data.tar.gz: 3c78fb0a78b5c0b3969fe04a265d2fe59d5b0284302861a54523604ab1961c269c8ff66b0687c9001aece8f56fe9410c6e28586d9f08323afd9f7911d0e5f404
+  metadata.gz: 5674b84f008018f0033aa29c177c5f9b1ad578f2860f19343871679d630e85caf273c09db62150e8c565832a75e749aadda89a2edbb416a1ea4b43ddf1469ccd
+  data.tar.gz: 5a6e890806dd92a78730b902be40e17a37a83d83dc6c7a9ed6d73a3d44d18b378bf03265e505355daa64deff6033e1e8330b162214513bc36f3374fd0b9aad4d

data/Rakefile

@@ -32,7 +32,7 @@ package_task = GNOME2::Rake::PackageTask.new do |package|
       :name => "glib",
       :download_site => :gnome,
       :label => "GLib",
-      :version => "2.52.3",
+      :version => "2.54.1",
       :compression_method => "xz",
       :windows => {
         :build => false,
@@ -47,7 +47,7 @@ package_task = GNOME2::Rake::PackageTask.new do |package|
       :name => "gobject-introspection",
       :download_site => :gnome,
       :label => "gobject-introspection",
-      :version => "1.52.1",
+      :version => "1.54.1",
       :compression_method => "xz",
       :windows => {
         :configure_args => [

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

@@ -61,13 +61,14 @@ array_c_to_ruby_sized_interface(gconstpointer *elements,
             g_base_info_unref(interface_info);
             g_base_info_unref(element_type_info);
         } else {
-            interface_name = g_info_type_to_string(interface_type);
+            /* TODO: Should we check caller_allocates? */
+            gsize struct_size = g_struct_info_get_size(interface_info);
+            for (i = 0; i < n_elements; i++) {
+                gpointer element = ((gchar *)elements) + struct_size * i;
+                rb_ary_push(rb_array, BOXED2RVAL(element, gtype));
+            }
             g_base_info_unref(interface_info);
             g_base_info_unref(element_type_info);
-            rb_raise(rb_eNotImpError,
-                     "TODO: GIArgument(array)[c][interface(%s)](%s) -> Ruby",
-                     interface_name,
-                     g_type_name(gtype));
         }
         break;
     case GI_INFO_TYPE_BOXED:
@@ -131,12 +132,20 @@ array_c_to_ruby_sized(gconstpointer *elements,
 
     switch (element_type_tag) {
     case GI_TYPE_TAG_VOID:
-    case GI_TYPE_TAG_BOOLEAN:
         g_base_info_unref(element_type_info);
         rb_raise(rb_eNotImpError,
                  "TODO: GIArgument(array)[c][%s] -> Ruby",
                  g_type_tag_to_string(element_type_tag));
         break;
+    case GI_TYPE_TAG_BOOLEAN:
+        g_base_info_unref(element_type_info);
+        {
+            const gboolean *booleans = (const gboolean *)elements;
+            for (i = 0; i < n_elements; i++) {
+                rb_ary_push(rb_array, CBOOL2RVAL(booleans[i]));
+            }
+        }
+        break;
     case GI_TYPE_TAG_INT8:
         g_base_info_unref(element_type_info);
         {
@@ -1146,8 +1155,15 @@ rb_gi_argument_to_ruby_ghash(GIArgument *argument, GITypeInfo *type_info)
             g_base_info_unref(value_type_info);
             rb_argument =
                 rb_gi_argument_to_ruby_ghash_utf8_utf8(argument->v_pointer);
-            break;
+        } else {
+            g_base_info_unref(key_type_info);
+            g_base_info_unref(value_type_info);
+            rb_raise(rb_eNotImpError,
+                     "TODO: GIArgument(GHash)[%s][%s] -> Ruby",
+                     g_type_tag_to_string(key_type_tag),
+                     g_type_tag_to_string(value_type_tag));
         }
+        break;
       case GI_TYPE_TAG_FILENAME:
       case GI_TYPE_TAG_ARRAY:
       case GI_TYPE_TAG_INTERFACE:
@@ -3330,6 +3346,22 @@ set_in_array_length_argument(GIArgument *argument,
     }
 }
 
+static void
+set_in_array_boolean_arguments_from_ruby(GIArgument *array_argument,
+                                         VALUE rb_boolean_array)
+{
+    gboolean *booleans;
+    gint i, n_args;
+
+    n_args = RARRAY_LEN(rb_boolean_array);
+    booleans = ALLOC_N(gboolean, n_args);
+    for (i = 0; i < n_args; i++) {
+        booleans[i] = RVAL2CBOOL(RARRAY_PTR(rb_boolean_array)[i]);
+    }
+
+    array_argument->v_pointer = booleans;
+}
+
 static void
 set_in_array_int8_arguments_from_ruby(GIArgument *array_argument,
                                       VALUE rb_number_array)
@@ -3644,11 +3676,16 @@ in_array_c_argument_from_ruby(GIArgument *array_argument,
     element_type_tag = g_type_info_get_tag(element_type_info);
     switch (element_type_tag) {
     case GI_TYPE_TAG_VOID:
-    case GI_TYPE_TAG_BOOLEAN:
         rb_raise(rb_eNotImpError,
                  "TODO: Ruby -> GIArgument(array)[%s]",
                  g_type_tag_to_string(element_type_tag));
         break;
+    case GI_TYPE_TAG_BOOLEAN:
+        rb_argument = rbg_to_array(rb_argument);
+        set_in_array_boolean_arguments_from_ruby(array_argument, rb_argument);
+        set_in_array_length_argument(length_argument, length_type_info,
+                                     RARRAY_LEN(rb_argument));
+        break;
     case GI_TYPE_TAG_INT8:
         if (RB_TYPE_P(rb_argument, RUBY_T_STRING)) {
             array_argument->v_pointer = RSTRING_PTR(rb_argument);
@@ -3953,11 +3990,13 @@ rb_gi_value_argument_free_array_c(VALUE rb_argument,
     element_type_tag = g_type_info_get_tag(element_type_info);
     switch (element_type_tag) {
     case GI_TYPE_TAG_VOID:
-    case GI_TYPE_TAG_BOOLEAN:
         rb_raise(rb_eNotImpError,
                  "TODO: free GIArgument(array)[%s]",
                  g_type_tag_to_string(element_type_tag));
         break;
+    case GI_TYPE_TAG_BOOLEAN:
+        xfree(argument->v_pointer);
+        break;
     case GI_TYPE_TAG_INT8:
     case GI_TYPE_TAG_UINT8:
         if (RB_TYPE_P(rb_argument, RUBY_T_STRING)) {
@@ -3985,6 +4024,7 @@ rb_gi_value_argument_free_array_c(VALUE rb_argument,
         rb_raise(rb_eNotImpError,
                  "TODO: free GIArgument(array)[%s]",
                  g_type_tag_to_string(element_type_tag));
+        break;
     case GI_TYPE_TAG_INTERFACE:
         xfree(argument->v_pointer);
         break;

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

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2012-2015  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2012-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
@@ -23,6 +23,7 @@
 #define RG_TARGET_NAMESPACE rb_cGILoader
 
 static const gchar *boxed_class_converters_name = "@@boxed_class_converters";
+static const gchar *object_class_converters_name = "@@object_class_converters";
 
 static VALUE
 rg_s_define_class(int argc, VALUE *argv, G_GNUC_UNUSED VALUE klass)
@@ -194,6 +195,76 @@ rg_s_register_boxed_class_converter(VALUE klass, VALUE rb_gtype)
     return Qnil;
 }
 
+typedef struct {
+    GType type;
+    VALUE rb_converters;
+    VALUE rb_converter;
+} ObjectInstance2RObjData;
+
+static void
+object_class_converter_free(gpointer user_data)
+{
+    ObjectInstance2RObjData *data = user_data;
+    rb_ary_delete(data->rb_converters, data->rb_converter);
+    g_free(data);
+}
+
+static VALUE
+object_instance2robj(gpointer instance, gpointer user_data)
+{
+    ObjectInstance2RObjData *data = user_data;
+    VALUE existing_rb_instance;
+    VALUE default_rb_instance;
+    VALUE klass;
+    ID id_call;
+    VALUE converted_rb_instance;
+    ID id_unref;
+
+    existing_rb_instance = rbgobj_get_ruby_object_from_gobject(instance, FALSE);
+    if (!NIL_P(existing_rb_instance))
+        return existing_rb_instance;
+
+    default_rb_instance = rbgobj_get_ruby_object_from_gobject(instance, TRUE);
+    CONST_ID(id_call, "call");
+    klass = rb_funcall(data->rb_converter, id_call, 1, default_rb_instance);
+    if (klass == rb_class_of(default_rb_instance))
+        return default_rb_instance;
+
+    converted_rb_instance = rbgobj_object_alloc_func(klass);
+    g_object_ref(instance);
+    CONST_ID(id_unref, "unref");
+    rb_funcall(default_rb_instance, id_unref, 0);
+    rbgobj_gobject_initialize(converted_rb_instance, instance);
+    return converted_rb_instance;
+}
+
+static VALUE
+rg_s_register_object_class_converter(VALUE klass, VALUE rb_gtype)
+{
+    RGConvertTable table;
+    ObjectInstance2RObjData *data;
+    ID id_to_i;
+    VALUE object_class_converters;
+
+    memset(&table, 0, sizeof(RGConvertTable));
+    CONST_ID(id_to_i, "to_i");
+    table.type = NUM2ULONG(rb_funcall(rb_gtype, id_to_i, 0));
+    table.klass = Qnil;
+    table.instance2robj = object_instance2robj;
+
+    data = g_new(ObjectInstance2RObjData, 1);
+    data->type = table.type;
+    data->rb_converter = rb_block_proc();
+    object_class_converters = rb_cv_get(klass, object_class_converters_name);
+    rb_ary_push(object_class_converters, data->rb_converter);
+    table.user_data = data;
+    table.notify = object_class_converter_free;
+
+    rbgobj_convert_define(&table);
+
+    return Qnil;
+}
+
 static VALUE
 rg_s_register_constant_rename_map(G_GNUC_UNUSED VALUE klass,
                                   VALUE rb_original,
@@ -260,12 +331,14 @@ rb_gi_loader_init(VALUE rb_mGI)
     RG_TARGET_NAMESPACE = rb_define_class_under(rb_mGI, "Loader", rb_cObject);
 
     rb_cv_set(RG_TARGET_NAMESPACE, boxed_class_converters_name, rb_ary_new());
+    rb_cv_set(RG_TARGET_NAMESPACE, object_class_converters_name, rb_ary_new());
 
     RG_DEF_SMETHOD(define_class, -1);
     RG_DEF_SMETHOD(define_interface, 3);
     RG_DEF_SMETHOD(define_struct, -1);
     RG_DEF_SMETHOD(define_error, -1);
     RG_DEF_SMETHOD(register_boxed_class_converter, 1);
+    RG_DEF_SMETHOD(register_object_class_converter, 1);
     RG_DEF_SMETHOD(register_constant_rename_map, 2);
     RG_DEF_SMETHOD(start_callback_dispatch_thread, 0);
     RG_DEF_SMETHOD(reference_gobject, -1);

data/test/run-test.rb

@@ -27,7 +27,7 @@ modules = [
   [gobject_introspection_base, "gobject-introspection"]
 ]
 modules.each do |target, module_name|
-  if system("which make > /dev/null")
+  if File.exist?("#{target}/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))

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gobject-introspection
 version: !ruby/object:Gem::Version
-  version: 3.1.8
+  version: 3.1.9
 platform: ruby
 authors:
 - The Ruby-GNOME2 Project Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-15 00:00:00.000000000 Z
+date: 2017-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: glib2
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.8
+        version: 3.1.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.8
+        version: 3.1.9
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
@@ -144,7 +144,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.5.2.1
 signing_key: 
 specification_version: 4
 summary: Ruby/GObjectIntrospection is a Ruby binding of GObjectIntrospection.