gio2 3.4.9 → 3.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f4a4d09ea9411136b38331b9cbca08137a3b0af06a582786cc35c7dd8c3ed379
-  data.tar.gz: d65b69893523d4c8d909ef1acdf58cb13c87a212b623e35dffb3ef7d61d227b7
+  metadata.gz: 641772657997d3ed85fa83c47ddd0ca91c5243e17c7378f250d41517545a1691
+  data.tar.gz: 275adb45985d155ef45b70f5855c9d073683ccbeb47f4cf23ff15ce412db7607
 SHA512:
-  metadata.gz: 457bde4980343bc46888f99be08615fd2f90a8f271a50b3a9373250481d5c706b2b41bf76987607e3c3a1588126a9ad29ff411c5a9fef7886206b50ef8dbedef
-  data.tar.gz: 6b8e561bb7b2b4c006c95523231a222c3296174d311935c8868fee4b5671c4d9322895baa9b9c406fed1419ed39afbe93eb9aa0c6c6f1f64f7f910b42a39f0df
+  metadata.gz: cdea4aa0ad4e855a9ea0b1cc4692dfaef770b2d15e9d973801675ff09355c1f32822e4de9dfe2e1f6f4574be13d52b3c2cec83710f70e795531bf1e06c0f9d2f
+  data.tar.gz: 139379b3bf244377b246239d8f78a8f075723b4bede4fc5c6935c767350464dab035192578a612159d40fb6ba737ff3b751cc2b340f012e2107fe8b57a2b5bad

data/gio2.gemspec

@@ -1,6 +1,6 @@
 # -*- ruby -*-
 #
-# Copyright (C) 2018  Ruby-GNOME Project Team
+# Copyright (C) 2018-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
@@ -43,6 +43,7 @@ Gem::Specification.new do |s|
   s.files += Dir.glob("ext/#{s.name}/*.{c,h,def,rb}")
   s.files += Dir.glob("test/**/*")
 
+  s.add_runtime_dependency("fiddle")
   s.add_runtime_dependency("gobject-introspection", "= #{s.version}")
 
   s.metadata["msys2_mingw_dependencies"] = "glib-networking"

data/lib/gio2/input-stream.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2019  Ruby-GNOME Project Team
+# Copyright (C) 2014-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

data/lib/gio2/loader.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013-2019  Ruby-GNOME Project Team
+# Copyright (C) 2013-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
@@ -39,6 +39,18 @@ module Gio
       end
       require_extension
       require_libraries
+
+      if defined?(Ractor)
+        [
+          @content_type_class,
+          @mime_type_class,
+          @dbus_module,
+          @resources_module,
+        ].each do |klass|
+          Ractor.make_shareable(klass::INVOKERS)
+          Ractor.make_shareable(klass.singleton_class::INVOKERS)
+        end
+      end
     end
 
     def require_extension
@@ -55,9 +67,12 @@ module Gio
       require "gio2/inet-address"
       require "gio2/input-stream"
       require "gio2/menu-item"
+      require "gio2/output-stream"
       require "gio2/pollable-input-stream"
       require "gio2/pollable-output-stream"
       require "gio2/resources"
+      require "gio2/ruby-input-stream"
+      require "gio2/ruby-output-stream"
       require "gio2/settings"
       require "gio2/settings-schema-source"
       require "gio2/simple-action"
@@ -67,6 +82,9 @@ module Gio
 
     def define_content_type_class
       @content_type_class = Class.new do
+        const_set(:INVOKERS, {})
+        singleton_class.const_set(:INVOKERS, {})
+
         def initialize(type)
           @type = type
         end
@@ -80,6 +98,9 @@ module Gio
 
     def define_mime_type_class
       @mime_type_class = Class.new do
+        const_set(:INVOKERS, {})
+        singleton_class.const_set(:INVOKERS, {})
+
         def initialize(type)
           @type = type
         end
@@ -92,12 +113,18 @@ module Gio
     end
 
     def define_dbus_module
-      @dbus_module = Module.new
+      @dbus_module = Module.new do
+        const_set(:INVOKERS, {})
+        singleton_class.const_set(:INVOKERS, {})
+      end
       @base_module.const_set("DBus", @dbus_module)
     end
 
     def define_resources_module
