gir_ffi 0.13.0 → 0.13.1

data/test/gir_ffi/builders/return_value_builder_test.rb

@@ -405,7 +405,7 @@ describe GirFFI::Builders::ReturnValueBuilder do
     let(:type_info) { callback_info.args[0].argument_type }
 
     before do
-      builder.closure = true
+      builder.mark_as_user_data :dummy
     end
 
     it 'fetches the stored object in #post_conversion' do

data/test/gir_ffi/builders/signal_closure_builder_test.rb

@@ -12,7 +12,7 @@ describe GirFFI::Builders::SignalClosureBuilder do
 
     it 'builds a descendant of RubyClosure' do
       klass = builder.build_class
-      klass.ancestors.must_include GObject::RubyClosure
+      klass.superclass.must_equal GObject::RubyClosure
     end
   end
 

data/test/gir_ffi/builders/unintrospectable_boxed_builder_test.rb

@@ -23,7 +23,7 @@ describe GirFFI::Builders::UnintrospectableBoxedBuilder do
   end
 
   it 'builds a class derived from GirFFI::BoxedBase' do
-    boxed_class.ancestors.must_include GirFFI::BoxedBase
+    boxed_class.superclass.must_equal GirFFI::BoxedBase
   end
 
   it 'returns the same class when built again' do

data/test/gir_ffi/builders/unintrospectable_builder_test.rb

@@ -21,11 +21,11 @@ describe GirFFI::Builders::UnintrospectableBuilder do
     end
 
     it 'builds a class derived from GObject::Object' do
-      assert_includes @klass.ancestors, GObject::Object
+      assert_includes @klass.registered_ancestors, GObject::Object
     end
 
     it 'builds a class derived from Gio::File' do
-      assert_includes @klass.ancestors, Gio::File
+      assert_includes @klass.registered_ancestors, Gio::File
     end
 
     it 'returns the same class when built again' do

data/test/gir_ffi/builders/vfunc_builder_test.rb

@@ -40,7 +40,7 @@ describe GirFFI::Builders::VFuncBuilder do
         def self.call_with_argument_mapping(_proc, _instance)
           _v1 = GIMarshallingTests::Object.wrap(_instance)
           _v2 = _proc.call(_v1)
-          _v3 = GIMarshallingTests::Enum.from(_v2)
+          _v3 = GIMarshallingTests::Enum.to_int(_v2)
           return _v3
         end
         CODE

data/test/gir_ffi/enum_base_test.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+require 'gir_ffi_test_helper'
+
+GirFFI.setup :Regress
+
+describe GirFFI::EnumBase do
+  describe '.wrap' do
+    it 'converts an integer to a symbol if possible' do
+      Regress::TestEnum.wrap(1).must_equal :value2
+    end
+
+    it 'passes an integer if it cannot be converted' do
+      Regress::TestEnum.wrap(32).must_equal 32
+    end
+
+    it 'passes a known symbol untouched' do
+      Regress::TestEnum.wrap(:value1).must_equal :value1
+    end
+
+    it 'passes an unknown symbol untouched' do
+      Regress::TestEnum.wrap(:foo).must_equal :foo
+    end
+  end
+
+  describe '.to_int' do
+    it 'passes a known integer untouched' do
+      Regress::TestEnum.to_int(1).must_equal 1
+    end
+
+    it 'passes an unknown integer untouched' do
+      Regress::TestEnum.to_int(32).must_equal 32
+    end
+
+    it 'convertes a known symbol to an integer' do
+      Regress::TestEnum.to_int(:value1).must_equal 0
+    end
+
+    it 'raises an error for an unknown symbol' do
+      -> { Regress::TestEnum.to_int(:foo) }.must_raise ArgumentError
+    end
+  end
+end

data/test/gir_ffi/info_ext/i_type_info_test.rb

