gobject-introspection 4.3.9 → 4.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e39e6feae1d2623095aa26ad12481c07726a5f797999e23fdc98b103ce083288
-  data.tar.gz: c4fea6dd3fd14c5ec51193396e052dacce887bac6c035dc82963c92fe0f6e125
+  metadata.gz: a71466d8733cb6b96ea22ef764d7f57fe757c694bc23468f181ec0404527a9d3
+  data.tar.gz: 4e3f8b8646372d617e2245cec2b9d24aa15cd35ac7e86186a70880b9b511eb40
 SHA512:
-  metadata.gz: ce675d17cb6870a8b8a27ffe5ac5c806bab2d5f3da6b4e04e3ba2774b36e1587167212d622ded13ddfb9fd9d44fe43a4e842bf8ce9c7396d095d1549d2d2448f
-  data.tar.gz: 2c41300a2740d624ab4c00d7e4bc588cbc22dc10adf629a0996d9da5cab791197167e7a30fdf93df87f1abfa40d08b29918a795f41cc19850bcc54bf3a28f3ce
+  metadata.gz: db687934ad2f486086aa3ceb4e9fe3987fcc7a292e3aec7e56f44afb1658a4e5d80eb0b21a8f969b016680148fe749eb59d47ce2e45d19732b04768b4ad01a10
+  data.tar.gz: 656e9922a8db31271a112c99879623e84b138606dfe310f6e392b843d343673f6ae2cee4f3e4972444b211c391fc1ac2a3512f14d316b02dfcfccc16d3286d7f

