gio2 3.3.5 → 3.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7394471a422e8b875addf9c2569022eb96661a09c757a8edd623775d4c536ff8
-  data.tar.gz: 5aee64f55f699c17fe124b28c5dfe8b27af4d069d476d5e64a71e3e6caf0b7d4
+  metadata.gz: 0c876c844dbc227000b93fe74bc2acf0353d0e0530c6dae898e4c1dc39a4dd35
+  data.tar.gz: 4693dec79412fb456b8dd0bece005b6616969bae75fa42f4f9025d51a6daef3b
 SHA512:
-  metadata.gz: 144d58fdba9a260dda89f9c34274e33e310ed05c054c189b1bce095c2852c18e9d9fd2023ffd090fd974f8373b1ad1b7c6ed95d7b215b3a72cb0959aaaf9fbd9
-  data.tar.gz: 4d82b6e4d25e2c7d9a21e831b12b7cde5573de2202d43b9761831cb697c89cf9d688b175586c53f25155f0a051861f5272e163bc3919624503b66b683287bbca
+  metadata.gz: 499406198636de28647319fc878d4a656bc2a13885f968e625d96990ea9e76996f73100406d75a5f76eecf08788a31009eaa68826b08dd8533d1057f9522771f
+  data.tar.gz: d567e56d33cbe164d95a85840fa76b4e6c6729805db906056b4a2d650b6b9ecff3d3e57ffe248f99462d18d33ee2b86ce3b263dc7a51ca7427b626fb81d1584c

data/ext/gio2/extconf.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 #
-# Copyright (C) 2014  Ruby-GNOME2 Project Team
+# Copyright (C) 2014-2019  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
@@ -36,7 +36,7 @@ $LOAD_PATH.unshift(mkmf_gnome2_dir.to_s)
 module_name = "gio2"
 package_id = "gio-2.0"
 
-require "mkmf-gnome2"
+require "mkmf-gnome"
 
 ["glib2", "gobject-introspection"].each do |package|
   directory = "#{package}#{version_suffix}"
@@ -52,7 +52,7 @@ end
 unless required_pkg_config_package(package_id,
                                    :alt_linux => "libgio-devel",
                                    :debian => "libglib2.0-dev",
-                                   :redhat => "glib2-devel",
+                                   :redhat => "pkgconfig(#{package_id})",
                                    :arch_linux => "glib2",
                                    :homebrew => "glib",
                                    :macports => "glib2")

data/gio2.gemspec

@@ -1,6 +1,6 @@
 # -*- ruby -*-
 #
-# Copyright (C) 2018  Ruby-GNOME2 Project Team
+# Copyright (C) 2018  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,7 @@ Gem::Specification.new do |s|
   s.description   =
     "Ruby/GIO2 provide Ruby binding to a VFS API and useful APIs " +
     "for desktop applications (such as networking and D-Bus support)."
-  s.author        = "The Ruby-GNOME2 Project Team"
+  s.author        = "The Ruby-GNOME Project Team"
   s.email         = "ruby-gnome2-devel-en@lists.sourceforge.net"
   s.homepage      = "https://ruby-gnome2.osdn.jp/"
   s.licenses      = ["LGPL-2.1+"]

data/lib/gio2/file.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2016-2017  Ruby-GNOME2 Project Team
+# Copyright (C) 2016-2019  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
@@ -30,6 +30,7 @@ module Gio
             file = new_for_commandline_arg(arg)
           end
         elsif path
+          path = path.to_path if path.respond_to?(:to_path)
           file = new_for_path(path)
         elsif uri
           file = new_for_uri(uri)
@@ -45,5 +46,17 @@ module Gio
         end
       end
     end
+
+    alias_method :read_raw, :read
+    def read(cancellable=nil)
+      input_stream = read_raw(cancellable)
+      return input_stream unless block_given?
+
+      begin
+        yield(input_stream)
+      ensure
+        input_stream.close unless input_stream.closed?
+      end
+    end
   end
 end

data/lib/gio2/icon.rb

@@ -0,0 +1,24 @@
+# Copyright (C) 2019  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 Icon
+    def eql?(other)
+      other.is_a?(self.class) and
+        hash == other.hash
+    end
+  end
+end

data/lib/gio2/input-stream.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014  Ruby-GNOME2 Project Team
+# Copyright (C) 2014-2019  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,6 +16,19 @@
 
 module Gio
   class InputStream
