gio2 3.0.9 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 16c22ff55d522db082d963e7bac9a42b4939caa6
-  data.tar.gz: ae9b6164c52e6a481553406f8bbfe33134aea41d
+  metadata.gz: 3e3bfdf472b2d76f14c87a54d389ef6d83ea2da2
+  data.tar.gz: b1c3f4cb4dfa19f10496aafcc47624a71805fdc7
 SHA512:
-  metadata.gz: 345ef1f27af30477f8bddc096d7735710f21e6e2913f19f67a2a1fbebc2528556c50458d77d59852713097c095312b771b8dbf2cef7e2cdbf8b13453ca7fc163
-  data.tar.gz: 779772d334eae123ae9a93a76c76ae9511d51b5874accc507f3ba4c926e9b097b614a5620e5cc581cda642e3ed15eda8c32e6e9861b53cd2bc2e4eed99b591d0
+  metadata.gz: 3c84884c4a7538781d6fc959f034bce9d3ff14c8778f651bee68af5ed1b5ddbdf328c41be76a6896b9796855cd431bc861cef2702ca8178b6f7d80984c45569b
+  data.tar.gz: 6c51885ac72c9cf1658429fef6df6b1b6d0f7e9db984ffbbe0348e047b79bcf281ad80898a4055b37e52dc5779a10833ce81d2ccd9716b77c3b051bf4d593bf8

data/lib/gio2/action-map.rb

@@ -37,15 +37,16 @@ module Gio
 
     private
     def actions
-      @acitions ||= {}
+      @actions ||= {}
     end
 
     def convert_to_action(definition)
       name = definition[:name]
       parameter_type = definition[:parameter_type]
+      state = definition[:state]
       callback = definition[:callback]
 
-      action = SimpleAction.new(name, parameter_type)
+      action = SimpleAction.new(name, parameter_type, state)
       if callback
         action.signal_connect("activate") do |*args|
           callback.call(*args)

data/lib/gio2/content-type.rb

@@ -0,0 +1,28 @@
+# Copyright (C) 2016  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 ContentType
+    class << self
+      alias_method :registered_raw, :registered
+      def registered
+        registered_raw([]).collect do |type|
+          new(type)
+        end
+      end
+    end
+  end
+end

data/lib/gio2/file.rb

@@ -0,0 +1,30 @@
+# Copyright (C) 2016  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 File
+    class << self
+      alias_method :commandline_arg_raw, :commandline_arg
+      def commandline_arg(arg, cwd=nil)
+        if cwd
+          commandline_arg_and_cwd(arg, cwd)
+        else
+          commandline_arg_raw(arg)
+        end
+      end
+    end
+  end
+end

data/lib/gio2/loader.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013-2015  Ruby-GNOME2 Project Team
+# Copyright (C) 2013-2016  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
@@ -31,7 +31,7 @@ module Gio
         info = @content_type_guess_for_tree_info
         file_module = @base_module.const_get("File")
         file_module.__send__(:define_method, "guess_content_types") do
-          info.invoke(:arguments => [self]).collect do |type|
+          info.invoke([self]).collect do |type|
             content_type_class.new(type)
           end
         end
@@ -53,11 +53,15 @@ module Gio
       require "gio2/action"
       require "gio2/action-map"
       require "gio2/application-command-line"
+      require "gio2/content-type"
+      require "gio2/file"
       require "gio2/inet-address"
       require "gio2/input-stream"
       require "gio2/pollable-input-stream"
       require "gio2/pollable-output-stream"
       require "gio2/resources"
+      require "gio2/settings"
+      require "gio2/settings-schema-source"
       require "gio2/simple-action"
 
       require "gio2/deprecated"
@@ -105,24 +109,20 @@ module Gio
       when /\Acontent_type_/
         load_function_info_content_type(info)
       when "content_types_get_registered"
-        @content_type_class.define_singleton_method(:registered) do
-          info.invoke(:arguments => []).collect do |type|
-            new(type)
-          end
-        end
+        define_singleton_method(@content_type_class, "registered", info)
       when /\Aresources_/
         name = rubyish_method_name(info, :prefix => "resources_")
