gir_ffi 0.3.1 → 0.3.2

data/History.txt

@@ -1,3 +1,8 @@
+== 0.3.2 / 2012-08-24
+
+* Correctly set FFI return type when callbacks that return GObjects have
+  incomplete type specification.
+
 == 0.3.1 / 2012-05-13
 
 * Correctly map Interface types in callbacks.

data/lib/ffi-gobject/helper.rb

@@ -1,15 +1,31 @@
 module GObject
   module Helper
+    # Create a signal hander callback. Wraps the given block in such a way that
+    # arguments and return value are cast correctly to the ruby world and back.
+    #
+    # @param  klass   The class of the object that will receive the signal.
+    # @param  signal  The name of the signal
+    # @param  &block  The body of the signal handler
+    #
+    # @returns [FFI::Function] The signal handler, ready to be passed as a
+    # callback to C.
     def self.signal_callback klass, signal, &block
-      sig = klass._find_signal signal
+      sig_info = klass._find_signal signal
 
-      rettype = GirFFI::Builder.itypeinfo_to_ffitype sig.return_type
-      argtypes = GirFFI::Builder.ffi_argument_types_for_signal sig
-      callback_block = Helper.signal_callback_args(sig, klass, &block)
+      callback_block = signal_callback_args(sig_info, klass, &block)
 
-      FFI::Function.new rettype, argtypes, &callback_block
+      builder.build_callback sig_info, &callback_block
     end
 
+    def self.builder= bldr
+      @builder = bldr
+    end
+
+    def self.builder
+      @builder ||= GirFFI::Builder
+    end
+
+    # FIXME: Move either to ISignalInfo or the base GObject class.
     def self.signal_callback_args sig, klass, &block
       raise ArgumentError, "Block needed" if block.nil?
       return Proc.new do |*args|
@@ -21,7 +37,7 @@ module GObject
     def self.signal_arguments_to_gvalue_array signal, instance, *rest
       sig = instance.class._find_signal signal
 
-      arr = ::GObject::ValueArray.new sig.n_args+1
+      arr = ::GObject::ValueArray.new sig.n_args + 1
 
       arr.append signal_reciever_to_gvalue instance
 
@@ -85,6 +101,8 @@ module GObject
         case iface.info_type
         when :enum, :flags
           kls[arg]
+        when :interface
+          arg.to_object
         else
           kls.wrap(arg)
         end

data/lib/gir_ffi/builder.rb

@@ -31,6 +31,13 @@ module GirFFI
       Builder::Module.new(namespace, version).build_module_non_recursive
     end
 
+    def self.build_callback callable_info, &block
+      rettype = ffi_callback_return_type callable_info
+      argtypes = ffi_callback_argument_types callable_info
+
+      FFI::Function.new rettype, argtypes, &block
+    end
+
     # TODO: Move elsewhere, perhaps to Builder::Function.
     def self.attach_ffi_function lib, info
       sym = info.symbol
@@ -52,13 +59,17 @@ module GirFFI
       types
     end
 
-    def self.ffi_argument_types_for_signal info
+    def self.ffi_callback_argument_types info
       types = info.args.map do |arg|
         itypeinfo_to_callback_ffitype arg.argument_type
       end
       types.unshift(:pointer).push(:pointer)
     end
 
+    def self.ffi_callback_return_type info
+      ffi_function_return_type info
+    end
+
     def self.ffi_function_return_type info
       rt = info.return_type
       # FIXME: Workaround for older gobject-introspection not identifying all

data/lib/gir_ffi/version.rb

@@ -1,4 +1,4 @@
 module GirFFI
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end
 

data/test/ffi-gobject/g_object_overrides_test.rb

@@ -200,6 +200,21 @@ class GObjectOverridesTest < MiniTest::Spec
             assert_equal :july, res
           end
         end
+
+        describe "with info for an interface" do
+          before do
+            ifaceinfo = get_introspection_data 'Regress', 'TestInterface'
+            stub(arg_t = Object.new).interface { ifaceinfo }
+            stub(arg_t).tag { :interface }
+            stub(@info = Object.new).argument_type { arg_t }
+          end
+
+          it "casts the argument by calling #to_object on it" do
+            mock(ptr = Object.new).to_object { "good-result" }
+            res = GObject::Helper.cast_signal_argument @info, ptr
+            res.must_equal "good-result"
+          end
+        end
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gir_ffi
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-13 00:00:00.000000000 Z
+date: 2012-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
-  requirement: &16863900 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,15 @@ dependencies:
         version: 1.0.8
   type: :runtime
   prerelease: false
-  version_requirements: *16863900
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.8
 - !ruby/object:Gem::Dependency
   name: indentation
-  requirement: &16863300 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +37,15 @@ dependencies:
         version: 0.0.6
   type: :runtime
   prerelease: false
-  version_requirements: *16863300
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.0.6
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &16862540 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +53,15 @@ dependencies:
         version: 2.0.2
   type: :development
   prerelease: false
-  version_requirements: *16862540
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.0.2
 - !ruby/object:Gem::Dependency
   name: rr
-  requirement: &16861560 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +69,15 @@ dependencies:
         version: 1.0.2
   type: :development
   prerelease: false
-  version_requirements: *16861560
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.2
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &16861080 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,7 +85,12 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *16861080
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.2
 description: 
 email:
 - matijs@matijs.net
@@ -77,183 +102,183 @@ extra_rdoc_files:
 - README.rdoc
 - TODO.rdoc
 files:
-- lib/ffi-gtk3.rb
-- lib/gir_ffi.rb
-- lib/ffi-gtk/base.rb
 - lib/ffi-gtk2.rb
-- lib/ffi-gobject_introspection/i_field_info.rb
-- lib/ffi-gobject_introspection/i_flags_info.rb
-- lib/ffi-gobject_introspection/g_error.rb
-- lib/ffi-gobject_introspection/i_object_info.rb
-- lib/ffi-gobject_introspection/i_enum_info.rb
-- lib/ffi-gobject_introspection/i_value_info.rb
-- lib/ffi-gobject_introspection/i_signal_info.rb
-- lib/ffi-gobject_introspection/i_callback_info.rb
-- lib/ffi-gobject_introspection/lib.rb
-- lib/ffi-gobject_introspection/i_property_info.rb
-- lib/ffi-gobject_introspection/i_registered_type_info.rb
-- lib/ffi-gobject_introspection/i_repository.rb
-- lib/ffi-gobject_introspection/i_vfunc_info.rb
-- lib/ffi-gobject_introspection/i_constant_info.rb
-- lib/ffi-gobject_introspection/i_struct_info.rb
-- lib/ffi-gobject_introspection/i_callable_info.rb
-- lib/ffi-gobject_introspection/i_function_info.rb
-- lib/ffi-gobject_introspection/i_base_info.rb
-- lib/ffi-gobject_introspection/i_union_info.rb
-- lib/ffi-gobject_introspection/gobject_lib.rb
-- lib/ffi-gobject_introspection/i_interface_info.rb
-- lib/ffi-gobject_introspection/i_arg_info.rb
-- lib/ffi-gobject_introspection/i_type_info.rb
 - lib/ffi-gobject_introspection.rb
-- lib/ffi-glib.rb
-- lib/ffi-gobject.rb
-- lib/ffi-glib/array.rb
-- lib/ffi-glib/ptr_array.rb
-- lib/ffi-glib/list.rb
-- lib/ffi-glib/container_class_methods.rb
-- lib/ffi-glib/list_methods.rb
-- lib/ffi-glib/strv.rb
-- lib/ffi-glib/hash_table.rb
-- lib/ffi-glib/byte_array.rb
-- lib/ffi-glib/s_list.rb
+- lib/gir_ffi.rb
+- lib/ffi-gtk/base.rb
 - lib/gir_ffi/lib_c.rb
-- lib/gir_ffi/builder_helper.rb
-- lib/gir_ffi/builder.rb
-- lib/gir_ffi/in_out_pointer.rb
-- lib/gir_ffi/builder/argument/base.rb
-- lib/gir_ffi/builder/argument/in_base.rb
-- lib/gir_ffi/builder/argument/out_base.rb
-- lib/gir_ffi/builder/argument/in_out_base.rb
-- lib/gir_ffi/builder/property.rb
-- lib/gir_ffi/builder/module.rb
 - lib/gir_ffi/builder/function.rb
-- lib/gir_ffi/builder/type/with_methods.rb
-- lib/gir_ffi/builder/type/base.rb
 - lib/gir_ffi/builder/type/constant.rb
-- lib/gir_ffi/builder/type/interface.rb
-- lib/gir_ffi/builder/type/struct_based.rb
-- lib/gir_ffi/builder/type/struct.rb
-- lib/gir_ffi/builder/type/enum.rb
-- lib/gir_ffi/builder/type/registered_type.rb
-- lib/gir_ffi/builder/type/callback.rb
-- lib/gir_ffi/builder/type/unintrospectable.rb
-- lib/gir_ffi/builder/type/with_layout.rb
 - lib/gir_ffi/builder/type/union.rb
+- lib/gir_ffi/builder/type/base.rb
+- lib/gir_ffi/builder/type/callback.rb
 - lib/gir_ffi/builder/type/user_defined.rb
+- lib/gir_ffi/builder/type/unintrospectable.rb
 - lib/gir_ffi/builder/type/object.rb
-- lib/gir_ffi/builder/type.rb
+- lib/gir_ffi/builder/type/with_methods.rb
+- lib/gir_ffi/builder/type/with_layout.rb
+- lib/gir_ffi/builder/type/struct_based.rb
+- lib/gir_ffi/builder/type/enum.rb
+- lib/gir_ffi/builder/type/interface.rb
+- lib/gir_ffi/builder/type/registered_type.rb
+- lib/gir_ffi/builder/type/struct.rb
 - lib/gir_ffi/builder/field.rb
+- lib/gir_ffi/builder/type.rb
+- lib/gir_ffi/builder/module.rb
+- lib/gir_ffi/builder/property.rb
 - lib/gir_ffi/builder/argument.rb
-- lib/gir_ffi/interface_base.rb
-- lib/gir_ffi/module_base.rb
-- lib/gir_ffi/class_base.rb
-- lib/gir_ffi/callback_helper.rb
-- lib/gir_ffi/in_pointer.rb
-- lib/gir_ffi/user_defined/i_object_info.rb
+- lib/gir_ffi/builder/argument/base.rb
+- lib/gir_ffi/builder/argument/out_base.rb
+- lib/gir_ffi/builder/argument/in_out_base.rb
+- lib/gir_ffi/builder/argument/in_base.rb
+- lib/gir_ffi/method_stubber.rb
+- lib/gir_ffi/arg_helper.rb
+- lib/gir_ffi/allocation_helper.rb
+- lib/gir_ffi/type_map.rb
 - lib/gir_ffi/user_defined/i_property_info.rb
-- lib/gir_ffi/user_defined/i_registered_type_info.rb
 - lib/gir_ffi/user_defined/i_base_info.rb
+- lib/gir_ffi/user_defined/i_object_info.rb
+- lib/gir_ffi/user_defined/i_registered_type_info.rb
+- lib/gir_ffi/ffi_ext/pointer.rb
+- lib/gir_ffi/builder_helper.rb
 - lib/gir_ffi/variable_name_generator.rb
+- lib/gir_ffi/in_pointer.rb
+- lib/gir_ffi/in_out_pointer.rb
 - lib/gir_ffi/version.rb
+- lib/gir_ffi/callback_helper.rb
+- lib/gir_ffi/builder.rb
+- lib/gir_ffi/interface_base.rb
+- lib/gir_ffi/info_ext/i_type_info.rb
 - lib/gir_ffi/info_ext/i_field_info.rb
 - lib/gir_ffi/info_ext/i_property_info.rb
-- lib/gir_ffi/info_ext/i_type_info.rb
-- lib/gir_ffi/allocation_helper.rb
-- lib/gir_ffi/ffi_ext/pointer.rb
-- lib/gir_ffi/method_stubber.rb
-- lib/gir_ffi/arg_helper.rb
-- lib/gir_ffi/type_map.rb
+- lib/gir_ffi/module_base.rb
+- lib/gir_ffi/class_base.rb
 - lib/ffi-gobject/ruby_style.rb
 - lib/ffi-gobject/ruby_closure.rb
 - lib/ffi-gobject/base.rb
+- lib/ffi-gobject/object.rb
 - lib/ffi-gobject/value.rb
-- lib/ffi-gobject/closure.rb
-- lib/ffi-gobject/initially_unowned.rb
 - lib/ffi-gobject/helper.rb