+    class << self
+      def open(*arguments)
+        input_stream = new(*arguments)
+        return input_stream unless block_given?
+
+        begin
+          yield(input_stream)
+        ensure
+          input_stream.close unless input_stream.closed?
+        end
+      end
+    end
+
     alias_method :read_raw, :read
     def read(size=nil)
       if size.nil?
@@ -23,7 +36,7 @@ module Gio
         buffer_size = 8192
         buffer = " ".force_encoding("ASCII-8BIT") * buffer_size
         loop do
-          _, read_bytes = read_all_raw_compatible(buffer)
+          read_bytes = read_all_raw_compatible(buffer)
           all << buffer.byteslice(0, read_bytes)
           break if read_bytes != buffer_size
         end
@@ -39,25 +52,33 @@ module Gio
     alias_method :read_all_raw, :read_all
     def read_all(size)
       buffer = " " * size
-      _, read_bytes = read_all_raw_compatible(buffer)
+      read_bytes = read_all_raw_compatible(buffer)
       buffer.replace(buffer.byteslice(0, read_bytes))
       buffer
     end
 
     private
     def read_raw_compatible(buffer)
-      if (GLib::VERSION <=> [2, 36, 0]) >= 0
+      if (GLib::VERSION <=> [2, 62, 0]) >= 0
+        read_bytes, _buffer = read_raw(buffer)
+        read_bytes
+      elsif (GLib::VERSION <=> [2, 36, 0]) >= 0
         read_raw(buffer)
       else
-        read_raw(buffer, buffer.bytesize)
+        read_bytes = read_raw(buffer, buffer.bytesize)
       end
     end
 
     def read_all_raw_compatible(buffer)
-      if (GLib::VERSION <=> [2, 36, 0]) >= 0
-        read_all_raw(buffer)
+      if (GLib::VERSION <=> [2, 62, 0]) >= 0
+        _success, _buffer, read_bytes = read_all_raw(buffer)
+        read_bytes
+      elsif (GLib::VERSION <=> [2, 36, 0]) >= 0
+        _success, read_bytes = read_all_raw(buffer)
+        read_bytes
       else
-        read_all_raw(buffer, buffer.bytesize)
+        _success, read_bytes = read_all_raw(buffer, buffer.bytesize)
+        read_bytes
       end
     end
   end

data/lib/gio2/loader.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013-2016  Ruby-GNOME2 Project Team
+# Copyright (C) 2013-2019  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
@@ -51,6 +51,7 @@ module Gio
       require "gio2/application-command-line"
       require "gio2/content-type"
       require "gio2/file"
+      require "gio2/icon"
       require "gio2/inet-address"
       require "gio2/input-stream"
       require "gio2/menu-item"
@@ -113,7 +114,7 @@ module Gio
       when /\Adbus_/
         name = rubyish_method_name(info, :prefix => "dbus_")
         define_singleton_method(@dbus_module, name, info)
-      when /\Afile_/
+      when /\A{file,icon}_/
         # Ignore because they are defined by load_interface_info
       else
         super
@@ -171,6 +172,17 @@ module Gio
       end
     end
 
+    def load_function_info_singleton_method(info, klass, method_name)
+      case "#{klass.name}##{method_name}"
+      when "Gio::Icon#hash"
+        define_method(info, klass, method_name)
+      when "Gio::Icon#new_for_string"
+        super(info, klass, "find")
+      else
+        super
+      end
+    end
+
     def rubyish_class_name(info)
       case info.name
       when /Enum\z/

data/test/gio2-test-utils.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013  Ruby-GNOME2 Project Team
+# Copyright (C) 2013-2019  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
@@ -16,6 +16,7 @@
 
 require "test-unit"
 
+require "pathname"
 require "tempfile"
 
 require "gio2-test-utils/fixture"

data/test/test-file.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2017  Ruby-GNOME2 Project Team
+# Copyright (C) 2014-2019  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
@@ -18,7 +18,33 @@ class TestFile < Test::Unit::TestCase
   include GioTestUtils::Fixture
   include GioTestUtils::Omissions
 
-  class TestContentType < self
+  sub_test_case(".open") do
+    sub_test_case(":path") do
+      def test_string
+        path = __FILE__
+        Gio::File.open(path: path) do |file|
+          file.read do |input|
+            assert_equal(File.read(__FILE__), input.read)
+          end
+        end
+      end
+
+      def test_pathname
+        path = Pathname(__FILE__)
+        Gio::File.open(path: path) do |file|
+          file.read do |input|
+            assert_equal(File.read(__FILE__), input.read)
+          end
+        end
+      end
+    end
+  end
+
+  sub_test_case("instance methods") do
+    def setup
+      @file = Gio::File.open(path: __FILE__)
+    end
+
     def test_guess_content_type
       omit_on_os_x
       path = fixture_path("content-type", "x-content", "unix-software")
@@ -26,5 +52,19 @@ class TestFile < Test::Unit::TestCase
       assert_equal(["x-content/unix-software"],
                    dir.guess_content_types.collect(&:to_s))
     end
+
+    sub_test_case("#read") do
+      def test_no_block
+        input_stream = @file.read
+        assert_equal(File.read(__FILE__), input_stream.read)
+      end
+
+      def test_with_block
+        content = @file.read do |input_stream|
+          input_stream.read
+        end
+        assert_equal(File.read(__FILE__), content)
+      end
+    end
   end
 end

data/test/test-icon.rb

@@ -0,0 +1,49 @@
+# Copyright (C) 2019  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 TestIcon < Test::Unit::TestCase
+  include GioTestUtils::Fixture
+  include GioTestUtils::Omissions
+
+  sub_test_case(".find") do
+    def test_found
+      assert_equal(Gio::ThemedIcon.new("open"),
+                   Gio::Icon.find("open"))
+    end
+
+    def test_not_found
+      Gio::Icon.find("nonexistent")
+    end
+  end
+
+  sub_test_case(".hash") do
+    def test_use_as_key
+      hash = {Gio::Icon => true}
+      assert do
+        hash[Gio::Icon]
+      end
+    end
+  end
+
+  sub_test_case("#hash") do
+    def test_use_as_key
+      hash = {Gio::Icon.find("open") => true}
+      assert do
+        hash[Gio::Icon.find("open")]
+      end
+    end
+  end
+end

data/test/test-input-stream.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014  Ruby-GNOME2 Project Team
+# Copyright (C) 2014-2019  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
@@ -26,6 +26,45 @@ class TestInputStream < Test::Unit::TestCase
     teardown_socket_client
   end
 
+  sub_test_case(".open") do
+    def setup
+      super
+      @data = "Hello\n"
+      client = @server.accept
+      client.write(@data)
+      client.flush
+      client.close
+    end
+
+    def test_no_block
+      input = Gio::BufferedInputStream.open(@stream)
+      assert_equal(@data[0, 4], input.read(4))
+      input.close
+    end
+
+    def test_block
+      input = nil
+      read_data = Gio::BufferedInputStream.open(@stream) do |i|
+        input = i
+        input.read(4)
+      end
+      assert_equal([@data[0, 4], true],
+                   [read_data, input.closed?])
+    end
+
+    def test_block_closed
+      input = nil
+      read_data = Gio::BufferedInputStream.open(@stream) do |i|
+        input = i
+        data = input.read(4)
+        input.close
+        data
+      end
+      assert_equal([@data[0, 4], true],
+                   [read_data, input.closed?])
+    end
+  end
+
   sub_test_case("#read") do
     def test_with_size
       data = "Hello\n"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gio2
 version: !ruby/object:Gem::Version
-  version: 3.3.5
+  version: 3.4.0
 platform: ruby
 authors:
-- The Ruby-GNOME2 Project Team
+- The Ruby-GNOME Project Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-09 00:00:00.000000000 Z
+date: 2019-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gobject-introspection
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.3.5
+        version: 3.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.3.5
+        version: 3.4.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
@@ -50,6 +50,7 @@ files:
 - lib/gio2/content-type.rb
 - lib/gio2/deprecated.rb
 - lib/gio2/file.rb
+- lib/gio2/icon.rb
 - lib/gio2/inet-address.rb
 - lib/gio2/input-stream.rb
 - lib/gio2/loader.rb
@@ -82,6 +83,7 @@ files:
 - test/test-file-enumerator.rb
 - test/test-file-monitor.rb
 - test/test-file.rb
+- test/test-icon.rb
 - test/test-inet-address.rb
 - test/test-input-stream.rb
 - test/test-memory-input-stream.rb