gobject-introspection 3.1.1 → 3.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5e7de825796aca9c7935a109c3e048b84432e163
-  data.tar.gz: b22702a31833ad07b46dd190895c955b95fdcaac
+  metadata.gz: 35811ac9e736fa0695b78153abb1f115aca9a97a
+  data.tar.gz: 8eff89de97f6feebf3de2befb97d862d0ba851bc
 SHA512:
-  metadata.gz: 78016bee5bbd67ea91f822eda8a13f888edc9393a11dca852b07a1df4dc8002a8a865473fdfed55b61583030817bcdab69d03a43acffcb75e9f6f76cf97ffbab
-  data.tar.gz: 677113a40e5ad47a968061441b6fc066f365277286dccde7aa9c9b464ab9194d05ca83fce507fb82709f1fb5ca663ab7ed4350361dadc20fca0c2b99a0667354
+  metadata.gz: 730890b3b4bbe8fb74f181c5b23989e4bdd5184e8a4f692b3ca5e5c334587fa4ebc0fd1088d97bea994ef71c7db53b41ea29b42eeb67b644f471e51d6a42afac
+  data.tar.gz: 70513be500ce797f970dbeedff8faa17b7757a50cbafafb1eeeeb1e6287e7aeb94fd3dd035c50a5b7440c636700e69902c5d2c44030c5172865f1e9c0664f98f

data/Rakefile

@@ -32,7 +32,7 @@ package_task = GNOME2::Rake::PackageTask.new do |package|
       :name => "glib",
       :download_site => :gnome,
       :label => "GLib",
-      :version => "2.50.2",
+      :version => "2.52.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.50.0",
+      :version => "1.52.1",
       :compression_method => "xz",
       :windows => {
         :configure_args => [

data/ext/gobject-introspection/extconf.rb

@@ -57,11 +57,11 @@ end
 setup_windows(module_name, base_dir)
 
 unless required_pkg_config_package(package_id,
-                                   :altlinux => "gobject-introspection-devel",
+                                   :alt_linux => "gobject-introspection-devel",
                                    :debian => "libgirepository1.0-dev",
                                    :redhat => "gobject-introspection-devel",
                                    :homebrew => "gobject-introspection",
-                                   :arch => "gobject-introspection",
+                                   :arch_linux => "gobject-introspection",
                                    :macports => "gobject-introspection")
   exit(false)
 end

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

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2012-2016  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
@@ -37,8 +37,28 @@ interface_struct_to_ruby(gpointer object,
 
     namespace = g_base_info_get_namespace(interface_info);
     name = g_base_info_get_name(interface_info);
+
+    if (strcmp(namespace, "cairo") == 0) {
+        gchar *gtype_name;
+        GType gtype;
+
+        gtype_name = g_strdup_printf("Cairo%s", name);
+        gtype = g_type_from_name(gtype_name);
+        g_free(gtype_name);
+        return BOXED2RVAL(target_object, gtype);
+    }
+
     rb_module = rb_const_get(rb_cObject, rb_intern(namespace));
     rb_class = rb_const_get(rb_module, rb_intern(name));
+    if (rb_respond_to(rb_class, rb_intern("gtype"))) {
+        VALUE rb_gtype;
+        GType gtype;
+
+        rb_gtype = rb_funcall(rb_class, rb_intern("gtype"), 0);
+        gtype = NUM2ULONG(rb_funcall(rb_gtype, rb_intern("to_i"), 0));
+        return BOXED2RVAL(target_object, gtype);
+    }
+
     if (duplicate) {
         size_t object_size;
         object_size = g_struct_info_get_size(interface_info);
@@ -166,12 +186,20 @@ array_c_to_ruby_sized(gconstpointer *elements,
     switch (element_type_tag) {
     case GI_TYPE_TAG_VOID:
     case GI_TYPE_TAG_BOOLEAN:
-    case GI_TYPE_TAG_INT8:
         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_INT8:
+        g_base_info_unref(element_type_info);
+        {
+            const gint8 *numbers = (const gint8 *)elements;
+            for (i = 0; i < n_elements; i++) {
+                rb_ary_push(rb_array, INT2NUM(numbers[i]));
+            }
+        }
+        break;
     case GI_TYPE_TAG_UINT8:
         g_base_info_unref(element_type_info);
         {
@@ -198,7 +226,20 @@ 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));
+        break;
     case GI_TYPE_TAG_INT64:
+        g_base_info_unref(element_type_info);
+        {
+            const gint64 *numbers = (const gint64 *)elements;
+            for (i = 0; i < n_elements; i++) {
+                rb_ary_push(rb_array, LL2NUM(numbers[i]));
+            }
+        }
+        break;
     case GI_TYPE_TAG_UINT64:
     case GI_TYPE_TAG_FLOAT:
     case GI_TYPE_TAG_DOUBLE:
@@ -570,12 +611,6 @@ rb_gi_argument_to_ruby_interface(GIArgument *argument,
                                                     duplicate,
                                                     type_info,
                                                     interface_info);
-        } else if (gtype == G_TYPE_BYTES) {
-            GBytes *bytes = argument->v_pointer;
-            gconstpointer data;
-            gsize size;
-            data = g_bytes_get_data(bytes, &size);
-            rb_interface = rb_enc_str_new(data, size, rb_ascii8bit_encoding());
         } else if (gtype == G_TYPE_VARIANT) {
             GVariant *variant = argument->v_pointer;
             rb_interface = rbg_variant_to_ruby(variant);
@@ -1234,7 +1269,14 @@ rb_gi_out_argument_init_array_c(GIArgument *argument,
         break;
       case GI_TYPE_TAG_FILENAME:
       case GI_TYPE_TAG_ARRAY:
+        g_base_info_unref(element_type_info);
+        rb_raise(rb_eNotImpError,
+                 "TODO: allocates GIArgument(array)[c][%s] for output",
+                 g_type_tag_to_string(element_type_tag));
+        break;
       case GI_TYPE_TAG_INTERFACE:
+        argument->v_pointer = xmalloc(sizeof(gpointer *));
+        break;
       case GI_TYPE_TAG_GLIST:
       case GI_TYPE_TAG_GSLIST:
       case GI_TYPE_TAG_GHASH:
@@ -1791,7 +1833,14 @@ rb_gi_out_argument_fin_array_c(GIArgument *argument,
         break;
       case GI_TYPE_TAG_FILENAME:
       case GI_TYPE_TAG_ARRAY:
+        g_base_info_unref(element_type_info);
+        rb_raise(rb_eNotImpError,
+                 "TODO: free out GIArgument(array)[c][%s]",
+                 g_type_tag_to_string(element_type_tag));
+        break;
       case GI_TYPE_TAG_INTERFACE:
+        xfree(argument->v_pointer);
+        break;
       case GI_TYPE_TAG_GLIST:
       case GI_TYPE_TAG_GSLIST:
       case GI_TYPE_TAG_GHASH:
@@ -2805,11 +2854,17 @@ rb_gi_value_argument_from_ruby(GIArgument *argument, GITypeInfo *type_info,
         break;
     case GI_TYPE_TAG_GHASH:
     case GI_TYPE_TAG_ERROR:
-    case GI_TYPE_TAG_UNICHAR:
         rb_raise(rb_eNotImpError,
                  "TODO: Ruby -> GIArgument(%s)",
                  g_type_tag_to_string(type_tag));
         break;
+    case GI_TYPE_TAG_UNICHAR:
+      if (NIL_P(rb_argument)) {
+          argument->v_uint32 = 0;
+      } else {
+          argument->v_uint32 = NUM2UINT(rb_argument);
+      }
+      break;
     default:
         g_assert_not_reached();
         break;
@@ -2917,7 +2972,7 @@ static void
 rb_gi_in_argument_transfer_interface(GIArgument *argument,
                                      G_GNUC_UNUSED GITransfer transfer,
                                      GITypeInfo *type_info,
-                                     G_GNUC_UNUSED VALUE rb_argument)
+                                     VALUE rb_argument)
 {
     GIBaseInfo *interface_info;
     GIInfoType interface_type;

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

@@ -75,6 +75,7 @@ VALUE
 rb_gi_field_info_get_field_raw(GIFieldInfo *info, gpointer memory)
 {
     GIArgument argument;
+    gboolean processed = FALSE;
     GITypeInfo *type_info;
     GITypeTag type_tag;
     VALUE rb_field_value;
@@ -82,17 +83,51 @@ rb_gi_field_info_get_field_raw(GIFieldInfo *info, gpointer memory)
     type_info = g_field_info_get_type(info);
     type_tag = g_type_info_get_tag(type_info);
 
-    if (!g_field_info_get_field(info, memory, &argument)) {
-        g_base_info_unref(type_info);
-        rb_raise(rb_eArgError, "failed to get field value: %s[%s]",
-                 g_base_info_get_name(info),
-                 g_type_tag_to_string(type_tag));
+    switch (type_tag) {
+      case GI_TYPE_TAG_INTERFACE:
+        {
+            GIBaseInfo *interface_info;
+            GIInfoType interface_type;
+
+            interface_info = g_type_info_get_interface(type_info);
+            interface_type = g_base_info_get_type(interface_info);
+            switch (interface_type) {
+              case GI_INFO_TYPE_STRUCT:
+              case GI_INFO_TYPE_UNION:
+              case GI_INFO_TYPE_BOXED:
+                {
+                    int offset;
+
+                    offset = g_field_info_get_offset(info);
+                    argument.v_pointer = G_STRUCT_MEMBER(gpointer, memory, offset);
+                    processed = TRUE;
+                }
+                break;
+              default:
+                break;
+            }
+            g_base_info_unref(interface_info);
+        }
+        break;
+      case GI_TYPE_TAG_UTF8:
+        {
+            int offset;
+            offset = g_field_info_get_offset(info);
+            argument.v_string = G_STRUCT_MEMBER(gchar *, memory, offset);
+            processed = TRUE;
+        }
+        break;
+      default:
+        break;
     }
 
-    if (type_tag == GI_TYPE_TAG_UTF8) {
-        int offset;
-        offset = g_field_info_get_offset(info);
-        argument.v_string = G_STRUCT_MEMBER(gchar *, memory, offset);
+    if (!processed) {
+        if (!g_field_info_get_field(info, memory, &argument)) {
+            g_base_info_unref(type_info);
+            rb_raise(rb_eArgError, "failed to get field value: %s[%s]",
+                     g_base_info_get_name(info),
+                     g_type_tag_to_string(type_tag));
+        }
     }
 
     rb_field_value = GI_ARGUMENT2RVAL(&argument, FALSE, type_info,
@@ -117,11 +152,43 @@ rb_gi_field_info_set_field_raw(GIFieldInfo *info, gpointer memory,
 
     succeeded = g_field_info_set_field(info, memory, &field_value);
     if (!succeeded) {
-        if (type_tag == GI_TYPE_TAG_UTF8) {
-            int offset;
-            offset = g_field_info_get_offset(info);
-            G_STRUCT_MEMBER(gchar *, memory, offset) = field_value.v_string;
-            succeeded = TRUE;
+        switch (type_tag) {
+          case GI_TYPE_TAG_INTERFACE:
+            {
+                GIBaseInfo *interface_info;
+                GIInfoType interface_type;
+
+                interface_info = g_type_info_get_interface(type_info);
+                interface_type = g_base_info_get_type(interface_info);
+                switch (interface_type) {
+                  case GI_INFO_TYPE_STRUCT:
+                  case GI_INFO_TYPE_UNION:
+                  case GI_INFO_TYPE_BOXED:
+                    {
+                        int offset;
+
+                        offset = g_field_info_get_offset(info);
+                        G_STRUCT_MEMBER(gpointer, memory, offset) =
+                            field_value.v_pointer;
+                        succeeded = TRUE;
+                    }
+                    break;
+                  default:
+                    break;
+                }
+                g_base_info_unref(interface_info);
+            }
+            break;
+          case GI_TYPE_TAG_UTF8:
+            {
+                int offset;
+                offset = g_field_info_get_offset(info);
+                G_STRUCT_MEMBER(gchar *, memory, offset) = field_value.v_string;
+                succeeded = TRUE;
+            }
+            break;
+          default:
+            break;
         }
     }
     rb_gi_value_argument_free(rb_field_value, &field_value, type_info);

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

@@ -57,6 +57,12 @@ rg_s_define_interface(G_GNUC_UNUSED VALUE klass,
     return G_DEF_INTERFACE(gtype, RVAL2CSTR(rb_name), rb_module);
 }
 
+static void
+struct_free(void *pointer)
+{
+    xfree(pointer);
+}
+
 static VALUE
 struct_alloc(VALUE klass)
 {
@@ -66,9 +72,8 @@ struct_alloc(VALUE klass)
 
     rb_size = rb_iv_get(klass, "@size");
     size = NUM2ULONG(rb_size);
-    instance = xmalloc(size);
-    memset(instance, 0, size);
-    return Data_Wrap_Struct(klass, NULL, xfree, instance);
+    instance = xcalloc(1, size);
+    return Data_Wrap_Struct(klass, NULL, struct_free, instance);
 }
 
 static VALUE

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

@@ -270,5 +270,9 @@ rb_gi_repository_init(VALUE rb_mGI)
     RG_DEF_METHOD(get_version, 1);
 
     G_DEF_CLASS(G_TYPE_I_REPOSITORY_LOAD_FLAGS, "RepositoryLoadFlags", rb_mGI);
-    G_DEF_CLASS(G_TYPE_I_REPOSITORY_ERROR, "RepositoryError", rb_mGI);
+    G_DEF_ERROR(G_IREPOSITORY_ERROR,
+                "RepositoryError",
+                rb_mGI,
+                rb_eLoadError,
+                G_TYPE_I_REPOSITORY_ERROR);
 }

data/lib/gobject-introspection/loader.rb

@@ -1,4 +1,4 @@
-# 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
@@ -118,9 +118,11 @@ module GObjectIntrospection
         klass = self.class.define_struct(info.size, name, @base_module,
                                          :parent => options[:parent])
       else
+        size = info.size
+        size = nil if size.zero?
         klass = self.class.define_class(info.gtype, name, @base_module,
                                         :parent => options[:parent],
-                                        :size   => info.size)
+                                        :size   => size)
       end
       load_fields(info, klass)
       load_methods(info, klass)
@@ -133,7 +135,7 @@ module GObjectIntrospection
         method_infos = info.methods.find_all do |method_info|
           method_info.is_a?(MethodInfo)
         end
-        unless methods.empty?
+        unless method_infos.empty?
           base_class = @base_module.const_get(base_class_name)
           load_method_infos(method_infos, base_class.singleton_class)
         end
@@ -233,23 +235,33 @@ module GObjectIntrospection
       field_info.name
     end
 
-    def load_field(info, i, field_info, klass)
+    def load_field(info, i, field_info, klass, options={})
       name = field_name(field_info, klass)
       flags = field_info.flags
 
-      if flags.readable?
-        if field_info.type.tag == TypeTag::BOOLEAN
-          reader_method_name = "#{name}?"
-        else
-          reader_method_name = name
-        end
+      readable = options[:readable]
+      readable = flags.readable? if readable.nil?
+      need_number_to_bool_convert = false
+      if name.start_with?("is_") and
+          field_info.type.tag == TypeTag::UINT32
+        need_number_to_bool_convert = true
+      end
+      if readable
+        reader_method_name = rubyish_field_reader_name(field_info, name)
         remove_existing_method(klass, reader_method_name)
         klass.__send__(:define_method, reader_method_name) do ||
-          info.get_field_value(self, i)
+          value = info.get_field_value(self, i)
+          if need_number_to_bool_convert
+            value != 0
+          else
+            value
+          end
         end
       end
 
-      if flags.writable?
+      writable = options[:writable]
+      writable = flags.writable? if writable.nil?
+      if writable
         klass.__send__(:define_method, "#{name}=") do |value|
           info.set_field_value(self, i, value)
         end
@@ -413,8 +425,17 @@ module GObjectIntrospection
       if options[:prefix]
         name = name.gsub(/\A#{Regexp.escape(options[:prefix])}/, "")
       end
+      if name == "initialize"
+        name += "_raw"
+      end
       return_type = function_info.return_type
       return_type_tag = return_type.tag
+      if return_type_tag == TypeTag::VOID
+        out_arg_tags = function_info.out_args.collect {|arg| arg.type.tag}
+        if out_arg_tags == [TypeTag::ARRAY, TypeTag::INT32]
+          return_type_tag = TypeTag::ARRAY
+        end
+      end
       case return_type_tag
       when TypeTag::BOOLEAN
         case name
@@ -443,7 +464,7 @@ module GObjectIntrospection
         else
           name
         end
-      when TypeTag::GLIST, TypeTag::GSLIST
+      when TypeTag::GLIST, TypeTag::GSLIST, TypeTag::ARRAY
         case name
         when /\A(?:list|get)_/
           if function_info.n_in_args.zero?
@@ -472,6 +493,21 @@ module GObjectIntrospection
       end
     end
 
+    def rubyish_field_reader_name(field_info, name)
+      case field_info.type.tag
+      when TypeTag::BOOLEAN
+        name.gsub(/\Ais_/, "") + "?"
+      when TypeTag::UINT32
+        if /\Ais_/ =~ name
+          "#{$POSTMATCH}?"
+        else
+          name
+        end
+      else
+        name
+      end
+    end
+
     def rubyish_class_name(info)
       name = info.name
       case info

data/lib/gobject-introspection/repository.rb

@@ -16,6 +16,13 @@
 
 module GObjectIntrospection
   class Repository
+    class << self
+      alias_method :default_raw, :default
+      def default
+        @@default ||= default_raw
+      end
+    end
+
     include Enumerable
 
     def each(*namespaces)

data/test/test-union-info.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2012  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
@@ -16,6 +16,38 @@
 
 class TestUnionInfo < Test::Unit::TestCase
   def setup
-    # TODO: find UnionInfo
+    @repository = GObjectIntrospection::Repository.default
+    @repository.require("GLib")
+    @info = @repository.find("GLib", "Mutex")
+  end
+
+  def test_n_fields
+    assert_equal(2, @info.n_fields)
+  end
+
+  def test_get_field
+    assert_kind_of(GObjectIntrospection::FieldInfo,
+                   @info.get_field(0))
+  end
+
+  def test_n_methods
+    assert_operator(@info.n_methods, :>=, 5)
+  end
+
+  def test_get_method
+    assert_kind_of(GObjectIntrospection::FunctionInfo,
+                   @info.get_method(0))
+  end
+
+  def test_size
+    assert_operator(@info.size, :>=, 8)
+  end
+
+  def test_alignment
+    assert_operator(@info.alignment, :>=, 8)
+  end
+
+  def test_discriminated
+    assert_false(@info.discriminated?)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gobject-introspection
 version: !ruby/object:Gem::Version
-  version: 3.1.1
+  version: 3.1.2
 platform: ruby
 authors:
 - The Ruby-GNOME2 Project Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-26 00:00:00.000000000 Z
+date: 2017-04-26 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.1
+        version: 3.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.1
+        version: 3.1.2
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
@@ -126,7 +126,7 @@ files:
 - test/test-vfunc-info.rb
 homepage: http://ruby-gnome2.sourceforge.jp/
 licenses:
-- LGPLv2.1+
+- LGPL-2.1+
 metadata: {}
 post_install_message: 
 rdoc_options: []