gobject-introspection 3.0.8 → 3.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 56a8444d735e61e928d73a46737489b01d4e8729
-  data.tar.gz: 67cb7addc35ba3b342333351a3209f6d9a22e6cf
+  metadata.gz: 81a3676d6cd2cce80cd376a462f8d0fae34501d3
+  data.tar.gz: 1f7bed61f0b68cb302520d6e53ff5b92c0a3af68
 SHA512:
-  metadata.gz: 9e885d7aafc2c2a88d3bd80913ae8242e93255f4b96969f120c1683bf5c0821a73cfda070dacdad95865606a5a528c538e46e7658191ad907180dd7d7e3a4ec1
-  data.tar.gz: f53172284ded58b0299d435c728bbd7b401b6214bde64f870c51fb22918166a789d0ba3bd88f5a7387322a2497f14b41b5957c010ee7a8f1277da79b2af60691
+  metadata.gz: 3f3c73939a3f73715ae81376e4a9b1716e971c3e50dd8a402067c56b281dbe47a5bacabe4940604fdd222d483e1d7c21a47500cc830683dc7dae2160c4924126
+  data.tar.gz: ed0d4a4340e89ef28baef2be6c87984b9d33a9678d8354eb5a4444ce8f504d1aedb7a4097dc1edaeee0c085f2a050e983c5127759523a43c8dd87db0c69090c3

data/Rakefile

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

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

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2012-2015  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2012-2016  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
@@ -191,7 +191,7 @@ array_c_to_ruby_sized(gconstpointer *elements,
     case GI_TYPE_TAG_INT32:
         g_base_info_unref(element_type_info);
         {
-            const gint8 *numbers = (const gint8 *)elements;
+            const gint32 *numbers = (const gint32 *)elements;
             for (i = 0; i < n_elements; i++) {
                 rb_ary_push(rb_array, INT2NUM(numbers[i]));
             }
@@ -945,6 +945,86 @@ rb_gi_argument_to_ruby_glist(GIArgument *argument, GITypeInfo *type_info)
     return rb_argument;
 }
 
+static VALUE
+rb_gi_argument_to_ruby_gslist_interface(GIArgument *argument,
+                                        G_GNUC_UNUSED GITypeInfo *type_info,
+                                        GITypeInfo *element_type_info)
+{
+    VALUE rb_argument = Qnil;
+    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);
+
+    switch (interface_type) {
+    case GI_INFO_TYPE_INVALID:
+    case GI_INFO_TYPE_FUNCTION:
+    case GI_INFO_TYPE_CALLBACK:
+        g_base_info_unref(interface_info);
+        g_base_info_unref(element_type_info);
+        rb_raise(rb_eNotImpError,
+                 "TODO: GIArgument(GSList)[interface(%s)](%s) -> Ruby",
+                 interface_name,
+                 g_type_name(gtype));
+        break;
+    case GI_INFO_TYPE_STRUCT:
+        if (gtype == G_TYPE_NONE) {
+            GSList *node;
+            rb_argument = rb_ary_new();
+            for (node = argument->v_pointer; node; node = g_slist_next(node)) {
+                rb_ary_push(rb_argument,
+                            interface_struct_to_ruby(node->data,
+                                                     FALSE,
+                                                     element_type_info,
+                                                     interface_info));
+            }
+        } else {
+            rb_argument = BOXEDGLIST2RVAL(argument->v_pointer, gtype);
+        }
+        break;
+    case GI_INFO_TYPE_BOXED:
+        rb_argument = BOXEDGLIST2RVAL(argument->v_pointer, gtype);
+        break;
+    case GI_INFO_TYPE_ENUM:
+    case GI_INFO_TYPE_FLAGS:
+    case GI_INFO_TYPE_OBJECT:
+    case GI_INFO_TYPE_INTERFACE:
+        rb_argument = GOBJGLIST2RVAL(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:
+        g_base_info_unref(interface_info);
+        g_base_info_unref(element_type_info);
+        rb_raise(rb_eNotImpError,
+                 "TODO: GIArgument(GSList)[interface(%s)](%s) -> Ruby",
+                 interface_name,
+                 g_type_name(gtype));
+        break;
+    default:
+        g_assert_not_reached();
+        break;
+    }
+
+    g_base_info_unref(interface_info);
+    g_base_info_unref(element_type_info);
+
+    return rb_argument;
+}
+
 static VALUE
 rb_gi_argument_to_ruby_gslist(GIArgument *argument, GITypeInfo *type_info)
 {
@@ -954,7 +1034,6 @@ rb_gi_argument_to_ruby_gslist(GIArgument *argument, GITypeInfo *type_info)
 
     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:
@@ -970,34 +1049,42 @@ rb_gi_argument_to_ruby_gslist(GIArgument *argument, GITypeInfo *type_info)
     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: GIArgument(GSList)[%s] -> Ruby",
                  g_type_tag_to_string(element_type_tag));
         break;
     case GI_TYPE_TAG_UTF8:
+        g_base_info_unref(element_type_info);
         rb_argument = CSTRGSLIST2RVAL(argument->v_pointer);
         break;
     case GI_TYPE_TAG_FILENAME:
+        g_base_info_unref(element_type_info);
         rb_argument = FILENAMEGSLIST2RVAL(argument->v_pointer);
         break;
     case GI_TYPE_TAG_ARRAY:
+        g_base_info_unref(element_type_info);
         rb_raise(rb_eNotImpError,
                  "TODO: GIArgument(GSList)[%s] -> Ruby",
                  g_type_tag_to_string(element_type_tag));
         break;
     case GI_TYPE_TAG_INTERFACE:
-        rb_argument = GOBJGSLIST2RVAL(argument->v_pointer);
+        rb_argument = rb_gi_argument_to_ruby_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: GIArgument(GSList)[%s] -> Ruby",
                  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

@@ -214,6 +214,29 @@ fill_metadata_array(GPtrArray *args_metadata)
     }
 }
 
+static void
+fill_metadata_array_from_callable_info(GPtrArray *args_metadata,
+                                       GICallableInfo *info)
+{
+    GITypeInfo return_type_info;
+    RBGIArgMetadata *array_length_metadata;
+    gint array_length_index = -1;
+
+    g_callable_info_load_return_type(info, &return_type_info);
+    if (g_type_info_get_tag(&return_type_info) != GI_TYPE_TAG_ARRAY) {
+        return;
+    }
+
+    array_length_index = g_type_info_get_array_length(&return_type_info);
+    if (array_length_index == -1) {
+        return;
+    }
+
+    array_length_metadata = g_ptr_array_index(args_metadata, array_length_index);
+    array_length_metadata->array_length_p = TRUE;
+    array_length_metadata->rb_arg_index = -1;
+}
+
 static void
 fill_metadata_rb_arg_index(GPtrArray *args_metadata)
 {
@@ -251,10 +274,11 @@ fill_metadata_rb_arg_index(GPtrArray *args_metadata)
 }
 
 static void
-fill_metadata(GPtrArray *args_metadata)
+fill_metadata(GPtrArray *args_metadata, GICallableInfo *info)
 {
     fill_metadata_callback(args_metadata);
     fill_metadata_array(args_metadata);
+    fill_metadata_array_from_callable_info(args_metadata, info);
     fill_metadata_rb_arg_index(args_metadata);
 }
 
@@ -866,7 +890,7 @@ ffi_closure_callback(G_GNUC_UNUSED ffi_cif *cif,
                        in_args,
                        out_args,
                        args_metadata);
