gobject-introspection 3.4.3 → 3.4.9

data/lib/gobject-introspection/loader.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2019  Ruby-GNOME Project Team
+# Copyright (C) 2012-2021  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
@@ -216,6 +216,7 @@ module GObjectIntrospection
       klass = self.class.define_class(info.gtype,
                                       rubyish_class_name(info),
                                       @base_module)
+      load_virtual_functions(info, klass)
       load_fields(info, klass)
       load_methods(info, klass)
     end
@@ -338,6 +339,20 @@ module GObjectIntrospection
       end
     end
 
+    def load_virtual_functions(info, klass)
+      klass.extend(VirtualFunctionImplementable)
+      gtype_prefix = rubyish_gtype_name(klass.gtype.name)
+      implementor = VirtualFunctionImplementor.new(self.class,
+                                                   gtype_prefix,
+                                                   info.vfuncs)
+      klass.__send__(:initialize_virtual_function_implementable,
+                     implementor)
+    end
+
+    def rubyish_gtype_name(name)
+      name.scan(/[A-Z]+[a-z\d]+/).collect(&:downcase).join("_")
+    end
+
     def initialize_post(object)
     end
 
@@ -546,6 +561,7 @@ module GObjectIntrospection
         self.class.define_interface(info.gtype,
                                     rubyish_class_name(info),
                                     @base_module)
+      load_virtual_functions(info, interface_module)
       load_methods(info, interface_module)
     end
 
@@ -708,5 +724,53 @@ module GObjectIntrospection
         "#{@full_method_name}: wrong number of arguments (#{detail})"
       end
     end
+
+    class VirtualFunctionImplementor
+      def initialize(loader_class, gtype_prefix, infos)
+        @loader_class = loader_class
+        @gtype_prefix = gtype_prefix
+        @infos = {}
+        prefix = GLib::VIRTUAL_FUNCTION_IMPLEMENTATION_PREFIX
+        infos.each do |info|
+          name = info.name
+          @infos[:"#{prefix}#{name}"] = info
+          @infos[:"#{prefix}#{gtype_prefix}_#{name}"] = info
+        end
+      end
+
+      def implement(implementor_gtype, name)
+        info = @infos[name]
+        return false if info.nil?
+        container = info.container
+        vtable_gtype = container.gtype
+        if container.respond_to?(:class_struct)
+          struct = container.class_struct
+        else
+          return false unless implementor_gtype.type_is_a?(vtable_gtype)
+          struct = container.iface_struct
+        end
+        field = struct.find_field(info.name)
+        @loader_class.implement_virtual_function(field,
+                                                 implementor_gtype,
+                                                 vtable_gtype,
+                                                 name.to_s)
+        true
+      end
+    end
+
+    module VirtualFunctionImplementable
+      def initialize_virtual_function_implementable(implementor)
+        @virtual_function_implementor = implementor
+      end
+
+      def implement_virtual_function(implementor_class, name)
+        unless instance_variable_defined?(:@virtual_function_implementor)
+          return false
+        end
+        @virtual_function_implementor.implement(implementor_class.gtype,
+                                                name)
+        true
+      end
+    end
   end
 end

data/test/gobject-introspection-test-utils.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2012  Ruby-GNOME2 Project Team
+# Copyright (C) 2012-2021  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
@@ -14,7 +14,7 @@
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
-require "test-unit"
+require "gobject-introspection"
 
 module GObjectIntrospectionTestUtils
   def require_version(major, minor, micro)

data/test/run-test.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 #
-# Copyright (C) 2012-2020  Ruby-GNOME Project Team
+# Copyright (C) 2012-2021  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
@@ -16,31 +16,24 @@
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
-ruby_gnome_base = File.join(File.dirname(__FILE__), "..", "..")
-ruby_gnome_base = File.expand_path(ruby_gnome_base)
+require_relative "../../glib2/test/run-test"
 
-glib_base = File.join(ruby_gnome_base, "glib2")
-gobject_introspection_base = File.join(ruby_gnome_base, "gobject-introspection")
+run_test(__dir__,
+         [
+           "glib2",
+           "gobject-introspection",
+         ]) do |context|
+  require_relative "gobject-introspection-test-utils"
 
-modules = [
-  [glib_base, "glib2"],
-  [gobject_introspection_base, "gobject-introspection"]
-]
-modules.each do |target, module_name|
-  if File.exist?("#{target}/Makefile") and system("which make > /dev/null")
-    `make -C #{target.dump} > /dev/null` or exit(false)
+  begin
+    repository = GObjectIntrospection::Repository.default
+    repository.require("Gio")
+  rescue GObjectIntrospection::RepositoryError
+    puts("Omit because typelib file doesn't exist: #{$!.message}")
+    exit(true)
   end
-  $LOAD_PATH.unshift(File.join(target, "ext", module_name))
-  $LOAD_PATH.unshift(File.join(target, "lib"))
-end
-
-$LOAD_PATH.unshift(File.join(glib_base, "test"))
-require "glib-test-init"
-
-$LOAD_PATH.unshift(File.join(gobject_introspection_base, "test"))
-require "gobject-introspection-test-utils"
 
-require "gobject-introspection"
-
-exit Test::Unit::AutoRunner.run(true,
-                                File.join(gobject_introspection_base, "test"))
+  module Gio
+    GObjectIntrospection::Loader.load("Gio", self)
+  end
+end

data/test/test-base-info.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2012  Ruby-GNOME2 Project Team
+# Copyright (C) 2012-2021  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
@@ -28,4 +28,8 @@ class TestBaseInfo < Test::Unit::TestCase
   def test_namespace
     assert_equal("GObject", @info.namespace)
   end
