gobject-introspection 3.0.1 → 3.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 406e1d36ce3b08fbab6c90974f57204f2557bba3
-  data.tar.gz: 25c0cf6a1adb6b4d0df57a8d180c9bc364b8dac2
+  metadata.gz: 43fb9034b06bbabd0681a877e2bdad9ee92ecd44
+  data.tar.gz: cc096dc7cefc3c80b9b55bb615aca413aca24b07
 SHA512:
-  metadata.gz: 398b9f2d7c6e57e8f338a77ccdff77ef254939076201bb1ab85402e849af508b2a9d6fce7a276941d88d40251605fa8d6c778ba22f0a65494e7f9ac2dff208e0
-  data.tar.gz: 3c8a08371456e02fa3a52e97cff452dc71603f5950417abfca0a3837eaac6f81f32e062cfc7cb64fc64652772d17d7cc2d66f322b4d83b829e17dbb4d276ddab
+  metadata.gz: efce6549fc4ec94824e903654200252ff5a805528e35e9a5a7befbf1c3940a13aa748538e6be53049fd3548ed4de9036b0cb09c6d6b7f80b40796d493ba231ee
+  data.tar.gz: 929fa23d59f2b783779911a1783e3e0416804a87497dbb2e32ed800e5ab176917869d070daae7fa09f3dd6bcdb48c0f7851c96134b6352eba514645a9f7cdc42

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

@@ -1366,67 +1366,70 @@ rb_gi_out_argument_init(GIArgument *argument, GIArgInfo *arg_info)
     g_arg_info_load_type(arg_info, &type_info);
     type_tag = g_type_info_get_tag(&type_info);
     switch (type_tag) {
-    case GI_TYPE_TAG_VOID:
+      case GI_TYPE_TAG_VOID:
+        if (g_type_info_is_pointer(&type_info)) {
+            argument->v_pointer = ALLOC(gpointer);
+        }
         break;
-    case GI_TYPE_TAG_BOOLEAN:
+      case GI_TYPE_TAG_BOOLEAN:
         argument->v_pointer = ALLOC(gboolean);
         break;
-    case GI_TYPE_TAG_INT8:
+      case GI_TYPE_TAG_INT8:
         argument->v_pointer = ALLOC(gint8);
         break;
-    case GI_TYPE_TAG_UINT8:
+      case GI_TYPE_TAG_UINT8:
         argument->v_pointer = ALLOC(guint8);
         break;
-    case GI_TYPE_TAG_INT16:
+      case GI_TYPE_TAG_INT16:
         argument->v_pointer = ALLOC(gint16);
         break;
-    case GI_TYPE_TAG_UINT16:
+      case GI_TYPE_TAG_UINT16:
         argument->v_pointer = ALLOC(guint16);
         break;
-    case GI_TYPE_TAG_INT32:
+      case GI_TYPE_TAG_INT32:
         argument->v_pointer = ALLOC(gint32);
         break;
-    case GI_TYPE_TAG_UINT32:
+      case GI_TYPE_TAG_UINT32:
         argument->v_pointer = ALLOC(guint32);
         break;
-    case GI_TYPE_TAG_INT64:
+      case GI_TYPE_TAG_INT64:
         argument->v_pointer = ALLOC(gint64);
         break;
-    case GI_TYPE_TAG_UINT64:
+      case GI_TYPE_TAG_UINT64:
         argument->v_pointer = ALLOC(guint64);
         break;
-    case GI_TYPE_TAG_FLOAT:
+      case GI_TYPE_TAG_FLOAT:
         argument->v_pointer = ALLOC(gfloat);
         break;
-    case GI_TYPE_TAG_DOUBLE:
+      case GI_TYPE_TAG_DOUBLE:
         argument->v_pointer = ALLOC(gdouble);
         break;
-    case GI_TYPE_TAG_GTYPE:
+      case GI_TYPE_TAG_GTYPE:
         argument->v_pointer = ALLOC(GType);
         break;
-    case GI_TYPE_TAG_UTF8:
-    case GI_TYPE_TAG_FILENAME:
+      case GI_TYPE_TAG_UTF8:
+      case GI_TYPE_TAG_FILENAME:
         argument->v_pointer = ALLOC(gchar *);
         break;
-    case GI_TYPE_TAG_ARRAY:
+      case GI_TYPE_TAG_ARRAY:
         rb_gi_out_argument_init_array(argument, arg_info, &type_info);
         break;
-    case GI_TYPE_TAG_INTERFACE:
+      case GI_TYPE_TAG_INTERFACE:
         rb_gi_out_argument_init_interface(argument, arg_info, &type_info);
         break;
-    case GI_TYPE_TAG_GLIST:
-    case GI_TYPE_TAG_GSLIST:
-    case GI_TYPE_TAG_GHASH:
+      case GI_TYPE_TAG_GLIST:
+      case GI_TYPE_TAG_GSLIST:
+      case GI_TYPE_TAG_GHASH:
         argument->v_pointer = ALLOC(gpointer);
         break;
-    case GI_TYPE_TAG_ERROR:
+      case GI_TYPE_TAG_ERROR:
         argument->v_pointer = ALLOC(GError *);
         memset(argument->v_pointer, 0, sizeof(GError *));
         break;
-    case GI_TYPE_TAG_UNICHAR:
+      case GI_TYPE_TAG_UNICHAR:
         argument->v_pointer = ALLOC(gunichar);
         break;
-    default:
+      default:
         g_assert_not_reached();
         break;
     }
