gir_ffi 0.7.8 → 0.7.9

data/lib/gir_ffi/registered_type_base.rb

@@ -6,7 +6,12 @@ module GirFFI
   module RegisteredTypeBase
     include TypeBase
 
+    # @deprecated Use #gtype. Will be removed in 0.8.0.
     def get_gtype
+      gtype
+    end
+
+    def gtype
       self::G_TYPE
     end
   end

data/lib/gir_ffi/return_value_info.rb

@@ -2,9 +2,11 @@ module GirFFI
   # Represents a return value with the same interface as IArgumentInfo
   class ReturnValueInfo
     attr_reader :argument_type
+    attr_reader :ownership_transfer
 
-    def initialize type, skip = false
+    def initialize type, ownership_transfer, skip
       @argument_type = type
+      @ownership_transfer = ownership_transfer
       @skip = skip
     end
 

data/lib/gir_ffi/sized_array.rb

@@ -45,7 +45,7 @@ module GirFFI
     private
 
     def element_ffi_type
-      @element_ffi_type ||= GirFFI::TypeMap.type_specification_to_ffitype element_type
+      @element_ffi_type ||= GirFFI::TypeMap.type_specification_to_ffi_type element_type
     end
 
     def element_size

data/lib/gir_ffi/struct_base.rb

@@ -1,29 +1,7 @@
-require 'gir_ffi/class_base'
+require 'gir_ffi/boxed_base'
 
 module GirFFI
   # Base class for generated classes representing GLib structs.
-  class StructBase < ClassBase
-    extend FFI::DataConverter
-
-    def self.native_type
-      FFI::Type::Struct.new(self::Struct)
-    end
-
-    def self.to_ffitype
-      self
-    end
-
-    def self.to_native value, _context
-      value.struct
-    end
-
-    def self.get_value_from_pointer pointer
-      pointer.to_ptr
-    end
-
-    def self.copy_value_to_pointer value, pointer, offset = 0
-      size = self::Struct.size
-      pointer.put_bytes offset, value.to_ptr.read_bytes(size), 0, size
-    end
+  class StructBase < BoxedBase
   end
 end

data/lib/gir_ffi/type_map.rb

@@ -44,9 +44,13 @@ module GirFFI
     end
 
     def self.type_specification_to_ffitype type
+      type_specification_to_ffi_type type
+    end
+
+    def self.type_specification_to_ffi_type type
       case type
       when Module
-        type.to_ffitype
+        type.to_ffi_type
       when Array
         type[0]
       else

data/lib/gir_ffi/union_base.rb

@@ -1,7 +1,7 @@
-require 'gir_ffi/struct_base'
+require 'gir_ffi/boxed_base'
 
 module GirFFI
   # Base class for generated classes representing GLib unions.
-  class UnionBase < StructBase
+  class UnionBase < BoxedBase
   end
 end

data/lib/gir_ffi/version.rb

@@ -1,4 +1,4 @@
 # Current GirFFI version
 module GirFFI
-  VERSION = '0.7.8'
+  VERSION = '0.7.9'
 end

data/lib/gir_ffi/zero_terminated.rb

@@ -58,7 +58,7 @@ module GirFFI
     end
 
     def ffi_type
-      @ffi_type ||= TypeMap.type_specification_to_ffitype element_type
+      @ffi_type ||= TypeMap.type_specification_to_ffi_type element_type
     end
 
     def ffi_type_size

data/test/base_test_helper.rb

@@ -5,17 +5,16 @@ begin
   SimpleCov.start do
     add_filter '/test/'
   end
-rescue LoadError
-end
 
-begin
-  require 'coveralls'
-  Coveralls.wear!
+  if ENV['CI']
+    require 'coveralls'
+    Coveralls.wear!
+  end
 rescue LoadError
 end
 
+require 'minitest/rspec_mocks'
 require 'minitest/autorun'
-require 'rr'
 
 require 'gir_ffi-base'
 require 'ffi-gobject_introspection'
@@ -83,3 +82,4 @@ module BaseTestExtensions
 end
 
 Minitest::Test.send :include, BaseTestExtensions
+Minitest::Test.send :include, Minitest::RSpecMocks

data/test/ffi-glib/hash_table_test.rb

@@ -10,7 +10,7 @@ describe GLib::HashTable do
   describe '::from' do
     it 'creates a GHashTable from a Ruby hash' do
       hsh = GLib::HashTable.from [:utf8, :gint32],
-        'foo' => 23, 'bar' => 32
+                                 'foo' => 23, 'bar' => 32
       assert_equal({ 'foo' => 23, 'bar' => 32 }, hsh.to_hash)
     end
 
@@ -51,16 +51,16 @@ describe GLib::HashTable do
       a = {}
       @hash.each { |k, v| a[k] = v }
       a.must_be :==,
-        'foo' => 'bar',
-        'baz' => 'bat',
-        'qux' => 'quux'
+                'foo' => 'bar',
+                'baz' => 'bat',
+                'qux' => 'quux'
     end
 
     it 'has a working #to_hash method' do
       @hash.to_hash.must_be :==,
-        'foo' => 'bar',
-        'baz' => 'bat',
-        'qux' => 'quux'
+                            'foo' => 'bar',
+                            'baz' => 'bat',
+                            'qux' => 'quux'
     end
   end
 end

data/test/ffi-glib/iconv_test.rb

@@ -1,15 +1,14 @@
 require 'gir_ffi_test_helper'
 
 describe GLib::IConv do
+  let(:instance) { GLib::IConv.open('ascii', 'utf-8') }
+
   describe '.open' do
     it 'creates a new instance of GLib::Iconv' do
-      instance = GLib::IConv.open('ascii', 'utf-8')
       instance.must_be_instance_of GLib::IConv
     end
   end
 
-  let(:instance) { GLib::IConv.open('ascii', 'utf-8') }
-
   describe '#setup_and_call' do
     it "works for the method called ''" do
       instance.setup_and_call :'', [nil, nil, nil, nil]

data/test/ffi-glib/main_loop_test.rb

@@ -6,7 +6,7 @@ describe GLib::MainLoop do
       main_loop = GLib::MainLoop.new nil, false
 
       a = []
-      GLib.timeout_add(GLib::PRIORITY_DEFAULT, 100,
+      GLib.timeout_add(GLib::PRIORITY_DEFAULT, 150,
                        proc { main_loop.quit },
                        nil, nil)
 
@@ -21,7 +21,7 @@ describe GLib::MainLoop do
 
       slow_thread.join
 
-      a.last.must_equal 'After run'
+      a.must_equal ['Before run', 'During run', 'After run']
     end
   end
 end

data/test/ffi-gobject/gobject_test.rb

@@ -49,7 +49,7 @@ describe GObject do
       gtype = object_class.g_type_class.g_type
 
       object_class.must_be_instance_of GObject::ObjectClass
-      gtype.must_equal GIMarshallingTests::OverridesObject.get_gtype
+      gtype.must_equal GIMarshallingTests::OverridesObject.gtype
     end
   end
 

data/test/ffi-gobject/object_test.rb

@@ -5,8 +5,7 @@ require 'ffi-gobject'
 describe GObject::Object do
   describe '#get_property' do
     it 'is overridden to have arity 1' do
-      assert_equal 1,
-        GObject::Object.instance_method('get_property').arity
+      GObject::Object.instance_method('get_property').arity.must_equal 1
     end
   end
 
@@ -38,21 +37,17 @@ describe GObject::Object do
     subject { GObject::Object.new GObject::TYPE_OBJECT, nil }
 
     it 'delegates to GObject' do
-      mock(GObject).signal_connect(subject, 'some-event', nil)
+      expect(GObject).to receive(:signal_connect).with(subject, 'some-event', nil)
       subject.signal_connect('some-event') do
         nothing
       end
-
-      RR.verify
     end
 
     it 'delegates to GObject if an optional data argument is passed' do
-      mock(GObject).signal_connect(subject, 'some-event', 'data')
+      expect(GObject).to receive(:signal_connect).with(subject, 'some-event', 'data')
       subject.signal_connect('some-event', 'data') do
         nothing
       end
-
-      RR.verify
     end
   end
 
@@ -60,21 +55,17 @@ describe GObject::Object do
     subject { GObject::Object.new GObject::TYPE_OBJECT, nil }
 
     it 'delegates to GObject' do
-      mock(GObject).signal_connect_after(subject, 'some-event', nil)
+      expect(GObject).to receive(:signal_connect_after).with(subject, 'some-event', nil)
       subject.signal_connect_after('some-event') do
         nothing
       end
-
-      RR.verify
     end
 
     it 'delegates to GObject if an optional data argument is passed' do
-      mock(GObject).signal_connect_after(subject, 'some-event', 'data')
+      expect(GObject).to receive(:signal_connect_after).with(subject, 'some-event', 'data')
       subject.signal_connect_after('some-event', 'data') do
         nothing
       end
-
-      RR.verify
     end
   end
 end

data/test/ffi-gobject/value_test.rb

@@ -52,14 +52,14 @@ describe GObject::Value do
 
     it 'handles enum values presented as symbols' do
       value = :value2
-      gv = GObject::Value.for_g_type Regress::TestEnum.get_gtype
+      gv = GObject::Value.for_g_type Regress::TestEnum.gtype
       gv.set_value value
       gv.get_value.must_equal value
     end
 
     it 'handles enum values presented as numbers' do
       value = :value2
-      gv = GObject::Value.for_g_type Regress::TestEnum.get_gtype
+      gv = GObject::Value.for_g_type Regress::TestEnum.gtype
       gv.set_value Regress::TestEnum[value]
       gv.get_value.must_equal value
     end
@@ -119,7 +119,6 @@ describe GObject::Value do
       gv.set_value value
       gv.get_variant.must_equal value
     end
-
   end
 
   describe '#get_value' do
@@ -144,14 +143,14 @@ describe GObject::Value do
 
     it 'unwraps an enum value' do
       value = :value2
-      gv = GObject::Value.for_g_type Regress::TestEnum.get_gtype
+      gv = GObject::Value.for_g_type Regress::TestEnum.gtype
       gv.set_enum Regress::TestEnum[value]
       gv.get_value.must_equal value
     end
 
     it 'unwraps a flags value' do
       value = Regress::TestFlags[:flag1] | Regress::TestFlags[:flag3]
-      gv = GObject::Value.for_g_type Regress::TestFlags.get_gtype
+      gv = GObject::Value.for_g_type Regress::TestFlags.gtype
       gv.set_flags value
       gv.get_value.must_equal value
     end
@@ -257,7 +256,7 @@ describe GObject::Value do
 
     it 'raises an error when setting an incompatible object type' do
       o = GIMarshallingTests::Object.new 1
-      v = GObject::Value.new.init(GIMarshallingTests::OverridesObject.get_gtype)
+      v = GObject::Value.new.init(GIMarshallingTests::OverridesObject.gtype)
       proc { v.set_value o }.must_raise ArgumentError
     end
 
@@ -268,4 +267,29 @@ describe GObject::Value do
       v.get_value.to_string.must_equal 'some bytes'
     end
   end
+
+  describe 'upon garbage collection' do
+    before do
+      GirFFI.setup :GIMarshallingTests
+    end
+
+    it 'restores the underlying GValue to its pristine state' do
+      if defined?(RUBY_ENGINE) && %w(jruby rbx).include?(RUBY_ENGINE)
+        skip 'cannot be reliably tested on JRuby and Rubinius'
+      end
+
+      value = GObject::Value.from 42
+
+      # Drop reference to original GObject::Value
+      value = GObject::Value.wrap value.to_ptr
+      value.current_gtype_name.must_equal 'gint'
+
+      GC.start
+      sleep 1
+      GC.start
+      GC.start
+
+      value.current_gtype_name.wont_equal 'gint'
+    end
+  end
 end

data/test/ffi-gobject_introspection/i_base_info_test.rb

@@ -4,12 +4,12 @@ describe GObjectIntrospection::IBaseInfo do
   let(:described_class) { GObjectIntrospection::IBaseInfo }
   describe '#initialize' do
     it 'raises an error if a null pointer is passed' do
-      mock(ptr = Object.new).null? { true }
+      expect(ptr = Object.new).to receive(:null?).and_return true
       proc { described_class.new ptr }.must_raise ArgumentError
     end
 
     it 'raises no error if a non-null pointer is passed' do
-      mock(ptr = Object.new).null? { false }
+      expect(ptr = Object.new).to receive(:null?).and_return false
       described_class.new ptr
       pass
     end
@@ -35,15 +35,15 @@ describe GObjectIntrospection::IBaseInfo do
         skip 'cannot be reliably tested on JRuby and Rubinius'
       end
 
-      mock(ptr = Object.new).null? { false }
-      mock(lib = Object.new).g_base_info_unref(ptr) { nil }
+      expect(ptr = Object.new).to receive(:null?).and_return false
+      expect(lib = Object.new).to receive(:g_base_info_unref).with(ptr).and_return nil
       described_class.new ptr, lib
 
       GC.start
 
       # Yes, the next three lines are needed. https://gist.github.com/4277829
-      stub(ptr2 = Object.new).null? { false }
-      stub(lib).g_base_info_unref(ptr2) { nil }
+      allow(ptr2 = Object.new).to receive(:null?).and_return false
+      allow(lib).to receive(:g_base_info_unref).with(ptr2).and_return nil
       described_class.new ptr2, lib
 
       GC.start

data/test/ffi-gobject_introspection/i_repository_test.rb

@@ -1,6 +1,8 @@
 require 'introspection_test_helper'
 
 describe GObjectIntrospection::IRepository do
+  let(:gir) { GObjectIntrospection::IRepository.default }
+
   describe 'an instance' do
     it 'is not created by calling new()' do
       assert_raises NoMethodError do
@@ -9,19 +11,15 @@ describe GObjectIntrospection::IRepository do
     end
 
     it 'is created by calling default()' do
-      gir = GObjectIntrospection::IRepository.default
       assert_kind_of GObjectIntrospection::IRepository, gir
     end
 
     it 'is a singleton' do
-      gir = GObjectIntrospection::IRepository.default
       gir2 = GObjectIntrospection::IRepository.default
       assert_equal gir, gir2
     end
   end
 
-  let(:gir) { GObjectIntrospection::IRepository.default }
-
   describe '#require' do
     it "raises an error if the namespace doesn't exist" do
       assert_raises RuntimeError do

data/test/gir_ffi/arg_helper_test.rb

@@ -4,7 +4,7 @@ describe GirFFI::ArgHelper do
   describe '.cast_from_pointer' do
     it 'handles class types' do
       klass = Class.new
-      mock(klass).wrap(:pointer_value) { :wrapped_value }
+      expect(klass).to receive(:wrap).with(:pointer_value).and_return :wrapped_value
       GirFFI::ArgHelper.cast_from_pointer(klass, :pointer_value).must_equal :wrapped_value
     end
 

data/test/gir_ffi/builder_test.rb

@@ -18,10 +18,12 @@ describe GirFFI::Builder do
     it 'calls attach_function with the correct types for Regress.test_callback_destroy_notify' do
       function_info = get_introspection_data 'Regress', 'test_callback_destroy_notify'
 
-      mock(lib).
-        attach_function('regress_test_callback_destroy_notify',
-                        [Regress::TestCallbackUserData, :pointer, GLib::DestroyNotify],
-                        :int32) { true }
+      expect(lib).
+        to receive(:attach_function).
+        with('regress_test_callback_destroy_notify',
+             [Regress::TestCallbackUserData, :pointer, GLib::DestroyNotify],
+             :int32).
+        and_return true
 
       GirFFI::Builder.attach_ffi_function(lib, function_info)
     end
@@ -29,25 +31,29 @@ describe GirFFI::Builder do
     it 'calls attach_function with the correct types for Regress::TestObj#torture_signature_0' do
       info = get_method_introspection_data 'Regress', 'TestObj', 'torture_signature_0'
 
-      mock(lib).
-        attach_function('regress_test_obj_torture_signature_0',
-                        [:pointer, :int32, :pointer, :pointer, :pointer, :pointer, :uint32],
-                        :void) { true }
+      expect(lib).
+        to receive(:attach_function).
+        with('regress_test_obj_torture_signature_0',
+             [:pointer, :int32, :pointer, :pointer, :pointer, :pointer, :uint32],
+             :void).
+        and_return true
 
       GirFFI::Builder.attach_ffi_function(lib, info)
     end
 
     it 'calls attach_function with the correct types for Regress::TestObj#instance_method' do
       info = get_method_introspection_data 'Regress', 'TestObj', 'instance_method'
-      mock(lib).attach_function('regress_test_obj_instance_method',
-                                [:pointer], :int32) { true }
+      expect(lib).to receive(:attach_function).
+        with('regress_test_obj_instance_method', [:pointer], :int32).
+        and_return true
       GirFFI::Builder.attach_ffi_function(lib, info)
     end
 
     it 'calls attach_function with the correct types for Regress.test_array_gint32_in' do
       info = get_introspection_data 'Regress', 'test_array_gint32_in'
-      mock(lib).attach_function('regress_test_array_gint32_in',
-                                [:int32, :pointer], :int32) { true }
+      expect(lib).to receive(:attach_function).
+        with('regress_test_array_gint32_in', [:int32, :pointer], :int32).
+        and_return true
       GirFFI::Builder.attach_ffi_function(lib, info)
     end
   end