+
+  def test_container
+    assert_equal("Object", @info.vfuncs.first.container.name)
+  end
 end

data/test/test-callable-info.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2012  Ruby-GNOME2 Project Team
+# Copyright (C) 2012-2021  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
@@ -21,6 +21,12 @@ class TestCallableInfo < Test::Unit::TestCase
     @info = @repository.find("GObject", "signal_name")
   end
 
+  def test_can_throw_gerror
+    assert do
+      not @info.can_throw_gerror?
+    end
+  end
+
   def test_return_type
     assert_kind_of(GObjectIntrospection::TypeInfo,
                    @info.return_type)
@@ -32,7 +38,15 @@ class TestCallableInfo < Test::Unit::TestCase
   end
 
   def test_may_return_null?
-    assert_false(@info.may_return_null?)
+    if GObjectIntrospection::Version.or_later?(1, 67, 0)
+      assert do
+        @info.may_return_null?
+      end
+    else
+      assert do
+        not @info.may_return_null?
+      end
+    end
   end
 
   def test_n_args

data/test/test-loader.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2012  Ruby-GNOME2 Project Team
+# Copyright (C) 2012-2021  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
@@ -17,14 +17,60 @@
 class TestLoaderInfo < Test::Unit::TestCase
   def setup
     @repository = GObjectIntrospection::Repository.default
-    @repository.require("Gio")
-    @info = @repository.find("Gio", "Application")
-    @sandbox = Module.new
   end
 
   def test_define_class
-    gtype = @info.gtype
-    GObjectIntrospection::Loader.define_class(gtype, "Application", @sandbox)
-    assert_equal(gtype, @sandbox::Application.gtype)
+    info = @repository.find("Gio", "Application")
+    gtype = info.gtype
+    assert_equal(gtype, Gio::Application.gtype)
+  end
+
+  sub_test_case("virtual function") do
+    def test_without_prefix
+      active_vfs_class = Class.new(Gio::Vfs) do
+        type_register("ActiveVfsWithoutPrefix")
+
+        def virtual_do_is_active
+          true
+        end
+      end
+      active_vfs = active_vfs_class.new
+      assert do
+        active_vfs.active?
+      end
+    end
+
+    def test_with_prefix
+      active_vfs_class = Class.new(Gio::Vfs) do
+        type_register("ActiveVfsWithPrefix")
+
+        def virtual_do_gvfs_is_active
+          true
+        end
+      end
+      active_vfs = active_vfs_class.new
+      assert do
+        active_vfs.active?
+      end
+    end
+
+    def test_interface
+      resettable_converter_class = Class.new(GLib::Object) do
+        type_register("ResettableConverter")
+
+        include Gio::Converter
+
+        attr_reader :resetted
+
+        def virtual_do_reset
+          @resetted = true
+        end
+      end
+      resettable_converter = resettable_converter_class.new
+      resettable_converter.reset
+      assert do
+        resettable_converter.resetted
+      end
+    end
   end
 end

data/test/test-object-info.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2012  Ruby-GNOME2 Project Team
+# Copyright (C) 2012-2021  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
@@ -113,6 +113,10 @@ class TestObjectInfo < Test::Unit::TestCase
     assert_equal(0, @info.n_constants)
   end
 
+  def test_class_struct
+    assert_equal("FileOutputStreamClass", @info.class_struct.name)
+  end
+
   def test_unref_function
     assert_nil(@info.unref_function)
   end

data/test/test-struct-info.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2014  Ruby-GNOME2 Project Team
+# Copyright (C) 2012-2021  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
@@ -30,6 +30,11 @@ class TestStructInfo < Test::Unit::TestCase
                    @info.get_field(0))
   end
 
+  def test_find_field
+    assert_equal("g_type",
+                 @info.find_field("g_type").name)
+  end
+
   def test_n_methods
     assert_operator(@info.n_methods, :>=, 62)
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gobject-introspection
 version: !ruby/object:Gem::Version
-  version: 3.4.3
+  version: 3.4.9
 platform: ruby
 authors:
 - The Ruby-GNOME Project Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-10 00:00:00.000000000 Z
+date: 2021-08-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.4.3
+        version: 3.4.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.4.3
+        version: 3.4.9
 description: Ruby/GObjectIntrospection provides bindings of GObject Introspection
   and a loader module that can generate dynamically Ruby bindings of any GObject C
   libraries
@@ -38,6 +38,8 @@ files:
 - Rakefile
 - ext/gobject-introspection/depend
 - ext/gobject-introspection/extconf.rb
+- ext/gobject-introspection/gobject-introspection-enum-types.c
+- ext/gobject-introspection/gobject-introspection-enum-types.h
 - ext/gobject-introspection/gobject_introspection.def
 - ext/gobject-introspection/rb-gi-arg-info.c
 - ext/gobject-introspection/rb-gi-argument.c
@@ -86,6 +88,7 @@ files:
 - ext/gobject-introspection/rb-gi-vfunc-info.c
 - ext/gobject-introspection/rb-gobject-introspection.c
 - ext/gobject-introspection/rb-gobject-introspection.h
+- ext/gobject-introspection/rbgiversion.h
 - extconf.rb
 - gobject-introspection.gemspec
 - lib/gi.rb
@@ -151,7 +154,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.0.pre1
+rubygems_version: 3.3.0.dev
 signing_key: 
 specification_version: 4
 summary: Ruby/GObjectIntrospection is a Ruby binding of GObject Introspection.