-      @resources_module = Module.new
+      @resources_module = Module.new do
+        const_set(:INVOKERS, {})
+        singleton_class.const_set(:INVOKERS, {})
+      end
       @base_module.const_set("Resources", @resources_module)
     end
 
@@ -196,17 +223,60 @@ module Gio
       Error
     end
 
-    def should_unlock_gvl?(function_info, klass)
+    def prepare_function_info_lock_gvl(function_info, klass)
+      super
       case klass.name
+      when "Gio::Seekable"
+        function_info.lock_gvl_default = false
+        if defined?(Ractor)
+          predicate = Ractor.current.instance_eval do
+            lambda do |_, receiver|
+              receiver.is_a?(RubySeekable)
+            end
+          end
+          Ractor.make_shareable(predicate)
+        else
+          predicate = lambda do |_, receiver|
+            receiver.is_a?(RubySeekable)
+          end
+        end
+        function_info.add_lock_gvl_predicate(&predicate)
       when "Gio::InputStream"
         case function_info.name
-        when "read", "read_all"
-          true
-        else
-          false
+        when "read", "read_all", "skip", "close"
+          function_info.lock_gvl_default = false
+          if defined?(Ractor)
+            predicate = Ractor.current.instance_eval do
+              lambda do |_, receiver|
+                receiver.is_a?(RubyInputStream)
+              end
+            end
+            Ractor.make_shareable(predicate)
+          else
+            predicate = lambda do |_, receiver|
+              receiver.is_a?(RubyInputStream)
+            end
+          end
+          function_info.add_lock_gvl_predicate(&predicate)
+        end
+      when "Gio::OutputStream"
+        case function_info.name
+        when "write", "write_all", "flush", "close"
+          function_info.lock_gvl_default = false
+          if defined?(Ractor)
+            predicate = Ractor.current.instance_eval do
+              lambda do |_, receiver|
+                receiver.is_a?(RubyOutputStream)
+              end
+            end
+            Ractor.make_shareable(predicate)
+          else
+            predicate = lambda do |_, receiver|
+              receiver.is_a?(RubyOutputStream)
+            end
+          end
+          function_info.add_lock_gvl_predicate(&predicate)
         end
-      else
-        false
       end
     end
   end

data/lib/gio2/output-stream.rb

@@ -0,0 +1,32 @@
+# Copyright (C) 2014-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
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+module Gio
+  class OutputStream
+    class << self
+      def open(*arguments)
+        output_stream = new(*arguments)
+        return output_stream unless block_given?
+
+        begin
+          yield(output_stream)
+        ensure
+          output_stream.close unless output_stream.closed?
+        end
+      end
+    end
+  end
+end

data/lib/gio2/pollable-input-stream.rb

@@ -51,7 +51,8 @@ module Gio
     private
     def read_nonblocking_raw_compatible(buffer)
       if (GLib::VERSION <=> [2, 42, 0]) >= 0
-        read_nonblocking_raw(buffer)
+        n_bytes, = read_nonblocking_raw(buffer)
+        n_bytes
       else
         read_nonblocking_raw(buffer, buffer.bytesize)
       end

data/lib/gio2/ruby-input-stream.rb

@@ -0,0 +1,70 @@
+# Copyright (C) 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
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# 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 "fiddle"
+
+require_relative "ruby-seekable"
+
+module Gio
+  class RubyInputStream < InputStream
+    type_register("RubyInputStream")
+
+    include Seekable
+    include RubySeekable
+
+    def initialize(ruby_input)
+      @ruby_input = ruby_input
+      @buffer = ""
+      super()
+    end
+
+    private
+    def ruby_io
+      @ruby_input
+    end
+
+    def virtual_do_read_fn(buffer_address, count, cancellable)
+      buffer = Fiddle::Pointer.new(buffer_address)
+      if @ruby_input.read(count, @buffer)
+        buffer[0, @buffer.bytesize] = @buffer
+        @buffer.bytesize
+      else
+        0
+      end
+    end
+
+    def virtual_do_skip(count, cancellable)
+      if @ruby_input.respond_to?(:seek)
+        if @ruby_input.seek(count, IO::SEEK_CUR).zero?
+          count
+        else
+          -1
+        end
+      else
+        if @ruby_input.read(count, @buffer)
+          @buffer.bytesize
+        else
+          -1
+        end
+      end
+    end
+
+    def virtual_do_close_fn(cancellable)
+      @ruby_input.close
+      true
+    end
+  end
+end

