glib2 3.1.9 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c1c8eb28db7aee6ac06f5a721e2f16b7c49e1d9f
-  data.tar.gz: 98d3afb3b78d83dc43a9a57d308cf9308b8a31a5
+  metadata.gz: 7d43d9ed5f11b3fccdab8aafc21a2fdb6b1aa371
+  data.tar.gz: d1f0fd447c1f7bda052bd3a9b70b5f3880b6e69a
 SHA512:
-  metadata.gz: 0fdd234ca217c0ac8a5a193b8b10baf64506a116c0838fe43ee70e996531ff16ec0f4a7beb96e40c529a7abd9d188d9ebe2aa9f57979e8258a6bb0364e49bf36
-  data.tar.gz: 5585355516dee22a8f55c8c78fc5e38ee5e4dcb8755570947b57c71a8b25230a17c27b7a2c62a6f37b9ffb4789bb91e744f304b6bd86d23c139c14af5571f134
+  metadata.gz: 2f5909e8f1fca4f41d19ff39412e437f5519d33a8f763f215936b2e91044cce33b3aff3de17380c0dd131a6d04618234b3ebf924b3713ff0a80e815708b658da
+  data.tar.gz: 28a379fd75d9024aa5365db8bee8fe2a820983b28bcfe93ec8a386960a7e57b8f7b0512256bb60002ba2a48c8c64e3e0404c2f3475ced6651d67c21b54b16990

data/ext/glib2/rbglib.h

@@ -35,8 +35,8 @@ extern "C" {
 #endif /* __cplusplus */
 
 #define RBGLIB_MAJOR_VERSION 3
-#define RBGLIB_MINOR_VERSION 1
-#define RBGLIB_MICRO_VERSION 9
+#define RBGLIB_MINOR_VERSION 2
+#define RBGLIB_MICRO_VERSION 0
 
 #ifndef RB_ZALLOC
 #  ifdef ZALLOC

data/ext/glib2/rbglib_iochannel.c

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2011-2017  Ruby-GNOME2 Project Team
  *  Copyright (C) 2005  Masao Mutoh
  *
  *  This library is free software; you can redistribute it and/or
@@ -27,6 +27,8 @@ static ID id_unpack;
 
 static VALUE default_rs;
 
+static VALUE rb_mIOChannelSource;
+
 #define RG_TARGET_NAMESPACE cIOChannel
 #define _SELF(s) ((GIOChannel*)RVAL2BOXED(s, G_TYPE_IO_CHANNEL))
 
@@ -499,8 +501,17 @@ rg_close(gint argc, VALUE *argv, VALUE self)
 static VALUE
 rg_create_watch(VALUE self, VALUE condition)
 {
-    return BOXED2RVAL(g_io_create_watch(_SELF(self), NUM2INT(condition)), 
-                      G_TYPE_SOURCE);
+    VALUE rb_source;
+
+    rb_source = BOXED2RVAL(g_io_create_watch(_SELF(self), NUM2INT(condition)),
+                           G_TYPE_SOURCE);
+    rb_extend_object(rb_source, rb_mIOChannelSource);
+    if (rb_block_given_p()) {
+        ID id_set_callback;
+        CONST_ID(id_set_callback, "set_callback");
+        rb_funcall(rb_source, id_set_callback, 0);
+    }
+    return rb_source;
 }
 
 static gboolean
@@ -529,6 +540,20 @@ guint       g_io_add_watch_full             (GIOChannel *channel,
                                              GDestroyNotify notify);
 */
 
+static VALUE
+rg_io_channel_source_set_callback(VALUE self)
+{
+    VALUE callback;
+
+    callback = rb_block_proc();
+    G_RELATIVE(self, callback);
+    g_source_set_callback(RVAL2BOXED(self, G_TYPE_SOURCE),
+                          (GSourceFunc)io_func,
+                          (gpointer)callback,
+                          (GDestroyNotify)NULL);
+    return self;
+}
+
 static VALUE
 rg_buffer_size(VALUE self)
 {
@@ -818,4 +843,10 @@ Init_glib_io_channel(void)
     rb_define_const(RG_TARGET_NAMESPACE, "FLAG_MASK", INT2NUM(G_IO_FLAG_MASK));
     rb_define_const(RG_TARGET_NAMESPACE, "FLAG_GET_MASK", INT2NUM(G_IO_FLAG_GET_MASK));
     rb_define_const(RG_TARGET_NAMESPACE, "FLAG_SET_MASK", INT2NUM(G_IO_FLAG_SET_MASK));
+
+    rb_mIOChannelSource = rb_define_module_under(mGLib, "IOChannelSource");
+    rb_define_method(rb_mIOChannelSource,
+                     "set_callback",
+                     rg_io_channel_source_set_callback,
+                     0);
 }

data/ext/glib2/rbglib_source.c

@@ -28,6 +28,10 @@ static ID id_call;
 static void
 source_free(GSource *source)
 {
+    if (g_source_is_destroyed(source)) {
+        return;
+    }
+
     g_source_unref(source);
     g_source_destroy(source);
 }

data/test/{test_iochannel.rb → test-iochannel.rb}

@@ -1,4 +1,4 @@
-# Copyright (C) 2015  Ruby-GNOME2 Project Team
+# Copyright (C) 2015-2017  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
@@ -13,19 +13,16 @@
 # 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 'test/unit'
 require 'glib2'
 
 require 'tempfile'
-require 'nkf'
-
-$KCODE = "U" unless defined?(:Encoding)
 
 class TestGIOChannel < Test::Unit::TestCase
   def setup
     @content = "aaa\nbbb\nccc\nあああ\n"
-    @sjis_content = NKF.nkf("-sW", @content)
+    @sjis_content = @content.encode("CP932")
 
     @file = Tempfile.new("glib2-content")
     @file.open
@@ -65,7 +62,7 @@ class TestGIOChannel < Test::Unit::TestCase
     GLib::IOChannel.open(write_test_file.path, "w") do |_io|
       io = _io
       assert_raises(RuntimeError) do
-	assert_equal(@content, io.read)
+        assert_equal(@content, io.read)
       end
     end
 
@@ -81,8 +78,8 @@ class TestGIOChannel < Test::Unit::TestCase
   def test_getc
     io = GLib::IOChannel.new(@file.path)
     ["a", "b", "c", "あ"].each do |v|
-      3.times do 
-	assert_equal(v.unpack("U")[0], io.getc)
+      3.times do
+        assert_equal(v.unpack("U")[0], io.getc)
       end
       assert_equal("\n".unpack("U")[0], io.getc)
     end
@@ -162,7 +159,7 @@ class TestGIOChannel < Test::Unit::TestCase
     io = GLib::IOChannel.new(@file.path)
     assert_raises(RuntimeError) {
       io.each {|line|
-	raise "test"
+        raise "test"
       }
     }
     io.close
@@ -179,7 +176,7 @@ class TestGIOChannel < Test::Unit::TestCase
     GLib::IOChannel.open(@file.path) do |_io|
       io = _io
       io.each_with_index do |line, _i|
-	assert_equal(lines[_i], line)
+        assert_equal(lines[_i], line)
       end
     end
 
@@ -286,4 +283,50 @@ class TestGIOChannel < Test::Unit::TestCase
       GLib::IOChannel.new("foo")
     }
   end
