gio2 3.3.4 → 3.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e33a7c20919e21dcadaac1a53fdf7df2a31d23b5f7679dc76a2903351c614bbb
-  data.tar.gz: 408899a0801fdc4d7faac45e169fec4ef14da0c3557ca631514a15b896845f4a
+  metadata.gz: 852d554d3e78a6b9c79bb99431e531bbfb123bd1cb5d457b34d6511ccba2c871
+  data.tar.gz: f77f0d28354552d43c42445543e80c4bda4857f0a39e7b16fd46882ec94feafa
 SHA512:
-  metadata.gz: 6ec43a46bd5f7a3ed764ce8f248e82e80c5fea82e650c84c8f9a9abc85fd86ab2c6738a4b1eeb7a925685c4fc38ced9c29f774999a83e8d21619f4aa306f3895
-  data.tar.gz: cab6136ae0c27e06076a8c9a1a49607c2e8ec80e096fb0b7050ada803b357a9de921b3c756eb11afb99cb2ab4834865ad15b04898c48b8f647468106670419c4
+  metadata.gz: 70ccbe75a0382d5d9d6d60681731c87a396fcc63cc3870a0d438031b5ecdd4a136fbc6cbb3844d169971af91d9a765155e13d25908b6c0b097895c4eae7266dc
+  data.tar.gz: 98f2188796590570649db9c613bbb29b6477fb87fa27324460ffe9fa007dd382d7994df659ba2bb53b20f5d1bd114433e856e49dc61c37cf089dde934f918520

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/input-stream.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014  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
@@ -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?

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-input-stream.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014  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
@@ -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.4
+  version: 3.3.6
 platform: ruby
 authors:
 - The Ruby-GNOME2 Project Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-09 00:00:00.000000000 Z
+date: 2019-03-21 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.4
+        version: 3.3.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.3.4
+        version: 3.3.6
 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