gobject-introspection 3.1.6 → 3.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0b0cf26de448b61b4341e1ad15eb9a04ae2828f7
-  data.tar.gz: b772a02a70a314662153c9b4a5c35c8dbdcb9c14
+  metadata.gz: dbc48c4c3360aba4976bfc8a8428094760921932
+  data.tar.gz: 9f9943b50c151c7ab28378e4844dbd39fa4083d1
 SHA512:
-  metadata.gz: 0aa60449ae273bb766b3813b8d23158afa68cd5205551ef9c8669092b9c92582884b64e5bc5e256305b0948c0f044c9ce7eb79228779763d30c8775fb95461a2
-  data.tar.gz: 1429323eb665721178ea9ac4d4996f5e5f22ec4ac561d9563e9a743c9be978bbd7b19114558dcfb5397b763f3b391f390d71e84acc003495c1ce307722556dd9
+  metadata.gz: ecd9680ce20049cd212f26b46957b6f9481890b32a29f0192d8a99d562354135d64d539a45ca4ce4967b0f5a8fcf0957ad6a2329ac7c2bff8b63cc1805cdb1f6
+  data.tar.gz: bcb871a0fa09f4c32faafc6b1ca77e33222c160ccfdb70c297ca11c6bb04474145f96758073632501aba2366e05c22fa44e06a459653c29c5f531f94529deea4

data/Rakefile

@@ -32,7 +32,7 @@ package_task = GNOME2::Rake::PackageTask.new do |package|
       :name => "glib",
       :download_site => :gnome,
       :label => "GLib",
-      :version => "2.52.1",
+      :version => "2.52.3",
       :compression_method => "xz",
       :windows => {
         :build => false,

data/ext/gobject-introspection/extconf.rb

@@ -37,13 +37,7 @@ $LOAD_PATH.unshift(mkmf_gnome2_dir.to_s)
 module_name = "gobject_introspection"
 package_id = "gobject-introspection-1.0"
 
-begin
-  require "mkmf-gnome2"
-rescue LoadError
-  require "rubygems"
-  gem "glib2"
-  require "mkmf-gnome2"
-end
+require "mkmf-gnome2"
 
 ["glib2"].each do |package|
   directory = "#{package}#{version_suffix}"

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

@@ -210,11 +210,22 @@ array_c_to_ruby_sized(gconstpointer *elements,
         }
         break;
     case GI_TYPE_TAG_INT16:
+        g_base_info_unref(element_type_info);
+        {
+            const gint16 *numbers = (const gint16 *)elements;
+            for (i = 0; i < n_elements; i++) {
+                rb_ary_push(rb_array, INT2NUM(numbers[i]));
+            }
+        }
+        break;
     case GI_TYPE_TAG_UINT16:
         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));
+        {
+            const guint16 *numbers = (const guint16 *)elements;
+            for (i = 0; i < n_elements; i++) {
+                rb_ary_push(rb_array, UINT2NUM(numbers[i]));
+            }
+        }
         break;
     case GI_TYPE_TAG_INT32:
         g_base_info_unref(element_type_info);
@@ -227,9 +238,12 @@ array_c_to_ruby_sized(gconstpointer *elements,
         break;
     case GI_TYPE_TAG_UINT32:
         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));
+        {
+            const guint32 *numbers = (const guint32 *)elements;
+            for (i = 0; i < n_elements; i++) {
+                rb_ary_push(rb_array, UINT2NUM(numbers[i]));
+            }
+        }
         break;
     case GI_TYPE_TAG_INT64:
         g_base_info_unref(element_type_info);
@@ -241,8 +255,32 @@ array_c_to_ruby_sized(gconstpointer *elements,
         }
         break;
     case GI_TYPE_TAG_UINT64:
+        g_base_info_unref(element_type_info);
+        {
+            const guint64 *numbers = (const guint64 *)elements;
+            for (i = 0; i < n_elements; i++) {
+                rb_ary_push(rb_array, ULL2NUM(numbers[i]));
+            }
+        }
+        break;
     case GI_TYPE_TAG_FLOAT:
