gio2 0.90.5 → 0.90.6

data/ext/gio2/gsocketlistener.c

@@ -100,17 +100,21 @@ socketlistener_add_any_inet_port(int argc, VALUE *argv, VALUE self)
 static VALUE
 socketlistener_accept(int argc, VALUE *argv, VALUE self)
 {
-        VALUE source_object, cancellable;
+        VALUE cancellable;
+        GObject *source_object;
         GError *error = NULL;
         GSocketConnection *connection;
 
-        rb_scan_args(argc, argv, "02", &source_object, &cancellable);
-        connection = g_socket_listener_accept(_SELF(self), RVAL2GOBJ(source_object),
-                                              RVAL2GCANCELLABLE(cancellable), &error);
+        rb_scan_args(argc, argv, "01", &cancellable);
+        connection = g_socket_listener_accept(_SELF(self),
+                                              &source_object,
+                                              RVAL2GCANCELLABLE(cancellable),
+                                              &error);
         if (connection == NULL)
                 rbgio_raise_error(error);
 
-        return GOBJ2RVAL_UNREF(connection);
+        return rb_assoc_new(GOBJ2RVAL_UNREF(connection),
+                            GOBJ2RVAL(source_object));
 }
 
 static VALUE
@@ -131,39 +135,41 @@ socketlistener_accept_async(int argc, VALUE *argv, VALUE self)
 }
 
 static VALUE
-socketlistener_accept_finish(int argc, VALUE *argv, VALUE self)
+socketlistener_accept_finish(VALUE self, VALUE result)
 {
-        VALUE result, source_object;
+        GObject *source_object;
         GError *error = NULL;
         GSocketConnection *connection;
 
-        rb_scan_args(argc, argv, "11", &result, &source_object);
         connection = g_socket_listener_accept_finish(_SELF(self),
                                                      RVAL2GASYNCRESULT(result),
-                                                     RVAL2GOBJ(source_object),
+                                                     &source_object,
                                                      &error);
         if (connection == NULL)
                 rbgio_raise_error(error);
 
-        return GOBJ2RVAL_UNREF(connection);
+        return rb_assoc_new(GOBJ2RVAL_UNREF(connection),
+                            GOBJ2RVAL(source_object));
 }
 
 static VALUE
 socketlistener_accept_socket(int argc, VALUE *argv, VALUE self)
 {
-        VALUE source_object, cancellable;
+        VALUE cancellable;
+        GObject *source_object;
         GError *error = NULL;
         GSocket *socket;
 
-        rb_scan_args(argc, argv, "02", &source_object, &cancellable);
+        rb_scan_args(argc, argv, "01", &cancellable);
         socket = g_socket_listener_accept_socket(_SELF(self),
-                                                 RVAL2GOBJ(source_object),
+                                                 &source_object,
                                                  RVAL2GCANCELLABLE(cancellable),
                                                  &error);
         if (socket == NULL)
                 rbgio_raise_error(error);
 
-        return GOBJ2RVAL_UNREF(socket);
+        return rb_assoc_new(GOBJ2RVAL_UNREF(socket),
+                            GOBJ2RVAL(source_object));
 }
 
 static VALUE
@@ -184,21 +190,21 @@ socketlistener_accept_socket_async(int argc, VALUE *argv, VALUE self)
 }
 
 static VALUE
-socketlistener_accept_socket_finish(int argc, VALUE *argv, VALUE self)
+socketlistener_accept_socket_finish(VALUE self, VALUE result)
 {
-        VALUE result, source_object;
+        GObject *source_object;
         GError *error = NULL;
         GSocket *socket;
 
-        rb_scan_args(argc, argv, "11", &result, &source_object);
         socket = g_socket_listener_accept_socket_finish(_SELF(self),
                                                         RVAL2GASYNCRESULT(result),
-                                                        RVAL2GOBJ(source_object),
+                                                        &source_object,
                                                         &error);
         if (socket == NULL)
                 rbgio_raise_error(error);
 
-        return GOBJ2RVAL_UNREF(socket);
+        return rb_assoc_new(GOBJ2RVAL_UNREF(socket),
+                            GOBJ2RVAL(source_object));
 }
 
 static VALUE
@@ -229,10 +235,10 @@ Init_gsocketlistener(VALUE glib)
         rb_define_method(socketlistener, "add_any_inet_port", socketlistener_add_any_inet_port, -1);
         rb_define_method(socketlistener, "accept", socketlistener_accept, -1);
         rb_define_method(socketlistener, "accept_async", socketlistener_accept_async, -1);