-- lib/ffi-gobject/object.rb
-- test/gir_ffi_test_helper.rb
-- test/lib/Makefile.am
-- test/lib/autogen.sh
-- test/lib/configure.ac
-- test/lib/m4/jhflags.m4
-- test/ffi-gtk/gtk_test.rb
-- test/ffi-gobject_introspection/i_repository_test.rb
-- test/ffi-gobject_introspection/i_object_info_test.rb
-- test/ffi-gobject_introspection/i_base_info_test.rb
-- test/ffi-gobject_introspection/lib_test.rb
-- test/ffi-gobject_introspection/i_function_info_test.rb
-- test/ffi-gobject_introspection/i_constant_info_test.rb
+- lib/ffi-gobject/initially_unowned.rb
+- lib/ffi-gobject/closure.rb
+- lib/ffi-glib.rb
+- lib/ffi-glib/container_class_methods.rb
+- lib/ffi-glib/array.rb
+- lib/ffi-glib/list.rb
+- lib/ffi-glib/hash_table.rb
+- lib/ffi-glib/list_methods.rb
+- lib/ffi-glib/strv.rb
+- lib/ffi-glib/byte_array.rb
+- lib/ffi-glib/ptr_array.rb
+- lib/ffi-glib/s_list.rb
+- lib/ffi-gobject_introspection/i_struct_info.rb
+- lib/ffi-gobject_introspection/i_callback_info.rb
+- lib/ffi-gobject_introspection/i_arg_info.rb
+- lib/ffi-gobject_introspection/i_type_info.rb
+- lib/ffi-gobject_introspection/i_function_info.rb
+- lib/ffi-gobject_introspection/i_callable_info.rb
+- lib/ffi-gobject_introspection/i_field_info.rb
+- lib/ffi-gobject_introspection/gobject_lib.rb
+- lib/ffi-gobject_introspection/i_vfunc_info.rb
+- lib/ffi-gobject_introspection/i_interface_info.rb
+- lib/ffi-gobject_introspection/i_property_info.rb
+- lib/ffi-gobject_introspection/i_enum_info.rb
+- lib/ffi-gobject_introspection/lib.rb
+- lib/ffi-gobject_introspection/i_repository.rb
+- lib/ffi-gobject_introspection/i_constant_info.rb
+- lib/ffi-gobject_introspection/i_value_info.rb
+- lib/ffi-gobject_introspection/i_signal_info.rb
+- lib/ffi-gobject_introspection/i_union_info.rb
+- lib/ffi-gobject_introspection/i_base_info.rb
+- lib/ffi-gobject_introspection/i_object_info.rb
+- lib/ffi-gobject_introspection/i_flags_info.rb
+- lib/ffi-gobject_introspection/i_registered_type_info.rb
+- lib/ffi-gobject_introspection/g_error.rb
+- lib/ffi-gobject.rb
+- lib/ffi-gtk3.rb
 - test/test_helper.rb
-- test/girffi_test.rb
-- test/unit/user_defined_object_info_test.rb
-- test/unit/union_builder_test.rb
+- test/unit/user_defined_registered_type_info_test.rb
 - test/unit/unintrospectable_type_builder_test.rb
-- test/unit/argument_builder_test.rb
+- test/unit/user_defined_type_builder_test.rb
+- test/unit/object_type_builder_test.rb
 - test/unit/user_defined_property_info_test.rb
-- test/unit/callback_builder_test.rb
-- test/unit/arg_helper_test.rb
 - test/unit/i_type_info_test.rb
-- test/unit/user_defined_registered_type_info_test.rb
+- test/unit/enum_builder_test.rb
 - test/unit/constant_builder_test.rb
-- test/unit/class_base_test.rb
+- test/unit/builder_test.rb
+- test/unit/in_pointer_test.rb
+- test/unit/in_out_pointer_test.rb
+- test/unit/arg_helper_test.rb
 - test/unit/function_builder_test.rb
-- test/unit/module_builder_test.rb
+- test/unit/variable_name_generator_test.rb
+- test/unit/callback_helper_test.rb
+- test/unit/struct_builder_test.rb
+- test/unit/class_base_test.rb
+- test/unit/union_builder_test.rb
+- test/unit/callback_builder_test.rb
+- test/unit/argument_builder_test.rb
+- test/unit/interface_builder_test.rb
 - test/unit/hash_table_element_type_provider_test.rb
+- test/unit/i_field_info_test.rb
+- test/unit/user_defined_object_info_test.rb
 - test/unit/list_element_type_provider_test.rb
