gio2 3.1.0 → 3.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3e3bfdf472b2d76f14c87a54d389ef6d83ea2da2
-  data.tar.gz: b1c3f4cb4dfa19f10496aafcc47624a71805fdc7
+  metadata.gz: 5dc578d247292033bf8e59ca7e08c62fcb287267
+  data.tar.gz: baf4aaa19e4a80e4a9e27d59504d802574a3a99b
 SHA512:
-  metadata.gz: 3c84884c4a7538781d6fc959f034bce9d3ff14c8778f651bee68af5ed1b5ddbdf328c41be76a6896b9796855cd431bc861cef2702ca8178b6f7d80984c45569b
-  data.tar.gz: 6c51885ac72c9cf1658429fef6df6b1b6d0f7e9db984ffbbe0348e047b79bcf281ad80898a4055b37e52dc5779a10833ce81d2ccd9716b77c3b051bf4d593bf8
+  metadata.gz: 71fb5a9297cbe5b55ef8c9c19b422b589f632467d576408f4334f5188e40312db1584d9cfa3de84ef6ead1655f14421f90e9309bc5e1c79daa376781dc198f0b
+  data.tar.gz: e564d110ecc693911cceeaade69cf3634775282c5920bad623a6d6325bda052aa392f66dfc50966f924f906100782a4cc88bc7803fc5446db0726aac8069310c

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

@@ -16,18 +16,20 @@
 
 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
+    if method_defined?(:list_schemas)
+      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)
+        list_schemas_raw(recursive)
+      end
     end
   end
 end

data/lib/gio2/settings.rb

@@ -16,6 +16,30 @@
 
 module Gio
   class Settings
+    alias_method :initialize_raw, :initialize
+
+    def initialize(*args)
+      if args.size == 1
+        initialize_raw(args[0])
+      elsif args.size == 2
+        schema_id = args[0]
+        options = args[1]
+        path = options[:path] || nil
+        backend = options[:backend] || nil
+        if path && backend
+          initialize_new_with_backend_and_path(schema_id, backend, path)
+        elsif path
+          initialize_new_with_path(schema_id, path)
+        elsif backend
+          initialize_new_with_backend(schema_id, backend)
+        end
+      elsif args.size == 3
+        initialize_new_full(*args)
+      else
+        $stderr.puts "Arguments error for Gio::Settings#new"
+      end
+    end
+
     alias_method :set_value_raw, :set_value
     def set_value(key, value)
       schema_key = settings_schema.get_key(key)

data/test/fixture/Rakefile

@@ -0,0 +1,51 @@
+# -*- 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"
+
+generated_files = []
+
+Rake::FileList["resource/**/*.gresource.xml"].each do |gresource_xml|
+  gresource = gresource_xml.gsub(/\.xml\z/, "")
+  gresource_dir = File.dirname(gresource_xml)
+  generated_files << gresource
+  CLEAN << gresource
+  dependencies = [gresource_xml] + Rake::FileList["#{gresource_dir}/*.png"]
+  file gresource => dependencies do
+    cd(gresource_dir) do
+      sh("glib-compile-resources", File.basename(gresource_xml))
+    end
+  end
+end
+
+schema_dirs = [
+  "schema/default",
+  "schema/source",
+]
+schema_dirs.each do |schema_dir|
+  gschema_compiled = File.join(schema_dir, "gschemas.compiled")
+  generated_files << gschema_compiled
+  CLEAN << gschema_compiled
+  file gschema_compiled => Rake::FileList["#{schema_dir}/*.gschema.xml"] do
+    cd(schema_dir) do
+      sh("glib-compile-schemas", ".")
+    end
+  end
+end
+
+task :default => generated_files

data/test/fixture/schema/{settings/jp.ruby-gnome2.test.value.gschema.xml → default/jp.ruby-gnome2.test.settings.gschema.xml}

@@ -1,6 +1,6 @@
 <schemalist>
-  <schema id="jp.ruby-gnome2.test.value"
-          path="/jp/ruby-gnome2/test/value/">
+  <schema id="jp.ruby-gnome2.test.settings"
+          path="/jp/ruby-gnome2/test/settings/">
     <key name="string" type="s">
       <default>"default-string"</default>
     </key>

data/test/gio2-test-utils.rb

@@ -16,6 +16,8 @@
 
 require "test-unit"
 
+require "tempfile"
+
 require "gio2-test-utils/fixture"
 require "gio2-test-utils/omissions"
 require "gio2-test-utils/socket-client"

data/test/run-test.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 #
-# 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
@@ -38,20 +38,11 @@ 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
-
-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
+fixture_dir = File.join(gio2_base, "test", "fixture")
+Dir.chdir(fixture_dir) do
   system("rake") or exit(false)
 end
+ENV["GSETTINGS_SCHEMA_DIR"] = File.join(fixture_dir, "schema", "default")
 
 $LOAD_PATH.unshift(File.join(glib_base, "test"))
 require "glib-test-init"

data/test/test-settings.rb

