gir_ffi 0.10.0 → 0.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 464fd086b86382dddea95e18946be4af246c36b4
-  data.tar.gz: c9c13a75efe36d9a513c7ff8d9327b1aab20e8cb
+  metadata.gz: fa45cf6ed9c1af0159b7faeea5573b925d0fbff3
+  data.tar.gz: c016996c65de12f29c5133955b211d8ae0346f9d
 SHA512:
-  metadata.gz: d3324bd949d9d9915d1656641d9ab19831aa884adfbd36df8690749450405f9b75721bac8104c8ec4c75baf2ceb079219338abd61b2c43bab5d731382190394f
-  data.tar.gz: dffc23519a16b729b03372502594cb959733bd9c94305814829579cf99821e2d301173fd7cda51b82d0472136c33f78b0569f684f91701a20f34a37f7c85f298
+  metadata.gz: 21a3c042d42c4c441908818ba387905d8a397245adbdd112980d4fba07166954b997219327781b3ab461d3fb93c9abd47e9f3e5aee2b3264c23208bab3aec2b6
+  data.tar.gz: 412062c0492c572e3aa2d9fb2beda46665c43fdf5263c77b96afc2b9c6c66f4ecf6d7ac7bda7ae722ea93e929d04f995b69bb0521b10b34d239ceed2de89c4fd

data/Changelog.md

@@ -1,5 +1,19 @@
 # Changelog
 
+## 0.10.1 / 2016-03-28
+
+* Restore JRuby compatibility.
+  - Introduce #owned to flag unions and structs for release at garbage collection time.
+    In JRuby's implementation, FFI::Pointer does not implement #autorelease=
+    and #autorelease?, so this different technique is used to free pointers
+    allocated by GLib. It is in fact doubtful that setting autorelease had any
+    actual effect even on CRuby.
+  - Immediately free string pointers whose ownership is transfered. Again, the
+    #autorelease technique doesn't work on JRuby.
+  - Fix handling of callee-allocated out parameters in vfuncs. The put_pointer
+    method was wrongly called, and JRuby is more picky about what types that
+    method expects, exposing the bug.
+
 ## 0.10.0 / 2016-03-23
 
 * Ensure ownership of created RubyClosure objects

data/Gemfile

@@ -4,7 +4,7 @@ source 'https://rubygems.org'
 # The gem's dependencies are specified in gir_ffi.gemspec
 gemspec
 
-gem 'rubocop', '~> 0.37.0', type: :development
+gem 'rubocop', '~> 0.38.0', type: :development
 
 if ENV['CI']
   if ENV['TRAVIS_RUBY_VERSION'] == '2.2'

data/lib/ffi-gobject/ruby_closure.rb

@@ -11,7 +11,7 @@ module GObject
     # the object_id of the associated block.
     #
     # @api private
-    class Struct < FFI::Struct
+    class Struct < GirFFI::Struct
       layout :parent, Closure::Struct, 0,
              :block_id, :int64
     end

data/lib/ffi-gobject/value.rb

@@ -207,10 +207,5 @@ module GObject
       METHOD_MAP[current_gtype] || METHOD_MAP[current_fundamental_type] ||
         raise("No method map entry for #{current_gtype_name}")
     end
-
-    def make_finalizer
-      gtype = self.class.gtype
-      ObjectSpace.define_finalizer self, self.class.make_finalizer(@struct, gtype)
-    end
   end
 end

data/lib/ffi-gobject.rb

@@ -107,6 +107,8 @@ module GObject
 
     attach_function :g_param_spec_ref, [:pointer], :pointer
     attach_function :g_param_spec_sink, [:pointer], :pointer
+
+    attach_function :g_type_class_ref, [:size_t], :pointer
   end
 
   TYPE_ARRAY = Lib.g_array_get_type

data/lib/gir_ffi/allocation_helper.rb

@@ -21,5 +21,11 @@ module GirFFI
       type_size = FFI.type_size type
       safe_malloc(type_size)
     end
+
+    def self.free_after(ptr)
+      result = yield ptr
+      LibC.free ptr unless ptr.null?
+      result
+    end
   end
 end

data/lib/gir_ffi/boxed_base.rb

@@ -8,15 +8,20 @@ module GirFFI
       store_pointer(self.class::Struct.new.to_ptr)
     end
 
-    def self.make_finalizer(ptr, gtype)
+    def self.make_finalizer(struct, gtype)
       proc do
-        if ptr.autorelease?
-          ptr.autorelease = false
-          GObject.boxed_free gtype, ptr
+        if struct.owned?
+          struct.owned = false
+          GObject.boxed_free gtype, struct.to_ptr
         end
       end
     end
 
+    # Wrap value and take ownership of it
+    def self.wrap_own(val)
+      wrap(val).tap { |it| it && it.struct.owned = true }
+    end
+
     # Create an unowned copy of the struct represented by val
     def self.copy_from(val)
       copy from(val)
@@ -24,7 +29,8 @@ module GirFFI
 
     # Wrap an owned copy of the struct represented by val
     def self.wrap_copy(val)
-      copy(wrap(val)).tap { |it| it && it.to_ptr.autorelease = true }
+      # TODO: Is this needed? We may get away with just copying on transfer away from us.
+      copy(wrap(val)).tap { |it| it && it.struct.owned = true }
     end
 
     def self.copy(val)
@@ -42,7 +48,7 @@ module GirFFI
 
     def make_finalizer
       gtype = self.class.gtype
-      ObjectSpace.define_finalizer self, self.class.make_finalizer(to_ptr, gtype)
+      ObjectSpace.define_finalizer self, self.class.make_finalizer(@struct, gtype)
     end
   end
 end

data/lib/gir_ffi/builders/c_to_ruby_convertor.rb

@@ -15,7 +15,7 @@ module GirFFI
         case @type_info.flattened_tag
         when :utf8, :filename
           if @ownership_transfer == :everything
-            "#{@argument}.tap { |it| it.autorelease = true }.to_utf8"
+            "GirFFI::AllocationHelper.free_after #{@argument}, &:to_utf8"
           else
             "#{@argument}.to_utf8"
           end

data/lib/gir_ffi/builders/callback_argument_builder.rb

@@ -90,7 +90,11 @@ module GirFFI
       end
 
       def pointer_value_convertor
-        @pointer_value_convertor ||= PointerValueConvertor.new(type_spec)
+        @pointer_value_convertor ||= if allocated_by_us?
+                                       PointerValueConvertor.new(type_spec[1])
+                                     else
+                                       PointerValueConvertor.new(type_spec)
+                                     end
       end
 
       def pointer_to_value_conversion

data/lib/gir_ffi/builders/function_builder.rb

@@ -28,7 +28,7 @@ module GirFFI
       end
 
       def function_call_arguments
-        ca = argument_builder_collection.call_argument_names
+        ca = argument_builder_collection.call_argument_names.dup
         ca.unshift receiver_call_argument if @info.method?
         ca
       end

data/lib/gir_ffi/builders/initializer_return_value_builder.rb

@@ -7,10 +7,11 @@ module GirFFI
     class InitializerReturnValueBuilder < BaseReturnValueBuilder
       def post_conversion
         result = []
+        result << "store_pointer(#{capture_variable_name})"
         if specialized_type_tag == :struct
-          result << "#{capture_variable_name}.autorelease = true"
+          result << '@struct.owned = true'
         end
-        result << "store_pointer(#{capture_variable_name})"
+        result
       end
     end
   end

data/lib/gir_ffi/builders/object_builder.rb

@@ -3,6 +3,7 @@ require 'gir_ffi/builders/registered_type_builder'
 require 'gir_ffi/builders/with_layout'
 require 'gir_ffi/builders/property_builder'
 require 'gir_ffi/object_base'
+require 'gir_ffi/struct'
 
 module GirFFI
   module Builders
@@ -74,7 +75,7 @@ module GirFFI
 
       # FIXME: Private method only used in subclass
       def layout_superclass
-        FFI::Struct
+        GirFFI::Struct
       end
 
       def parent_info

data/lib/gir_ffi/builders/struct_builder.rb

@@ -10,7 +10,7 @@ module GirFFI
       include StructLike
 
       def layout_superclass
-        FFI::Struct
+        GirFFI::Struct
       end
 
       def superclass

data/lib/gir_ffi/builders/unintrospectable_boxed_builder.rb

@@ -23,7 +23,7 @@ module GirFFI
       end
 
       def layout_superclass
-        FFI::Struct
+        GirFFI::Struct
       end
     end
   end

data/lib/gir_ffi/builders/union_builder.rb

@@ -2,16 +2,17 @@
 require 'gir_ffi/builders/registered_type_builder'
 require 'gir_ffi/builders/struct_like'
 require 'gir_ffi/union_base'
+require 'gir_ffi/union'
 
 module GirFFI
   module Builders
     # Implements the creation of a class representing union type. The
-    # class will have a nested FFI::Union class to represent its C union.
+    # class will have a nested GirFFI::Union class to represent its C union.
     class UnionBuilder < RegisteredTypeBuilder
       include StructLike
 
       def layout_superclass
-        FFI::Union
+        GirFFI::Union
       end
 
       private

data/lib/gir_ffi/in_pointer.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 module GirFFI
-  # The InPointer class handles conversion from ruby types to pointers for
+  # The InPointer module handles conversion from ruby types to pointers for
   # arguments with direction :in. This is used for arguments that are
   # arrays, strings, or interfaces.
-  class InPointer < FFI::Pointer
+  module InPointer
     def self.from_array(type, ary)
       return unless ary
       case type
@@ -36,11 +36,11 @@ module GirFFI
       when :utf8, :filename
         from_utf8 val
       when :gint32, :guint32, :gint8, :GType
-        new val
+        FFI::Pointer.new val
       when Class, :void
         val.to_ptr
       when Module
-        new type[val]
+        FFI::Pointer.new type[val]
       else
         raise NotImplementedError, type
       end
@@ -77,12 +77,12 @@ module GirFFI
         type_size = FFI.type_size(ffi_type)
         length = ary.length
 
-        ptr = AllocationHelper.safe_malloc type_size * (length + 1)
+        ptr = FFI::MemoryPointer.new type_size * (length + 1)
+        ptr.autorelease = false
         ary.each_with_index do |item, idx|
           type.copy_value_to_pointer item, ptr, idx * type_size
         end
-        ptr.put_bytes length * type_size, "\0" * type_size, 0, type_size
-        new ptr
+        ptr
       end
 
       def from_enum_array(type, ary)
@@ -93,24 +93,20 @@ module GirFFI
 
       def from_utf8(str)
         return unless str
-        len = str.bytesize
-        ptr = AllocationHelper.safe_malloc(len + 1).write_string(str).put_char(len, 0)
-        new ptr
+        ptr = FFI::MemoryPointer.from_string(str)
+        ptr.autorelease = false
+        ptr
       end
 
       private
 
       def from_basic_type_array(type, ary)
         ffi_type = TypeMap.type_specification_to_ffi_type type
-        ary = ary.dup << null_value(ffi_type)
         type_size = FFI.type_size(ffi_type)
-        block = AllocationHelper.safe_malloc type_size * ary.length
+        block = FFI::MemoryPointer.new type_size * (ary.length + 1)
+        block.autorelease = false
         block.send "put_array_of_#{ffi_type}", 0, ary
-        new block
-      end
-
-      def null_value(ffi_type)
-        ffi_type == :pointer ? nil : 0
+        block
       end
     end
   end

data/lib/gir_ffi/object_base.rb

@@ -67,7 +67,7 @@ module GirFFI
     def self.object_class
       @object_class ||=
         begin
-          ptr = GObject.type_class_ref(gtype).to_ptr
+          ptr = GObject::Lib.g_type_class_ref(gtype)
           gir_ffi_builder.object_class_struct.wrap ptr
         end
     end