-        rb_define_method(socketlistener, "accept_finish", socketlistener_accept_finish, -1);
+        rb_define_method(socketlistener, "accept_finish", socketlistener_accept_finish, 1);
         rb_define_method(socketlistener, "accept_socket", socketlistener_accept_socket, -1);
         rb_define_method(socketlistener, "accept_socket_async", socketlistener_accept_socket_async, -1);
-        rb_define_method(socketlistener, "accept_socket_finish", socketlistener_accept_socket_finish, -1);
+        rb_define_method(socketlistener, "accept_socket_finish", socketlistener_accept_socket_finish, 1);
         rb_define_method(socketlistener, "close", socketlistener_close, 0);
         rb_define_method(socketlistener, "set_backlog", socketlistener_set_backlog, 1);
         G_DEF_SETTER(socketlistener, "backlog");

data/ext/gio2/gtcpconnection.c

@@ -20,29 +20,8 @@
 
 #include "gio2.h"
 
-#define _SELF(value) G_TCP_CONNECTION(RVAL2GOBJ(value))
-
-static VALUE
-tcpconnection_set_graceful_disconnect(VALUE self, VALUE graceful_disconnect)
-{
-        g_tcp_connection_set_graceful_disconnect(_SELF(self),
-                                                 RVAL2CBOOL(graceful_disconnect));
-
-        return self;
-}
-
-static VALUE
-tcpconnection_get_graceful_disconnect(VALUE self)
-{
-        return CBOOL2RVAL(g_tcp_connection_get_graceful_disconnect(_SELF(self)));
-}
-
 void
 Init_gtcpconnection(VALUE glib)
 {
-        VALUE tcpconnection = G_DEF_CLASS(G_TYPE_TCP_CONNECTION, "TcpConnection", glib);
-
-        rb_define_method(tcpconnection, "set_graceful_disconnect", tcpconnection_set_graceful_disconnect, 1);
-        G_DEF_SETTER(tcpconnection, "graceful_disconnect");
-        rb_define_method(tcpconnection, "graceful_disconnect?", tcpconnection_get_graceful_disconnect, 0);
+        (void)G_DEF_CLASS(G_TYPE_TCP_CONNECTION, "TcpConnection", glib);
 }

data/ext/gio2/gthreadedsocketservice.c

@@ -20,12 +20,13 @@
 
 #include "gio2.h"
 
-#define _SELF(value) G_THREADED_SOCKET_SERVICE(RVAL2GOBJ(value))
-
 static VALUE
-threadedsocketservice_initialize(VALUE self)
+threadedsocketservice_initialize(VALUE self, VALUE max_threads)
 {
-        G_INITIALIZE(self, g_socket_service_new());
+        G_INITIALIZE(self,
+                     g_threaded_socket_service_new(RVAL2TYPE_WITH_DEFAULT(max_threads,
+                                                                          RVAL2GINT,
+                                                                          10)));
 
         return Qnil;
 }
@@ -35,5 +36,5 @@ Init_gthreadedsocketservice(VALUE glib)
 {
         VALUE threadedsocketservice = G_DEF_CLASS(G_TYPE_THREADED_SOCKET_SERVICE, "ThreadedSocketService", glib);
 
-        rb_define_method(threadedsocketservice, "initialize", threadedsocketservice_initialize, 0);
+        rb_define_method(threadedsocketservice, "initialize", threadedsocketservice_initialize, -1);
 }

data/ext/gio2/gunixfdlist.c

@@ -98,7 +98,7 @@ void
 Init_gunixfdlist(G_GNUC_UNUSED VALUE glib)
 {
 #ifdef HAVE_GIO_UNIX
-        VALUE unixfdlist = G_DEF_CLASS(G_TYPE_UNIX_FD_LIST, "UnixFdList", glib);
+        VALUE unixfdlist = G_DEF_CLASS(G_TYPE_UNIX_FD_LIST, "UnixFDList", glib);
 
         rb_define_method(unixfdlist, "initialize", unixfdlist_initialize, -1);
         rb_define_method(unixfdlist, "length", unixfdlist_get_length, 0);

data/ext/gio2/gunixfdmessage.c

@@ -40,14 +40,6 @@ unixfdmessage_initialize(int argc, VALUE *argv, VALUE self)
         return Qnil;
 }
 
