gio2 2.2.5 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a485cf4ab6ef8555c57e552dc9029116a25693d2
-  data.tar.gz: 83c0c2ce0a9edfb967e5df79fd3b67702927f725
+  metadata.gz: 08aa0b2ec12cbecf736185c296186a2402e3b1af
+  data.tar.gz: 9dd1864abc6b3c4e0c7ed4b4aa623c84fe2ac933
 SHA512:
-  metadata.gz: 3e4d4b3751398d8fd60de994f86ced447419403abad96253337486562823362024dcf8b99e0fa67fa7e3cb47fc075c784e6edf1dbc0b49794f151bfd6b6a3b4f
-  data.tar.gz: 653850c7628f74fa3c55a88a80765670277672db884bc7d486bc14181d0b6911ce1ce9be34d076fcefbb337bea39741494ccf8c8d1af50766f9654279c16270d
+  metadata.gz: 34beed6d9b9aaaf10c4d5d6596ef4cf2b0981620e0414b4e965738c107ccdcf87f9f33b376184422a9acc6780c067803ec8920229208075153c2fed523311aef
+  data.tar.gz: 8475639689b9e86af70941ee3f87f88069990b3d7b4a4cc8a117cafc667d1f49f383dc41d7d25432d2ebfdd14f17febd50ee4c8193d159be3633925e4d584494

data/ext/gio2/rb-gio2-application.c

@@ -0,0 +1,54 @@
+/* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
+/*
+ *  Copyright (C) 2015  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
+ *  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
+ */
+
+#include "rb-gio2.h"
+
+#define RG_TARGET_NAMESPACE cApplication
+
+static VALUE
+rg_open_signal_func(G_GNUC_UNUSED guint num, const GValue *values)
+{
+    VALUE rb_files;
+    GFile **files;
+    gint i, n_files;
+
+    files = g_value_get_pointer(&(values[1]));
+    n_files = g_value_get_int(&(values[2]));
+    rb_files = rb_ary_new2(n_files);
+    for (i = 0; i < n_files; i++) {
+        GFile *file = files[i];
+        rb_ary_push(rb_files, GOBJ2RVAL(file));
+    }
+
+    return rb_ary_new3(3,
+                       GVAL2RVAL(&values[0]),
+                       rb_files,
+                       GVAL2RVAL(&values[3]));
+}
+
+void
+rb_gio2_init_application (VALUE mGio)
+{
+    VALUE RG_TARGET_NAMESPACE;
+
+    RG_TARGET_NAMESPACE = rb_const_get(mGio, rb_intern("Application"));
+
+    G_DEF_SIGNAL_FUNC(RG_TARGET_NAMESPACE, "open", rg_open_signal_func);
+}

data/ext/gio2/rb-gio2.c

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2014  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2014-2015  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
@@ -22,11 +22,58 @@
 
 #define RG_TARGET_NAMESPACE rb_mGio
 
+static gboolean
+name_equal(GIArgInfo *info, const gchar *target_name)
+{
+    GITypeInfo type_info;
+    GIBaseInfo *interface_info;
+    const gchar *namespace;
+    const gchar *name;
+    gboolean equal_name_p = FALSE;
+
+    g_arg_info_load_type(info, &type_info);
+    interface_info = g_type_info_get_interface(&type_info);
+    namespace = g_base_info_get_namespace(interface_info);
+    name = g_base_info_get_name(interface_info);
+    if (strcmp(namespace, "Gio") == 0 && strcmp(name, target_name) == 0) {
+        equal_name_p = TRUE;
+    }
+    g_base_info_unref(interface_info);
+
+    return equal_name_p;
+}
+
+static void
+rb_gio2_async_ready_callback_callback(GObject *source_object,
+                                      GAsyncResult *result,
+                                      gpointer user_data)
+{
+    RBGICallbackData *callback_data = user_data;
+    ID id_call;
+
+    CONST_ID(id_call, "call");
+    rb_funcall(callback_data->rb_callback, id_call, 2,
+               GOBJ2RVAL(source_object), GOBJ2RVAL(result));
+}
+
+static gpointer
+rb_gio2_async_ready_callback_finder(GIArgInfo *info)
+{
+    if (!name_equal(info, "AsyncReadyCallback")) {
+        return NULL;
+    }
+    return rb_gio2_async_ready_callback_callback;
+}
+
 void
 Init_gio2 (void)
 {
     VALUE RG_TARGET_NAMESPACE;
 
     RG_TARGET_NAMESPACE = rb_define_module("Gio");
+
+    rb_gio2_init_application(RG_TARGET_NAMESPACE);
     rb_gio2_init_pollable_source(RG_TARGET_NAMESPACE);
+
+    rb_gi_callback_register_finder(rb_gio2_async_ready_callback_finder);
 }

data/ext/gio2/rb-gio2.h

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2014  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2014-2015  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
@@ -23,4 +23,5 @@
 #include <rb-gobject-introspection.h>
 
 extern void Init_gio2 (void);
+G_GNUC_INTERNAL extern void rb_gio2_init_application (VALUE rb_mGio);
 G_GNUC_INTERNAL extern void rb_gio2_init_pollable_source (VALUE rb_mGio);

data/lib/gio2.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013-2014  Ruby-GNOME2 Project Team
+# Copyright (C) 2013-2015  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
@@ -24,7 +24,6 @@ GLib.prepend_dll_path(vendor_bin_dir)
 vendor_girepository_dir = vendor_dir + "lib" + "girepository-1.0"
 GObjectIntrospection.prepend_typelib_path(vendor_girepository_dir)
 
-require "gio2/deprecated"
 require "gio2/loader"
 
 module Gio

data/lib/gio2/action-map.rb

@@ -0,0 +1,57 @@
+# Copyright (C) 2015  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
+# 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 ActionMap
+    alias_method :add_action_raw, :add_action
+    def add_action(action)
+      action = convert_to_action(action) unless action.is_a?(Action)
+      add_action_raw(action)
+      actions[action.name] = action
+    end
+
+    alias_method :remove_action_raw, :remove_action
+    def remove_action(name)
+      remove_action_raw(name)
+      actions.delete(name)
+    end
+
+    def add_actions(actions)
+      actions.each do |action|
+        add_action(action)
+      end
+    end
+
+    private
+    def actions
+      @acitions ||= {}
+    end
+
+    def convert_to_action(definition)
+      name = definition[:name]
+      parameter_type = definition[:parameter_type]
+      callback = definition[:callback]
+
+      action = SimpleAction.new(name, parameter_type)
+      if callback
+        action.signal_connect("activate") do |*args|
+          callback.call(*args)
+        end
+      end
+      action
+    end
+  end
+end

data/lib/gio2/action.rb

@@ -0,0 +1,30 @@
+# Copyright (C) 2015  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
+# 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 Action
+    alias_method :activate_raw, :activate
+    def activate(parameter=nil)
+      case parameter
+      when nil, GLib::Variant
+        # do nothing
+      else
+        parameter = GLib::Variant.new(parameter)
+      end
+      activate_raw(parameter)
+    end
+  end
+end

data/lib/gio2/loader.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013-2014  Ruby-GNOME2 Project Team
+# Copyright (C) 2013-2015  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
@@ -50,11 +50,16 @@ module Gio
     end
 
     def require_libraries
-      require "gio2/resources"
+      require "gio2/action"
+      require "gio2/action-map"
       require "gio2/inet-address"
       require "gio2/input-stream"
       require "gio2/pollable-input-stream"
       require "gio2/pollable-output-stream"
+      require "gio2/resources"
+      require "gio2/simple-action"
+
+      require "gio2/deprecated"
     end
 
     def define_content_type_class
@@ -183,7 +188,6 @@ module Gio
       case klass.name
       when "Gio::File"
         load_function_infos_file(infos, klass)
-        super
       else
         super
       end

data/lib/gio2/simple-action.rb

@@ -0,0 +1,27 @@
+# Copyright (C) 2015  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
+# 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 SimpleAction
+    alias_method :initialize_raw, :initialize
+    def initialize(name, parameter_type=nil, state=nil)
+      if parameter_type.is_a?(String)
+        parameter_type = GLib::VariantType.new(parameter_type)
+      end
+      initialize_raw(name, parameter_type, state)
+    end
+  end
+end

data/test/run-test.rb

@@ -38,11 +38,13 @@ modules.each do |target, module_name|
   $LOAD_PATH.unshift(File.join(target, "lib"))
 end
 
+Dir.chdir(File.join(gio2_base, "test", "fixture", "resource")) do
+  system("rake") or exit(false)
+end
+
 $LOAD_PATH.unshift(File.join(glib_base, "test"))
 require "glib-test-init"
 
-$VERBOSE = false # TODO: remove me
-
 $LOAD_PATH.unshift(File.join(gio2_base, "test"))
 require "gio2-test-utils"
 

data/test/test-action-map.rb

@@ -0,0 +1,51 @@
+# Copyright (C) 2015  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
+# 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 TestActionMap < Test::Unit::TestCase
+  def setup
+    @map = Gio::SimpleActionGroup.new
+  end
+
+  sub_test_case "#add_actions" do
+    test "name" do
+      @map.add_actions([
+                         {
+                           :name => "open",
+                         }
+                       ])
+      action = @map.lookup_action("open")
+      assert_equal("open", action.name)
+    end
+
+    test "parameter_type" do
+      args = nil
+      callback = lambda do |*callback_args|
+        args = callback_args
+      end
+      @map.add_actions([
+                         {
+                           :name => "open",
+                           :parameter_type => "s",
+                           :callback => callback,
+                         }
+                       ])
+      action = @map.lookup_action("open")
+      action.activate("X")
+      assert_equal([action, "X"], args)
+    end
+  end
+end

data/test/test-file-monitor.rb

@@ -17,17 +17,15 @@
 class TestFileMonitor < Test::Unit::TestCase
   class Flags < self
     def test_file_monitor_flags
-      assert_nothing_raised do
-        Gio::FileMonitorFlags.new(Gio::FileMonitorFlags::SEND_MOVED)
-      end
+      assert_equal("send-moved",
+                   Gio::FileMonitorFlags::SEND_MOVED.nick)
     end
   end
 
   class Event < self
     def test_file_monitor_event
-      assert_nothing_raised do
-        Gio::FileMonitorEvent.new(Gio::FileMonitorEvent::CHANGED)
-      end
+      assert_equal("changed",
+                   Gio::FileMonitorEvent::CHANGED.nick)
     end
   end
 end

data/test/test-mount.rb

@@ -0,0 +1,23 @@
+# Copyright (C) 2015  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
+# 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 TestMount < Test::Unit::TestCase
+  def test_can_unmount
+    assert do
+      Gio::Mount.method_defined?(:can_unmount?)
+    end
+  end
+end

data/test/test-simple-action.rb

@@ -0,0 +1,44 @@
+# Copyright (C) 2015  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
+# 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 TestSimpleAction < Test::Unit::TestCase
+  sub_test_case "#initialize" do
+    sub_test_case "parameter type" do
+      test "omit" do
+        action = Gio::SimpleAction.new("open")
+        assert_nil(action.parameter_type)
+      end
+
+      test "nil" do
+        action = Gio::SimpleAction.new("open", nil)
+        assert_nil(action.parameter_type)
+      end
+
+      test "String" do
+        action = Gio::SimpleAction.new("open", "s")
+        assert_equal(GLib::VariantType::STRING,
+                     action.parameter_type)
+      end
+
+      test "GLib::VariantType" do
+        action = Gio::SimpleAction.new("open", GLib::VariantType::STRING)
+        assert_equal(GLib::VariantType::STRING,
+                     action.parameter_type)
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gio2
 version: !ruby/object:Gem::Version
-  version: 2.2.5
+  version: 3.0.1
 platform: ruby
 authors:
 - The Ruby-GNOME2 Project Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-24 00:00:00.000000000 Z
+date: 2015-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: glib2
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.5
+        version: 3.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.5
+        version: 3.0.1
 - !ruby/object:Gem::Dependency
   name: gobject-introspection
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.5
+        version: 3.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.5
+        version: 3.0.1
 description: Ruby/GIO2 is a Ruby binding of gio-2.x.
 email: ruby-gnome2-devel-en@lists.sourceforge.net
 executables: []
@@ -48,11 +48,14 @@ files:
 - Rakefile
 - ext/gio2/depend
 - ext/gio2/extconf.rb
+- ext/gio2/rb-gio2-application.c
 - ext/gio2/rb-gio2-pollable-source.c
 - ext/gio2/rb-gio2.c
 - ext/gio2/rb-gio2.h
 - extconf.rb
 - lib/gio2.rb
+- lib/gio2/action-map.rb
+- lib/gio2/action.rb
 - lib/gio2/deprecated.rb
 - lib/gio2/inet-address.rb
 - lib/gio2/input-stream.rb
@@ -60,16 +63,17 @@ files:
 - lib/gio2/pollable-input-stream.rb
 - lib/gio2/pollable-output-stream.rb
 - lib/gio2/resources.rb
+- lib/gio2/simple-action.rb
 - test/fixture/content-type/x-content/unix-software/autorun.sh
 - test/fixture/resource/Rakefile
 - test/fixture/resource/logo.png
-- test/fixture/resource/ruby-gio2.gresource
 - test/fixture/resource/ruby-gio2.gresource.xml
 - test/gio2-test-utils.rb
 - test/gio2-test-utils/fixture.rb
 - test/gio2-test-utils/omissions.rb
 - test/gio2-test-utils/socket-client.rb
 - test/run-test.rb
+- test/test-action-map.rb
 - test/test-buffered-input-stream.rb
 - test/test-charset-converter.rb
 - test/test-content-type.rb
@@ -82,10 +86,12 @@ files:
 - test/test-input-stream.rb
 - test/test-memory-input-stream.rb
 - test/test-memory-output-stream.rb
+- test/test-mount.rb
 - test/test-output-stream.rb
 - test/test-pollable-input-stream.rb
 - test/test-pollable-output-stream.rb
 - test/test-resources.rb
+- test/test-simple-action.rb
 homepage: http://ruby-gnome2.sourceforge.jp/
 licenses:
 - LGPLv2.1 or later