+
+  sub_test_case("#create_watch") do
+    def setup
+      super
+      @context = GLib::MainContext.new
+    end
+
+    def test_with_block
+      GLib::IOChannel.open(@file.path) do |channel|
+        received_condition = nil
+        source = channel.create_watch(GLib::IOChannel::IN) do |_, condition|
+          received_condition = condition
+          GLib::Source::CONTINUE
+        end
+        begin
+          source.attach(@context)
+          10.times do
+            @context.iteration(false)
+          end
+          assert_equal(GLib::IOCondition::IN, received_condition)
+        ensure
+          source.destroy
+        end
+      end
+    end
+
+    def test_set_callback
+      GLib::IOChannel.open(@file.path) do |channel|
+        received_condition = nil
+        source = channel.create_watch(GLib::IOChannel::IN)
+        source.set_callback do |_, condition|
+          received_condition = condition
+          GLib::Source::CONTINUE
+        end
+        begin
+          source.attach(@context)
+          10.times do
+            @context.iteration(false)
+          end
+          assert_equal(GLib::IOCondition::IN, received_condition)
+        ensure
+          source.destroy
+        end
+      end
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glib2
 version: !ruby/object:Gem::Version
-  version: 3.1.9
+  version: 3.2.0
 platform: ruby
 authors:
 - The Ruby-GNOME2 Project Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-16 00:00:00.000000000 Z
+date: 2017-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pkg-config
@@ -171,6 +171,7 @@ files:
 - test/test-binding.rb
 - test/test-bytes.rb
 - test/test-date-time.rb
+- test/test-iochannel.rb
 - test/test-match-info.rb
 - test/test-regex.rb
 - test/test-time-zone.rb
@@ -181,7 +182,6 @@ files:
 - test/test_file_utils.rb
 - test/test_flags.rb
 - test/test_glib2.rb
-- test/test_iochannel.rb
 - test/test_key_file.rb
 - test/test_mkenums.rb
 - test/test_poll_fd.rb