+        g_base_info_unref(element_type_info);
+        {
+            const gfloat *numbers = (const gfloat *)elements;
+            for (i = 0; i < n_elements; i++) {
+                rb_ary_push(rb_array, rb_float_new(numbers[i]));
+            }
+        }
+        break;
     case GI_TYPE_TAG_DOUBLE:
+        g_base_info_unref(element_type_info);
+        {
+            const gdouble *numbers = (const gdouble *)elements;
+            for (i = 0; i < n_elements; i++) {
+                rb_ary_push(rb_array, rb_float_new(numbers[i]));
+            }
+        }
+        break;
     case GI_TYPE_TAG_GTYPE:
         g_base_info_unref(element_type_info);
         rb_raise(rb_eNotImpError,
@@ -2364,6 +2402,83 @@ rb_gi_return_argument_free_everything_glist(GIArgument *argument,
     }
 }
 
+static void
+rb_gi_return_argument_free_everything_gslist_interface(GIArgument *argument,
+                                                       G_GNUC_UNUSED GITypeInfo *type_info,
+                                                       GITypeInfo *element_type_info)
+{
+    GIBaseInfo *interface_info;
+    GIInfoType interface_type;
+    const gchar *interface_name;
+    GType gtype;
+
+    interface_info = g_type_info_get_interface(element_type_info);
+    interface_type = g_base_info_get_type(interface_info);
+    interface_name = g_info_type_to_string(interface_type);
+    gtype = g_registered_type_info_get_g_type(interface_info);
+    g_base_info_unref(interface_info);
+    g_base_info_unref(element_type_info);
+
+    switch (interface_type) {
+      case GI_INFO_TYPE_INVALID:
+      case GI_INFO_TYPE_FUNCTION:
+      case GI_INFO_TYPE_CALLBACK:
+        rb_raise(rb_eNotImpError,
+                 "TODO: free GIArgument(GSList)[interface(%s)](%s) everything",
+                 interface_name,
+                 g_type_name(gtype));
+        break;
+      case GI_INFO_TYPE_STRUCT:
+        if (gtype == G_TYPE_NONE) {
+            rb_raise(rb_eNotImpError,
+                     "TODO: free GIArgument(GSList)[interface(%s)](%s) everything",
+                     interface_name,
+                     g_type_name(gtype));
+        } else {
+            g_slist_foreach(argument->v_pointer,
+                            rb_gi_boxed_free_callback,
+                            &gtype);
+            g_slist_free(argument->v_pointer);
+        }
+        break;
+      case GI_INFO_TYPE_BOXED:
+        g_slist_foreach(argument->v_pointer, rb_gi_boxed_free_callback, &gtype);
+        g_slist_free(argument->v_pointer);
+        break;
+      case GI_INFO_TYPE_ENUM:
+      case GI_INFO_TYPE_FLAGS:
+        rb_raise(rb_eNotImpError,
+                 "TODO: free GIArgument(GSList)[interface(%s)](%s) everything",
+                 interface_name,
+                 g_type_name(gtype));
+        break;
+      case GI_INFO_TYPE_OBJECT:
+      case GI_INFO_TYPE_INTERFACE:
+        g_slist_foreach(argument->v_pointer, (GFunc)g_object_unref, NULL);
+        g_slist_free(argument->v_pointer);
+        break;
+      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: free GIArgument(GSList)[interface(%s)](%s) everything",
+                 interface_name,
+                 g_type_name(gtype));
+        break;
+      default:
+        g_assert_not_reached();
+        break;
+    }
+}
+
 static void
 rb_gi_return_argument_free_everything_gslist(GIArgument *argument,
                                              GITypeInfo *type_info)