data/lib/gio2/ruby-output-stream.rb

@@ -0,0 +1,50 @@
+# Copyright (C) 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
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# 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_relative "ruby-seekable"
+
+module Gio
+  class RubyOutputStream < OutputStream
+    type_register("RubyOutputStream")
+
+    include Seekable
+    include RubySeekable
+
+    def initialize(ruby_output)
+      @ruby_output = ruby_output
+      super()
+    end
+
+    private
+    def ruby_io
+      @ruby_output
+    end
+
+    def virtual_do_write_fn(buffer, cancellable)
+      @ruby_output.write(buffer)
+    end
+
+    def virtual_do_flush(cancellable)
+      @ruby_output.flush
+      true
+    end
+
+    def virtual_do_close_fn(cancellable)
+      @ruby_output.close
+      true
+    end
+  end
+end

data/lib/gio2/ruby-seekable.rb

@@ -0,0 +1,50 @@
+# Copyright (C) 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
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+module Gio
+  module RubySeekable
+    private
+    # GSeekable methods
+    def virtual_do_tell
+      ruby_io.tell
+    end
+
+    def virtual_do_can_seek
+      ruby_io.respond_to?(:seek)
+    end
+
+    def virtual_do_seek(offset, type, cancellable)
+      case type
+      when GLib::IOChannel::SEEK_CUR
+        ruby_type = IO::SEEK_CUR
+      when GLib::IOChannel::SEEK_SET
+        ruby_type = IO::SEEK_SET
+      when GLib::IOChannel::SEEK_END
+        ruby_type = IO::SEEK_END
+      end
+      ruby_io.seek(offset, ruby_type).zero?
+    end
+
+    def virtual_do_can_truncate
+      ruby_io.respond_to?(:truncate)
+    end
+
+    def virtual_do_truncate_fn(offset, cancellable)
+      ruby_io.truncate(offset)
+      true
+    end
+  end
+end

data/test/gio2-test-utils.rb

@@ -15,6 +15,7 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 require "pathname"
+require "stringio"
 require "tempfile"
 
 require_relative "gio2-test-utils/fixture"

data/test/test-buffered-input-stream.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013  Ruby-GNOME2 Project Team
+# Copyright (C) 2013-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
@@ -15,9 +15,17 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 class TestBufferedInputStream < Test::Unit::TestCase
-  def test_buffered_input_stream
-    assert_nothing_raised do
-      Gio::BufferedInputStream.new(Gio::FileInputStream.new)
+  def setup
+    Gio::RubyInputStream.open(StringIO.new("Hello!")) do |base_stream|
+      Gio::BufferedInputStream.open(base_stream) do |stream|
+        @stream = stream
+        yield
+      end
     end
   end
+
+  def test_fill
+    assert_equal(2, @stream.fill(2))
+    assert_equal("He", @stream.read(2))
+  end
 end

data/test/test-resolver.rb

@@ -0,0 +1,38 @@
+# Copyright (C) 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
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+class TestResolver < Test::Unit::TestCase
+  include GioTestUtils::Fixture
+  include GioTestUtils::Omissions
+
+  def test_lookup_records_async
+    loop = GLib::MainLoop.new
+    timeout_id = GLib::Timeout.add(5000) do
+      loop.quit
+      GLib::Source::REMOVE
+    end
+    resolver = Gio::Resolver.default
+    records = nil
+    resolver.lookup_records_async("clear-code.com", :mx) do |_, result|
+      records = resolver.lookup_records_finish(result)
+      GLib::Source.remove(timeout_id)
+      loop.quit
+    end
+    loop.run
+    assert_equal([[10, "mail.clear-code.com"]],
+                 records)
+  end
+end

data/test/test-ruby-input-stream.rb