-    fill_metadata(args_metadata);
+    fill_metadata(args_metadata, callback->callback_info);
     arguments_from_raw_data(callback->callback_info,
                             raw_args,
                             in_args,
@@ -1071,7 +1095,7 @@ arguments_from_ruby(GICallableInfo *info, VALUE self, VALUE rb_arguments,
     gint i, n_args;
 
     allocate_arguments(info, in_args, out_args, args_metadata);
-    fill_metadata(args_metadata);
+    fill_metadata(args_metadata, info);
 
     n_args = g_callable_info_get_n_args(info);
     for (i = 0; i < n_args; i++) {

data/ext/gobject-introspection/rbgiversion.h

@@ -11,7 +11,7 @@
 #define __RBGI_VERSION_H__
 
 #define GI_MAJOR_VERSION (1)
-#define GI_MINOR_VERSION (42)
+#define GI_MINOR_VERSION (46)
 #define GI_MICRO_VERSION (0)
 
 #define GI_CHECK_VERSION(major,minor,micro)    \

data/lib/gobject-introspection/arg-info.rb

@@ -17,6 +17,13 @@
 module GObjectIntrospection
   class ArgInfo
     def gclosure?
+      @gclosure_p ||= nil
+      return @gclosure_p unless @gclosure_p.nil?
+      @gclosure_p = compute_gclosure?
+    end
+
+    private
+    def compute_gclosure?
       type_info = type
       return false if type_info.tag != TypeTag::INTERFACE
 

data/lib/gobject-introspection/callable-info.rb

@@ -23,6 +23,48 @@ module GObjectIntrospection
     collection_reader("args")
 
     def in_args
+      @in_args ||= compute_in_args
+    end
+
+    def required_in_args
+      @required_in_args ||= in_args.reject do |arg|
+        arg.may_be_null?
+      end
+    end
+
+    def n_in_args
+      in_args.size
+    end
+
+    def n_required_in_args
+      required_in_args.size
+    end
+
+    def require_callback?
+      args.any? do |arg|
+        arg.direction == Direction::IN and
+          arg.scope != ScopeType::INVALID and
+          !arg.may_be_null?
+      end
+    end
+
+    def out_args
+      @out_args ||= args.find_all do |arg|
+        case arg.direction
+        when Direction::OUT, Direction::INOUT
+          true
+        else
+          false
+        end
+      end
+    end
+
+    def n_out_args
+      out_args.size
+    end
+
+    private
+    def compute_in_args
       array_length_indexes = []
       callback_indexes = []
       closure_indexes = []
@@ -61,42 +103,5 @@ module GObjectIntrospection
         end
       end
     end
-
-    def required_in_args
-      in_args.reject do |arg|
-        arg.may_be_null?
-      end
-    end
-
-    def n_in_args
-      in_args.size
-    end
-
-    def n_required_in_args
-      required_in_args.size
-    end
-
-    def require_callback?
-      args.any? do |arg|
-        arg.direction == Direction::IN and
-          arg.scope != ScopeType::INVALID and
-          !arg.may_be_null?
-      end
-    end
-
-    def out_args
-      args.find_all do |arg|
-        case arg.direction
-        when Direction::OUT, Direction::INOUT
-          true
-        else
-          false
-        end
-      end
-    end
-
-    def n_out_args
-      out_args.size
-    end
   end
 end

data/lib/gobject-introspection/collection-reader.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2012  Ruby-GNOME2 Project Team
+# Copyright (C) 2012-2016  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
@@ -24,9 +24,16 @@ module GObjectIntrospection
         singular = name.sub(/s\z/, "")
       end
       getter = "get_#{singular}"
+      cache_name = "@#{name}"
       define_method(name) do
-        send(n_getter).times.collect do |i|
-          send(getter, i)
+        if instance_variable_defined?(cache_name)
+          instance_variable_get(cache_name)
+        else
+          collection = send(n_getter).times.collect do |i|
+            send(getter, i)
+          end
+          instance_variable_set(cache_name, collection)
+          collection
         end
       end
     end

data/lib/gobject-introspection/loader.rb

@@ -121,11 +121,12 @@ module GObjectIntrospection
     end
 
     def define_struct(info, options={})
+      name = rubyish_class_name(info)
       if info.gtype == GLib::Type::NONE
-        klass = self.class.define_struct(info.size, info.name, @base_module,
+        klass = self.class.define_struct(info.size, name, @base_module,
                                          :parent => options[:parent])
       else
-        klass = self.class.define_class(info.gtype, info.name, @base_module,
+        klass = self.class.define_class(info.gtype, name, @base_module,
                                         :parent => options[:parent],
                                         :size   => info.size)
       end
@@ -136,7 +137,7 @@ module GObjectIntrospection
     def load_struct_info(info)
       case info.name
       when /Class\z/
-        base_class_name = $PREMATCH
+        base_class_name = rubyish_class_name(info)
         method_infos = info.methods.find_all do |method_info|
           method_info.is_a?(MethodInfo)
         end
@@ -169,26 +170,18 @@ module GObjectIntrospection
 
     def define_enum(info)
       self.class.define_class(info.gtype,
-                              enum_class_name(info),
+                              rubyish_class_name(info),
                               @base_module)
     end
 
-    def enum_class_name(info)
-      info.name
-    end
-
     def define_error(info)
       self.class.define_error(info.error_domain,
-                              error_class_name(info),
+                              rubyish_class_name(info),
                               @base_module,
                               :parent => error_parent_class(info),
                               :gtype => info.gtype)
     end
 
-    def error_class_name(info)
-      info.name
-    end
-
     def error_parent_class(info)
       nil
     end
@@ -199,7 +192,7 @@ module GObjectIntrospection
         info.values.each do |value_info|
           load_enum_value(value_info, enum_module)
         end
-        @base_module.const_set(info.name, enum_module)
+        @base_module.const_set(rubyish_class_name(info), enum_module)
       else
         if info.error_domain
           define_error(info)
@@ -219,7 +212,7 @@ module GObjectIntrospection
         info.values.each do |value_info|
           load_flag_value(value_info, flags_module)
         end
-        @base_module.const_set(info.name, flags_module)
+        @base_module.const_set(rubyish_class_name(info), flags_module)
       else
         self.class.define_class(info.gtype, flags_class_name(info), @base_module)
       end
@@ -230,7 +223,9 @@ module GObjectIntrospection
     end
 
     def load_object_info(info)
-      klass = self.class.define_class(info.gtype, info.name, @base_module)
+      klass = self.class.define_class(info.gtype,
+                                      rubyish_class_name(info),
+                                      @base_module)
       load_fields(info, klass)
       load_methods(info, klass)
     end
@@ -414,7 +409,9 @@ module GObjectIntrospection
         when InfoType::STRUCT
           match_argument_interface_struct?(arg_info, interface, argument)
         when InfoType::OBJECT,
-             InfoType::INTERFACE
+             InfoType::INTERFACE,
+             InfoType::FLAGS,
+             InfoType::ENUM
           argument.is_a?(interface.gtype.to_class)
         else
           # TODO
@@ -468,7 +465,7 @@ module GObjectIntrospection
           else
             name
           end
-        when /\A(?:has|use|can|in|.*_is)_/
+        when /\A(?:has|use|can|in|on|.*_is)_/
           "#{name}?"
         when "exists"
           "exist?"
@@ -504,6 +501,21 @@ module GObjectIntrospection
       end
     end
 
+    def rubyish_class_name(info)
+      name = info.name
+      case info
+      when StructInfo
+        case name
+        when /Class\z/
+          $PREMATCH
+        else
+          name
+        end
+      else
+        name
+      end
+    end
+
     def should_unlock_gvl?(function_info, klass)
       false
     end
@@ -537,10 +549,11 @@ module GObjectIntrospection
         validate_arguments(info, "#{klass}\##{method_name}", arguments)
         [arguments, block]
       end
+      require_callback_p = info.require_callback?
       klass.__send__(:define_method, method_name) do |*arguments, &block|
         arguments = [self] + arguments if function_info_p
         arguments, block = prepare.call(arguments, &block)
-        if block.nil? and info.require_callback?
+        if block.nil? and require_callback_p
           to_enum(method_name, *arguments)
         else
           options = {
@@ -577,12 +590,18 @@ module GObjectIntrospection
 
     def load_interface_info(info)
       interface_module =
-        self.class.define_interface(info.gtype, info.name, @base_module)
+        self.class.define_interface(info.gtype,
+                                    rubyish_class_name(info),
+                                    @base_module)
       load_methods(info, interface_module)
     end
 
     def load_constant_info(info)
-      @base_module.const_set(info.name, info.value)
+      define_constant(info.name, info)
+    end
+
+    def define_constant(name, info)
+      @base_module.const_set(name, info.value)
     end
 
     def load_union_info(info)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gobject-introspection
 version: !ruby/object:Gem::Version
-  version: 3.0.8
+  version: 3.0.9
 platform: ruby
 authors:
 - The Ruby-GNOME2 Project Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-03 00:00:00.000000000 Z
+date: 2016-08-12 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.8
+        version: 3.0.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.8
+        version: 3.0.9
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
@@ -135,7 +135,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: 2.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="