gio2 3.1.3 → 3.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 741ccf2ed3233a640031c441e5bb425f2bfb5de7
-  data.tar.gz: 4b3f8d992040600b9851dfd21efe51b639085f52
+  metadata.gz: b6d84eca2c1900d778c7ea7ee72407f41147045d
+  data.tar.gz: b3391e2c37b479fe4018af91c6e3411b41360c33
 SHA512:
-  metadata.gz: 74f23eb7225bb8d7498bbfbc57b3a99c16c590ecf9a008a08e6d58c4955e2ab67082eb6c98ce72a94d37989f0a3825aca9f7a2172283112a11425005a164a437
-  data.tar.gz: 522ef92b0ee4b780a9511bd2746448f526f3a53b42b32bea28b7e77716e61070241a08d4c8ad7c9131d0a93b055af3fc40809274a13f131b4709e94f442df883
+  metadata.gz: fe70c6286d70c5b7dd709a312a4da5f6a163c902c6cb024ffcef742c6c9a5305031256317893bf98ca17e781cc04d2fbaad5c7d6ec1d6602586400f8f1df8771
+  data.tar.gz: 22d10e4e393b976c2d67b0f1720ca3c17400d2ba8d18ef2f4aff10f772be3cbff667df69fbbb2c86a4e37a02fa6f99db6bdfce1ba90cc1115f344e4cea0af293

data/lib/gio2/deprecated.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013  Ruby-GNOME2 Project Team
+# Copyright (C) 2013-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
@@ -116,3 +116,23 @@ module GLib
   end
 end
 
+module Gio
+  module File
+    extend GLib::Deprecatable
+
+    define_deprecated_singleton_method(:commandline_arg,
+                                       "open(arg: arg, cwd: cwd)") do |_self, arg, cwd=nil|
+      open(arg: arg, cwd: cwd)
+    end
+
+    define_deprecated_singleton_method(:path,
+                                       "open(path: path)") do |_self, path|
+      open(path: path)
+    end
+
+    define_deprecated_singleton_method(:uri,
+                                       "open(uri: uri)") do |_self, uri|
+      open(uri: uri)
+    end
+  end
+end

data/lib/gio2/file.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2016  Ruby-GNOME2 Project Team
+# Copyright (C) 2016-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
@@ -17,12 +17,31 @@
 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)
+      def open(options={})
+        arg = options[:arg]
+        cwd = options[:cwd]
+        path = options[:path]
+        uri = options[:uri]
+
+        if arg
+          if cwd
+            file = new_for_commandline_arg_and_cmd(arg, cwd)
+          else
+            file = new_for_commandline_arg(arg)
+          end
+        elsif path
+          file = new_for_path(path)
+        elsif uri
+          file = new_for_uri(uri)
+        else
+          message = "must specify :arg, :path or :uri: #{options.inspect}"
+          raise ArgumentError, message
+        end
+
+        if block_given?
+          yield(file)
         else
-          commandline_arg_raw(arg)
+          file
         end
       end
     end

data/lib/gio2/loader.rb

@@ -22,6 +22,7 @@ module Gio
       define_mime_type_class
       define_dbus_module
       define_resources_module
+      @file_function_infos = []
       @content_type_guess_for_tree_info = nil
     end
 
@@ -116,6 +117,8 @@ module Gio
       when /\Adbus_/
         name = rubyish_method_name(info, :prefix => "dbus_")
         define_singleton_method(@dbus_module, name, info)
+      when /\Afile_/
+        # Ignore because they are defined by load_interface_info
       else
         super
       end
@@ -172,15 +175,6 @@ module Gio
       end
     end
 
-    def rubyish_method_name(info, options={})
-      case info.name
-      when /\Anew_(?:for_)?/
-        $POSTMATCH
-      else
-        super
-      end
-    end
-
     def rubyish_class_name(info)
       case info.name
       when /Enum\z/

data/test/test-file-enumerator.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013-2014  Ruby-GNOME2 Project Team
+# Copyright (C) 2013-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
@@ -19,7 +19,7 @@ class TestFileEnumerator < Test::Unit::TestCase
 
   def test_container
     path = File.dirname(__FILE__)
-    dir = Gio::File.path(path)
+    dir = Gio::File.open(path: path)
     enumerator = dir.enumerate_children("*", :none)
     assert_equal(path, enumerator.container.path)
   end

data/test/test-file.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014  Ruby-GNOME2 Project Team
+# Copyright (C) 2014-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
@@ -22,7 +22,7 @@ class TestFile < Test::Unit::TestCase
     def test_guess_content_type
       omit_on_os_x
       path = fixture_path("content-type", "x-content", "unix-software")
-      dir = Gio::File.path(path)
+      dir = Gio::File.open(path: path)
       assert_equal(["x-content/unix-software"],
                    dir.guess_content_types.collect(&:to_s))
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gio2
 version: !ruby/object:Gem::Version
-  version: 3.1.3
+  version: 3.1.4
 platform: ruby
 authors:
 - The Ruby-GNOME2 Project Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-27 00:00:00.000000000 Z
+date: 2017-05-30 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.3
+        version: 3.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.3
+        version: 3.1.4
 - !ruby/object:Gem::Dependency
   name: gobject-introspection
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.3
+        version: 3.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.3
+        version: 3.1.4
 description: Ruby/GIO2 is a Ruby binding of gio-2.x.
 email: ruby-gnome2-devel-en@lists.sourceforge.net
 executables: []