gir_ffi 0.7.8 → 0.7.9

data/test/gir_ffi/builders/argument_builder_test.rb

@@ -22,7 +22,7 @@ describe GirFFI::Builders::ArgumentBuilder do
     describe 'for :zero_terminated' do
       let(:arg_info) {
         get_introspection_data('GIMarshallingTests',
-                                              'array_in_len_zero_terminated').args[0]
+                               'array_in_len_zero_terminated').args[0]
       }
 
       it 'has the correct value for #pre_conversion' do
@@ -109,7 +109,6 @@ describe GirFFI::Builders::ArgumentBuilder do
     end
 
     describe 'for :struct' do
-
       describe 'when not allocated by the caller' do
         let(:arg_info) {
           get_introspection_data('GIMarshallingTests', 'boxed_struct_out').args[0]
@@ -156,7 +155,6 @@ describe GirFFI::Builders::ArgumentBuilder do
     end
 
     describe 'for :array' do
-
       describe 'when allocated by the callee' do
         let(:arg_info) {
           get_introspection_data('GIMarshallingTests', 'garray_utf8_none_out').args[0]
@@ -221,7 +219,6 @@ describe GirFFI::Builders::ArgumentBuilder do
     end
 
     describe 'for :c' do
-
       describe 'with fixed size' do
         let(:arg_info) {
           get_introspection_data('GIMarshallingTests', 'array_fixed_out').args[0]
@@ -243,7 +240,7 @@ describe GirFFI::Builders::ArgumentBuilder do
 
         let(:length_argument) { Object.new }
         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
 

data/test/gir_ffi/builders/callback_builder_test.rb

@@ -52,7 +52,7 @@ describe GirFFI::Builders::CallbackBuilder do
     describe 'for a callback with one out argument' do
       let(:callback_info) {
         get_introspection_data('GIMarshallingTests',
-                                                   'CallbackOneOutParameter')
+                               'CallbackOneOutParameter')
       }
       it 'returns a valid mapping method' do
         expected = <<-CODE.reset_indentation

data/test/gir_ffi/builders/callback_return_value_builder_test.rb

@@ -2,11 +2,12 @@ require 'gir_ffi_test_helper'
 
 describe GirFFI::Builders::CallbackReturnValueBuilder do
   let(:var_gen) { GirFFI::VariableNameGenerator.new }
-  let(:return_value_info) { GirFFI::ReturnValueInfo.new(type_info) }
+  let(:return_value_info) { GirFFI::ReturnValueInfo.new(type_info, ownership_transfer, false) }
   let(:type_info) { callback_info.return_type }
+  let(:ownership_transfer) { callback_info.caller_owns }
   let(:builder) {
     GirFFI::Builders::CallbackReturnValueBuilder.new(var_gen,
-                                                                   return_value_info)
+                                                     return_value_info)
   }
 
   before do
@@ -29,7 +30,7 @@ describe GirFFI::Builders::CallbackReturnValueBuilder do
   describe 'for :void' do
     let(:callback_info) {
       get_introspection_data('GIMarshallingTests',
-                                                 'CallbackMultipleOutParameters')
+                             'CallbackMultipleOutParameters')
     }
 
     it 'has no statements in #post_conversion' do
@@ -45,8 +46,8 @@ describe GirFFI::Builders::CallbackReturnValueBuilder do
   describe 'for :enum' do
     let(:callback_info) {
       get_vfunc_introspection_data('GIMarshallingTests',
-                                                       'Object',
-                                                       'vfunc_return_enum')
+                                   'Object',
+                                   'vfunc_return_enum')
     }
 
     it 'converts the result' do
@@ -61,17 +62,17 @@ describe GirFFI::Builders::CallbackReturnValueBuilder do
     end
   end
 
-  describe 'for :object' do
+  describe 'for :object with full transfer' do
     let(:callback_info) {
       get_vfunc_introspection_data('GIMarshallingTests',
-                                                       'Object',
-                                                       'vfunc_return_object_transfer_full')
+                                   'Object',
+                                   'vfunc_return_object_transfer_full')
     }
 