@@ -1448,53 +1451,56 @@ rb_gi_out_argument_to_ruby(GIArgument *argument,
     g_arg_info_load_type(arg_info, &type_info);
     type_tag = g_type_info_get_tag(&type_info);
     switch (type_tag) {
-    case GI_TYPE_TAG_VOID:
+      case GI_TYPE_TAG_VOID:
+        if (g_type_info_is_pointer(&type_info)) {
+            normalized_argument.v_pointer = *((gpointer *)(argument->v_pointer));
+        }
         break;
-    case GI_TYPE_TAG_BOOLEAN:
+      case GI_TYPE_TAG_BOOLEAN:
         normalized_argument.v_boolean = *((gboolean *)(argument->v_pointer));
         break;
-    case GI_TYPE_TAG_INT8:
+      case GI_TYPE_TAG_INT8:
         normalized_argument.v_int8 = *((gint8 *)(argument->v_pointer));
         break;
-    case GI_TYPE_TAG_UINT8:
+      case GI_TYPE_TAG_UINT8:
         normalized_argument.v_uint8 = *((guint8 *)(argument->v_pointer));
         break;
-    case GI_TYPE_TAG_INT16:
+      case GI_TYPE_TAG_INT16:
         normalized_argument.v_int16 = *((gint16 *)(argument->v_pointer));
         break;
-    case GI_TYPE_TAG_UINT16:
+      case GI_TYPE_TAG_UINT16:
         normalized_argument.v_uint16 = *((guint16 *)(argument->v_pointer));
         break;
-    case GI_TYPE_TAG_INT32:
+      case GI_TYPE_TAG_INT32:
         normalized_argument.v_int32 = *((gint32 *)(argument->v_pointer));
         break;
-    case GI_TYPE_TAG_UINT32:
+      case GI_TYPE_TAG_UINT32:
         normalized_argument.v_uint32 = *((guint32 *)(argument->v_pointer));
         break;
-    case GI_TYPE_TAG_INT64:
+      case GI_TYPE_TAG_INT64:
         normalized_argument.v_int64 = *((gint64 *)(argument->v_pointer));
         break;
-    case GI_TYPE_TAG_UINT64:
+      case GI_TYPE_TAG_UINT64:
         normalized_argument.v_uint64 = *((guint64 *)(argument->v_pointer));
         break;
-    case GI_TYPE_TAG_FLOAT:
+      case GI_TYPE_TAG_FLOAT:
         normalized_argument.v_float = *((gfloat *)(argument->v_pointer));
         break;
-    case GI_TYPE_TAG_DOUBLE:
+      case GI_TYPE_TAG_DOUBLE:
         normalized_argument.v_double = *((gdouble *)(argument->v_pointer));
         break;
-    case GI_TYPE_TAG_GTYPE:
+      case GI_TYPE_TAG_GTYPE:
         normalized_argument.v_size = *((GType *)(argument->v_pointer));
         break;
-    case GI_TYPE_TAG_UTF8:
-    case GI_TYPE_TAG_FILENAME:
+      case GI_TYPE_TAG_UTF8:
+      case GI_TYPE_TAG_FILENAME:
         normalized_argument.v_string = *((gchar **)(argument->v_pointer));
         break;
-    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_ARRAY:
+      case GI_TYPE_TAG_INTERFACE:
+      case GI_TYPE_TAG_GLIST:
+      case GI_TYPE_TAG_GSLIST:
+      case GI_TYPE_TAG_GHASH:
         if (g_arg_info_is_caller_allocates(arg_info)) {
             duplicate = TRUE;
             normalized_argument.v_pointer = argument->v_pointer;
@@ -1502,13 +1508,13 @@ rb_gi_out_argument_to_ruby(GIArgument *argument,
             normalized_argument.v_pointer = *((gpointer *)(argument->v_pointer));
         }
         break;
-    case GI_TYPE_TAG_ERROR:
+      case GI_TYPE_TAG_ERROR:
         normalized_argument.v_pointer = *((GError **)(argument->v_pointer));
         break;
-    case GI_TYPE_TAG_UNICHAR:
+      case GI_TYPE_TAG_UNICHAR:
         normalized_argument.v_uint32 = *((guint32 *)(argument->v_pointer));
         break;
-    default:
+      default:
         g_assert_not_reached();
         break;
     }
@@ -2396,6 +2402,34 @@ rb_gi_value_argument_from_ruby_void(GIArgument *argument, GITypeInfo *type_info,
     }
 }
 
+static GType
+rb_gi_value_argument_from_ruby_gtype(VALUE rb_argument)
+{
+    ID id_gtype;
+    VALUE rb_gtype;
+
+    if (RB_TYPE_P(rb_argument, RUBY_T_STRING)) {
+        GType gtype;
+        gtype = g_type_from_name(RVAL2CSTR(rb_argument));
+        if (gtype == 0) {
+            rb_raise(rb_eArgError,
+                     "unknown GType name: <%s>",
+                     RVAL2CSTR(rb_argument));
+        }
+        return gtype;
+    }
+
+    CONST_ID(id_gtype, "gtype");
+
+    if (rb_respond_to(rb_argument, id_gtype)) {
+        rb_gtype = rb_funcall(rb_argument, id_gtype, 0);
+    } else {
+        rb_gtype = rb_argument;
+    }
+
+    return NUM2ULONG(rb_gtype);
+}
+
 GIArgument *
 rb_gi_value_argument_from_ruby(GIArgument *argument, GITypeInfo *type_info,
                                VALUE rb_argument, VALUE self)
@@ -2443,8 +2477,7 @@ rb_gi_value_argument_from_ruby(GIArgument *argument, GITypeInfo *type_info,
         argument->v_double = NUM2DBL(rb_argument);
         break;
     case GI_TYPE_TAG_GTYPE:
-        /* TODO: support GLib::Type and String as GType name. */
-        argument->v_size = NUM2ULONG(rb_argument);
+        argument->v_size = rb_gi_value_argument_from_ruby_gtype(rb_argument);
         break;
     case GI_TYPE_TAG_UTF8:
         /* TODO: support UTF-8 convert like rb_argument.encode("UTF-8"). */

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

@@ -236,6 +236,17 @@ rg_s_reference_gobject(int argc, VALUE *argv, G_GNUC_UNUSED VALUE klass)
     return Qnil;
 }
 
+static VALUE
+rg_s_instantiate_gobject_pointer(G_GNUC_UNUSED VALUE klass,
+                                 VALUE rb_gobject_pointer)
+{
+    GObject *gobject;
+
+    gobject = GUINT_TO_POINTER(NUM2ULONG(rb_gobject_pointer));
+
+    return GOBJ2RVAL(gobject);
+}
+
 void
 rb_gi_loader_init(VALUE rb_mGI)
 {
@@ -253,4 +264,5 @@ rb_gi_loader_init(VALUE rb_mGI)
     RG_DEF_SMETHOD(register_constant_rename_map, 2);
     RG_DEF_SMETHOD(start_callback_dispatch_thread, 0);
     RG_DEF_SMETHOD(reference_gobject, -1);
+    RG_DEF_SMETHOD(instantiate_gobject_pointer, 1);
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gobject-introspection
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.0.2
 platform: ruby
 authors:
 - The Ruby-GNOME2 Project Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-11 00:00:00.000000000 Z
+date: 2015-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: glib2
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.1
+        version: 3.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.1
+        version: 3.0.2
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement