gobject-introspection 1.2.1 → 1.2.2

data/lib/gobject-introspection/loader.rb

@@ -50,6 +50,8 @@ module GObjectIntrospection
         load_function_info(info)
       when StructInfo
         load_struct_info(info)
+      when FlagsInfo
+        load_flags_info(info)
       when EnumInfo
         load_enum_info(info)
       when ObjectInfo
@@ -64,12 +66,17 @@ module GObjectIntrospection
     end
 
     def load_function_info(info)
-      define_module_function(@base_module, info.name, info)
+      name = rubyish_method_name(info)
+      define_module_function(@base_module, name, info)
     end
 
     def define_module_function(target_module, name, function_info)
+      validate = lambda do |arguments|
+        validate_arguments(function_info, arguments)
+      end
       target_module.module_eval do
         define_method(name) do |*arguments, &block|
+          validate.call(arguments, &block)
           function_info.invoke(*arguments, &block)
         end
         module_function(name)
@@ -82,7 +89,7 @@ module GObjectIntrospection
                                          :parent => options[:parent])
       else
         klass = self.class.define_class(info.gtype, info.name, @base_module,
-                                         :parent => options[:parent])
+                                        :parent => options[:parent])
       end
       load_fields(info, klass)
       load_methods(info, klass)
@@ -94,8 +101,36 @@ module GObjectIntrospection
       define_struct(info)
     end
 
+    def load_enum_value(value_info, enum_module)
+      enum_module.const_set(value_info.name.upcase, value_info.value)
+    end
+
     def load_enum_info(info)
-      self.class.define_class(info.gtype, info.name, @base_module)
+      if info.gtype == GLib::Type::NONE
+        enum_module = Module.new
+        info.values.each do |value_info|
+          load_enum_value(value_info, enum_module)
+        end
+        @base_module.const_set(info.name, enum_module)
+      else
+        self.class.define_class(info.gtype, info.name, @base_module)
+      end
+    end
+
+    def load_flag_value(value_info, flags_module)
+      flags_module.const_set(value_info.name.upcase, value_info.value)
+    end
+
+    def load_flags_info(info)
+      if info.gtype == GLib::Type::NONE
+        flags_module = Module.new
+        info.values.each do |value_info|
+          load_flag_value(value_info, flags_module)
+        end
+        @base_module.const_set(info.name, flags_module)
+      else
+        self.class.define_class(info.gtype, info.name, @base_module)
+      end
     end
 
     def load_object_info(info)
@@ -111,7 +146,7 @@ module GObjectIntrospection
         flags = field_info.flags
 
         if flags.readable?
-          klass.__send__(:define_method, name) do
+          klass.__send__(:define_method, name) do ||
             info.get_field_value(self, i)
           end
         end
@@ -155,6 +190,7 @@ module GObjectIntrospection
           validate.call(info, arguments, &block)
           info.invoke(self, *arguments, &block)
         end
+        klass.__send__(:private, name)
       end
 
       find_info = lambda do |arguments|
@@ -167,10 +203,17 @@ module GObjectIntrospection
     end
 
     def validate_arguments(info, arguments)
-      if arguments.size != info.n_in_args
-        details = "#{arguments.size} for #{info.n_in_args}"
-        raise ArgumentError, "wrong number of arguments (#{detail})"
+      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)
+
+      detail = "#{arguments.size} for "
+      if n_in_args == n_required_in_args
+        detail << "#{info.n_in_args}"
+      else
+        detail << "#{info.n_required_in_args}..#{info.n_in_args}"
       end
+      raise ArgumentError, "wrong number of arguments (#{detail})"
     end
 
     def find_suitable_callable_info(infos, arguments)
@@ -191,9 +234,9 @@ module GObjectIntrospection
       raise ArgumentError, "wrong number of arguments (#{detail})"
     end
 
-    def rubyish_method_name(method_info)
-      name = method_info.name
-      return_type = method_info.return_type
+    def rubyish_method_name(function_info)
+      name = function_info.name
+      return_type = function_info.return_type
       if return_type.tag == GObjectIntrospection::TypeTag::BOOLEAN
         case name
         when /\A(?:is|get_is|get)_/
@@ -203,10 +246,17 @@ module GObjectIntrospection
         else
           name
         end
-      elsif /\Aget_/ =~ name and method_info.n_in_args.zero?
+      elsif /\Aget_/ =~ name and function_info.n_in_args.zero?
         $POSTMATCH
       else
-        name
+        case name
+        when "to_string"
+          "to_s"
+        when "foreach"
+          "each"
+        else
+          name
+        end
       end
     end
 
@@ -221,19 +271,35 @@ module GObjectIntrospection
     end
 
     def load_method_info(info, klass, method_name)
+      validate = lambda do |arguments|
+        validate_arguments(info, arguments)
+      end
       klass.__send__(:define_method, method_name) do |*arguments, &block|
-        info.invoke(self, *arguments, &block)
+        validate.call(arguments, &block)
+        if block.nil? and info.require_callback?
+          Enumerator.new(self, method_name, *arguments)
+        else
+          info.invoke(self, *arguments, &block)
+        end
       end
     end
 
     def load_function_infos(infos, klass)
       infos.each do |info|
-        name = info.name
+        name = rubyish_method_name(info)
         next if name == "new"
         next if name == "alloc"
+        validate = lambda do |arguments|
+          validate_arguments(info, arguments)
+        end
         singleton_class = (class << klass; self; end)
         singleton_class.__send__(:define_method, name) do |*arguments, &block|
-          info.invoke(*arguments, &block)
+          validate.call(arguments, &block)
+          if block.nil? and info.require_callback?
+            Enumerator.new(self, name, *arguments)
+          else
+            info.invoke(*arguments, &block)
+          end
         end
       end
     end

metadata

@@ -1,163 +1,147 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: gobject-introspection
-version: !ruby/object:Gem::Version 
-  hash: 29
+version: !ruby/object:Gem::Version
+  version: 1.2.2
   prerelease: 
-  segments: 
-  - 1
-  - 2
-  - 1
-  version: 1.2.1
 platform: ruby
-authors: 
+authors:
 - The Ruby-GNOME2 Project Team
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-01-30 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-03-11 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: glib2
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 29
-        segments: 
-        - 1
-        - 2
-        - 1
-        version: 1.2.1
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.2.2
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: test-unit
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.2.2
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 2
-        version: "2"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '2'
   type: :development
-  version_requirements: *id002
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '2'
 description: Ruby/GObjectIntrospection is a Ruby binding of GObjectIntrospection.
 email: ruby-gnome2-devel-en@lists.sourceforge.net
 executables: []
-
-extensions: 
+extensions:
 - ext/gobject-introspection/extconf.rb
 extra_rdoc_files: []
-
-files: 
+files:
 - Rakefile
 - extconf.rb
 - lib/gobject-introspection.rb
+- lib/gobject-introspection/callable-info.rb
+- lib/gobject-introspection/collection-reader.rb
 - lib/gobject-introspection/interface-info.rb
-- lib/gobject-introspection/union-info.rb
-- lib/gobject-introspection/object-info.rb
 - lib/gobject-introspection/loader.rb
-- lib/gobject-introspection/callable-info.rb
+- lib/gobject-introspection/object-info.rb
 - lib/gobject-introspection/repository.rb
-- lib/gobject-introspection/collection-reader.rb
 - lib/gobject-introspection/struct-info.rb
-- ext/gobject-introspection/rb-gi-union-info.c
+- lib/gobject-introspection/union-info.rb
+- ext/gobject-introspection/depend
+- ext/gobject-introspection/extconf.rb
+- ext/gobject-introspection/rb-gi-arg-info.c
 - ext/gobject-introspection/rb-gi-argument.c
+- ext/gobject-introspection/rb-gi-base-info.c
+- ext/gobject-introspection/rb-gi-boxed-info.c
+- ext/gobject-introspection/rb-gi-callable-info.c
 - ext/gobject-introspection/rb-gi-callback-info.c
+- ext/gobject-introspection/rb-gi-constant-info.c
+- ext/gobject-introspection/rb-gi-constructor-info.c
+- ext/gobject-introspection/rb-gi-conversions.h
+- ext/gobject-introspection/rb-gi-enum-info.c
+- ext/gobject-introspection/rb-gi-field-info.c
+- ext/gobject-introspection/rb-gi-flags-info.c
+- ext/gobject-introspection/rb-gi-function-info.c
+- ext/gobject-introspection/rb-gi-interface-info.c
+- ext/gobject-introspection/rb-gi-loader.c
 - ext/gobject-introspection/rb-gi-method-info.c