-    it 'converts the result to a pointer' do
+    it 'increases the refcount of the result and converts it to a pointer' do
       # Ensure variable names are generated in order
       builder.capture_variable_name.must_equal '_v1'
-      builder.post_conversion.must_equal ['_v2 = GObject::Object.from(_v1).to_ptr']
+      builder.post_conversion.must_equal ['_v2 = GObject::Object.from(_v1.ref).to_ptr']
     end
 
     it 'returns the result of the conversion' do

data/test/gir_ffi/builders/field_builder_test.rb

@@ -11,7 +11,6 @@ describe GirFFI::Builders::FieldBuilder do
           _v1 = @struct.to_ptr + #{field_info.offset}
           _v2 = GirFFI::InOutPointer.new(:gint8, _v1)
           _v3 = _v2.to_value
-          
           _v3
         end
       CODE
@@ -55,7 +54,6 @@ describe GirFFI::Builders::FieldBuilder do
           _v1 = @struct.to_ptr + #{field_info.offset}
           _v2 = GirFFI::InOutPointer.new(Regress::TestEnum, _v1)
           _v3 = _v2.to_value
-          
           _v3
         end
       CODE

data/test/gir_ffi/builders/function_builder_test.rb

@@ -1,170 +1,144 @@
 require 'gir_ffi_test_helper'
 
 describe GirFFI::Builders::FunctionBuilder do
-  it 'builds a correct definition of Regress:test_array_fixed_out_objects' do
-    go = get_introspection_data 'Regress', 'test_array_fixed_out_objects'
-    skip unless go
-    fbuilder = GirFFI::Builders::FunctionBuilder.new go
-    code = fbuilder.generate
-
-    expected = <<-CODE
-      def self.test_array_fixed_out_objects
-        _v1 = GirFFI::InOutPointer.for [:pointer, :c]
-        Regress::Lib.regress_test_array_fixed_out_objects _v1
-        _v2 = GirFFI::SizedArray.wrap([:pointer, Regress::TestObj], 2, _v1.to_value)
-        return _v2
-      end
-    CODE
-
-    assert_equal expected.reset_indentation, code
-  end
+  describe '#generate' do
+    let(:builder) { GirFFI::Builders::FunctionBuilder.new function_info }
+    let(:code) { builder.generate }
 
-  it 'builds a correct definition for functions having a linked length argument' do
-    go = get_introspection_data 'Regress', 'test_array_gint16_in'
-    fbuilder = GirFFI::Builders::FunctionBuilder.new go
-    code = fbuilder.generate
-
-    expected = <<-CODE
-      def self.test_array_gint16_in(ints)
-        n_ints = ints.nil? ? 0 : ints.length
-        _v1 = n_ints
-        _v2 = GirFFI::SizedArray.from(:gint16, -1, ints)
-        _v3 = Regress::Lib.regress_test_array_gint16_in _v1, _v2
-        return _v3
+    describe 'for Regress:test_array_fixed_out_objects' do
+      let(:function_info) { get_introspection_data 'Regress', 'test_array_fixed_out_objects' }
+      it 'builds a correct definition' do
+        skip unless function_info
+        code.must_equal <<-CODE.reset_indentation
+          def self.test_array_fixed_out_objects
+            _v1 = GirFFI::InOutPointer.for [:pointer, :c]
+            Regress::Lib.regress_test_array_fixed_out_objects _v1
+            _v2 = GirFFI::SizedArray.wrap([:pointer, Regress::TestObj], 2, _v1.to_value)
+            return _v2
+          end
+        CODE
       end
-    CODE
-
-    assert_equal expected.reset_indentation, code
-  end
+    end
 
-  it 'builds a correct definition for functions with callbacks' do
-    go = get_introspection_data 'Regress', 'test_callback_destroy_notify'
-    fbuilder = GirFFI::Builders::FunctionBuilder.new go
-    code = fbuilder.generate
-
-    expected = <<-CODE
-      def self.test_callback_destroy_notify(callback, user_data, notify)
-        _v1 = Regress::TestCallbackUserData.from(callback)
-        _v2 = GirFFI::InPointer.from_closure_data(user_data)
-        _v3 = GLib::DestroyNotify.from(notify)
-        _v4 = Regress::Lib.regress_test_callback_destroy_notify _v1, _v2, _v3
-        return _v4
+    describe 'for functions having a linked length argument' do
+      let(:function_info) { get_introspection_data 'Regress', 'test_array_gint16_in' }
+      it 'builds a correct definition' do
+        code.must_equal <<-CODE.reset_indentation
+          def self.test_array_gint16_in(ints)
+            n_ints = ints.nil? ? 0 : ints.length
+            _v1 = n_ints
+            _v2 = GirFFI::SizedArray.from(:gint16, -1, ints)
+            _v3 = Regress::Lib.regress_test_array_gint16_in _v1, _v2
+            return _v3
+          end
+        CODE
       end
-    CODE
-
-    assert_equal expected.reset_indentation, code
-  end
+    end
 
-  it 'builds correct definition for constructors' do
-    go = get_method_introspection_data 'Regress', 'TestObj', 'new_from_file'
-    fbuilder = GirFFI::Builders::FunctionBuilder.new go
-    code = fbuilder.generate
-
-    expected = <<-CODE
-      def self.new_from_file(x)
-        _v1 = GirFFI::InPointer.from(:utf8, x)
-        _v2 = FFI::MemoryPointer.new(:pointer).write_pointer nil
-        _v3 = Regress::Lib.regress_test_obj_new_from_file _v1, _v2
-        GirFFI::ArgHelper.check_error(_v2)
-        _v4 = self.constructor_wrap(_v3)
-        return _v4
+    describe 'for functions with callbacks' do
+      let(:function_info) { get_introspection_data 'Regress', 'test_callback_destroy_notify' }
+      it 'builds a correct definition' do
+        code.must_equal <<-CODE.reset_indentation
+          def self.test_callback_destroy_notify(callback, user_data, notify)
+            _v1 = Regress::TestCallbackUserData.from(callback)
+            _v2 = GirFFI::InPointer.from_closure_data(user_data)
+            _v3 = GLib::DestroyNotify.from(notify)
+            _v4 = Regress::Lib.regress_test_callback_destroy_notify _v1, _v2, _v3
+            return _v4
+          end
+        CODE
       end
-    CODE
-
-    assert_equal expected.reset_indentation, code
-  end
-
-  it 'creates a call to GObject::Value#from for functions that take a GValue' do
-    go = get_introspection_data 'GIMarshallingTests', 'gvalue_in'
-    fbuilder = GirFFI::Builders::FunctionBuilder.new go
-    code = fbuilder.generate
+    end
 
-    expected = <<-CODE
-      def self.gvalue_in(value)
-        _v1 = GObject::Value.from(value)
-        GIMarshallingTests::Lib.gi_marshalling_tests_gvalue_in _v1
+    describe 'for constructors' do
+      let(:function_info) { get_method_introspection_data 'Regress', 'TestObj', 'new_from_file' }
+      it 'builds correct definition' do
+        code.must_equal <<-CODE.reset_indentation
+          def self.new_from_file(x)
+            _v1 = GirFFI::InPointer.from(:utf8, x)
+            _v2 = FFI::MemoryPointer.new(:pointer).write_pointer nil
+            _v3 = Regress::Lib.regress_test_obj_new_from_file _v1, _v2
+            GirFFI::ArgHelper.check_error(_v2)
+            _v4 = self.constructor_wrap(_v3)
+            return _v4
+          end
+        CODE
       end
-    CODE
-
-    assert_equal expected.reset_indentation, code
-  end
+    end
 
-  it 'builds correct definition for functions with a nullable input array' do
-    go = get_introspection_data 'Regress', 'test_array_int_null_in'
-    fbuilder = GirFFI::Builders::FunctionBuilder.new go
-    code = fbuilder.generate
-
-    expected = <<-CODE
-      def self.test_array_int_null_in(arr)
-        len = arr.nil? ? 0 : arr.length
-        _v1 = len
-        _v2 = GirFFI::SizedArray.from(:gint32, -1, arr)
-        Regress::Lib.regress_test_array_int_null_in _v2, _v1
+    describe 'for functions that take a GValue' do
+      let(:function_info) { get_introspection_data 'GIMarshallingTests', 'gvalue_in' }
+      it 'creates a call to GObject::Value#from' do
+        code.must_equal <<-CODE.reset_indentation
+          def self.gvalue_in(value)
+            _v1 = GObject::Value.from(value)
+            GIMarshallingTests::Lib.gi_marshalling_tests_gvalue_in _v1
+          end
+        CODE
       end
-    CODE
-
-    assert_equal expected.reset_indentation, code
-  end
+    end
 
-  it 'builds correct definition for functions with a nullable output array' do
-    go = get_introspection_data 'Regress', 'test_array_int_null_out'
-    fbuilder = GirFFI::Builders::FunctionBuilder.new go
-    code = fbuilder.generate
-
-    expected = <<-CODE
-      def self.test_array_int_null_out
-        _v1 = GirFFI::InOutPointer.for :gint32
-        _v2 = GirFFI::InOutPointer.for [:pointer, :c]
-        Regress::Lib.regress_test_array_int_null_out _v2, _v1
-        _v3 = _v1.to_value
-        _v4 = GirFFI::SizedArray.wrap(:gint32, _v3, _v2.to_value)
-        return _v4
+    describe 'for functions with a nullable input array' do
+      let(:function_info) { get_introspection_data 'Regress', 'test_array_int_null_in' }
+      it 'builds correct definition' do
+        code.must_equal <<-CODE.reset_indentation
+          def self.test_array_int_null_in(arr)
+            len = arr.nil? ? 0 : arr.length
+            _v1 = len
+            _v2 = GirFFI::SizedArray.from(:gint32, -1, arr)
+            Regress::Lib.regress_test_array_int_null_in _v2, _v1
+          end
+        CODE
       end
-    CODE
-
-    assert_equal expected.reset_indentation, code
-  end
+    end
 
-  it 'builds the correct definition for a method with an inout array with size argument' do
-    go = get_method_introspection_data 'GIMarshallingTests', 'Object', 'method_array_inout'
-    fbuilder = GirFFI::Builders::FunctionBuilder.new go
-    code = fbuilder.generate
-
-    expected = <<-CODE
-      def method_array_inout(ints)
-        length = ints.nil? ? 0 : ints.length
-        _v1 = GirFFI::InOutPointer.for :gint32
-        _v1.set_value length
-        _v2 = GirFFI::InOutPointer.for [:pointer, :c]
-        _v2.set_value GirFFI::SizedArray.from(:gint32, -1, ints)
-        GIMarshallingTests::Lib.gi_marshalling_tests_object_method_array_inout self, _v2, _v1
-        _v3 = _v1.to_value
-        _v4 = GirFFI::SizedArray.wrap(:gint32, _v3, _v2.to_value)
-        return _v4
+    describe 'for functions with a nullable output array' do
+      let(:function_info) { get_introspection_data 'Regress', 'test_array_int_null_out' }
+      it 'builds correct definition' do
+        code.must_equal <<-CODE.reset_indentation
+          def self.test_array_int_null_out
+            _v1 = GirFFI::InOutPointer.for :gint32
+            _v2 = GirFFI::InOutPointer.for [:pointer, :c]
+            Regress::Lib.regress_test_array_int_null_out _v2, _v1
+            _v3 = _v1.to_value
+            _v4 = GirFFI::SizedArray.wrap(:gint32, _v3, _v2.to_value)
+            return _v4
+          end
+        CODE
       end
-    CODE
-
-    assert_equal expected.reset_indentation, code
-  end
-
-  it 'builds a correct definition for a simple method' do
-    go = get_method_introspection_data 'Regress', 'TestObj', 'instance_method'
-    fbuilder = GirFFI::Builders::FunctionBuilder.new go
-    code = fbuilder.generate
+    end
 
-    expected = <<-CODE
-      def instance_method
-        _v1 = Regress::Lib.regress_test_obj_instance_method self
-        return _v1
+    describe 'for a method with an inout array with size argument' do
+      let(:function_info) { get_method_introspection_data 'GIMarshallingTests', 'Object', 'method_array_inout' }
+      it 'builds the correct definition' do
+        code.must_equal <<-CODE.reset_indentation
+          def method_array_inout(ints)
+            length = ints.nil? ? 0 : ints.length
+            _v1 = GirFFI::InOutPointer.for :gint32
+            _v1.set_value length
+            _v2 = GirFFI::InOutPointer.for [:pointer, :c]
+            _v2.set_value GirFFI::SizedArray.from(:gint32, -1, ints)
+            GIMarshallingTests::Lib.gi_marshalling_tests_object_method_array_inout self, _v2, _v1
+            _v3 = _v1.to_value
+            _v4 = GirFFI::SizedArray.wrap(:gint32, _v3, _v2.to_value)
+            return _v4
+          end
+        CODE
       end
-    CODE
+    end
 
-    assert_equal expected.reset_indentation, code
-  end
+    describe 'for a simple method' do
+      let(:function_info) { get_method_introspection_data 'Regress', 'TestObj', 'instance_method' }
 
-  describe '#generate' do
-    let(:builder) { GirFFI::Builders::FunctionBuilder.new function_info }
-    let(:code) { builder.generate }
+      it 'builds a correct definition' do
+        code.must_equal <<-CODE.reset_indentation
+          def instance_method
+            _v1 = Regress::Lib.regress_test_obj_instance_method self
+            return _v1
+          end
+        CODE
+      end
+    end
 
     describe 'for GLib::Variant.get_strv' do
       let(:function_info) { get_method_introspection_data 'GLib', 'Variant', 'get_strv' }
@@ -197,7 +171,7 @@ describe GirFFI::Builders::FunctionBuilder do
       end
     end
 
-    describe 'for GIMarshallingTests::Object.method_int8_arg_and_out_callee' do
+    describe 'for GIMarshallingTests::Object#method_int8_arg_and_out_callee' do
       let(:function_info) {
         get_method_introspection_data('GIMarshallingTests', 'Object',
                                       'method_int8_arg_and_out_callee')
@@ -216,5 +190,40 @@ describe GirFFI::Builders::FunctionBuilder do
         CODE
       end
     end
+
+    describe 'for GIMarshallingTests::Object.full_inout' do
+      let(:function_info) {
+        get_method_introspection_data('GIMarshallingTests', 'Object',
+                                      'full_inout')
+      }
+
+      it 'builds a correct definition' do
+        code.must_equal <<-CODE.reset_indentation
+          def self.full_inout(object)
+            _v1 = GirFFI::InOutPointer.for [:pointer, GIMarshallingTests::Object]
+            _v1.set_value GIMarshallingTests::Object.from(object.ref)
+            GIMarshallingTests::Lib.gi_marshalling_tests_object_full_inout _v1
+            _v2 = GIMarshallingTests::Object.wrap(_v1.to_value)
+            return _v2
+          end
+        CODE
+      end
+    end
+
+    describe 'for Regress::TestObj#instance_method_full' do
+      let(:function_info) {
+        get_method_introspection_data('Regress', 'TestObj',
+                                      'instance_method_full')
+      }
+
+      it 'builds a correct definition including self.ref' do
+        skip unless function_info
+        code.must_equal <<-CODE.reset_indentation
+          def instance_method_full
+            Regress::Lib.regress_test_obj_instance_method_full self.ref
+          end
+        CODE
+      end
+    end
   end
 end