glib2 3.4.9 → 4.0.0

data/lib/glib2.rb

@@ -134,8 +134,30 @@ module GLib
   class Instantiatable
     class << self
       def method_added(name)
-        super
+        result = super
+        check_new_method(name)
+        result
+      end
+
+      def include(*modules, &block)
+        result = super
+        modules.each do |mod|
+          next if mod.is_a?(Interface)
+          mod.public_instance_methods(false).each do |name|
+            check_new_method(name)
+          end
+          mod.protected_instance_methods(false).each do |name|
+            check_new_method(name)
+          end
+          mod.private_instance_methods(false).each do |name|
+            check_new_method(name)
+          end
+        end
+        result
+      end
 
+      private
+      def check_new_method(name)
         case name.to_s
         when /\A#{Regexp.escape(SIGNAL_HANDLER_PREFIX)}/o
           signal_name = $POSTMATCH
@@ -313,8 +335,13 @@ GLib::Log.set_log_domain(GLib::Thread::LOG_DOMAIN)
 GLib::Log.set_log_domain(GLib::Module::LOG_DOMAIN)
 
 require "glib2/version"
-require "glib2/regex"
+
 require "glib2/deprecated"
+
+require "glib2/date-time"
+require "glib2/regex"
+require "glib2/variant"
+
 =begin
 Don't we need this?
 ObjectSpace.define_finalizer(GLib) {

data/lib/mkmf-gnome.rb

@@ -72,9 +72,10 @@ def try_compiler_option(opt, &block)
 end
 
 try_compiler_option '-Wall'
-try_compiler_option '-Waggregate-return'
+# NOTE: This generates warnings for functions defined in ruby.h.
+# try_compiler_option '-Waggregate-return'
 try_compiler_option '-Wcast-align'
-# NOTE: Generates way too many false positives.
+# NOTE: This generates way too many false positives.
 # try_compiler_option '-Wconversion'
 try_compiler_option '-Wextra'
 try_compiler_option '-Wformat=2'
@@ -190,12 +191,12 @@ end
 
 def add_depend_package_path(target_name, target_source_dir, target_build_dir)
   if File.exist?(target_source_dir)
-    $INCFLAGS = "-I#{target_source_dir} #{$INCFLAGS}"
+    $INCFLAGS = "-I#{target_source_dir}".quote + " #{$INCFLAGS}"
   end
 
   return unless File.exist?(target_build_dir)
   if target_source_dir != target_build_dir
-    $INCFLAGS = "-I#{target_build_dir} #{$INCFLAGS}"
+    $INCFLAGS = "-I#{target_build_dir}".quote + " #{$INCFLAGS}"
   end
 
   library_base_name = File.basename(target_source_dir).gsub(/-/, "_")

data/test/glib-test-utils.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2015-2021  Ruby-GNOME Project Team
+# Copyright (C) 2015-2022  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
@@ -33,7 +33,11 @@ module GLibTestUtils
   end
 
   def only_not_windows
-    omit("Not for for Windows platform") if GLib.os_win32?
+    omit("Not for Windows platform") if GLib.os_win32?
+  end
+
+  def only_not_scl
+    omit("Not for SCL environment") if ENV["SCL"]
   end
 
   def normalize_path(path)

data/test/test-date-time.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2016-2021  Ruby-GNOME Project Team
+# Copyright (C) 2016-2022  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
@@ -24,7 +24,6 @@ class TestDateTime < Test::Unit::TestCase
   end
 
   sub_test_case "new" do
-
     test "unix: :local" do
       time = Time.now
       format = "%Y-%m-%d-%H-%M"
@@ -111,4 +110,17 @@ class TestDateTime < Test::Unit::TestCase
       assert_equal(time.sec, datetime.second)
     end
   end
+
+  def test_format_iso8601
+    only_glib_version(2, 66, 0)
+    datetime = GLib::DateTime.new(year: 2022,
+                                  month: 7,
+                                  day: 18,
+                                  hour: 23,
+                                  minute: 24,
+                                  second: 4.9,
+                                  timezone: GLib::TimeZone.utc)
+    assert_equal("2022-07-18T23:24:04.900000Z",
+                 datetime.format_iso8601)
+  end
 end

data/test/test-glib2.rb

@@ -1,6 +1,6 @@
 # coding: ascii-8bit
 #
-# Copyright (C) 2015-2019  Ruby-GNOME2 Project Team
+# Copyright (C) 2015-2022  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
@@ -130,17 +130,19 @@ class TestGLib < Test::Unit::TestCase
   end
 
   def test_signal_handler_disconnect_and_gc
-    obj = GLib::Object.new
+    object = GLib::Object.new
     klass = Class.new
-    1000.times {
-      a = klass.new
-      id = obj.signal_connect("notify") { p a }
-      obj.signal_handler_disconnect(id)
+    n_tries = 100
+    n_tries.times {
+      garbage_collected_object = klass.new
+      id = object.signal_connect("notify") { p garbage_collected_object }
+      object.signal_handler_disconnect(id)
     }
     GC.start
-    ary = []
-    ObjectSpace.each_object(klass) { |a| ary.push(a) }
-    assert_operator(ary.size, :<, 1000)
+    n_alive_objects = ObjectSpace.each_object(klass) {}
+    assert do
+      n_alive_objects < n_tries
+    end
   end
 
   def test_gtype
@@ -150,4 +152,14 @@ class TestGLib < Test::Unit::TestCase
     obj = GLib::Object.new
     assert_equal(obj.gtype, GLib::Object.gtype)
   end
+
+  def test_malloc
+    address = GLib.malloc(29)
+    GLib.free(address)
+  end
+
+  def test_malloc0
+    address = GLib.malloc0(29)
+    GLib.free(address)
+  end
 end

data/test/test-spawn.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2015-2021  Ruby-GNOME Project Team
+# Copyright (C) 2015-2022  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
@@ -35,6 +35,8 @@ class TestGLibSpawn < Test::Unit::TestCase
 
   def test_async_clear_environment
     only_not_windows
+    only_not_scl
+
     if RbConfig.respond_to?(:ruby)
       ruby = RbConfig.ruby
     else

data/test/test-variant.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2018  Ruby-GNOME2 Project Team
+# Copyright (C) 2018-2022  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,6 +17,31 @@
 class TestGLibVariant < Test::Unit::TestCase
   include GLibTestUtils
 
+  sub_test_case ".parse" do
+    test "no type" do
+      variant = GLib::Variant.parse("'hello'")
+      assert_equal([GLib::VariantType::STRING, "hello"],
+                   [variant.type, variant.value])
+    end
+
+    test "type" do
+      variant = GLib::Variant.parse("29", "y")
+      assert_equal([GLib::VariantType::BYTE, 29],
+                   [variant.type, variant.value])
+    end
+
+    test "garbage" do
+      message = <<-MESSAGE
+expected end of input:
+  29 hello
+     ^    
+      MESSAGE
+      assert_raise(GLib::VariantParseError::InputNotAtEnd.new(message)) do
+        GLib::Variant.parse("29 hello", "y")
+      end
+    end
+  end
+
   sub_test_case "#initialize" do
     test "type: string" do
       variant = GLib::Variant.new("hello", "s")
@@ -24,4 +49,22 @@ class TestGLibVariant < Test::Unit::TestCase
                    [variant.type, variant.value])
     end
   end
+
+  sub_test_case "#to_s" do
+    test "default" do
+      variant = GLib::Variant.new(29, "y")
+      assert_equal("0x1d", variant.to_s)
+    end
+
+    test "type_annotate:" do
+      variant = GLib::Variant.new(29, "y")
+      assert_equal("byte 0x1d", variant.to_s(type_annotate: true))
+    end
+  end
+
+  test "#inspect" do
+    variant = GLib::Variant.new(29, "y")
+    assert_equal("#<GLib::Variant:0x00 type=y value=29>",
+                 variant.inspect.gsub(/0x\h+/, "0x00"))
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glib2
 version: !ruby/object:Gem::Version
-  version: 3.4.9
+  version: 4.0.0
 platform: ruby
 authors:
 - The Ruby-GNOME Project Team
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-10 00:00:00.000000000 Z
+date: 2022-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pkg-config
@@ -65,8 +65,6 @@ files:
 - Rakefile
 - ext/glib2/depend
 - ext/glib2/extconf.rb
-- ext/glib2/glib-enum-types.c
-- ext/glib2/glib-enum-types.h
 - ext/glib2/glib2.def
 - ext/glib2/rbgcompat.h
 - ext/glib2/rbglib-bytes.c
@@ -145,9 +143,11 @@ files:
 - glib2.gemspec
 - lib/glib-mkenums.rb
 - lib/glib2.rb
+- lib/glib2/date-time.rb
 - lib/glib2/deprecatable.rb
 - lib/glib2/deprecated.rb
 - lib/glib2/regex.rb
+- lib/glib2/variant.rb
 - lib/glib2/version.rb
 - lib/gnome2-raketask.rb
 - lib/gnome2/rake/external-package.rb
@@ -207,7 +207,7 @@ licenses:
 - LGPL-2.1+
 metadata:
   msys2_mingw_dependencies: glib2
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -222,8 +222,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.0.dev
-signing_key: 
+rubygems_version: 3.4.0.dev
+signing_key:
 specification_version: 4
 summary: Ruby/GLib2 is a Ruby binding of GLib-2.x.
 test_files: []