data/ext/gobject-introspection/rb-gi-arguments-in.c

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2012-2022  Ruby-GNOME Project Team
+ *  Copyright (C) 2012-2026  Ruby-GNOME Project Team
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public
@@ -828,13 +828,26 @@ rb_gi_arguments_in_init_arg_ruby_array_c(RBGIArguments *args,
             gchar *raw_array = RSTRING_PTR(rb_arg);
             gsize length = RSTRING_LEN(rb_arg);
             if (metadata->transfer != GI_TRANSFER_NOTHING) {
-                rb_raise(rb_eNotImpError,
-                         "TODO: [%s] %s Ruby -> GIArgument(array/%s)[%s][%s]",
-                         metadata->name,
-                         rb_gi_direction_to_string(metadata->direction),
-                         rb_gi_array_type_to_string(metadata->array_type),
-                         g_type_tag_to_string(metadata->element_type.tag),
-                         rb_gi_transfer_to_string(metadata->transfer));
+                if (metadata->direction == GI_DIRECTION_INOUT) {
+                    rb_raise(rb_eNotImpError,
+                             "TODO: [%s] %s Ruby -> GIArgument(array/%s)[%s][%s]",
+                             metadata->name,
+                             rb_gi_direction_to_string(metadata->direction),
+                             rb_gi_array_type_to_string(metadata->array_type),
+                             g_type_tag_to_string(metadata->element_type.tag),
+                             rb_gi_transfer_to_string(metadata->transfer));
+                }
+#if GLIB_CHECK_VERSION(2, 68, 0)
+                raw_array = g_memdup2(raw_array, length);
+#else
+                if (length > 0) {
+                    gchar *copied_raw_array = g_malloc(length);
+                    memcpy(copied_raw_array, raw_array, length);
+                    raw_array = copied_raw_array;
+                } else {
+                    raw_array = NULL;
+                }
+#endif
             }
             if (metadata->direction == GI_DIRECTION_INOUT) {
                 metadata->in_arg->v_pointer = ALLOC(gpointer);

data/lib/gobject-introspection/loader.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2025  Ruby-GNOME Project Team
+# Copyright (C) 2012-2026  Ruby-GNOME Project Team
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -361,6 +361,18 @@ module GObjectIntrospection
       klass.class_eval(<<-DEFINE_METHOD, __FILE__, __LINE__ + 1)
         def initialize(*arguments, &block)
           invokers = INITIALIZE_INVOKERS
+          if invokers.size > 1
+            # Prefer the constructor whose signature matches the given
+            # arguments without any cast.
+            matched_invoker = invokers.values.find do |invoker|
+              invoker.match?(self, arguments, block)
+            end
+            if matched_invoker
+              matched_invoker.invoke(self, arguments.dup, block)
+              LOADER_CLASS.initialize_instance_post(self)
+              return
+            end
+          end
           invokers.values.each do |invoker|
             catch do |tag|
               invoker.invoke(self, arguments.dup, block, abort_tag: tag)
@@ -729,6 +741,25 @@ module GObjectIntrospection
         end
       end
 
+      def match?(receiver, arguments, block)
+        ensure_prepared
+
+        arguments = arguments.dup
+        if receiver and @info.class == FunctionInfo
+          arguments.unshift(receiver)
+        end
+
+        arguments, _block = build(receiver, arguments, block)
+        return false if wrong_number_of_arguments?(arguments)
+        arguments.each_with_index.all? do |argument, i|
+          if argument.nil?
+            @in_arg_nils[i]
+          else
+            @in_arg_types[i].match?(argument)
+          end
+        end
+      end
+
       def signature
         ensure_prepared
         argument_signatures = @in_args.collect(&:signature)

data/lib/gobject-introspection/registered-type-info.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2019  Ruby-GNOME Project Team
+# Copyright (C) 2019-2026  Ruby-GNOME Project Team
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -19,16 +19,8 @@ module GObjectIntrospection
     def try_convert(value)
       return nil if value.nil?
 
-      type = gtype
-      if type == GLib::Type::NONE
-        ns = namespace
-        return value unless Object.const_defined?(ns)
-        mod = Object.const_get(ns)
-        return value unless mod.const_defined?(name)
-        klass = mod.const_get(name)
-      else
-        klass = type.to_class
-      end
+      klass = resolve_class
+      return value if klass.nil?
 
       case value
       when klass
@@ -42,8 +34,31 @@ module GObjectIntrospection
       end
     end
 
+    def match?(value)
+      return false if value.nil?
+
+      klass = resolve_class
+      return false if klass.nil?
+
+      value.is_a?(klass)
+    end
+
     def description
       "#{gtype.to_class}(#{gtype.name})"
     end
+
+    private
+    def resolve_class
+      type = gtype
+      if type == GLib::Type::NONE
+        ns = namespace
+        return nil unless Object.const_defined?(ns)
+        mod = Object.const_get(ns)
+        return nil unless mod.const_defined?(name)
+        mod.const_get(name)
+      else
+        type.to_class
+      end
+    end
   end
 end

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

@@ -1,4 +1,4 @@
-# Copyright (C) 2019  Ruby-GNOME Project Team
+# Copyright (C) 2019-2026  Ruby-GNOME Project Team
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -20,6 +20,10 @@ module GObjectIntrospection
       tag.try_convert(self, value)
     end
 
+    def match?(value)
+      tag.match?(self, value)
+    end
+
     def description
       tag.description(self)
     end

data/lib/gobject-introspection/type-tag.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2019-2021  Ruby-GNOME Project Team
+# Copyright (C) 2019-2026  Ruby-GNOME Project Team
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -25,6 +25,15 @@ module GObjectIntrospection
       end
     end
 
+    def match?(type_info, value)
+      method = "match_#{nick}?"
+      if respond_to?(method, true)
+        __send__(method, type_info, value)
+      else
+        false
+      end
+    end
+
     def description(type_info)
       method = "description_#{nick}"
       if respond_to?(method, true)
@@ -46,6 +55,10 @@ module GObjectIntrospection
       end
     end
 
+    def match_boolean?(type_info, value)
+      value == true or value == false
+    end
+
     def try_convert_integer(type_info, value)
       if value.is_a?(Integer)
         value
@@ -65,6 +78,19 @@ module GObjectIntrospection
     alias_method :try_convert_int64, :try_convert_integer
     alias_method :try_convert_uint64, :try_convert_integer
 
+    def match_integer?(type_info, value)
+      value.is_a?(Integer)
+    end
+
+    alias_method :match_int8?, :match_integer?
+    alias_method :match_uint8?, :match_integer?
+    alias_method :match_int16?, :match_integer?
+    alias_method :match_uint16?, :match_integer?
+    alias_method :match_int32?, :match_integer?
+    alias_method :match_uint32?, :match_integer?
+    alias_method :match_int64?, :match_integer?
+    alias_method :match_uint64?, :match_integer?
+
     def try_convert_float(type_info, value)
       if value.is_a?(Float)
         value
@@ -77,10 +103,20 @@ module GObjectIntrospection
 
     alias_method :try_convert_double, :try_convert_float
 
+    def match_float?(type_info, value)
+      value.is_a?(Float)
+    end
+
+    alias_method :match_double?, :match_float?
+
     def try_convert_gtype(type_info, value)
       GLib::Type.try_convert(value)
     end
 
+    def match_gtype?(type_info, value)
+      value.is_a?(GLib::Type)
+    end
+
     def try_convert_utf8(type_info, value)
       case value
       when String
@@ -96,6 +132,10 @@ module GObjectIntrospection
       end
     end
 
+    def match_utf8?(type_info, value)
+      value.is_a?(String)
+    end
+
     def try_convert_filename(type_info, value)
       case value
       when String
@@ -111,6 +151,10 @@ module GObjectIntrospection
       end
     end
 
+    def match_filename?(type_info, value)
+      value.is_a?(String)
+    end
+
     def try_convert_array_like(type_info, value)
       value = Array.try_convert(value)
       return nil if value.nil?
@@ -124,6 +168,14 @@ module GObjectIntrospection
       end
     end
 
+    def match_array_like?(type_info, value)
+      return false unless value.is_a?(Array)
+      element_type_info = get_element_type_info(type_info)
+      value.all? do |v|
+        v.nil? or element_type_info.match?(v)
+      end
+    end
+
     def description_array_like(type_info)
       element_type_info = type_info.get_param_type(0)
       "#{nick}(#{element_type_info.description})"
@@ -146,11 +198,21 @@ module GObjectIntrospection
       try_convert_array_like(type_info, value)
     end
 
+    def match_array?(type_info, value)
+      case get_element_type_info(type_info).tag
+      when INT8, UINT8
+        return true if value.is_a?(String)
+      end
+      match_array_like?(type_info, value)
+    end
+
     alias_method :description_array, :description_array_like
 
     alias_method :try_convert_glist, :try_convert_array_like
+    alias_method :match_glist?, :match_array_like?
     alias_method :description_glist, :description_array_like
     alias_method :try_convert_gslist, :try_convert_array_like
+    alias_method :match_gslist?, :match_array_like?
     alias_method :description_gslist, :description_array_like
 
     def try_convert_ghash(type_info, value)
@@ -162,6 +224,10 @@ module GObjectIntrospection
       end
     end
 
+    def match_ghash?(type_info, value)
+      value.is_a?(Hash)
+    end
+
     def description_ghash(type_info)
       key_type = type_info.get_param_type(0)
       value_type = type_info.get_param_type(1)
@@ -172,6 +238,10 @@ module GObjectIntrospection
       type_info.interface.try_convert(value)
     end
 
+    def match_interface?(type_info, value)
+      type_info.interface.match?(value)
+    end
+
     def description_interface(type_info)
       "#{nick}(#{type_info.interface.description})"
     end

data/test/test-registered-type-info.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2012  Ruby-GNOME2 Project Team
+# Copyright (C) 2012-2026  Ruby-GNOME Project Team
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -32,4 +32,28 @@ class TestRegisteredTypeInfo < Test::Unit::TestCase
   def test_gtype
     assert_equal(GLib::Type.new("GTypePlugin"), @info.gtype)
   end
+
+  def test_match
+    @repository.require("GLib")
+    info = @repository.find("GLib", "Bytes")
+    assert do
+      info.match?(GLib::Bytes.new("data"))
+    end
+  end
+
+  def test_match_cast
+    @repository.require("GLib")
+    info = @repository.find("GLib", "Bytes")
+    assert do
+      not info.match?("data")
+    end
+  end
+
+  def test_match_unresolved
+    @repository.require("GLib")
+    info = @repository.find("GLib", "Cond")
+    assert do
+      not info.match?(Object.new)
+    end
+  end
 end

data/test/test-type-info.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2012  Ruby-GNOME2 Project Team
+# Copyright (C) 2012-2026  Ruby-GNOME Project Team
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -59,4 +59,50 @@ class TestTypeInfo < Test::Unit::TestCase
     assert_equal(GObjectIntrospection::ArrayType::C,
                  @info.array_type)
   end
+
+  sub_test_case("#match?") do
+    def test_uint8_array_string
+      info = @repository.find("Gio", "content_type_guess").get_arg(1).type
+      assert do
+        info.match?("data")
+      end
+    end
+
+    def test_uint8_array_bytes
+      info = @repository.find("Gio", "content_type_guess").get_arg(1).type
+      assert do
+        not info.match?(GLib::Bytes.new("data"))
+      end
+    end
+
+    def test_utf8_string
+      function_info = @repository.find("Gio", "content_type_get_description")
+      info = function_info.get_arg(0).type
+      assert do
+        info.match?("text/plain")
+      end
+    end
+
+    def test_utf8_symbol
+      function_info = @repository.find("Gio", "content_type_get_description")
+      info = function_info.get_arg(0).type
+      assert do
+        not info.match?(:text)
+      end
+    end
+
+    def test_interface_enum
+      info = @repository.find("Gio", "bus_get_sync").get_arg(0).type
+      assert do
+        info.match?(Gio::BusType::SESSION)
+      end
+    end
+
+    def test_interface_enum_symbol
+      info = @repository.find("Gio", "bus_get_sync").get_arg(0).type
+      assert do
+        not info.match?(:session)
+      end
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gobject-introspection
 version: !ruby/object:Gem::Version
-  version: 4.3.9
+  version: 4.4.0
 platform: ruby
 authors:
 - The Ruby-GNOME Project Team
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.3.9
+        version: 4.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.3.9
+        version: 4.4.0
 description: Ruby/GObjectIntrospection provides bindings of GObject Introspection
   and a loader module that can generate dynamically Ruby bindings of any GObject C
   libraries
@@ -157,7 +157,7 @@ requirements:
 - 'system: gobject-introspection-1.0: macports: gobject-introspection'
 - 'system: gobject-introspection-1.0: msys2: gobject-introspection'
 - 'system: gobject-introspection-1.0: rhel: pkgconfig(gobject-introspection-1.0)'
-rubygems_version: 4.0.16
+rubygems_version: 4.0.20
 specification_version: 4
 summary: Ruby/GObjectIntrospection is a Ruby binding of GObject Introspection.
 test_files: []