@@ -2371,9 +2486,11 @@ rb_gi_return_argument_free_everything_gslist(GIArgument *argument,
     GITypeInfo *element_type_info;
     GITypeTag element_type_tag;
 
+    if (!argument->v_pointer)
+        return;
+
     element_type_info = g_type_info_get_param_type(type_info, 0);
     element_type_tag = g_type_info_get_tag(element_type_info);
-    g_base_info_unref(element_type_info);
 
     switch (element_type_tag) {
     case GI_TYPE_TAG_VOID:
@@ -2389,34 +2506,40 @@ rb_gi_return_argument_free_everything_gslist(GIArgument *argument,
     case GI_TYPE_TAG_FLOAT:
     case GI_TYPE_TAG_DOUBLE:
     case GI_TYPE_TAG_GTYPE:
+        g_base_info_unref(element_type_info);
         rb_raise(rb_eNotImpError,
                  "TODO: free GIArgument(GSList)[%s] everything",
                  g_type_tag_to_string(element_type_tag));
         break;
     case GI_TYPE_TAG_UTF8:
     case GI_TYPE_TAG_FILENAME:
+        g_base_info_unref(element_type_info);
         g_slist_foreach(argument->v_pointer, (GFunc)g_free, NULL);
         g_slist_free(argument->v_pointer);
         break;
     case GI_TYPE_TAG_ARRAY:
+        g_base_info_unref(element_type_info);
         rb_raise(rb_eNotImpError,
                  "TODO: free GIArgument(GSList)[%s] everything",
                  g_type_tag_to_string(element_type_tag));
         break;
     case GI_TYPE_TAG_INTERFACE:
-        g_slist_foreach(argument->v_pointer, (GFunc)g_object_unref, NULL);
-        g_slist_free(argument->v_pointer);
+        rb_gi_return_argument_free_everything_gslist_interface(argument,
+                                                               type_info,
+                                                               element_type_info);
         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:
+        g_base_info_unref(element_type_info);
         rb_raise(rb_eNotImpError,
                  "TODO: free GIArgument(GSList)[%s] everything",
                  g_type_tag_to_string(element_type_tag));
         break;
     default:
+        g_base_info_unref(element_type_info);
         g_assert_not_reached();
         break;
     }

data/ext/gobject-introspection/rb-gi-function-info.c

@@ -1400,7 +1400,10 @@ rb_gi_function_info_invoke_raw(GIFunctionInfo *info,
     if (NIL_P(rb_receiver)) {
         receiver.v_pointer = NULL;
     } else {
-        if (gobject_based_p((GIBaseInfo *)info)) {
+        VALUE rb_receiver_class;
+        rb_receiver_class = rb_class_of(rb_receiver);
+        if (gobject_based_p((GIBaseInfo *)info) ||
+            rb_respond_to(rb_receiver_class, rb_intern("gtype"))) {
             receiver.v_pointer = RVAL2GOBJ(rb_receiver);
         } else if (RVAL2CBOOL(rb_obj_is_kind_of(rb_receiver, rb_cClass)) &&
                    rb_respond_to(rb_receiver, rb_intern("gtype"))) {

data/lib/gobject-introspection/loader.rb

@@ -546,6 +546,7 @@ module GObjectIntrospection
     def load_method_info(info, klass, method_name)
       define_method(info, klass, method_name)
       define_equal_style_setter(info, klass, method_name)
+      define_inspect(info, klass, method_name)
     end
 
     def remove_existing_method(klass, method_name)
@@ -591,6 +592,14 @@ module GObjectIntrospection
       end
     end
 
+    def define_inspect(info, klass, method_name)
+      if method_name == "to_s" and info.n_args.zero?
+        klass.__send__(:define_method, "inspect") do ||
+          super().gsub(/\>\z/) {" #{to_s}>"}
+        end
+      end
+    end
+
     def load_function_infos(infos, klass)
       infos.each do |info|
         name = rubyish_method_name(info)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gobject-introspection
 version: !ruby/object:Gem::Version
-  version: 3.1.6
+  version: 3.1.7
 platform: ruby
 authors:
 - The Ruby-GNOME2 Project Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-03 00:00:00.000000000 Z
+date: 2017-07-10 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.6
+        version: 3.1.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.6
+        version: 3.1.7
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement