gir_ffi 0.5.1 → 0.5.2

data/test/integration/generated_gimarshallingtests_test.rb

@@ -67,7 +67,8 @@ describe GIMarshallingTests do
   end
 
   it "has the constant CONSTANT_GERROR_DEBUG_MESSAGE" do
-    skip
+    GIMarshallingTests::CONSTANT_GERROR_DEBUG_MESSAGE.must_equal(
+      "we got an error, life is shit")
   end
 
   it "has the constant CONSTANT_GERROR_DOMAIN" do
@@ -124,19 +125,19 @@ describe GIMarshallingTests do
     end
 
     it "has a working function #in" do
-      skip
+      skip "methods on enums are not supported yet"
     end
     it "has a working function #in_zero" do
-      skip
+      skip "methods on enums are not supported yet"
     end
     it "has a working function #inout" do
-      skip
+      skip "methods on enums are not supported yet"
     end
     it "has a working function #out" do
-      skip
+      skip "methods on enums are not supported yet"
     end
     it "has a working function #returnv" do
-      skip
+      skip "methods on enums are not supported yet"
     end
   end
 
@@ -151,16 +152,16 @@ describe GIMarshallingTests do
       assert_equal 42, GIMarshallingTests::GEnum[:value3]
     end
     it "has a working function #in" do
-      skip
+      skip "methods on enums are not supported yet"
     end
     it "has a working function #inout" do
-      skip
+      skip "methods on enums are not supported yet"
     end
     it "has a working function #out" do
-      skip
+      skip "methods on enums are not supported yet"
     end
     it "has a working function #returnv" do
-      skip
+      skip "methods on enums are not supported yet"
     end
   end
 
@@ -269,7 +270,10 @@ describe GIMarshallingTests do
     let(:instance) { GIMarshallingTests::Object.new 42 }
 
     it "has a working method #call_vfunc_with_callback" do
-      skip
+      # NOTE: To call this method, the callback slot vfunc_with_callback has to
+      # be filled in the GIMarshallingTests::Object class structure. The
+      # GIMarshallingTests library doesn't do this.
+      skip "Needs vfunc setup"
     end
 
     it "has a working method #full_in" do
@@ -277,10 +281,11 @@ describe GIMarshallingTests do
     end
 
     it "has a working method #int8_in" do
-      skip
+      skip "Needs vfunc setup"
     end
+
     it "has a working method #int8_out" do
-      skip
+      skip "Needs vfunc setup"
     end
 
     # TODO: Avoid using common method names?
@@ -310,13 +315,15 @@ describe GIMarshallingTests do
     end
 
     it "has a working method #method_int8_in" do
-      skip
+      skip "Needs vfunc setup"
     end
+
     it "has a working method #method_int8_out" do
-      skip
+      skip "Needs vfunc setup"
     end
+
     it "has a working method #method_variant_array_in" do
-      skip
+      skip "Needs vfunc setup"
     end
 
     it "has a working method #method_with_default_implementation" do
@@ -336,28 +343,28 @@ describe GIMarshallingTests do
     end
 
     it "has a working method #vfunc_caller_allocated_out_parameter" do
-      skip
+      skip "Needs vfunc setup"
     end
     it "has a working method #vfunc_meth_with_error" do
-      skip
+      skip "Needs vfunc setup"
     end
     it "has a working method #vfunc_multiple_out_parameters" do
-      skip
+      skip "Needs vfunc setup"
     end
     it "has a working method #vfunc_one_out_parameter" do
-      skip
+      skip "Needs vfunc setup"
     end
     it "has a working method #vfunc_return_value_and_multiple_out_parameters" do
-      skip
+      skip "Needs vfunc setup"
     end
     it "has a working method #vfunc_return_value_and_one_out_parameter" do
-      skip
+      skip "Needs vfunc setup"
     end
     it "has a working method #vfunc_return_value_only" do
-      skip
+      skip "Needs vfunc setup"
     end
     it "has a working method #vfunc_with_callback" do
-      skip
+      skip "Needs vfunc setup"
     end
 
     it "has a property 'int' containing the argument to #new" do
@@ -597,7 +604,7 @@ describe GIMarshallingTests do
   end
 
   it "has a working function #array_enum_in" do
-    skip
+    GIMarshallingTests.array_enum_in [:value1, :value2, :value3]
   end
 
   it "has a working function #array_fixed_inout" do
@@ -704,9 +711,12 @@ describe GIMarshallingTests do
   it "has a working function #array_simple_struct_in" do
     skip
   end
+
   it "has a working function #array_string_in" do
-    skip
+    GIMarshallingTests.array_string_in ["foo", "bar"]
+    pass
   end
+
   it "has a working function #array_struct_in" do
     skip
   end
@@ -808,8 +818,8 @@ describe GIMarshallingTests do
     ret = GIMarshallingTests.bytearray_full_return
     assert_instance_of GLib::ByteArray, ret
     assert_includes(
-	["0123".bytes.to_a, "\x001\xFF3".bytes.to_a],
-	ret.to_string.bytes.to_a)
+      ["0123".bytes.to_a, "\x001\xFF3".bytes.to_a],
+      ret.to_string.bytes.to_a)
   end
 
   it "has a working function #bytearray_none_in" do

data/test/integration/generated_regress_test.rb

@@ -561,15 +561,12 @@ describe Regress do
       assert !is_floating?(instance)
     end
 
-    # FIXME: Should it be possible to invoke this method by its virtual name?
     it "has a working method #matrix" do
-      rv = instance.matrix "bar"
-      assert_equal 42, rv
+      instance.matrix("bar").must_equal 42
     end
 
     it "has a working method #do_matrix" do
-      result = instance.do_matrix "bar"
-      result.must_equal 42
+      instance.do_matrix("bar").must_equal 42
     end
 
     it "has a working method #emit_sig_with_foreign_struct" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gir_ffi
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-01 00:00:00.000000000 Z
+date: 2013-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -133,6 +133,7 @@ files:
 - 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/zero_terminated.rb
 - lib/gir_ffi/callback.rb
 - lib/gir_ffi/argument_builder.rb
 - lib/gir_ffi/error_argument_builder.rb
@@ -148,10 +149,12 @@ files:
 - lib/gir_ffi/callback_helper.rb
 - lib/gir_ffi/builder.rb
 - lib/gir_ffi/interface_base.rb
+- lib/gir_ffi/info_ext/i_arg_info.rb
 - lib/gir_ffi/info_ext/i_type_info.rb
 - lib/gir_ffi/info_ext/i_field_info.rb
 - lib/gir_ffi/info_ext/safe_constant_name.rb
 - lib/gir_ffi/info_ext/i_property_info.rb
+- lib/gir_ffi/info_ext/i_signal_info.rb
 - lib/gir_ffi/info_ext/safe_function_name.rb
 - lib/gir_ffi/info_ext/i_registered_type_info.rb
 - lib/gir_ffi/module_base.rb
@@ -166,7 +169,6 @@ files:
 - lib/ffi-gobject/base.rb
 - lib/ffi-gobject/object.rb
 - lib/ffi-gobject/value.rb
-- lib/ffi-gobject/helper.rb
 - lib/ffi-gobject/initially_unowned.rb
 - lib/ffi-gobject/closure.rb
 - lib/ffi-glib.rb
@@ -224,6 +226,7 @@ files:
 - test/gir_ffi/builder/type/unintrospectable_test.rb
 - test/gir_ffi/builder/type/interface_test.rb
 - test/gir_ffi/builder/module_test.rb
+- test/gir_ffi/zero_terminated_test.rb
 - test/gir_ffi/object_base_test.rb
 - test/gir_ffi/user_defined/i_registered_type_info_test.rb
 - test/gir_ffi/user_defined/i_object_info_test.rb
@@ -240,6 +243,8 @@ files:
 - test/gir_ffi/argument_builder_test.rb
 - test/gir_ffi/return_value_builder_test.rb
 - test/gir_ffi/info_ext/i_type_info_test.rb
+- test/gir_ffi/info_ext/i_arg_info_test.rb
+- test/gir_ffi/info_ext/i_signal_info_test.rb
 - test/gir_ffi/info_ext/safe_constant_name_test.rb
 - test/gir_ffi/info_ext/safe_function_name_test.rb
 - test/gir_ffi/info_ext/i_field_info_test.rb
@@ -249,7 +254,6 @@ files:
 - test/ffi-gobject/object_test.rb
 - test/ffi-gobject/gobject_test.rb
 - test/ffi-gobject/value_test.rb
-- test/ffi-gobject/helper_test.rb
 - test/ffi-gobject/ruby_style_test.rb
 - test/base_test_helper.rb
 - test/ffi-glib/s_list_test.rb
@@ -318,7 +322,6 @@ test_files:
 - test/ffi-glib/ruby_closure_test.rb
 - test/ffi-glib/s_list_test.rb
 - test/ffi-gobject/gobject_test.rb
-- test/ffi-gobject/helper_test.rb
 - test/ffi-gobject/object_class_test.rb
 - test/ffi-gobject/object_test.rb
 - test/ffi-gobject/ruby_style_test.rb
@@ -350,7 +353,9 @@ test_files:
 - test/gir_ffi/function_builder_test.rb
 - test/gir_ffi/in_out_pointer_test.rb
 - test/gir_ffi/in_pointer_test.rb
+- test/gir_ffi/info_ext/i_arg_info_test.rb
 - test/gir_ffi/info_ext/i_field_info_test.rb
+- test/gir_ffi/info_ext/i_signal_info_test.rb
 - test/gir_ffi/info_ext/i_type_info_test.rb
 - test/gir_ffi/info_ext/safe_constant_name_test.rb
 - test/gir_ffi/info_ext/safe_function_name_test.rb
@@ -361,6 +366,7 @@ test_files:
 - test/gir_ffi/user_defined/i_property_info_test.rb
 - test/gir_ffi/user_defined/i_registered_type_info_test.rb
 - test/gir_ffi/variable_name_generator_test.rb
+- test/gir_ffi/zero_terminated_test.rb
 - test/gir_ffi_test.rb
 - test/gir_ffi_test_helper.rb
 - test/integration/derived_classes_test.rb

data/lib/ffi-gobject/helper.rb

@@ -1,114 +0,0 @@
-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
-    #
-    # @return [FFI::Function] The signal handler, ready to be passed as a
-    #   callback to C.
-    def self.signal_callback klass, signal, &block
-      sig_info = klass.find_signal signal
-
-      callback_block = signal_callback_args(sig_info, klass, &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|
-        mapped = cast_back_signal_arguments sig, klass, *args
-        block.call(*mapped)
-      end
-    end
-
-    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.append signal_reciever_to_gvalue instance
-
-      sig.args.zip(rest).each do |info, arg|
-        arr.append signal_argument_to_gvalue info, arg
-      end
-
-      arr
-    end
-
-    def self.signal_reciever_to_gvalue instance
-      val = ::GObject::Value.new
-      val.init ::GObject.type_from_instance instance
-      val.set_instance instance
-      return val
-    end
-
-    def self.signal_argument_to_gvalue info, arg
-      val = gvalue_for_type_info info.argument_type
-      val.set_value arg
-    end
-
-    def self.gvalue_for_type_info info
-      tag = info.tag
-      gtype = case tag
-              when :interface
-                info.interface.g_type
-              when :void
-                return nil
-              else
-                TYPE_TAG_TO_GTYPE[tag]
-              end
-      raise "GType not found for type info with tag #{tag}" unless gtype
-      Value.new.tap {|val| val.init gtype}
-    end
-
-    def self.gvalue_for_signal_return_value signal, object
-      sig = object.class.find_signal signal
-      rettypeinfo = sig.return_type
-
-      gvalue_for_type_info rettypeinfo
-    end
-
-    # TODO: Generate cast back methods using existing Argument builders.
-    def self.cast_back_signal_arguments signalinfo, klass, *args
-      instance = klass.wrap args.shift
-      user_data = GirFFI::ArgHelper::OBJECT_STORE[args.pop.address]
-
-      extra_arguments = signalinfo.args.zip(args).map do |info, arg|
-        cast_signal_argument(info, arg)
-      end
-
-      return [instance, *extra_arguments].push user_data
-    end
-
-    def self.cast_signal_argument info, arg
-      arg_t = info.argument_type
-      if arg_t.tag == :interface
-        iface = arg_t.interface
-        kls = GirFFI::Builder.build_class iface
-        case iface.info_type
-        when :enum, :flags
-          kls[arg]
-        when :interface
-          arg.to_object
-        else
-          kls.wrap(arg)
-        end
-      else
-        arg
-      end
-    end
-  end
-end

data/test/ffi-gobject/helper_test.rb

@@ -1,103 +0,0 @@
-require 'gir_ffi_test_helper'
-
-describe GObject::Helper do
-  before do
-    GirFFI.setup :Regress
-  end
-
-  describe "#signal_arguments_to_gvalue_array" do
-    describe "the result of wrapping test-with-static-scope-arg" do
-      setup do
-        o = Regress::TestSubObj.new
-        b = Regress::TestSimpleBoxedA.new
-
-        @gva =
-          GObject::Helper.signal_arguments_to_gvalue_array(
-            "test-with-static-scope-arg", o, b)
-      end
-
-      should "be a GObject::ValueArray" do
-        assert_instance_of GObject::ValueArray, @gva
-      end
-
-      should "contain two values" do
-        assert_equal 2, @gva.n_values
-      end
-
-      should "have a first value with GType for TestSubObj" do
-        assert_equal Regress::TestSubObj.get_gtype, (@gva.get_nth 0).current_gtype
-      end
-
-      should "have a second value with GType for TestSimpleBoxedA" do
-        assert_equal Regress::TestSimpleBoxedA.get_gtype, (@gva.get_nth 1).current_gtype
-      end
-    end
-  end
-
-  describe "#signal_argument_to_gvalue" do
-    it "maps a :utf8 argument to a string-valued GValue" do
-      stub(arg_t = Object.new).tag { :utf8 }
-      stub(info = Object.new).argument_type { arg_t }
-      val =
-        GObject::Helper.signal_argument_to_gvalue(
-          info, "foo")
-      assert_instance_of GObject::Value, val
-      assert_equal "foo", val.get_string
-    end
-  end
-
-  describe "#cast_back_signal_arguments" do
-    it "correctly casts back pointers for the test-with-static-scope-arg signal" do
-      o = Regress::TestSubObj.new
-      b = Regress::TestSimpleBoxedA.new
-      ud = GirFFI::ArgHelper.object_to_inptr "Hello!"
-
-      assert_equal "Hello!", GirFFI::ArgHelper::OBJECT_STORE[ud.address]
-
-      sig = o.class.find_signal "test-with-static-scope-arg"
-
-      gva =
-        GObject::Helper.cast_back_signal_arguments(
-          sig, o.class, o.to_ptr, b.to_ptr, ud)
-
-      klasses = gva.map {|it| it.class}
-      klasses.must_equal [ Regress::TestSubObj,
-                           Regress::TestSimpleBoxedA,
-                           String ]
-      gva[2].must_equal "Hello!"
-    end
-  end
-
-  describe "#cast_signal_argument" do
-    describe "with info for an enum" do
-      before do
-        enuminfo = get_introspection_data 'GLib', 'DateMonth'
-        stub(arg_t = Object.new).interface { enuminfo }
-        stub(arg_t).tag { :interface }
-        stub(@info = Object.new).argument_type { arg_t }
-      end
-
-      it "casts an integer to its enum symbol" do
-        res = GObject::Helper.cast_signal_argument @info, 7
-        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
-