@@ -0,0 +1,74 @@
+# Copyright (C) 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
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+class TestRubyInputStream < Test::Unit::TestCase
+  def setup
+    @base_stream = StringIO.new("Hello!")
+    Gio::RubyInputStream.open(@base_stream) do |stream|
+      @stream = stream
+      yield
+    end
+  end
+
+  sub_test_case("#read") do
+    def test_with_size
+      assert_equal("H", @stream.read(1))
+      assert_equal("ell", @stream.read(3))
+    end
+
+    def test_without_size
+      assert_equal("Hello!", @stream.read)
+    end
+  end
+
+  def test_skip
+    assert_equal(1, @stream.skip(1))
+    assert_equal("ell", @stream.read(3))
+  end
+
+  def test_tell
+    assert_equal(0, @stream.tell)
+    assert_equal(1, @stream.skip(1))
+    assert_equal(1, @stream.tell)
+  end
+
+  def test_can_seek?
+    assert do
+      @stream.can_seek?
+    end
+  end
+
+  def test_seek
+    assert do
+      @stream.seek(-1, GLib::IOChannel::SEEK_END)
+    end
+    assert_equal(@base_stream.string.bytesize - 1,
+                 @stream.tell)
+  end
+
+  def test_can_truncate?
+    assert do
+      @stream.can_truncate?
+    end
+  end
+
+  def test_truncate
+    assert do
+      @stream.truncate(2)
+    end
+    assert_equal("He", @stream.read)
+  end
+end

data/test/test-ruby-output-stream.rb

@@ -0,0 +1,70 @@
+# Copyright (C) 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
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+class TestRubyOutputStream < Test::Unit::TestCase
+  def setup
+    @base_stream = StringIO.new("Hello World")
+    Gio::RubyOutputStream.open(@base_stream) do |stream|
+      @stream = stream
+      yield
+    end
+  end
+
+  def test_write
+    assert_equal(2, @stream.write("Hi"))
+    assert_equal("Hillo World", @base_stream.string)
+  end
+
+  def test_splice
+    Gio::RubyInputStream.open(StringIO.new("Hi")) do |input_stream|
+      assert_equal(2, @stream.splice(input_stream, :none))
+    end
+    assert_equal("Hillo World", @base_stream.string)
+  end
+
+  def test_flush
+    assert do
+      @stream.flush
+    end
+  end
+
+  def test_can_seek?
+    assert do
+      @stream.can_seek?
+    end
+  end
+
+  def test_seek
+    assert do
+      @stream.seek(-1, GLib::IOChannel::SEEK_END)
+    end
+    assert_equal(@base_stream.string.bytesize - 1,
+                 @stream.tell)
+  end
+
+  def test_can_truncate?
+    assert do
+      @stream.can_truncate?
+    end
+  end
+
+  def test_truncate
+    assert do
+      @stream.truncate(2)
+    end
+    assert_equal("He", @base_stream.string)
+  end
+end

metadata

@@ -1,29 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: gio2
 version: !ruby/object:Gem::Version
-  version: 3.4.9
+  version: 3.5.0
 platform: ruby
 authors:
 - The Ruby-GNOME Project Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-10 00:00:00.000000000 Z
+date: 2022-01-11 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: fiddle
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: gobject-introspection
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.4.9
+        version: 3.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.4.9
+        version: 3.5.0
 description: Ruby/GIO2 provide Ruby binding to a VFS API and useful APIs for desktop
   applications (such as networking and D-Bus support).
 email: ruby-gnome2-devel-en@lists.sourceforge.net
@@ -55,9 +69,13 @@ files:
 - lib/gio2/input-stream.rb
 - lib/gio2/loader.rb
 - lib/gio2/menu-item.rb
+- lib/gio2/output-stream.rb
 - lib/gio2/pollable-input-stream.rb
 - lib/gio2/pollable-output-stream.rb
 - lib/gio2/resources.rb
+- lib/gio2/ruby-input-stream.rb
+- lib/gio2/ruby-output-stream.rb
+- lib/gio2/ruby-seekable.rb
 - lib/gio2/settings-schema-source.rb
 - lib/gio2/settings.rb
 - lib/gio2/simple-action.rb
@@ -93,7 +111,10 @@ files:
 - test/test-output-stream.rb
 - test/test-pollable-input-stream.rb
 - test/test-pollable-output-stream.rb
+- test/test-resolver.rb
 - test/test-resources.rb
+- test/test-ruby-input-stream.rb
+- test/test-ruby-output-stream.rb
 - test/test-settings-schema-source.rb
 - test/test-settings.rb
 - test/test-simple-action.rb
@@ -118,7 +139,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.0.dev
+rubygems_version: 3.4.0.dev
 signing_key: 
 specification_version: 4
 summary: Ruby/GIO2 is a Ruby binding of gio-2.x.