data/lib/gir_ffi/ownable.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module GirFFI
+  # Module implementing the concept of ownership. Owned objects need to have
+  # their memory freed or ref count lowered when they're garbage collected.
+  # Note that this attribute is generally placed on the nested struct of an
+  # object, and the relevant action is performed when the object's finalizer is
+  # run.
+  module Ownable
+    attr_accessor :owned
+
+    def owned?
+      owned
+    end
+  end
+end

data/lib/gir_ffi/struct.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+require 'gir_ffi/ownable'
+
+module GirFFI
+  # Struct that can be owned.
+  class Struct < FFI::Struct
+    include Ownable
+  end
+end

data/lib/gir_ffi/struct_base.rb

@@ -9,11 +9,13 @@ module GirFFI
 
     def initialize
       @struct = self.class::Struct.new
+      @struct.owned = true
+      @struct.to_ptr.autorelease = false
     end
 
     # Wrap value and take ownership of it
     def self.wrap_own(val)
-      wrap(val).tap { |it| it && it.to_ptr.autorelease = true }
+      own wrap(val)
     end
   end
 end

data/lib/gir_ffi/struct_like_base.rb

@@ -36,18 +36,30 @@ module GirFFI
 
     # Create an unowned copy of the struct represented by val
     def copy_from(val)
-      copy(from(val)).tap { |it| it && it.to_ptr.autorelease = false }
+      disown copy from(val)
     end
 
     # Wrap an owned copy of the struct represented by val
     def wrap_copy(val)
-      copy wrap(val)
+      own copy wrap(val)
+    end
+
+    def own(val)
+      val.struct.owned = true if val
+      val
+    end
+
+    def disown(val)
+      val.struct.owned = false if val
+      val
     end
 
     # Create a copy of the struct represented by val
     def copy(val)
       return unless val
-      new.tap { |copy| copy_value_to_pointer(val, copy.to_ptr) }
+      new.tap do |copy|
+        copy_value_to_pointer(val, copy.to_ptr)
+      end
     end
   end
 end

data/lib/gir_ffi/union.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+require 'gir_ffi/ownable'
+
+module GirFFI
+  # Union that can be owned.
+  class Union < FFI::Union
+    include Ownable
+  end
+end

data/lib/gir_ffi/union_base.rb

@@ -9,6 +9,8 @@ module GirFFI
 
     def initialize
       @struct = self.class::Struct.new
+      @struct.owned = true
+      @struct.to_ptr.autorelease = false
     end
   end
 end

data/lib/gir_ffi/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 # Current GirFFI version
 module GirFFI
-  VERSION = '0.10.0'.freeze
+  VERSION = '0.10.1'.freeze
 end

data/test/gir_ffi/boxed_base_test.rb

@@ -5,20 +5,20 @@ GirFFI.setup :GIMarshallingTests
 
 describe GirFFI::BoxedBase do
   describe 'wrap_copy' do
-    it 'returns a wrapped copy with autorelease true' do
+    it 'returns a wrapped copy with owned true' do
       original = GIMarshallingTests::BoxedStruct.new
       copy = GIMarshallingTests::BoxedStruct.wrap_copy(original.to_ptr)
       copy.to_ptr.wont_equal original.to_ptr
-      copy.to_ptr.must_be :autorelease?
+      copy.struct.must_be :owned?
     end
   end
 
   describe 'copy_from' do
-    it 'returns a copy with autorelease false' do
+    it 'returns a copy with owned false' do
       original = GIMarshallingTests::BoxedStruct.new
       copy = GIMarshallingTests::BoxedStruct.copy_from(original)
       copy.to_ptr.wont_equal original.to_ptr
-      copy.to_ptr.wont_be :autorelease?
+      copy.struct.wont_be :owned?
     end
   end
 end

data/test/gir_ffi/builders/argument_builder_test.rb

@@ -354,7 +354,7 @@ describe GirFFI::Builders::ArgumentBuilder do
 
         it 'has the correct value for #post_conversion' do
           builder.post_conversion.must_equal [
-            '_v2 = _v1.get_pointer(0).tap { |it| it.autorelease = true }.to_utf8'
+            '_v2 = GirFFI::AllocationHelper.free_after _v1.get_pointer(0), &:to_utf8'
           ]
         end
 

data/test/gir_ffi/builders/function_builder_test.rb

@@ -6,6 +6,16 @@ describe GirFFI::Builders::FunctionBuilder do
     let(:builder) { GirFFI::Builders::FunctionBuilder.new function_info }
     let(:code) { builder.method_definition }
 
+    describe 'generally' do
+      let(:function_info) { get_method_introspection_data 'GObject', 'Object', 'get_property' }
+
+      it 'returns the same result when called twice' do
+        original = builder.method_definition
+        copy = builder.method_definition
+        copy.must_equal original
+      end
+    end
+
     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
@@ -448,6 +458,23 @@ describe GirFFI::Builders::FunctionBuilder do
       end
     end
 
+    describe 'string ownership transfer' do
+      describe 'for Regress.test_utf8_out' do
+        let(:function_info) { get_introspection_data 'Regress', 'test_utf8_out' }
+
+        it 'builds a correct definition' do
+          code.must_equal <<-CODE.reset_indentation
+          def self.test_utf8_out
+            _v1 = FFI::MemoryPointer.new :pointer
+            Regress::Lib.regress_test_utf8_out _v1
+            _v2 = GirFFI::AllocationHelper.free_after _v1.get_pointer(0), &:to_utf8
+            return _v2
+          end
+          CODE
+        end
+      end
+    end
+
     describe 'for functions with an allow-none ingoing parameter' do
       let(:function_info) { get_introspection_data 'Regress', 'test_utf8_null_in' }
       it 'builds correct definition with default parameter value' do

data/test/gir_ffi/builders/initializer_builder_test.rb

@@ -39,12 +39,12 @@ describe GirFFI::Builders::InitializerBuilder do
         get_method_introspection_data 'GIMarshallingTests', 'BoxedStruct', 'new'
       end
 
-      it 'builds an initializer that sets autorelease to true' do
+      it 'builds an initializer that sets owned to true' do
         code.must_equal <<-CODE.reset_indentation
           def initialize
             _v1 = GIMarshallingTests::Lib.gi_marshalling_tests_boxed_struct_new
-            _v1.autorelease = true
             store_pointer(_v1)
+            @struct.owned = true
           end
         CODE
       end

data/test/gir_ffi/builders/return_value_builder_test.rb

@@ -347,7 +347,7 @@ describe GirFFI::Builders::ReturnValueBuilder do
       it 'autoreleases and converts the result in #post_conversion' do
         builder.capture_variable_name.must_equal '_v1'
         builder.post_conversion.
-          must_equal ['_v2 = _v1.tap { |it| it.autorelease = true }.to_utf8']
+          must_equal ['_v2 = GirFFI::AllocationHelper.free_after _v1, &:to_utf8']
       end
 
       it 'returns the converted result' do

data/test/gir_ffi/builders/union_builder_test.rb

@@ -23,8 +23,8 @@ describe GirFFI::Builders::UnionBuilder do
   end
 
   describe '#layout_superclass' do
-    it 'returns FFI::Union' do
-      builder.layout_superclass.must_equal FFI::Union
+    it 'returns GirFFI::Union' do
+      builder.layout_superclass.must_equal GirFFI::Union
     end
   end
 end

data/test/gir_ffi/builders/vfunc_builder_test.rb

@@ -101,7 +101,7 @@ describe GirFFI::Builders::VFuncBuilder do
           _v2 = arg
           _v3 = GirFFI::AllocationHelper.allocate(:int8).tap { |ptr| out.put_pointer 0, ptr }
           _v4 = _proc.call(_v1, _v2)
-          _v3.put_pointer 0, _v4
+          _v3.put_int8 0, _v4
         end
         CODE
 

data/test/gir_ffi/class_base_test.rb

@@ -5,7 +5,7 @@ describe GirFFI::ClassBase do
   describe 'a simple descendant' do
     let(:klass) do
       Class.new(GirFFI::ClassBase) do
-        self::Struct = Class.new(FFI::Struct) do
+        self::Struct = Class.new(GirFFI::Struct) do
           layout :foo, :int32
         end
       end

data/test/gir_ffi/in_out_pointer_test.rb

@@ -14,20 +14,20 @@ describe GirFFI::InOutPointer do
   describe '#to_value' do
     it 'returns the held value' do
       ptr = GirFFI::InOutPointer.allocate_new :gint32
-      ptr.write_int32 123
+      ptr.put_int32 0, 123
       assert_equal 123, ptr.to_value
     end
 
     describe 'for :gboolean values' do
       it 'works when the value is false' do
         ptr = GirFFI::InOutPointer.allocate_new :gboolean
-        ptr.write_int 0
+        ptr.put_int 0, 0
         ptr.to_value.must_equal false
       end
 
       it 'works when the value is true' do
         ptr = GirFFI::InOutPointer.allocate_new :gboolean
-        ptr.write_int 1
+        ptr.put_int 0, 1
         ptr.to_value.must_equal true
       end
     end
@@ -36,7 +36,7 @@ describe GirFFI::InOutPointer do
       it 'returns a pointer to the held string value' do
         str_ptr = GirFFI::InPointer.from_utf8 'Some value'
         ptr = GirFFI::InOutPointer.allocate_new :utf8
-        ptr.write_pointer str_ptr
+        ptr.put_pointer 0, str_ptr
         assert_equal 'Some value', ptr.to_value.read_string
       end
     end

data/test/gir_ffi/in_pointer_test.rb

@@ -25,7 +25,7 @@ describe GirFFI::InPointer do
 
     it 'handles struct types' do
       e = Class.new(GirFFI::StructBase) do
-        self::Struct = Class.new(FFI::Struct) do
+        self::Struct = Class.new(GirFFI::Struct) do
           layout :foo, :int32, :bar, :int32
         end
       end
@@ -65,8 +65,8 @@ describe GirFFI::InPointer do
       assert_equal 13, @result.get_int(4)
     end
 
-    it 'is an instance of GirFFI::InPointer' do
-      assert_instance_of GirFFI::InPointer, @result
+    it 'is an instance of FFI::MemoryPointer' do
+      @result.must_be_instance_of FFI::MemoryPointer
     end
 
     it 'is zero-terminated' do
@@ -105,8 +105,8 @@ describe GirFFI::InPointer do
       assert_equal 'foo', @result.read_string
     end
 
-    it 'is an instance of GirFFI::InPointer' do
-      assert_instance_of GirFFI::InPointer, @result
+    it 'is an instance of FFI::MemoryPointer' do
+      @result.must_be_instance_of FFI::MemoryPointer
     end
   end
 
@@ -119,8 +119,8 @@ describe GirFFI::InPointer do
       assert_equal 12_345, @result.address
     end
 
-    it 'is an instance of GirFFI::InPointer' do
-      assert_instance_of GirFFI::InPointer, @result
+    it 'is an instance of FFI::Pointer' do
+      @result.must_be_instance_of FFI::Pointer
     end
   end
 

data/test/gir_ffi/sized_array_test.rb

@@ -93,6 +93,8 @@ describe GirFFI::SizedArray do
       it 'creates unowned copies of struct pointer elements' do
         struct = GIMarshallingTests::BoxedStruct.new
         struct.long_ = 2342
+        struct.struct.must_be :owned?
+
         arr = GirFFI::SizedArray.copy_from([:pointer, GIMarshallingTests::BoxedStruct],
                                            1,
                                            [struct])
@@ -102,7 +104,7 @@ describe GirFFI::SizedArray do
         struct_copy = arr.first
         struct_copy.long_.must_equal struct.long_
         struct_copy.to_ptr.wont_equal struct.to_ptr
-        struct_copy.to_ptr.wont_be :autorelease?
+        struct_copy.struct.wont_be :owned?
       end
 
       it 'increases the ref count of object pointer elements' do

data/test/gir_ffi/struct_base_test.rb

@@ -4,21 +4,47 @@ require 'gir_ffi_test_helper'
 GirFFI.setup :GIMarshallingTests
 
 describe GirFFI::StructBase do
+  describe 'new' do
+    it 'creates an instance with an owned struct' do
+      instance = GIMarshallingTests::SimpleStruct.new
+      instance.struct.must_be :owned?
+    end
+
+    it 'ensures the wrapped pointer is not autoreleased' do
+      instance = GIMarshallingTests::SimpleStruct.new
+      instance.to_ptr.wont_be :autorelease?
+    end
+  end
+
   describe 'wrap_copy' do
-    it 'returns a wrapped copy with autorelease true' do
+    it 'returns a wrapped owned copy' do
       original = GIMarshallingTests::SimpleStruct.new
       copy = GIMarshallingTests::SimpleStruct.wrap_copy(original.to_ptr)
       copy.to_ptr.wont_equal original.to_ptr
-      copy.to_ptr.must_be :autorelease?
+      copy.to_ptr.wont_be :autorelease?
+      copy.struct.must_be :owned?
     end
   end
 
   describe 'copy_from' do
-    it 'returns a copy with autorelease false' do
+    it 'returns an unowned copy' do
       original = GIMarshallingTests::SimpleStruct.new
       copy = GIMarshallingTests::SimpleStruct.copy_from(original)
       copy.to_ptr.wont_equal original.to_ptr
       copy.to_ptr.wont_be :autorelease?
+      copy.struct.wont_be :owned?
+    end
+  end
+
+  describe 'wrap_own' do
+    it 'wraps and owns the supplied value' do
+      original = GIMarshallingTests::SimpleStruct.new
+      original.struct.owned = false
+
+      copy = GIMarshallingTests::SimpleStruct.wrap_own(original.to_ptr)
+      copy.to_ptr.must_equal original.to_ptr
+      copy.to_ptr.wont_be :autorelease?
+      copy.struct.must_be :owned?
     end
   end
 end

data/test/gir_ffi/union_base_test.rb

@@ -4,21 +4,35 @@ require 'gir_ffi_test_helper'
 GirFFI.setup :GIMarshallingTests
 
 describe GirFFI::UnionBase do
+  describe 'new' do
+    it 'creates an instance with an owned struct' do
+      instance = GIMarshallingTests::Union.new
+      instance.struct.must_be :owned?
+    end
+
+    it 'ensures the wrapped pointer is not autoreleased' do
+      instance = GIMarshallingTests::Union.new
+      instance.to_ptr.wont_be :autorelease?
+    end
+  end
+
   describe 'wrap_copy' do
-    it 'returns a wrapped copy with autorelease true' do
+    it 'returns a wrapped owned copy' do
       original = GIMarshallingTests::Union.new
       copy = GIMarshallingTests::Union.wrap_copy(original.to_ptr)
       copy.to_ptr.wont_equal original.to_ptr
-      copy.to_ptr.must_be :autorelease?
+      copy.to_ptr.wont_be :autorelease?
+      copy.struct.must_be :owned?
     end
   end
 
   describe 'copy_from' do
-    it 'returns a copy with autorelease false' do
+    it 'returns an unowned copy' do
       original = GIMarshallingTests::Union.new
       copy = GIMarshallingTests::Union.copy_from(original)
       copy.to_ptr.wont_equal original.to_ptr
       copy.to_ptr.wont_be :autorelease?
+      copy.struct.wont_be :owned?
     end
   end
 end

data/test/integration/generated_gimarshallingtests_test.rb

@@ -45,7 +45,7 @@ describe GIMarshallingTests do
     it 'creates an instance using #new' do
       bx = GIMarshallingTests::BoxedStruct.new
       assert_instance_of GIMarshallingTests::BoxedStruct, bx
-      bx.to_ptr.must_be :autorelease?
+      bx.struct.must_be :owned?
     end
 
     it 'has a working method #inv' do
@@ -57,27 +57,24 @@ describe GIMarshallingTests do
     it 'has a working function #inout' do
       bx = GIMarshallingTests::BoxedStruct.new
       bx.long_ = 42
-      bx.to_ptr.must_be :autorelease?
-
-      # FIXME: Temporary check method
-      bx.to_ptr.autorelease = true
+      bx.struct.must_be :owned?
 
       res = GIMarshallingTests::BoxedStruct.inout bx
-      bx.to_ptr.must_be :autorelease?
-      res.to_ptr.must_be :autorelease?
+      bx.struct.must_be :owned?
+      res.struct.must_be :owned?
 
       assert_equal 0, res.long_
     end
 
     it 'has a working function #out' do
       res = GIMarshallingTests::BoxedStruct.out
-      res.to_ptr.must_be :autorelease?
+      res.struct.must_be :owned?
       assert_equal 42, res.long_
     end
 
     it 'has a working function #returnv' do
       res = GIMarshallingTests::BoxedStruct.returnv
-      res.to_ptr.must_be :autorelease?
+      res.struct.must_be :owned?
       assert_equal 42, res.long_
       res.g_strv.must_be :==, %w(0 1 2)
     end

data/test/integration/generated_regress_test.rb

@@ -2564,7 +2564,7 @@ describe Regress do
 
     it 'has a writable field data1' do
       instance.data1.must_be :null?
-      instance.data1 = GirFFI::AllocationHelper.allocate(:int32).tap { |it| it.write_int(42) }
+      instance.data1 = GirFFI::AllocationHelper.allocate(:int32).tap { |it| it.put_int(0, 42) }
       instance.data1.read_int.must_equal 42
     end
 
@@ -2744,6 +2744,7 @@ describe Regress do
   end
 
   it 'has a working function #annotation_return_filename' do
+    skip 'This function is wrongly annotated as transfer-ownership: full'
     Regress.annotation_return_filename.must_equal 'a utf-8 filename'
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gir_ffi
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.10.1
 platform: ruby
 authors:
 - Matijs van Zuijlen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-23 00:00:00.000000000 Z
+date: 2016-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -100,28 +100,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.1'
+        version: '11.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.1'
+        version: '11.1'
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: 0.14.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: 0.14.1
 description: |2
       GirFFI creates bindings for GObject-based libraries at runtime based on introspection
       data provided by the GObject Introspection Repository (GIR) system. Bindings are created
@@ -293,6 +293,7 @@ files:
 - lib/gir_ffi/module_base.rb
 - lib/gir_ffi/object_base.rb
 - lib/gir_ffi/object_store.rb
+- lib/gir_ffi/ownable.rb
 - lib/gir_ffi/property_not_found_error.rb
 - lib/gir_ffi/receiver_argument_info.rb
 - lib/gir_ffi/receiver_type_info.rb
@@ -300,6 +301,7 @@ files:
 - lib/gir_ffi/return_value_info.rb
 - lib/gir_ffi/signal_not_found_error.rb
 - lib/gir_ffi/sized_array.rb
+- lib/gir_ffi/struct.rb
 - lib/gir_ffi/struct_base.rb
 - lib/gir_ffi/struct_like_base.rb
 - lib/gir_ffi/type_base.rb
@@ -307,6 +309,7 @@ files:
 - lib/gir_ffi/unintrospectable_boxed_info.rb
 - lib/gir_ffi/unintrospectable_signal_info.rb
 - lib/gir_ffi/unintrospectable_type_info.rb
+- lib/gir_ffi/union.rb
 - lib/gir_ffi/union_base.rb
 - lib/gir_ffi/user_defined_property_info.rb
 - lib/gir_ffi/user_defined_type_info.rb