gobject-introspection 2.1.0 → 2.2.0

data/lib/gobject-introspection/loader.rb

@@ -94,6 +94,26 @@ module GObjectIntrospection
       end
     end
 
+    def define_singleton_method(klass, name, info)
+      unlock_gvl = should_unlock_gvl?(info, klass)
+      validate = lambda do |arguments|
+        validate_arguments(info, "#{klass}.#{name}", arguments)
+      end
+      singleton_class = (class << klass; self; end)
+      singleton_class.__send__(:define_method, name) do |*arguments, &block|
+        validate.call(arguments, &block)
+        if block.nil? and info.require_callback?
+          Enumerator.new(self, name, *arguments)
+        else
+          info.invoke({
+                        :arguments => arguments,
+                        :unlock_gvl => unlock_gvl,
+                      },
+                      &block)
+        end
+      end
+    end
+
     def define_struct(info, options={})
       if info.gtype == GLib::Type::NONE
         klass = self.class.define_struct(info.size, info.name, @base_module,
@@ -127,6 +147,32 @@ module GObjectIntrospection
       enum_module.const_set(value_info.name.upcase, value_info.value)
     end
 
+    def define_enum(info)
+      self.class.define_class(info.gtype,
+                              enum_class_name(info),
+                              @base_module)
+    end
+
+    def enum_class_name(info)
+      info.name
+    end
+
+    def define_error(info)
+      self.class.define_error(info.error_domain,
+                              error_class_name(info),
+                              @base_module,
+                              :parent => error_parent_class(info),
+                              :gtype => info.gtype)
+    end
+
+    def error_class_name(info)
+      info.name
+    end
+
+    def error_parent_class(info)
+      nil
+    end
+
     def load_enum_info(info)
       if info.gtype == GLib::Type::NONE
         enum_module = Module.new
@@ -135,7 +181,11 @@ module GObjectIntrospection
         end
         @base_module.const_set(info.name, enum_module)
       else
-        self.class.define_class(info.gtype, info.name, @base_module)
+        if info.error_domain
+          define_error(info)
+        else
+          define_enum(info)
+        end
       end
     end
 
@@ -252,14 +302,27 @@ module GObjectIntrospection
     def find_suitable_callable_info(infos, arguments)
       min_n_args = nil
       max_n_args = nil
+      candidate_infos = []
       infos.each do |info|
         if arguments.size == info.n_in_args
-          return info
+          candidate_infos << info
         end
         n_in_args = info.n_in_args
         min_n_args = [min_n_args || n_in_args, n_in_args].min
         max_n_args = [max_n_args || n_in_args, n_in_args].max
       end
+
+      if candidate_infos.size == 1
+        return candidate_infos.first
+      elsif candidate_infos.size > 1
+        candidate_info = candidate_infos.find do |info|
+          info.in_args.each.with_index.all? do |arg_info, i|
+            match_argument?(arg_info, arguments[i])
+          end
+        end
+        return candidate_info || candidate_infos.first
+      end
+
       detail = "#{arguments.size} for #{min_n_args}"
       if min_n_args < max_n_args
         detail << "..#{max_n_args}"
@@ -267,6 +330,16 @@ module GObjectIntrospection
       raise ArgumentError, "wrong number of arguments (#{detail})"
     end
 
+    def match_argument?(arg_info, argument)
+      case arg_info.type.tag
+      when TypeTag::UTF8
+        argument.is_a?(String)
+      else
+        # TODO
+        false
+      end
+    end
+
     def rubyish_method_name(function_info)
       name = function_info.name
       return_type = function_info.return_type
@@ -332,23 +405,7 @@ module GObjectIntrospection
         name = rubyish_method_name(info)
         next if name == "new"
         next if name == "alloc"
-        unlock_gvl = should_unlock_gvl?(info, klass)
-        validate = lambda do |arguments|
-          validate_arguments(info, "#{klass}.#{name}", arguments)
-        end
-        singleton_class = (class << klass; self; end)
-        singleton_class.__send__(:define_method, name) do |*arguments, &block|
-          validate.call(arguments, &block)
-          if block.nil? and info.require_callback?
-            Enumerator.new(self, name, *arguments)
-          else
-            info.invoke({
-                          :arguments => arguments,
-                          :unlock_gvl => unlock_gvl,
-                        },
-                        &block)
-          end
-        end
+        define_singleton_method(klass, name, info)
       end
     end
 

data/test/test-enum-info.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2012  Ruby-GNOME2 Project Team
+# Copyright (C) 2012-2014  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
@@ -53,4 +53,9 @@ class TestEnumInfo < Test::Unit::TestCase
     assert_equal(GObjectIntrospection::TypeTag::UINT32,
                  @info.storage_type)
   end
+
+  def test_error_domain
+    assert_equal("g-resource-error-quark",
+                 @info.error_domain)
+  end
 end

data/test/test-interface-info.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2012  Ruby-GNOME2 Project Team
+# Copyright (C) 2012-2014  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
@@ -67,9 +67,9 @@ class TestInterfaceInfo < Test::Unit::TestCase
   end
 
   def test_get_signal_name
-    require_version(1, 34, 0)
+    require_version(1, 36, 0)
     info = @repository.find("Gio", "Volume")
-    assert_kind_of(GObjectIntrospection::FunctionInfo,
+    assert_kind_of(GObjectIntrospection::SignalInfo,
                    info.get_signal("changed"))
   end
 

data/test/test-repository.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2012  Ruby-GNOME2 Project Team
+# Copyright (C) 2012-2014  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
@@ -15,6 +15,8 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 class TestRepository < Test::Unit::TestCase
+  include GObjectIntrospectionTestUtils
+
   def setup
     @repository = GObjectIntrospection::Repository.default
     @repository.require("GObject")
@@ -31,7 +33,8 @@ class TestRepository < Test::Unit::TestCase
   end
 
   def test_get_dependencies
-    assert_equal(["GLib-2.0", "GObject-2.0"].sort,
+    require_version(1, 36, 0)
+    assert_equal(["GObject-2.0"].sort,
                  @repository.get_dependencies("Gio").sort)
   end
 

data/test/test-signal-info.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2012  Ruby-GNOME2 Project Team
+# Copyright (C) 2012-2014  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
@@ -15,15 +15,18 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 class TestSignalInfo < Test::Unit::TestCase
+  include GObjectIntrospectionTestUtils
+
   def setup
     @repository = GObjectIntrospection::Repository.default
     @repository.require("Gio")
     @object_info = @repository.find("Gio", "Application")
-    @info = @object_info.get_signal(0)
+    @info = @object_info.signals.find {|info| info.name == "startup"}
   end
 
   def test_flags
-    assert_equal(GLib::SignalFlags::RUN_CLEANUP,
+    require_version(1, 39, 0)
+    assert_equal(GLib::SignalFlags::RUN_LAST,
                  @info.flags)
   end
 

data/test/test-struct-info.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2012  Ruby-GNOME2 Project Team
+# Copyright (C) 2012-2014  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
@@ -40,11 +40,11 @@ class TestStructInfo < Test::Unit::TestCase
   end
 
   def test_size
-    assert_equal(24, @info.size)
+    assert_operator(@info.size, :>=, 20)
   end
 
   def test_alignment
-    assert_equal(8, @info.alignment)
+    assert_operator(@info.alignment, :>=, 4)
   end
 
   def test_gtype_struct?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gobject-introspection
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - The Ruby-GNOME2 Project Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-29 00:00:00.000000000 Z
+date: 2014-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: glib2
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.2.0
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement