gir_ffi 0.7.8 → 0.7.9

data/test/gir_ffi/builders/interface_builder_test.rb

@@ -3,7 +3,7 @@ require 'gir_ffi_test_helper'
 describe GirFFI::Builders::InterfaceBuilder do
   let(:interface_builder) {
     GirFFI::Builders::InterfaceBuilder.new(
-    get_introspection_data('Regress', 'TestInterface'))
+      get_introspection_data('Regress', 'TestInterface'))
   }
 
   describe '#build_class' do

data/test/gir_ffi/builders/module_builder_test.rb

@@ -4,11 +4,11 @@ describe GirFFI::Builders::ModuleBuilder do
   describe '#build_namespaced_class' do
     it 'raises a clear error if the named class does not exist' do
       gir = GObjectIntrospection::IRepository.default
-      stub(gir).require('Foo', nil) {}
+      allow(gir).to receive(:require).with('Foo', nil)
 
       builder = GirFFI::Builders::ModuleBuilder.new 'Foo'
 
-      mock(gir).find_by_name('Foo', 'Bar') { nil }
+      expect(gir).to receive(:find_by_name).with('Foo', 'Bar').and_return nil
 
       assert_raises NameError do
         builder.build_namespaced_class :Bar

data/test/gir_ffi/builders/object_builder_test.rb

@@ -3,11 +3,11 @@ require 'gir_ffi_test_helper'
 describe GirFFI::Builders::ObjectBuilder do
   let(:obj_builder) {
     GirFFI::Builders::ObjectBuilder.new(
-    get_introspection_data('Regress', 'TestObj'))
+      get_introspection_data('Regress', 'TestObj'))
   }
   let(:sub_obj_builder) {
     GirFFI::Builders::ObjectBuilder.new(
-    get_introspection_data('Regress', 'TestSubObj'))
+      get_introspection_data('Regress', 'TestSubObj'))
   }
 
   describe '#find_signal' do

data/test/gir_ffi/builders/property_builder_test.rb

@@ -58,8 +58,8 @@ describe GirFFI::Builders::PropertyBuilder do
   describe 'for a property of type :strv' do
     let(:property_info) {
       get_property_introspection_data('GIMarshallingTests',
-                                                          'PropertiesObject',
-                                                          'some-strv')
+                                      'PropertiesObject',
+                                      'some-strv')
     }
     before do
       skip unless property_info
@@ -115,9 +115,9 @@ describe GirFFI::Builders::PropertyBuilder do
     let(:container_info) { Object.new }
 
     before do
-      stub(property_info).container { container_info }
-      stub(property_info).name { 'foo-bar' }
-      stub(container_info).find_instance_method('foo_bar') { true }
+      allow(property_info).to receive(:container).and_return container_info
+      allow(property_info).to receive(:name).and_return 'foo-bar'
+      allow(container_info).to receive(:find_instance_method).with('foo_bar').and_return true
     end
 
     it 'finds methods with underscores for properties with dashes' do

data/test/gir_ffi/builders/return_value_builder_test.rb

@@ -2,18 +2,18 @@ require 'gir_ffi_test_helper'
 
 describe GirFFI::Builders::ReturnValueBuilder do
   let(:var_gen) { GirFFI::VariableNameGenerator.new }
-  let(:return_type_info) { GirFFI::ReturnValueInfo.new(type_info) }
+  let(:return_type_info) { GirFFI::ReturnValueInfo.new(type_info, :nothing, false) }
   let(:for_constructor) { false }
   let(:builder) {
     GirFFI::Builders::ReturnValueBuilder.new(var_gen,
-                                                           return_type_info,
-                                                           for_constructor)
+                                             return_type_info,
+                                             for_constructor)
   }
 
   describe 'for :gint32' do
     let(:type_info) {
       get_introspection_data('GIMarshallingTests',
-                                             'int_return_min').return_type
+                             'int_return_min').return_type
     }
 
     it 'has no statements in #post_conversion' do
@@ -29,8 +29,8 @@ describe GirFFI::Builders::ReturnValueBuilder do
   describe 'for :struct' do
     let(:type_info) {
       get_method_introspection_data('GIMarshallingTests',
-                                                    'BoxedStruct',
-                                                    'returnv').return_type
+                                    'BoxedStruct',
+                                    'returnv').return_type
     }
 
     it 'wraps the result in #post_conversion' do
@@ -47,8 +47,8 @@ describe GirFFI::Builders::ReturnValueBuilder do
   describe 'for :union' do
     let(:type_info) {
       get_method_introspection_data('GIMarshallingTests',
-                                                    'Union',
-                                                    'returnv').return_type
+                                    'Union',
+                                    'returnv').return_type
     }
 
     it 'wraps the result in #post_conversion' do
@@ -65,8 +65,8 @@ describe GirFFI::Builders::ReturnValueBuilder do
   describe 'for :interface' do
     let(:type_info) {
       get_method_introspection_data('Gio',
-                                                    'File',
-                                                    'new_for_commandline_arg').return_type
+                                    'File',
+                                    'new_for_commandline_arg').return_type
     }
 
     it 'wraps the result in #post_conversion' do
@@ -84,8 +84,8 @@ describe GirFFI::Builders::ReturnValueBuilder do
     describe 'when the method is not a constructor' do
       let(:type_info) {
         get_method_introspection_data('GIMarshallingTests',
-                                                      'Object',
-                                                      'full_return').return_type
+                                      'Object',
+                                      'full_return').return_type
       }
       let(:for_constructor) { false }
 
@@ -103,8 +103,8 @@ describe GirFFI::Builders::ReturnValueBuilder do
     describe 'when the method is a constructor' do
       let(:type_info) {
         get_method_introspection_data('GIMarshallingTests',
-                                                      'Object',
-                                                      'new').return_type
+                                      'Object',
+                                      'new').return_type
       }
       let(:for_constructor) { true }
 
@@ -123,8 +123,8 @@ describe GirFFI::Builders::ReturnValueBuilder do
   describe 'for :strv' do
     let(:type_info) {
       get_method_introspection_data('GLib',
-                                                    'KeyFile',
-                                                    'get_locale_string_list').return_type
+                                    'KeyFile',
+                                    'get_locale_string_list').return_type
     }
 
     it 'wraps the result in #post_conversion' do
@@ -141,8 +141,8 @@ describe GirFFI::Builders::ReturnValueBuilder do
   describe 'for :zero_terminated' do
     let(:type_info) {
       get_method_introspection_data('GLib',
-                                                    'Variant',
-                                                    'dup_bytestring').return_type
+                                    'Variant',
+                                    'dup_bytestring').return_type
     }
     before do
       skip unless type_info.zero_terminated?
@@ -162,7 +162,7 @@ describe GirFFI::Builders::ReturnValueBuilder do
   describe 'for :byte_array' do
     let(:type_info) {
       get_introspection_data('GIMarshallingTests',
-                                             'bytearray_full_return').return_type
+                             'bytearray_full_return').return_type
     }
 
     it 'wraps the result in #post_conversion' do
@@ -179,7 +179,7 @@ describe GirFFI::Builders::ReturnValueBuilder do
   describe 'for :ptr_array' do
     let(:type_info) {
       get_introspection_data('GIMarshallingTests',
-                                             'gptrarray_utf8_none_return').return_type
+                             'gptrarray_utf8_none_return').return_type
     }
 
     it 'wraps the result in #post_conversion' do
@@ -196,7 +196,7 @@ describe GirFFI::Builders::ReturnValueBuilder do
   describe 'for :glist' do
     let(:type_info) {
       get_introspection_data('GIMarshallingTests',
-                                             'glist_int_none_return').return_type
+                             'glist_int_none_return').return_type
     }
 
     it 'wraps the result in #post_conversion' do
@@ -213,7 +213,7 @@ describe GirFFI::Builders::ReturnValueBuilder do
   describe 'for :gslist' do
     let(:type_info) {
       get_introspection_data('GIMarshallingTests',
-                                             'gslist_int_none_return').return_type
+                             'gslist_int_none_return').return_type
     }
 
     it 'wraps the result in #post_conversion' do
@@ -230,7 +230,7 @@ describe GirFFI::Builders::ReturnValueBuilder do
   describe 'for :ghash' do
     let(:type_info) {
       get_introspection_data('GIMarshallingTests',
-                                             'ghashtable_int_none_return').return_type
+                             'ghashtable_int_none_return').return_type
     }
 
     it 'wraps the result in #post_conversion' do
@@ -247,7 +247,7 @@ describe GirFFI::Builders::ReturnValueBuilder do
   describe 'for :array' do
     let(:type_info) {
       get_introspection_data('GIMarshallingTests',
-                                             'garray_int_none_return').return_type
+                             'garray_int_none_return').return_type
     }
 
     it 'wraps the result in #post_conversion' do
@@ -264,7 +264,7 @@ describe GirFFI::Builders::ReturnValueBuilder do
   describe 'for :error' do
     let(:type_info) {
       get_introspection_data('GIMarshallingTests',
-                                             'gerror_return').return_type
+                             'gerror_return').return_type
     }
 
     it 'wraps the result in #post_conversion' do
@@ -282,7 +282,7 @@ describe GirFFI::Builders::ReturnValueBuilder do
     describe 'with fixed size' do
       let(:type_info) {
         get_introspection_data('GIMarshallingTests',
-                                               'array_fixed_int_return').return_type
+                               'array_fixed_int_return').return_type
       }
 
       it 'converts the result in #post_conversion' do
@@ -300,12 +300,12 @@ describe GirFFI::Builders::ReturnValueBuilder do
       let(:length_argument) { Object.new }
       let(:type_info) {
         get_method_introspection_data('GIMarshallingTests',
-                                                      'Object',
-                                                      'method_array_return').return_type
+                                      'Object',
+                                      'method_array_return').return_type
       }
 
       before do
-        stub(length_argument).post_converted_name { 'bar' }
+        allow(length_argument).to receive(:post_converted_name).and_return 'bar'
         builder.length_arg = length_argument
       end
 
@@ -399,7 +399,7 @@ describe GirFFI::Builders::ReturnValueBuilder do
     let(:type_info) {
       get_method_introspection_data('Regress', 'TestObj', 'skip_return_val').return_type
     }
-    let(:return_type_info) { GirFFI::ReturnValueInfo.new(type_info, true) }
+    let(:return_type_info) { GirFFI::ReturnValueInfo.new(type_info, :nothing, true) }
 
     it 'has no statements in #post_conversion' do
       builder.post_conversion.must_equal []

data/test/gir_ffi/builders/struct_builder_test.rb

@@ -17,15 +17,15 @@ describe GirFFI::Builders::StructBuilder do
       @field = Object.new
 
       @struct = Object.new
-      stub(@struct).namespace { 'Foo' }
-      stub(@struct).safe_name { 'Bar' }
-      stub(@struct).fields { [@field] }
+      allow(@struct).to receive(:namespace).and_return 'Foo'
+      allow(@struct).to receive(:safe_name).and_return 'Bar'
+      allow(@struct).to receive(:fields).and_return [@field]
 
       @builder = GirFFI::Builders::StructBuilder.new @struct
     end
 
     it 'creates the correct layout specification' do
-      mock(@field).layout_specification { [:bar, :int32, 0] }
+      expect(@field).to receive(:layout_specification).and_return [:bar, :int32, 0]
       spec = @builder.send :layout_specification
       assert_equal [:bar, :int32, 0], spec
     end
@@ -33,12 +33,12 @@ describe GirFFI::Builders::StructBuilder do
 
   describe 'for a struct with a layout with a complex type' do
     it 'does not flatten the complex type specification' do
-      mock(simplefield = Object.new).layout_specification { [:bar, :foo, 0] }
-      mock(complexfield = Object.new).layout_specification { [:baz, [:qux, 2], 0] }
-      mock(struct = Object.new).fields { [simplefield, complexfield] }
+      expect(simplefield = Object.new).to receive(:layout_specification).and_return [:bar, :foo, 0]
+      expect(complexfield = Object.new).to receive(:layout_specification).and_return [:baz, [:qux, 2], 0]
+      expect(struct = Object.new).to receive(:fields).and_return [simplefield, complexfield]
 
-      stub(struct).safe_name { 'Bar' }
-      stub(struct).namespace { 'Foo' }
+      allow(struct).to receive(:safe_name).and_return 'Bar'
+      allow(struct).to receive(:namespace).and_return 'Foo'
 
       builder = GirFFI::Builders::StructBuilder.new struct
       spec = builder.send :layout_specification
@@ -51,11 +51,11 @@ describe GirFFI::Builders::StructBuilder do
       @gir = GObjectIntrospection::IRepository.default
       @gir.require 'GObject', nil
 
-      stub(info = Object.new).parent { @gir.find_by_name 'GObject', 'Object' }
-      stub(info).fields { [] }
-      stub(info).info_type { :object }
-      stub(info).safe_name { 'Bar' }
-      stub(info).namespace { 'Foo' }
+      allow(info = Object.new).to receive(:parent).and_return @gir.find_by_name 'GObject', 'Object'
+      allow(info).to receive(:fields).and_return []
+      allow(info).to receive(:info_type).and_return :object
+      allow(info).to receive(:safe_name).and_return 'Bar'
+      allow(info).to receive(:namespace).and_return 'Foo'
 
       @classbuilder = GirFFI::Builders::ObjectBuilder.new info
 

data/test/gir_ffi/builders/user_defined_builder_test.rb

@@ -5,7 +5,7 @@ GirFFI.setup :GIMarshallingTests
 describe GirFFI::Builders::UserDefinedBuilder do
   let(:klass) {
     Object.const_set("DerivedClass#{Sequence.next}",
-                                 Class.new(GIMarshallingTests::Object))
+                     Class.new(GIMarshallingTests::Object))
   }
   let(:builder) { GirFFI::Builders::UserDefinedBuilder.new info }
   let(:info) { GirFFI::UserDefinedTypeInfo.new klass }
@@ -17,16 +17,16 @@ describe GirFFI::Builders::UserDefinedBuilder do
 
     describe 'with type info containing one property' do
       let(:info) {
-        GirFFI::UserDefinedTypeInfo.new klass do |info|
-          info.install_property GObject.param_spec_int('foo', 'foo bar',
-                                                       'The Foo Bar Property',
-                                                       10, 20, 15,
-                                                       3)
+        GirFFI::UserDefinedTypeInfo.new klass do |it|
+          it.install_property GObject.param_spec_int('foo', 'foo bar',
+                                                     'The Foo Bar Property',
+                                                     10, 20, 15,
+                                                     3)
         end
       }
 
       it 'registers a type that is bigger than the parent' do
-        gtype = klass.get_gtype
+        gtype = klass.gtype
         q = GObject.type_query gtype
         q.instance_size.must_be :>, GIMarshallingTests::Object::Struct.size
       end
@@ -56,13 +56,13 @@ describe GirFFI::Builders::UserDefinedBuilder do
 
     describe 'with type info containing an overridden g_name' do
       let(:info) {
-        GirFFI::UserDefinedTypeInfo.new klass do |info|
-          info.g_name = "OtherName#{Sequence.next}"
+        GirFFI::UserDefinedTypeInfo.new klass do |it|
+          it.g_name = "OtherName#{Sequence.next}"
         end
       }
 
       it 'registers a type under the overridden name' do
-        registered_name = GObject.type_name(klass.get_gtype)
+        registered_name = GObject.type_name(klass.gtype)
         registered_name.must_equal info.g_name
         registered_name.wont_equal klass.name
       end
@@ -70,8 +70,8 @@ describe GirFFI::Builders::UserDefinedBuilder do
 
     describe 'with type info containing a vfunc' do
       let(:info) {
-        GirFFI::UserDefinedTypeInfo.new klass do |info|
-          info.install_vfunc_implementation :method_int8_in, proc {|instance, in_|
+        GirFFI::UserDefinedTypeInfo.new klass do |it|
+          it.install_vfunc_implementation :method_int8_in, proc {|instance, in_|
             instance.int = in_
           }
         end
@@ -87,15 +87,15 @@ describe GirFFI::Builders::UserDefinedBuilder do
     describe 'with type info containing a vfunc from an included Interface' do
       let(:info) do
         klass.class_eval { include GIMarshallingTests::Interface }
-        GirFFI::UserDefinedTypeInfo.new klass do |info|
-          info.install_vfunc_implementation :test_int8_in,
-            proc { |instance, in_| instance.int = in_ }
+        GirFFI::UserDefinedTypeInfo.new klass do |it|
+          it.install_vfunc_implementation :test_int8_in,
+                                          proc { |instance, in_| instance.int = in_ }
         end
       end
 
       it 'marks the type as conforming to the included Interface' do
-        iface_gtype = GIMarshallingTests::Interface.get_gtype
-        GObject.type_interfaces(klass.get_gtype).to_a.must_equal [iface_gtype]
+        iface_gtype = GIMarshallingTests::Interface.gtype
+        GObject.type_interfaces(klass.gtype).to_a.must_equal [iface_gtype]
       end
 
       it 'allows the vfunc to be called through its invoker' do
@@ -105,12 +105,11 @@ describe GirFFI::Builders::UserDefinedBuilder do
       end
     end
 
-    it 'does not attempt to register a registered class' do
-      gtype = klass.get_gtype
+    it 'keeps the gtype for an already registered class' do
+      gtype = klass.gtype
       other_builder = GirFFI::Builders::UserDefinedBuilder.new info
-      other_builder.build_class
-      # FIXME: Does not really test what we want to test: other_builder might lie!
-      other_builder.target_gtype.must_equal gtype
+      other_klass = other_builder.build_class
+      other_klass.gtype.must_equal gtype
     end
   end
 end

data/test/gir_ffi/builders/vfunc_builder_test.rb

@@ -132,6 +132,63 @@ describe GirFFI::Builders::VFuncBuilder do
         result.must_equal expected
       end
     end
+
+    describe 'for a vfunc with a full-transfer return value' do
+      let(:vfunc_info) {
+        get_vfunc_introspection_data 'GIMarshallingTests', 'Object', 'vfunc_return_object_transfer_full'
+      }
+
+      it 'returns a valid mapping method' do
+        expected = <<-CODE.reset_indentation
+        def self.call_with_argument_mapping(_proc, _instance)
+          _v1 = GIMarshallingTests::Object.wrap(_instance)
+          _v2 = _proc.call(_v1)
+          _v3 = GObject::Object.from(_v2.ref).to_ptr
+          return _v3
+        end
+        CODE
+
+        result.must_equal expected
+      end
+    end
+
+    describe 'for a vfunc with a transfer-none in argument' do
+      let(:vfunc_info) {
+        get_vfunc_introspection_data 'GIMarshallingTests', 'Object', 'vfunc_in_object_transfer_none'
+      }
+
+      it 'returns a valid mapping method' do
+        expected = <<-CODE.reset_indentation
+        def self.call_with_argument_mapping(_proc, _instance, object)
+          _v1 = GIMarshallingTests::Object.wrap(_instance)
+          _v2 = GObject::Object.wrap(object)
+          _v2.ref
+          _proc.call(_v1, _v2)
+        end
+        CODE
+
+        result.must_equal expected
+      end
+    end
+
+    describe 'for a vfunc with a full-transfer outgoing argument' do
+      let(:vfunc_info) {
+        get_vfunc_introspection_data 'GIMarshallingTests', 'Object', 'vfunc_out_object_transfer_full'
+      }
+
+      it 'returns a valid mapping method' do
+        expected = <<-CODE.reset_indentation
+        def self.call_with_argument_mapping(_proc, _instance, object)
+          _v1 = GIMarshallingTests::Object.wrap(_instance)
+          _v2 = GirFFI::InOutPointer.new([:pointer, GObject::Object], object)
+          _v3 = _proc.call(_v1)
+          _v2.set_value GObject::Object.from(_v3.ref)
+        end
+        CODE
+
+        result.must_equal expected
+      end
+    end
   end
 
   describe '#argument_ffi_types' do