-- test/unit/interface_builder_test.rb
-- test/unit/in_out_pointer_test.rb
-- test/unit/callback_helper_test.rb
-- test/unit/builder_test.rb
-- test/unit/in_pointer_test.rb
-- test/unit/enum_builder_test.rb
+- test/unit/module_builder_test.rb
 - test/unit/gir_ffi_test.rb
-- test/unit/i_field_info_test.rb
-- test/unit/struct_builder_test.rb
-- test/unit/object_type_builder_test.rb
-- test/unit/user_defined_type_builder_test.rb
-- test/unit/variable_name_generator_test.rb
-- test/type_builder_test.rb
+- test/lib/configure.ac
+- test/lib/Makefile.am
+- test/lib/m4/jhflags.m4
+- test/lib/autogen.sh
 - test/builder_test.rb
-- test/integration/generated_regress_test.rb
-- test/integration/pretty_print_test.rb
-- test/integration/generated_pango_test.rb
+- test/gir_ffi_test_helper.rb
+- test/ffi-gtk/gtk_test.rb
 - test/integration/derived_classes_test.rb
+- test/integration/generated_regress_test.rb
 - test/integration/method_lookup_test.rb
+- test/integration/generated_gimarshallingtests_test.rb
+- test/integration/generated_gio_test.rb
 - test/integration/generated_gtk_test.rb
+- test/integration/pretty_print_test.rb
+- test/integration/generated_pango_test.rb
 - test/integration/generated_gobject_test.rb
-- test/integration/generated_gio_test.rb
-- test/integration/generated_gimarshallingtests_test.rb
+- test/ffi-gobject/g_object_overrides_test.rb
+- test/ffi-gobject/object_class_test.rb
+- test/ffi-gobject/object_test.rb
+- test/ffi-gobject/gobject_test.rb
+- test/ffi-gobject/value_test.rb
+- test/ffi-gobject/ruby_style_test.rb
 - test/ffi-glib/s_list_test.rb
-- test/ffi-glib/array_test.rb
 - test/ffi-glib/hash_table_test.rb
-- test/ffi-glib/byte_array_test.rb
-- test/ffi-glib/strv_test.rb
-- test/ffi-glib/glib_overrides_test.rb
 - test/ffi-glib/list_test.rb
+- test/ffi-glib/array_test.rb
 - test/ffi-glib/ptr_array_test.rb
-- test/ffi-gobject/gobject_test.rb
-- test/ffi-gobject/object_class_test.rb
-- test/ffi-gobject/g_object_overrides_test.rb
-- test/ffi-gobject/ruby_style_test.rb
-- test/ffi-gobject/object_test.rb
-- test/ffi-gobject/value_test.rb
+- test/ffi-glib/byte_array_test.rb
+- test/ffi-glib/glib_overrides_test.rb
+- test/ffi-glib/strv_test.rb
+- test/ffi-gobject_introspection/i_repository_test.rb
+- test/ffi-gobject_introspection/i_constant_info_test.rb
+- test/ffi-gobject_introspection/i_base_info_test.rb
+- test/ffi-gobject_introspection/i_object_info_test.rb
+- test/ffi-gobject_introspection/lib_test.rb
+- test/ffi-gobject_introspection/i_function_info_test.rb
+- test/type_builder_test.rb
+- test/girffi_test.rb
+- tasks/setup.rb
 - tasks/valgrind.rake
 - tasks/test.rake
-- tasks/setup.rb
-- examples/print_class.rb
-- examples/05_notification.rb
-- examples/demo_ffi_safe_inherited_layout.rb
-- examples/04_webkit.rb
 - examples/demo_ffi_nested_struct.rb
+- examples/hard_coded.rb
 - examples/leak_test.rb
+- examples/demo_ffi_safe_inherited_layout.rb
 - examples/demo_ffi_inherited_layout.rb
-- examples/hard_coded.rb
+- examples/04_webkit.rb
+- examples/01_empty_window.rb
 - examples/03_upgraded_hello_world.rb
+- examples/print_class.rb
 - examples/02_hello_world.rb
-- examples/01_empty_window.rb
-- TODO.rdoc
-- DESIGN.rdoc
+- examples/05_notification.rb
 - README.rdoc
+- DESIGN.rdoc
+- TODO.rdoc
 - History.txt
 - Rakefile
 - COPYING.LIB
@@ -279,7 +304,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: FFI-based GObject binding using the GObject Introspection Repository