-        define_module_function(@resources_module, name, info)
+        define_singleton_method(@resources_module, name, info)
       when /\Adbus_/
         name = rubyish_method_name(info, :prefix => "dbus_")
-        define_module_function(@dbus_module, name, info)
+        define_singleton_method(@dbus_module, name, info)
       else
         super
       end
     end
 
     def load_function_info_content_type(info)
-      name = info.name.gsub(/\Acontent_type_/, "")
+      name = rubyish_method_name(info, :prefix => "content_type_")
       case name
       when "equals", "is_a"
         case name
@@ -136,19 +136,19 @@ module Gio
             other = other.to_s
           end
           if other.is_a?(String)
-            info.invoke(:arguments => [to_s, other])
+            info.invoke([to_s, other])
           else
             false
           end
         end
       when "from_mime_type"
         @mime_type_class.__send__(:define_method, "content_type") do
-          info.invoke(:arguments => [to_s])
+          info.invoke([to_s])
         end
       when "get_mime_type"
         mime_type_class = @mime_type_class
         @content_type_class.__send__(:define_method, "mime_type") do
-          mime_type = info.invoke(:arguments => [to_s])
+          mime_type = info.invoke([to_s])
           if mime_type
             mime_type_class.new(mime_type)
           else
@@ -158,74 +158,29 @@ module Gio
       when "guess_for_tree"
         @content_type_guess_for_tree_info = info
       when "guess"
-        validate = lambda do |arguments|
-          method_name = "#{@content_type_class}.#{name}"
-          validate_arguments(info, method_name, arguments)
-        end
-        @content_type_class.define_singleton_method(:guess) do |*arguments|
-          validate.call(arguments)
-          info.invoke(:arguments => arguments)
-        end
+        define_singleton_method(@content_type_class, name, info)
       else
         case name
-        when /\Acan_be_/
-          method_name = "#{$POSTMATCH}?"
-        when /\Ais_/
-          method_name = "#{$POSTMATCH}?"
         when /\Aget_/
           method_name = $POSTMATCH
         else
           method_name = name
         end
         @content_type_class.__send__(:define_method, method_name) do
-          info.invoke(:arguments => [to_s])
+          info.invoke([to_s])
         end
       end
     end
 
-    def load_function_infos(infos, klass)
-      case klass.name
-      when "Gio::File"
-        load_function_infos_file(infos, klass)
+    def rubyish_method_name(info, options={})
+      case info.name
+      when /\Anew_(?:for_)?/
+        $POSTMATCH
       else
         super
       end
     end
 
-    def load_function_infos_file(infos, klass)
-      new_for_commandline_arg_infos = []
-
-      infos.each do |info|
-        name = info.name
-        case name
-        when /\Anew_for_commandline_arg/
-          new_for_commandline_arg_infos << info
-        when /\Anew_(?:for_)?/
-          method_name = $POSTMATCH
-          define_singleton_method(klass, method_name, info)
-        else
-          define_singleton_method(klass, name, info)
-        end
-      end
-
-      define_file_commandline_arg(new_for_commandline_arg_infos, klass)
-    end
-
-    def define_file_commandline_arg(infos, klass)
-      method_name = "commandline_arg"
-      find_info = lambda do |arguments|
-        find_suitable_callable_info(infos, arguments)
-      end
-      validate = lambda do |info, arguments|
-        validate_arguments(info, "#{klass}.#{method_name}", arguments)
-      end
-      klass.__send__(:define_method, method_name) do |*arguments|
-        info = find_info.call(arguments)
-        validate.call(info, arguments)
-        info.invoke(:arguments => arguments)
-      end
-    end
-
     def rubyish_class_name(info)
       case info.name
       when /Enum\z/

data/lib/gio2/resources.rb

@@ -17,12 +17,16 @@
 module Gio
   module Resources
     class << self
-      def register(resource)
-        resource._register
+      unless method_defined?(:register)
+        def register(resource)
+          resource._register
+        end
       end
 
-      def unregister(resource)
-        resource._unregister
+      unless method_defined?(:unregister)
+        def unregister(resource)
+          resource._unregister
+        end
       end
 
       alias_method :lookup_data_raw, :lookup_data

data/lib/gio2/settings-schema-source.rb

@@ -0,0 +1,33 @@
+# Copyright (C) 2016  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 SettingsSchemaSource
+    alias_method :list_schemas_raw, :list_schemas
+    def list_schemas(recursive_or_options=nil)
+      case recursive_or_options
+      when true, false
+        recursive = recursive_or_options
+      else
+        options = recursive_or_options || {}
+        recursive = options[:recursive]
+        recursive = true if recursive.nil?
+      end
+
+      list_schemas_raw(recursive)
+    end
+  end
+end

data/lib/gio2/settings.rb

@@ -0,0 +1,29 @@
+# Copyright (C) 2016  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 Settings
+    alias_method :set_value_raw, :set_value
+    def set_value(key, value)
+      schema_key = settings_schema.get_key(key)
+      variant_value = GLib::Variant.new(value, schema_key.value_type)
+      set_value_raw(key, variant_value)
+    end
+
+    alias_method :[], :get_value
+    alias_method :[]=, :set_value
+  end
+end

data/test/fixture/schema/settings/Rakefile

@@ -0,0 +1,28 @@
+# -*- ruby -*-
+#
+# Copyright (C) 2016  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
+
+require "rake/clean"
+
+gschemas_compiled = "gschemas.compiled"
+
+CLEAN << gschemas_compiled
+file gschemas_compiled => Rake::FileList["*.gschema.xml"] do
+  sh("glib-compile-schemas", ".")
+end
+
+task :default => gschemas_compiled

data/test/fixture/schema/settings/jp.ruby-gnome2.test.value.gschema.xml

@@ -0,0 +1,11 @@
+<schemalist>
+  <schema id="jp.ruby-gnome2.test.value"
+          path="/jp/ruby-gnome2/test/value/">
+    <key name="string" type="s">
+      <default>"default-string"</default>
+    </key>
+    <key name="boolean" type="b">
+      <default>true</default>
+    </key>
+  </schema>
+</schemalist>

data/test/fixture/schema/source/Rakefile

@@ -0,0 +1,28 @@
+# -*- ruby -*-
+#
+# Copyright (C) 2016  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
+
+require "rake/clean"
+
+gschemas_compiled = "gschemas.compiled"
+
+CLEAN << gschemas_compiled
+file gschemas_compiled => Rake::FileList["*.gschema.xml"] do
+  sh("glib-compile-schemas", ".")
+end
+
+task :default => gschemas_compiled

data/test/fixture/schema/source/jp.ruby-gnome2.test.source.gschema.xml

@@ -0,0 +1,5 @@
+<schemalist>
+  <schema id="jp.ruby-gnome2.test.source"
+          path="/jp/ruby-gnome2/test/source/">
+  </schema>
+</schemalist>

data/test/gio2-test-utils/omissions.rb

@@ -23,5 +23,11 @@ module GioTestUtils
     def omit_on_travis_ci
       omit("Skip this test on Travis CI") if ENV["CI"]
     end
+
+    def only_gio_version(major, minor, micro)
+      unless GLib.check_version?(major, minor, micro)
+        omit("Require GIO >= #{major}.#{minor}.#{micro}")
+      end
+    end
   end
 end

data/test/run-test.rb

@@ -42,6 +42,17 @@ Dir.chdir(File.join(gio2_base, "test", "fixture", "resource")) do
   system("rake") or exit(false)
 end
 
+schema_dir = File.join(gio2_base, "test", "fixture", "schema")
+settings_schema_dir = File.join(schema_dir, "settings")
+Dir.chdir(settings_schema_dir) do
+  system("rake") or exit(false)
+end
+ENV["GSETTINGS_SCHEMA_DIR"] = settings_schema_dir
+
+Dir.chdir(File.join(schema_dir, "source")) do
+  system("rake") or exit(false)
+end
+
 $LOAD_PATH.unshift(File.join(glib_base, "test"))
 require "glib-test-init"
 

data/test/test-settings-schema-source.rb

@@ -0,0 +1,56 @@
+# Copyright (C) 2016  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 TestSettingsSchemaSource < Test::Unit::TestCase
+  include GioTestUtils::Fixture
+  include GioTestUtils::Omissions
+
+  sub_test_case "#list_schemas" do
+    setup do
+      only_gio_version(2, 42, 0)
+      @default_source = Gio::SettingsSchemaSource.default
+      @source = Gio::SettingsSchemaSource.new(fixture_path("schema", "source"),
+                                              @default_source,
+                                              true)
+    end
+
+    test "recursive: default" do
+      assert_equal(@source.list_schemas(:recursive => true),
+                   @source.list_schemas)
+    end
+
+    test "recursive: true" do
+      non_relocatables_expected, relocatables_expected =
+        @default_source.list_schemas
+      non_relocatables_expected << "jp.ruby-gnome2.test.source"
+      non_relocatables_actual, relocatables_actual =
+        @source.list_schemas(:recursive => true)
+      assert_equal([
+                     non_relocatables_expected.sort,
+                     relocatables_expected,
+                   ],
+                   [
+                     non_relocatables_actual.sort,
+                     relocatables_actual,
+                   ])
+    end
+
+    test "recursive: false" do
+      assert_equal([["jp.ruby-gnome2.test.source"], []],
+                   @source.list_schemas(:recursive => false))
+    end
+  end
+end

data/test/test-settings.rb

@@ -0,0 +1,44 @@
+# Copyright (C) 2016  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 TestSettings < Test::Unit::TestCase
+  include GioTestUtils::Fixture
+  include GioTestUtils::Omissions
+
+  sub_test_case "accessor" do
+    setup do
+      @settings = Gio::Settings.new("jp.ruby-gnome2.test.value")
+    end
+
+    test "string" do
+      @settings.reset("string")
+      assert_equal("default-string",
+                   @settings["string"])
+      @settings["string"] = "new-string"
+      assert_equal("new-string",
+                   @settings["string"])
+    end
+
+    test "boolean" do
+      @settings.reset("boolean")
+      assert_equal(true,
+                   @settings["boolean"])
+      @settings["boolean"] = false
+      assert_equal(false,
+                   @settings["boolean"])
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gio2
 version: !ruby/object:Gem::Version
-  version: 3.0.9
+  version: 3.1.0
 platform: ruby
 authors:
 - The Ruby-GNOME2 Project Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-12 00:00:00.000000000 Z
+date: 2016-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: glib2
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.9
+        version: 3.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.9
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: gobject-introspection
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.9
+        version: 3.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.9
+        version: 3.1.0
 description: Ruby/GIO2 is a Ruby binding of gio-2.x.
 email: ruby-gnome2-devel-en@lists.sourceforge.net
 executables: []
@@ -57,18 +57,26 @@ files:
 - lib/gio2/action-map.rb
 - lib/gio2/action.rb
 - lib/gio2/application-command-line.rb
+- lib/gio2/content-type.rb
 - lib/gio2/deprecated.rb
+- lib/gio2/file.rb
 - lib/gio2/inet-address.rb
 - lib/gio2/input-stream.rb
 - lib/gio2/loader.rb
 - lib/gio2/pollable-input-stream.rb
 - lib/gio2/pollable-output-stream.rb
 - lib/gio2/resources.rb
+- lib/gio2/settings-schema-source.rb
+- lib/gio2/settings.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.xml
+- test/fixture/schema/settings/Rakefile
+- test/fixture/schema/settings/jp.ruby-gnome2.test.value.gschema.xml
+- test/fixture/schema/source/Rakefile
+- test/fixture/schema/source/jp.ruby-gnome2.test.source.gschema.xml
 - test/gio2-test-utils.rb
 - test/gio2-test-utils/fixture.rb
 - test/gio2-test-utils/omissions.rb
@@ -93,6 +101,8 @@ files:
 - test/test-pollable-input-stream.rb
 - test/test-pollable-output-stream.rb
 - test/test-resources.rb
+- test/test-settings-schema-source.rb
+- test/test-settings.rb
 - test/test-simple-action.rb
 - test/test-version.rb
 homepage: http://ruby-gnome2.sourceforge.jp/