@@ -20,7 +20,7 @@ class TestSettings < Test::Unit::TestCase
 
   sub_test_case "accessor" do
     setup do
-      @settings = Gio::Settings.new("jp.ruby-gnome2.test.value")
+      @settings = Gio::Settings.new("jp.ruby-gnome2.test.settings")
     end
 
     test "string" do
@@ -41,4 +41,90 @@ class TestSettings < Test::Unit::TestCase
                    @settings["boolean"])
     end
   end
+
+  sub_test_case ".new" do
+    def need_keyfile_settings_backend
+      unless Gio.respond_to?(:keyfile_settings_backend_new)
+        omit("Need Gio.keyfile_settings_backend_new")
+      end
+    end
+
+    test "minimum" do
+      settings = Gio::Settings.new("jp.ruby-gnome2.test.settings")
+      settings.reset("string")
+      assert_equal("default-string", settings["string"])
+    end
+
+    test ":path" do
+      settings = Gio::Settings.new("jp.ruby-gnome2.test.settings",
+                                   :path => "/jp/ruby-gnome2/test/settings/")
+      settings.reset("string")
+      assert_equal("default-string", settings["string"])
+    end
+
+    test ":backend" do
+      need_keyfile_settings_backend
+      keyfile = Tempfile.new(["settings", ".ini"])
+      backend = Gio::keyfile_settings_backend_new(keyfile.path, "/", "keyfile_settings")
+      settings = Gio::Settings.new("jp.ruby-gnome2.test.settings",
+                                   :backend => backend)
+
+      settings.reset("string")
+      assert_equal("default-string", settings["string"])
+      settings["string"] = "new-string"
+      assert_equal("new-string", settings["string"])
+
+      keyfile_content_ref = <<-KEYFILE
+[jp/ruby-gnome2/test/settings]
+string='new-string'
+      KEYFILE
+      keyfile_content = File.read(keyfile.path)
+      assert_equal(keyfile_content_ref, keyfile_content)
+      FileUtils.rm_f(keyfile)
+    end
+
+    test ":backend and :path" do
+      need_keyfile_settings_backend
+      keyfile = Tempfile.new(["settings", ".ini"])
+      backend = Gio::keyfile_settings_backend_new(keyfile.path, "/", "keyfile_settings")
+      settings = Gio::Settings.new("jp.ruby-gnome2.test.settings",
+                                   :backend => backend,
+                                   :path => "/jp/ruby-gnome2/test/settings/")
+
+      settings.reset("string")
+      assert_equal("default-string", settings["string"])
+      settings["string"] = "new-string"
+      assert_equal("new-string", settings["string"])
+
+      keyfile_content_ref = <<-KEYFILE
+[jp/ruby-gnome2/test/settings]
+string='new-string'
+      KEYFILE
+      keyfile_content = File.read(keyfile.path)
+      assert_equal(keyfile_content_ref, keyfile_content)
+    end
+
+    test "full" do
+      need_keyfile_settings_backend
+      keyfile = Tempfile.new(["settings", ".ini"])
+      backend = Gio::keyfile_settings_backend_new(keyfile.path, "/", "keyfile_settings")
+      schema_source = Gio::SettingsSchemaSource.new(fixture_path("schema"), nil, true)
+      schema = schema_source.lookup("jp.ruby-gnome2.test.settings", true)
+      settings = Gio::Settings.new(schema,
+                                   backend,
+                                   "/jp/ruby-gnome2/test/settings/")
+
+      settings.reset("string")
+      assert_equal("default-string", settings["string"])
+      settings["string"] = "new-string"
+      assert_equal("new-string", settings["string"])
+
+      keyfile_content_ref = <<-KEYFILE
+[jp/ruby-gnome2/test/settings]
+string='new-string'
+      KEYFILE
+      keyfile_content = File.read(keyfile.path)
+      assert_equal(keyfile_content_ref, keyfile_content)
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gio2
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.1.1
 platform: ruby
 authors:
 - The Ruby-GNOME2 Project Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-13 00:00:00.000000000 Z
+date: 2017-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: glib2
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 3.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 3.1.1
 - !ruby/object:Gem::Dependency
   name: gobject-introspection
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 3.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 3.1.1
 description: Ruby/GIO2 is a Ruby binding of gio-2.x.
 email: ruby-gnome2-devel-en@lists.sourceforge.net
 executables: []
@@ -69,13 +69,12 @@ files:
 - lib/gio2/settings-schema-source.rb
 - lib/gio2/settings.rb
 - lib/gio2/simple-action.rb
+- test/fixture/Rakefile
 - 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/default/jp.ruby-gnome2.test.settings.gschema.xml
 - test/fixture/schema/source/jp.ruby-gnome2.test.source.gschema.xml
 - test/gio2-test-utils.rb
 - test/gio2-test-utils/fixture.rb
@@ -125,7 +124,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Ruby/GIO2 is a Ruby binding of gio-2.x.

data/test/fixture/schema/settings/Rakefile

@@ -1,28 +0,0 @@
-# -*- 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/Rakefile

@@ -1,28 +0,0 @@
-# -*- 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