+- ext/gobject-introspection/rb-gi-object-info.c
+- ext/gobject-introspection/rb-gi-private.h
+- ext/gobject-introspection/rb-gi-property-info.c
 - ext/gobject-introspection/rb-gi-registered-type-info.c
-- ext/gobject-introspection/rb-gi-conversions.h
 - ext/gobject-introspection/rb-gi-repository.c
-- ext/gobject-introspection/rb-gi-struct-info.c
-- ext/gobject-introspection/rb-gobject-introspection.h
 - ext/gobject-introspection/rb-gi-signal-info.c
-- ext/gobject-introspection/rb-gi-flags-info.c
-- ext/gobject-introspection/rb-gi-property-info.c
+- ext/gobject-introspection/rb-gi-struct-info.c
+- ext/gobject-introspection/rb-gi-type-info.c
+- ext/gobject-introspection/rb-gi-type-tag.c
 - ext/gobject-introspection/rb-gi-types.h
+- ext/gobject-introspection/rb-gi-union-info.c
 - ext/gobject-introspection/rb-gi-unresolved-info.c
-- ext/gobject-introspection/rb-gi-boxed-info.c
 - ext/gobject-introspection/rb-gi-value-info.c
-- ext/gobject-introspection/extconf.rb
-- ext/gobject-introspection/rb-gobject-introspection.c
-- ext/gobject-introspection/rb-gi-function-info.c
-- ext/gobject-introspection/rb-gi-field-info.c
-- ext/gobject-introspection/rb-gi-object-info.c
-- ext/gobject-introspection/rb-gi-constant-info.c
-- ext/gobject-introspection/rb-gi-arg-info.c
-- ext/gobject-introspection/rb-gi-type-info.c
-- ext/gobject-introspection/rb-gi-constructor-info.c
-- ext/gobject-introspection/rb-gi-base-info.c
-- ext/gobject-introspection/rb-gi-loader.c
-- ext/gobject-introspection/rb-gi-callable-info.c
-- ext/gobject-introspection/rb-gi-interface-info.c
-- ext/gobject-introspection/rb-gi-enum-info.c
 - ext/gobject-introspection/rb-gi-vfunc-info.c
-- ext/gobject-introspection/rb-gi-type-tag.c
-- test/test-type-info.rb
-- test/test-union-info.rb
-- test/test-interface-info.rb
-- test/test-enum-info.rb
-- test/test-arg-info.rb
-- test/test-repository.rb
-- test/test-type-tag.rb
-- test/test-loader.rb
-- test/test-struct-info.rb
-- test/test-flags-info.rb
-- test/test-registered-type-info.rb
-- test/test-property-info.rb
-- test/test-constant-info.rb
+- ext/gobject-introspection/rb-gobject-introspection.c
+- ext/gobject-introspection/rb-gobject-introspection.h
+- test/gobject-introspection-test-utils.rb
 - test/run-test.rb
-- test/test-function-info.rb
-- test/test-callable-info.rb
+- test/test-arg-info.rb
 - test/test-base-info.rb
+- test/test-boxed-info.rb
+- test/test-callable-info.rb
 - test/test-callback-info.rb
-- test/gobject-introspection-test-utils.rb
+- test/test-constant-info.rb
+- test/test-enum-info.rb
 - test/test-field-type.rb
-- test/test-vfunc-info.rb
-- test/test-signal-info.rb
+- test/test-flags-info.rb
+- test/test-function-info.rb
+- test/test-interface-info.rb
+- test/test-loader.rb
 - test/test-object-info.rb
-- test/test-boxed-info.rb
+- test/test-property-info.rb
+- test/test-registered-type-info.rb
+- test/test-repository.rb
+- test/test-signal-info.rb
+- test/test-struct-info.rb
+- test/test-type-info.rb
+- test/test-type-tag.rb
+- test/test-union-info.rb
 - test/test-value-info.rb
+- test/test-vfunc-info.rb
 homepage: http://ruby-gnome2.sourceforge.jp/
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 61
-      segments: 
-      - 1
-      - 8
-      - 5
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.8.5
-required_rubygems_version: !ruby/object:Gem::Requirement 
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Ruby/GObjectIntrospection is a Ruby binding of GObjectIntrospection.
 test_files: []
-