@@ -267,16 +267,10 @@ describe GirFFI::InfoExt::ITypeInfo do
         allow(type_info).to receive(:pointer?).and_return false
       end
 
-      it 'correctly maps a :union argument to :pointer' do
-        allow(iface_info).to receive(:info_type).and_return :union
+      it 'delegates to interface info' do
+        allow(iface_info).to receive(:to_callback_ffi_type).and_return :some_ffi_type
 
-        type_info.to_callback_ffi_type.must_equal :pointer
-      end
-
-      it 'correctly maps a :flags argument to :int32' do
-        allow(iface_info).to receive(:info_type).and_return :flags
-
-        type_info.to_callback_ffi_type.must_equal :int32
+        type_info.to_callback_ffi_type.must_equal :some_ffi_type
       end
     end
   end

data/test/gir_ffi/object_base_test.rb

@@ -31,4 +31,34 @@ describe GirFFI::ObjectBase do
       second.must_be :eql?, first
     end
   end
+
+  describe '#included_interfaces' do
+    let(:base_class) { GIMarshallingTests::Object }
+    let(:derived_class) { Class.new(base_class) }
+
+    before do
+      derived_class.class_eval { include GIMarshallingTests::Interface }
+    end
+
+    it 'finds the included interface' do
+      derived_class.included_interfaces.must_equal [GIMarshallingTests::Interface]
+    end
+  end
+
+  describe '#registered_ancestors' do
+    let(:base_class) { GIMarshallingTests::Object }
+    let(:derived_class) { Class.new(base_class) }
+
+    before do
+      derived_class.class_eval { include GIMarshallingTests::Interface }
+    end
+
+    it 'finds the ancestor classes and included interface' do
+      derived_class.registered_ancestors.
+        must_equal [derived_class,
+                    GIMarshallingTests::Interface,
+                    GIMarshallingTests::Object,
+                    GObject::Object]
+    end
+  end
 end

data/test/gir_ffi/sized_array_test.rb

@@ -135,15 +135,6 @@ describe GirFFI::SizedArray do
       arr = GirFFI::SizedArray.copy_from :gint32, 0, nil
       arr.must_be_nil
     end
-
-    it 'creates an unowned copy of its argument if given a pointer' do
-      arr = GirFFI::SizedArray.from :gint32, 3, [3, 2, 1]
-      arr2 = GirFFI::SizedArray.copy_from :gint32, 3, arr.to_ptr
-      assert_instance_of GirFFI::SizedArray, arr2
-      arr2.to_ptr.wont_be :==, arr.to_ptr
-      arr2.to_ptr.wont_be :autorelease?
-      arr2.to_a.must_equal [3, 2, 1]
-    end
   end
 
   describe '#==' do

data/test/gir_ffi/user_defined_object_info_test.rb

@@ -19,10 +19,8 @@ describe GirFFI::UserDefinedObjectInfo do
     let(:foo_spec) { Object.new }
 
     it 'adds the passed in property to the list of properties' do
-      expect(foo_spec).to receive(:get_name).and_return :foo
-
       info.install_property foo_spec
-      info.properties.map(&:name).must_equal [:foo]
+      info.properties.must_equal [foo_spec]
     end
   end
 
@@ -60,12 +58,12 @@ describe GirFFI::UserDefinedObjectInfo do
     end
 
     before do
-      expect(foo_spec).to receive(:get_name).and_return :foo
-      expect(bar_spec).to receive(:get_name).and_return :bar
+      allow(foo_spec).to receive(:get_name).and_return :foo
+      allow(bar_spec).to receive(:get_name).and_return :bar
     end
 
     it 'yields the new object to the block passed' do
-      info.properties.map(&:name).must_equal [:foo, :bar]
+      info.properties.map(&:get_name).must_equal [:foo, :bar]
     end
   end
 

data/test/gir_ffi/user_defined_property_info_test.rb

@@ -10,7 +10,8 @@ describe GirFFI::UserDefinedPropertyInfo do
                            1, 3, 2,
                            readable: true, writable: true)
   end
-  let(:info) { GirFFI::UserDefinedPropertyInfo.new pspec }
+  let(:container) { Object.new }
+  let(:info) { GirFFI::UserDefinedPropertyInfo.new pspec, container, 24 }
 
   describe '#param_spec' do
     it 'returns the passed in parameter specification' do
@@ -19,8 +20,8 @@ describe GirFFI::UserDefinedPropertyInfo do
   end
 
   describe '#name' do
-    it 'returns the name retrieved from the parameter specification' do
-      info.name.must_equal 'foo-bar'
+    it 'returns the accessor name from the parameter specification' do
+      info.name.must_equal 'foo_bar'
     end
   end
 
@@ -30,9 +31,9 @@ describe GirFFI::UserDefinedPropertyInfo do
     end
   end
 
-  describe '#type_tag' do
+  describe '#field_type.tag' do
     it 'returns the mapped type symbol' do
-      info.type_tag.must_equal :gint
+      info.field_type.tag.must_equal :gint
     end
   end
 end

data/test/gir_ffi/zero_terminated_test.rb

@@ -14,6 +14,20 @@ describe GirFFI::ZeroTerminated do
     it 'returns a GirFFI::ZeroTerminated object' do
       result.must_be_instance_of GirFFI::ZeroTerminated
     end
+
+    it 'works for Regress::TestEnum from numbers' do
+      GirFFI.setup :Regress
+      enum_arr = GirFFI::ZeroTerminated.from Regress::TestEnum, [1, -1, 48]
+      ptr = enum_arr.to_ptr
+      ptr.read_array_of_int32(4).must_equal [1, -1, 48, 0]
+    end
+
+    it 'works for Regress::TestEnum from symbols' do
+      GirFFI.setup :Regress
+      enum_arr = GirFFI::ZeroTerminated.from Regress::TestEnum, [:value2, :value3, :value4]
+      ptr = enum_arr.to_ptr
+      ptr.read_array_of_int32(4).must_equal [1, -1, 48, 0]
+    end
   end
 
   describe '.wrap' do
@@ -83,4 +97,12 @@ describe GirFFI::ZeroTerminated do
   it 'includes Enumerable' do
     GirFFI::ZeroTerminated.must_include Enumerable
   end
+
+  describe '#to_a' do
+    it 'works for Regress::TestEnum' do
+      GirFFI.setup :Regress
+      enum_arr = GirFFI::ZeroTerminated.from Regress::TestEnum, [1, 48, -1]
+      enum_arr.to_a.must_equal [:value2, :value4, :value3]
+    end
+  end
 end

data/test/gir_ffi_test_helper.rb

@@ -17,6 +17,7 @@ module GirFFITestExtensions
 
   def save_module(name)
     return unless Object.const_defined? name
+
     puts "Saving #{name} over existing" if SAVED_MODULES.key? name
     SAVED_MODULES[name] = Object.const_get name
     Object.send(:remove_const, name)
@@ -25,6 +26,7 @@ module GirFFITestExtensions
   def restore_module(name)
     Object.send(:remove_const, name) if Object.const_defined? name
     return unless SAVED_MODULES.key? name
+
     Object.const_set name, SAVED_MODULES[name]
     SAVED_MODULES.delete name
   end

data/test/integration/generated_gimarshallingtests_test.rb

@@ -611,6 +611,7 @@ describe GIMarshallingTests do
       derived_instance = make_derived_instance do |info|
         info.install_vfunc_implementation :vfunc_meth_with_err, proc { |_object, x|
           raise 'This is not the answer!' unless x == 42
+
           true
         }
       end

data/test/integration/generated_gio_test.rb

@@ -9,8 +9,10 @@ describe 'The generated Gio module' do
   describe 'File#new_for_path, a method returning an interface,' do
     it 'returns an object of a more specific class' do
       file = Gio::File.new_for_path('/')
+      file.class.registered_ancestors.must_equal [file.class, Gio::File, GObject::Object]
+
       refute_instance_of Gio::File, file
-      assert_includes file.class.ancestors, Gio::File
+      assert_includes file.class.registered_ancestors, Gio::File
     end
   end
 
@@ -20,9 +22,7 @@ describe 'The generated Gio module' do
     end
 
     it 'is able to set up a method in a class that is not the first ancestor' do
-      anc = @it.class.ancestors
-      assert_equal [Gio::File, GObject::Object], anc[1, 2]
-
+      refute_defines_instance_method @it.class, :get_qdata
       refute_defines_instance_method Gio::File, :get_qdata
       assert_defines_instance_method GObject::Object, :get_qdata
 
@@ -82,8 +82,7 @@ describe 'The generated Gio module' do
   describe 'the CharsetConverter class' do
     it 'includes two interfaces' do
       klass = Gio::CharsetConverter
-      assert_includes klass.ancestors, Gio::Converter
-      assert_includes klass.ancestors, Gio::Initable
+      klass.included_interfaces.must_equal [Gio::Initable, Gio::Converter]
     end
 
     it 'allows an instance to find the #reset method' do

data/test/integration/generated_gobject_test.rb

@@ -48,7 +48,7 @@ describe GObject do
   describe GObject::TypeModule do
     it 'has the GObject::TypePlugin module as an ancestor' do
       klass = GObject::TypeModule
-      assert_includes klass.ancestors, GObject::TypePlugin
+      assert_includes klass.registered_ancestors, GObject::TypePlugin
     end
   end
 

data/test/integration/generated_gtop_test.rb

@@ -15,7 +15,9 @@ describe 'The generated GTop module' do
 
   describe 'Glibtop' do
     it 'is a valid struct class' do
-      GTop::Glibtop.ancestors.must_include GirFFI::StructBase
+      # Superclass is either BoxedBase or StructBase, depending on library
+      # versions. This means StructBase is always one of the ancestors.
+      assert GTop::Glibtop < GirFFI::StructBase
     end
 
     it 'can be created using Glibtop.init' do

data/test/integration/generated_regress_test.rb

@@ -1455,8 +1455,7 @@ describe Regress do
 
   describe 'Regress::TestFundamentalObject' do
     it 'does not have GObject::Object as an ancestor' do
-      refute_includes Regress::TestFundamentalObject.ancestors,
-                      GObject::Object
+      refute(Regress::TestFundamentalObject < GObject::Object)
     end
 
     it 'cannot be instantiated' do
@@ -1541,8 +1540,7 @@ describe Regress do
     end
 
     it 'extends InterfaceBase' do
-      metaclass = class << Regress::TestInterface; self; end
-      assert_includes metaclass.ancestors, GirFFI::InterfaceBase
+      Regress::TestInterface.singleton_class.must_include GirFFI::InterfaceBase
     end
 
     it 'has non-zero positive result for #gtype' do
@@ -3745,6 +3743,7 @@ describe Regress do
       a = u
     end
     assert_equal [244, 2 * 244, 6 + 31], [y, z, q]
+    a.must_be_instance_of Regress::TestCallbackUserData
   end
 
   it 'has a working function #test_uint' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gir_ffi
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.13.1
 platform: ruby
 authors:
 - Matijs van Zuijlen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-08 00:00:00.000000000 Z
+date: 2018-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -389,6 +389,7 @@ files:
 - test/gir_ffi/callback_base_test.rb
 - test/gir_ffi/class_base_test.rb
 - test/gir_ffi/core_test.rb
+- test/gir_ffi/enum_base_test.rb
 - test/gir_ffi/error_type_info_test.rb
 - test/gir_ffi/ffi_ext/pointer_test.rb
 - test/gir_ffi/g_type_test.rb