-static VALUE
-unixfdmessage_get_fd_list(VALUE self)
-{
-        /* TODO: Should we relate the return value with self?  It’s apparently
-         * valid as long as self is valid. */
-        return GOBJ2RVAL(g_unix_fd_message_get_fd_list(_SELF(self)));
-}
-
 static VALUE
 unixfdmessage_append_fd(VALUE self, VALUE fd)
 {
@@ -73,7 +65,6 @@ Init_gunixfdmessage(G_GNUC_UNUSED VALUE glib)
         VALUE unixfdmessage = G_DEF_CLASS(G_TYPE_UNIX_FD_MESSAGE, "UnixFDMessage", glib);
 
         rb_define_method(unixfdmessage, "initialize", unixfdmessage_initialize, -1);
-        rb_define_method(unixfdmessage, "fd_list", unixfdmessage_get_fd_list, 0);
         rb_define_method(unixfdmessage, "append_fd", unixfdmessage_append_fd, 1);
         rb_define_alias(unixfdmessage, "<<", "append_fd");
         rb_define_method(unixfdmessage, "steal_fds", unixfdmessage_steal_fds, 0);

data/ext/gio2/gunixinputstream.c

@@ -36,26 +36,6 @@ unixinputstream_initialize(int argc, VALUE *argv, VALUE self)
 
         return Qnil;
 }
-
-static VALUE
-unixinputstream_set_close_fd(VALUE self, VALUE close_fd)
-{
-        g_unix_input_stream_set_close_fd(_SELF(self), RVAL2CBOOL(close_fd));
-
-        return self;
-}
-
-static VALUE
-unixinputstream_get_close_fd(VALUE self)
-{
-        return CBOOL2RVAL(g_unix_input_stream_get_close_fd(_SELF(self)));
-}
-
-static VALUE
-unixinputstream_get_fd(VALUE self)
-{
-        return FD2RVAL(g_unix_input_stream_get_fd(_SELF(self)));
-}
 #endif
 
 void
@@ -65,9 +45,5 @@ Init_gunixinputstream(G_GNUC_UNUSED VALUE glib)
         VALUE unixinputstream = G_DEF_CLASS(G_TYPE_UNIX_INPUT_STREAM, "UnixInputStream", glib);
 
         rb_define_method(unixinputstream, "initialize", unixinputstream_initialize, -1);
-        rb_define_method(unixinputstream, "set_close_fd", unixinputstream_set_close_fd, 1);
-        G_DEF_SETTER(unixinputstream, "close_fd");
-        rb_define_method(unixinputstream, "close_fd?", unixinputstream_get_close_fd, 0);
-        rb_define_method(unixinputstream, "fd", unixinputstream_get_fd, 0);
 #endif
 }

data/ext/gio2/gunixmounts.c

@@ -290,10 +290,8 @@ Init_gunixmounts(G_GNUC_UNUSED VALUE glib)
         /* TODO: This doesn’t follow the naming conventions, but it seems
          * overkill to have GLib::Unix just for mount_path_system_internal?. */
         rb_define_singleton_method(unixmount, "mount_path_system_internal?", unix_is_mount_path_system_internal, 1);
+        rb_define_singleton_method(unixmount, "at", unixmount_at, 1);
 
-        rb_define_method(unixmount, "at", unixmount_at, 1);
-
-        rb_undef_alloc_func(unixmount);
         rbgobj_boxed_not_copy_obj(G_TYPE_UNIX_MOUNT_ENTRY);
 
         rb_define_method(unixmount, "compare", unixmount_compare, 1);
@@ -312,7 +310,6 @@ Init_gunixmounts(G_GNUC_UNUSED VALUE glib)
 
         rb_include_module(unixmountpoint, rb_mComparable);
 
-        rb_undef_alloc_func(unixmountpoint);
         rbgobj_boxed_not_copy_obj(G_TYPE_UNIX_MOUNT_POINT);
 
         rb_define_method(unixmountpoint, "compare", unixmountpoint_compare, 1);

data/ext/gio2/gunixoutputstream.c

@@ -36,26 +36,6 @@ unixoutputstream_initialize(int argc, VALUE *argv, VALUE self)
 
         return Qnil;
 }
-
-static VALUE
-unixoutputstream_set_close_fd(VALUE self, VALUE close_fd)
-{
-        g_unix_output_stream_set_close_fd(_SELF(self), RVAL2CBOOL(close_fd));
-
-        return self;
-}
-
-static VALUE
-unixoutputstream_get_close_fd(VALUE self)
-{
-        return CBOOL2RVAL(g_unix_output_stream_get_close_fd(_SELF(self)));
-}
-
-static VALUE
-unixoutputstream_get_fd(VALUE self)
-{
-        return FD2RVAL(g_unix_output_stream_get_fd(_SELF(self)));
-}
 #endif
 
 void
@@ -65,9 +45,5 @@ Init_gunixoutputstream(G_GNUC_UNUSED VALUE glib)
         VALUE unixoutputstream = G_DEF_CLASS(G_TYPE_UNIX_OUTPUT_STREAM, "UnixOutputStream", glib);
 
         rb_define_method(unixoutputstream, "initialize", unixoutputstream_initialize, -1);
-        rb_define_method(unixoutputstream, "set_close_fd", unixoutputstream_set_close_fd, 1);
-        G_DEF_SETTER(unixoutputstream, "close_fd");
-        rb_define_method(unixoutputstream, "close_fd?", unixoutputstream_get_close_fd, 0);
-        rb_define_method(unixoutputstream, "fd", unixoutputstream_get_fd, 0);
 #endif
 }

data/ext/gio2/gunixsocketaddress.c

@@ -41,21 +41,6 @@ unixsocketaddress_new_abstract(G_GNUC_UNUSED VALUE self, VALUE path)
                                                                   RSTRING_LEN(path)));
 }
 
-static VALUE
-unixsocketaddress_get_is_abstract(VALUE self)
-{
-        return CBOOL2RVAL(g_unix_socket_address_get_is_abstract(_SELF(self)));
-}
-
-static VALUE
-unixsocketaddress_get_path(VALUE self)
-{
-        return rb_str_new(g_unix_socket_address_get_path(_SELF(self)),
-                          g_unix_socket_address_get_path_len(_SELF(self)));
-}
-
-/* TODO: get_path_len is pointless in Ruby, right? */
-
 static VALUE
 unixsocketaddress_abstract_names_supported(G_GNUC_UNUSED VALUE self)
 {
@@ -69,11 +54,14 @@ Init_gunixsocketaddress(G_GNUC_UNUSED VALUE glib)
 #ifdef HAVE_GIO_UNIX
         VALUE unixsocketaddress = G_DEF_CLASS(G_TYPE_UNIX_SOCKET_ADDRESS, "UnixSocketAddress", glib);
 
+#  if GLIB_CHECK_VERSION(2, 26, 0)
+        G_DEF_CLASS(G_TYPE_UNIX_SOCKET_ADDRESS_TYPE, "Type", unixsocketaddress);
+        G_DEF_CONSTANTS(unixsocketaddress, G_TYPE_UNIX_SOCKET_ADDRESS_TYPE, "G_UNIX_SOCKET_ADDRESS_");
+#  endif
+
         rb_define_singleton_method(unixsocketaddress, "new_abstract", unixsocketaddress_new_abstract, 1);
         rb_define_singleton_method(unixsocketaddress, "abstract_names_supported?", unixsocketaddress_abstract_names_supported, 0);
 
         rb_define_method(unixsocketaddress, "initialize", unixsocketaddress_initialize, 1);
-        rb_define_method(unixsocketaddress, "abstract?", unixsocketaddress_get_is_abstract, 0);
-        rb_define_method(unixsocketaddress, "path", unixsocketaddress_get_path, 0);
 #endif
 }

data/ext/gio2/gvfs.c

@@ -74,8 +74,6 @@ Init_gvfs(VALUE glib)
         rb_define_singleton_method(vfs, "default", vfs_get_default, 0);
         rb_define_singleton_method(vfs, "local", vfs_get_local, 0);
 
-        rb_undef_alloc_func(vfs);
-
         rb_define_method(vfs, "file_for_path", vfs_get_file_for_path, 1);
         rb_define_method(vfs, "file_for_uri", vfs_get_file_for_uri, 1);
         rb_define_method(vfs, "parse_name", vfs_parse_name, 1);

data/ext/gio2/gvolumemonitor.c

@@ -65,8 +65,6 @@ Init_gvolumemonitor(VALUE glib)
 
         rb_define_const(volumemonitor, "EXTENSION_POINT_NAME", CSTR2RVAL(G_VOLUME_MONITOR_EXTENSION_POINT_NAME));
 
-        rb_undef_alloc_func(volumemonitor);
-
         rb_define_singleton_method(volumemonitor, "get", volumemonitor_get, 0);
 
         rb_define_method(volumemonitor, "connected_drives", volumemonitor_get_connected_drives, 0);

data/ext/gio2/gzlibcompressor.c

@@ -43,5 +43,8 @@ Init_gzlibcompressor(VALUE glib)
 {
         VALUE zlibcompressor = G_DEF_CLASS(G_TYPE_ZLIB_COMPRESSOR, "ZlibCompressor", glib);
 
+        G_DEF_CLASS(G_TYPE_ZLIB_COMPRESSOR_FORMAT, "Format", zlibcompressor);
+        G_DEF_CONSTANTS(zlibcompressor, G_TYPE_ZLIB_COMPRESSOR_FORMAT, "G_ZLIB_");
+
         rb_define_method(zlibcompressor, "initialize", zlibcompressor_initialize, -1);
 }

data/ext/gio2/ruby-gio2.pc

@@ -0,0 +1,3 @@
+Name: Ruby/GIO2
+Description: Ruby bindings for glib I/O library
+Version: 0.90.6

data/ext/gio2/util.c

@@ -170,6 +170,9 @@ rbgio_str_vector_to_ary(const gchar * const *vector)
 {
         int i, n;
         VALUE ary;
+
+        if (vector == NULL)
+             return Qnil;
  
         for (i = n = 0; vector[i] != NULL; i++)
                 n++;

data/lib/gio2.rb

@@ -12,6 +12,8 @@ rescue LoadError
 end
 
 class GLib::DataInputStream
+  include Enumerable
+
   def each
     while line = read_line
       yield line
@@ -55,6 +57,8 @@ if GLib.const_defined? :DesktopAppInfo
 end
 
 module GLib::File
+  include Enumerable
+
   def eql?(other)
     self === other and self == other
   end
@@ -72,7 +76,10 @@ module GLib::File
 end
 
 class GLib::FileEnumerator
+  include Enumerable
+
   def each(cancellable = nil)
+    return self.enum_for unless block_given?
     while file = next_file(cancellable)
       yield file
     end
@@ -80,9 +87,9 @@ class GLib::FileEnumerator
     self
   end
 
+  # TODO: Return Enumerator unless block_given?
   def each_async(num_files, io_priority = GLib::PRIORITY_DEFAULT, cancellable = nil, &block)
     each_async_loop num_files, io_priority, cancellable, block
-    self
   end
 
 private
@@ -139,3 +146,14 @@ module GLib::SocketConnectable
     end
   end
 end
+
+class GLib::UnixFDList
+  include Enumerable
+
+  def each
+    i = 0
+    while i < length
+      yield self[i]
+    end
+  end
+end

data/test/load-test.rb

@@ -0,0 +1,14 @@
+# -*- coding: utf-8 -*-
+
+base = File.dirname(File.expand_path(__FILE__))
+root = File.dirname(File.dirname(base))
+['glib2', 'gio2'].each do |lib|
+  ['ext/%s' % lib, 'lib'].each do |sub|
+    $LOAD_PATH.unshift File.join(root, lib, sub)
+  end
+end
+
+require 'gio2'
+require File.join(root, 'glib2/test/glib-test-init')
+
+exit Test::Unit::AutoRunner.run(true, base)

data/test/test_bufferedinputstream.rb

@@ -0,0 +1,2 @@
+# -*- coding: utf-8 -*-
+

data/test/test_charsetconverter.rb

@@ -0,0 +1,2 @@
+# -*- coding: utf-8 -*-
+

data/test/test_datainputstream.rb

@@ -0,0 +1,7 @@
+# -*- coding: utf-8 -*-
+
+class TestDataInputStream < Test::Unit::TestCase
+  def test_byte_order_property
+    assert_equal GLib::DATA_STREAM_BYTE_ORDER_BIG_ENDIAN, GLib::DataInputStream.new(GLib::MemoryInputStream.new).byte_order
+  end
+end

data/test/test_fileenumerator.rb

@@ -0,0 +1,8 @@
+# -*- coding: utf-8 -*-
+
+class TestFileEnumerator < Test::Unit::TestCase
+  def test_responds_to_properties
+    a = GLib::File.new_for_path('/').enumerate_children
+    assert a.respond_to?(:container)
+  end
+end

data/test/test_filemonitor.rb

@@ -0,0 +1,2 @@
+# -*- coding: utf-8 -*-
+

data/test/test_inetaddress.rb

@@ -0,0 +1,8 @@
+# -*- coding: utf-8 -*-
+
+class TestInetAddress < Test::Unit::TestCase
+  def test_responds_to_properties
+    a = GLib::InetAddress.new_any(GLib::Socket::FAMILY_IPV4)
+    assert a.respond_to?(:any?)
+  end
+end