gobject-introspection 1.2.3 → 1.2.4

data/lib/gobject-introspection/loader.rb

@@ -17,19 +17,22 @@
 module GObjectIntrospection
   class Loader
     class << self
-      def load(namespace, base_module)
+      def load(namespace, base_module, options={})
         loader = new(base_module)
+        loader.version = options[:version]
         loader.load(namespace)
       end
     end
 
+    attr_accessor :version
     def initialize(base_module)
       @base_module = base_module
+      @version = nil
     end
 
     def load(namespace)
       repository = Repository.default
-      repository.require(namespace)
+      repository.require(namespace, @version)
       pre_load(repository, namespace)
       repository.each(namespace) do |info|
         load_info(info)
@@ -72,7 +75,8 @@ module GObjectIntrospection
 
     def define_module_function(target_module, name, function_info)
       validate = lambda do |arguments|
-        validate_arguments(function_info, arguments)
+        method_name = "#{target_module}\#.#{name}"
+        validate_arguments(function_info, method_name, arguments)
       end
       target_module.module_eval do
         define_method(name) do |*arguments, &block|
@@ -181,13 +185,13 @@ module GObjectIntrospection
     def load_constructor_infos(infos, klass)
       return if infos.empty?
 
-      validate = lambda do |info, arguments|
-        validate_arguments(info, arguments)
+      validate = lambda do |info, method_name, arguments|
+        validate_arguments(info, "#{klass}\##{method_name}", arguments)
       end
       infos.each do |info|
         name = "initialize_#{info.name}"
         klass.__send__(:define_method, name) do |*arguments, &block|
-          validate.call(info, arguments, &block)
+          validate.call(info, name, arguments, &block)
           info.invoke(self, *arguments, &block)
         end
         klass.__send__(:private, name)
@@ -202,7 +206,7 @@ module GObjectIntrospection
       end
     end
 
-    def validate_arguments(info, arguments)
+    def validate_arguments(info, method_name, arguments)
       n_in_args = info.n_in_args
       n_required_in_args = info.n_required_in_args
       return if (n_required_in_args..n_in_args).cover?(arguments.size)
@@ -213,7 +217,8 @@ module GObjectIntrospection
       else
         detail << "#{info.n_required_in_args}..#{info.n_in_args}"
       end
-      raise ArgumentError, "wrong number of arguments (#{detail})"
+      message = "#{method_name}: wrong number of arguments (#{detail})"
+      raise ArgumentError, message
     end
 
     def find_suitable_callable_info(infos, arguments)
@@ -272,7 +277,7 @@ module GObjectIntrospection
 
     def load_method_info(info, klass, method_name)
       validate = lambda do |arguments|
-        validate_arguments(info, arguments)
+        validate_arguments(info, "#{klass}\##{method_name}", arguments)
       end
       klass.__send__(:define_method, method_name) do |*arguments, &block|
         validate.call(arguments, &block)
@@ -290,7 +295,7 @@ module GObjectIntrospection
         next if name == "new"
         next if name == "alloc"
         validate = lambda do |arguments|
-          validate_arguments(info, arguments)
+          validate_arguments(info, "#{klass}.#{name}", arguments)
         end
         singleton_class = (class << klass; self; end)
         singleton_class.__send__(:define_method, name) do |*arguments, &block|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gobject-introspection
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.2.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-17 00:00:00.000000000 Z
+date: 2013-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: glib2
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.2.3
+        version: 1.2.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.2.3
+        version: 1.2.4
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement