gir_ffi 0.10.2 → 0.11.0

data/test/integration/generated_regress_test.rb

@@ -99,7 +99,7 @@ describe Regress do
     end
 
     it 'has a writable field arr' do
-      instance.arr.must_equal nil
+      instance.arr.must_be_nil
       instance.arr = [1, 2, 3]
       # TODO: len should be set automatically
       instance.len = 3
@@ -394,6 +394,30 @@ describe Regress do
     end
   end
 
+  describe 'Regress::AnonymousUnionAndStruct' do
+    let(:instance) { Regress::AnonymousUnionAndStruct.new }
+
+    before do
+      skip unless get_introspection_data 'Regress', 'AnonymousUnionAndStruct'
+    end
+
+    it 'has a writable field x' do
+      instance.x = 42
+      instance.x.must_equal 42
+    end
+
+    it 'has a writable field a' do
+      skip 'Anonymous struct fields are not exposed in the GIR data'
+    end
+
+    it 'has a writable field b' do
+      skip 'Anonymous struct fields are not exposed in the GIR data'
+    end
+
+    it 'has a writable field padding' do
+      skip 'Anonymous union fields are not exposed in the GIR data'
+    end
+  end
   it 'has the constant BOOL_CONSTANT' do
     skip unless get_introspection_data 'Regress', 'BOOL_CONSTANT'
     Regress::BOOL_CONSTANT.must_equal true
@@ -782,11 +806,11 @@ describe Regress do
 
     describe "its 'string' property" do
       it 'can be retrieved with #get_property' do
-        instance.get_property('string').must_equal nil
+        instance.get_property('string').must_be_nil
       end
 
       it 'can be retrieved with #string' do
-        instance.string.must_equal nil
+        instance.string.must_be_nil
       end
 
       it 'can be set with #set_property' do
@@ -895,7 +919,7 @@ describe Regress do
   describe 'Regress::FooStruct' do
     let(:instance) { Regress::FooStruct.new }
 
-    it 'blocks access to the field priv' do
+    it 'blocks access to the hidden struct field priv' do
       proc { instance.priv = nil }.must_raise NoMethodError
       proc { instance.priv }.must_raise NoMethodError
     end
@@ -956,7 +980,6 @@ describe Regress do
 
   describe 'Regress::FooSubobject' do
     it 'creates an instance using #new' do
-      # TODO: Guard against instantiating abstract classes
       skip 'This function is defined in the header but not implemented'
     end
   end
@@ -1167,7 +1190,7 @@ describe Regress do
       instance.nested_a.some_int.must_equal 12_345
     end
 
-    it 'blocks access to the field priv' do
+    it 'blocks access to the hidden struct field priv' do
       proc { instance.priv = nil }.must_raise NoMethodError
       proc { instance.priv }.must_raise NoMethodError
     end
@@ -1440,20 +1463,18 @@ describe Regress do
       proc { Regress::TestFundamentalObject.new }.must_raise NoMethodError
     end
 
-    # NOTE: Instance methods can only be tested on the subclass, since
-    # TestFundamentalObject is an abstract class.
-    let(:instance) { Regress::TestFundamentalSubObject.new 'foo' }
+    let(:derived_instance) { Regress::TestFundamentalSubObject.new 'foo' }
 
     it 'has a working method #ref' do
-      instance.refcount.must_equal 1
-      instance.ref
-      instance.refcount.must_equal 2
+      derived_instance.refcount.must_equal 1
+      derived_instance.ref
+      derived_instance.refcount.must_equal 2
     end
 
     it 'has a working method #unref' do
-      instance.refcount.must_equal 1
-      instance.unref
-      instance.refcount.must_equal 0
+      derived_instance.refcount.must_equal 1
+      derived_instance.unref
+      derived_instance.refcount.must_equal 0
     end
   end
 
@@ -1483,23 +1504,28 @@ describe Regress do
       skip unless get_introspection_data 'Regress', 'TestInheritDrawable'
     end
 
-    let(:instance) { ConcreteDrawable.new }
+    it 'cannot be instantiated' do
+      proc { Regress::TestInheritDrawable.new }.must_raise NoMethodError
+    end
+
+    let(:derived_instance) { ConcreteDrawable.new }
+
     it 'has a working method #do_foo' do
-      instance.do_foo 42
+      derived_instance.do_foo 42
       pass
     end
 
     it 'has a working method #do_foo_maybe_throw' do
-      instance.do_foo_maybe_throw 42
-      proc { instance.do_foo_maybe_throw 41 }.must_raise GirFFI::GLibError
+      derived_instance.do_foo_maybe_throw 42
+      proc { derived_instance.do_foo_maybe_throw 41 }.must_raise GirFFI::GLibError
     end
 
     it 'has a working method #get_origin' do
-      instance.get_origin.must_equal [0, 0]
+      derived_instance.get_origin.must_equal [0, 0]
     end
 
     it 'has a working method #get_size' do
-      instance.get_size.must_equal [42, 42]
+      derived_instance.get_size.must_equal [42, 42]
     end
   end
 
@@ -1596,6 +1622,17 @@ describe Regress do
       instance.do_matrix('bar').must_equal 42
     end
 
+    it 'has a working method #emit_sig_with_array_len_prop' do
+      skip unless get_method_introspection_data('Regress', 'TestObj',
+                                                'emit_sig_with_array_len_prop')
+      array = nil
+      instance.signal_connect 'sig-with-array-len-prop' do |_obj, ary|
+        array = ary.to_a
+      end
+      instance.emit_sig_with_array_len_prop
+      array.to_a.must_equal [0, 1, 2, 3, 4]
+    end
+
     it 'has a working method #emit_sig_with_foreign_struct' do
       skip unless get_method_introspection_data('Regress', 'TestObj',
                                                 'emit_sig_with_foreign_struct')
@@ -1657,6 +1694,21 @@ describe Regress do
       instance.ref_count.must_equal 1
     end
 
+    it 'has a working method #not_nullable_element_typed_gpointer_in' do
+      skip unless get_method_introspection_data('Regress', 'TestObj',
+                                                'not_nullable_element_typed_gpointer_in')
+      instance.not_nullable_element_typed_gpointer_in [1, 2, 3]
+      # TODO: Make method raise when passed nil
+    end
+
+    it 'has a working method #not_nullable_typed_gpointer_in' do
+      skip unless get_method_introspection_data('Regress', 'TestObj',
+                                                'not_nullable_typed_gpointer_in')
+      obj = Regress::TestObj.new_from_file('bar')
+      instance.not_nullable_typed_gpointer_in obj
+      # TODO: Make method raise when passed nil
+    end
+
     it 'has a working method #set_bare' do
       obj = Regress::TestObj.new_from_file('bar')
       instance.set_bare obj
@@ -2198,7 +2250,7 @@ describe Regress do
       Regress::TestPrivateEnum[:public_enum_before].must_equal 1
     end
     it 'does not have the member :private' do
-      Regress::TestPrivateEnum[:private].must_equal nil
+      Regress::TestPrivateEnum[:private].must_be_nil
     end
     it 'has the member :public_enum_after' do
       Regress::TestPrivateEnum[:public_enum_after].must_equal 4
@@ -2432,7 +2484,7 @@ describe Regress do
 
     it 'has a writable field obj' do
       o = Regress::TestSubObj.new
-      instance.obj.must_equal nil
+      instance.obj.must_be_nil
       instance.obj = o
       instance.obj.must_equal o
     end
@@ -2455,7 +2507,7 @@ describe Regress do
     end
 
     it 'has a writable field field' do
-      instance.field.must_equal nil
+      instance.field.must_be_nil
       o = Regress::TestSubObj.new
       instance.field = o
       instance.field.must_equal o
@@ -2564,7 +2616,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.put_int(0, 42) }
+      instance.data1 = FFI::MemoryPointer.new(:int32).tap { |it| it.put_int(0, 42) }
       instance.data1.read_int.must_equal 42
     end
 
@@ -2872,6 +2924,13 @@ describe Regress do
     pass
   end
 
+  it 'has a working function #get_variant' do
+    skip unless get_introspection_data 'Regress', 'get_variant'
+    var = Regress.get_variant
+    var.get_int32.must_equal 42
+    # TODO: Make var not floating
+  end
+
   it 'has a working function #global_get_flags_out' do
     result = Regress.global_get_flags_out
     result.must_equal(flag1: true, flag3: true)
@@ -3003,13 +3062,19 @@ describe Regress do
   end
 
   it 'has a working function #test_array_int_null_out' do
-    assert_equal nil, Regress.test_array_int_null_out
+    Regress.test_array_int_null_out.must_be_nil
   end
 
   it 'has a working function #test_array_int_out' do
     Regress.test_array_int_out.must_be :==, [0, 1, 2, 3, 4]
   end
 
+  it 'has a working function #test_array_struct_out' do
+    skip unless get_introspection_data 'Regress', 'test_array_struct_out'
+    result = Regress.test_array_struct_out
+    result.map(&:some_int).must_equal [22, 33, 44]
+  end
+
   it 'has a working function #test_async_ready_callback' do
     main_loop = GLib::MainLoop.new nil, false
 
@@ -3408,7 +3473,7 @@ describe Regress do
 
   it 'has a working function #test_glist_null_out' do
     result = Regress.test_glist_null_out
-    assert_equal nil, result
+    result.must_be_nil
   end
 
   it 'has a working function #test_gslist_container_return' do
@@ -3449,7 +3514,7 @@ describe Regress do
 
   it 'has a working function #test_gslist_null_out' do
     result = Regress.test_gslist_null_out
-    assert_equal nil, result
+    result.must_be_nil
   end
 
   it 'has a working function #test_gtype' do
@@ -3554,6 +3619,13 @@ describe Regress do
     Regress.test_nested_parameter(3).must_be_nil
   end
 
+  it 'has a working function #test_noptr_callback' do
+    skip unless get_introspection_data 'Regress', 'test_noptr_callback'
+    a = 0
+    Regress.test_noptr_callback { a = 1 }
+    a.must_equal 1
+  end
+
   it 'has a working function #test_null_gerror_callback' do
     value = nil
     Regress.test_owned_gerror_callback { |err| value = err }
@@ -3566,6 +3638,18 @@ describe Regress do
     value.message.must_equal 'regression test owned error'
   end
 
+  it 'has a working function #test_return_allow_none' do
+    skip unless get_introspection_data 'Regress', 'test_return_allow_none'
+    result = Regress.test_return_allow_none
+    result.must_be_nil
+  end
+
+  it 'has a working function #test_return_nullable' do
+    skip unless get_introspection_data 'Regress', 'test_return_nullable'
+    result = Regress.test_return_nullable
+    result.must_be_nil
+  end
+
   it 'has a working function #test_short' do
     result = Regress.test_short 23
     assert_equal 23, result
@@ -3724,7 +3808,7 @@ describe Regress do
   end
 
   it 'has a working function #test_utf8_null_out' do
-    assert_equal nil, Regress.test_utf8_null_out
+    Regress.test_utf8_null_out.must_be_nil
   end
 
   it 'has a working function #test_utf8_out' do

data/test/integration/generated_secret_test.rb

@@ -2,6 +2,8 @@
 require 'gir_ffi_test_helper'
 
 describe 'The generated Secret module' do
+  cover 'Secret'
+
   describe 'Secret::Schema' do
     it 'has a working constructor' do
       begin

data/test/integration/generated_warnlib_test.rb

@@ -2,6 +2,8 @@
 require 'gir_ffi_test_helper'
 
 describe 'The generated WarnLib module' do
+  cover 'WarnLib'
+
   before do
     begin
       GirFFI.setup :WarnLib

data/test/integration/method_lookup_test.rb

@@ -3,6 +3,8 @@ require 'gir_ffi_test_helper'
 
 # Tests how methods are looked up and generated on first use.
 describe 'Looking up methods' do
+  cover 'GirFFI'
+
   before do
     save_module :Regress
     GirFFI.setup :Regress

data/test/introspection_test_helper.rb

@@ -3,6 +3,21 @@ require 'base_test_helper'
 
 require 'ffi-gobject_introspection'
 
+GObjectIntrospection::IRepository.prepend_search_path File.join(File.dirname(__FILE__), 'lib')
+
+module LocalSharedLibrary
+  def shared_library(namespace)
+    case namespace
+    when 'Everything', 'GIMarshallingTests', 'Regress', 'Utility', 'WarnLib'
+      File.join(File.dirname(__FILE__), 'lib', "lib#{namespace.downcase}.so")
+    else
+      super
+    end
+  end
+end
+
+GObjectIntrospection::IRepository.prepend LocalSharedLibrary
+
 module IntrospectionTestExtensions
   module_function
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gir_ffi
 version: !ruby/object:Gem::Version
-  version: 0.10.2
+  version: 0.11.0
 platform: ruby
 authors:
 - Matijs van Zuijlen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-29 00:00:00.000000000 Z
+date: 2016-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -66,34 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.5'
-- !ruby/object:Gem::Dependency
-  name: minitest-rspec_mocks
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.3.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: rspec-mocks
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.4.1
+        version: 3.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.4.1
+        version: 3.5.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -173,6 +159,7 @@ files:
 - lib/ffi-gobject/value.rb
 - lib/ffi-gobject_introspection.rb
 - lib/ffi-gobject_introspection/g_error.rb
+- lib/ffi-gobject_introspection/gobject_type_init.rb
 - lib/ffi-gobject_introspection/i_arg_info.rb
 - lib/ffi-gobject_introspection/i_base_info.rb
 - lib/ffi-gobject_introspection/i_callable_info.rb
@@ -195,15 +182,14 @@ files:
 - lib/ffi-gobject_introspection/i_value_info.rb
 - lib/ffi-gobject_introspection/i_vfunc_info.rb
 - lib/ffi-gobject_introspection/lib.rb
+- lib/ffi-gobject_introspection/strv.rb
 - lib/gir_ffi-base.rb
-- lib/gir_ffi-base/glib.rb
-- lib/gir_ffi-base/glib/boolean.rb
-- lib/gir_ffi-base/glib/strv.rb
 - lib/gir_ffi-base/gobject.rb
 - lib/gir_ffi-base/gobject/lib.rb
 - lib/gir_ffi.rb
 - lib/gir_ffi/allocation_helper.rb
 - lib/gir_ffi/arg_helper.rb
+- lib/gir_ffi/boolean.rb
 - lib/gir_ffi/boxed_base.rb
 - lib/gir_ffi/builder.rb
 - lib/gir_ffi/builder_helper.rb
@@ -262,6 +248,7 @@ files:
 - lib/gir_ffi/class_base.rb
 - lib/gir_ffi/core.rb
 - lib/gir_ffi/enum_base.rb
+- lib/gir_ffi/enum_like_base.rb
 - lib/gir_ffi/error_argument_info.rb
 - lib/gir_ffi/error_type_info.rb
 - lib/gir_ffi/ffi_ext.rb
@@ -311,8 +298,8 @@ files:
 - lib/gir_ffi/unintrospectable_type_info.rb
 - lib/gir_ffi/union.rb
 - lib/gir_ffi/union_base.rb
+- lib/gir_ffi/user_defined_object_info.rb
 - lib/gir_ffi/user_defined_property_info.rb
-- lib/gir_ffi/user_defined_type_info.rb
 - lib/gir_ffi/variable_name_generator.rb
 - lib/gir_ffi/version.rb
 - lib/gir_ffi/vfunc_implementation.rb
@@ -323,6 +310,7 @@ files:
 - test/ffi-glib/array_test.rb
 - test/ffi-glib/byte_array_test.rb
 - test/ffi-glib/bytes_test.rb
+- test/ffi-glib/closure_test.rb
 - test/ffi-glib/destroy_notify_test.rb
 - test/ffi-glib/hash_table_test.rb
 - test/ffi-glib/iconv_test.rb
@@ -338,6 +326,7 @@ files:
 - test/ffi-gobject/object_test.rb
 - test/ffi-gobject/param_spec_test.rb
 - test/ffi-gobject/value_test.rb
+- test/ffi-gobject_introspection/gobject_type_init_test.rb
 - test/ffi-gobject_introspection/i_base_info_test.rb
 - test/ffi-gobject_introspection/i_constant_info_test.rb
 - test/ffi-gobject_introspection/i_enum_info_test.rb
@@ -350,11 +339,13 @@ files:
 - test/ffi-gobject_introspection/i_struct_info_test.rb
 - test/ffi-gobject_introspection/i_type_info_test.rb
 - test/ffi-gobject_introspection/i_union_info_test.rb
+- test/ffi-gobject_introspection/i_vfunc_info_test.rb
 - test/ffi-gobject_introspection/lib_test.rb
+- test/ffi-gobject_introspection/strv_test.rb
 - test/ffi-gobject_test.rb
-- test/gir_ffi-base/glib/boolean_test.rb
-- test/gir_ffi-base/glib/strv_test.rb
+- test/gir_ffi/allocation_helper_test.rb
 - test/gir_ffi/arg_helper_test.rb
+- test/gir_ffi/boolean_test.rb
 - test/gir_ffi/boxed_base_test.rb
 - test/gir_ffi/builder_test.rb
 - test/gir_ffi/builders/argument_builder_test.rb
@@ -380,9 +371,11 @@ files:
 - test/gir_ffi/builders/unintrospectable_builder_test.rb
 - test/gir_ffi/builders/union_builder_test.rb
 - test/gir_ffi/builders/user_defined_builder_test.rb
+- test/gir_ffi/builders/vfunc_argument_builder_test.rb
 - test/gir_ffi/builders/vfunc_builder_test.rb
 - test/gir_ffi/callback_base_test.rb
 - test/gir_ffi/class_base_test.rb
+- test/gir_ffi/core_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
@@ -401,17 +394,18 @@ files:
 - test/gir_ffi/method_stubber_test.rb
 - test/gir_ffi/object_base_test.rb
 - test/gir_ffi/object_store_test.rb
+- test/gir_ffi/receiver_argument_info_test.rb
 - test/gir_ffi/sized_array_test.rb
 - test/gir_ffi/struct_base_test.rb
+- test/gir_ffi/struct_like_base_test.rb
 - test/gir_ffi/type_map_test.rb
 - test/gir_ffi/unintrospectable_type_info_test.rb
 - test/gir_ffi/union_base_test.rb
+- test/gir_ffi/user_defined_object_info_test.rb
 - test/gir_ffi/user_defined_property_info_test.rb
-- test/gir_ffi/user_defined_type_info_test.rb
 - test/gir_ffi/variable_name_generator_test.rb
 - test/gir_ffi/version_test.rb
 - test/gir_ffi/zero_terminated_test.rb
-- test/gir_ffi_test.rb
 - test/gir_ffi_test_helper.rb
 - test/integration/callback_exceptions_test.rb
 - test/integration/derived_classes_test.rb
@@ -449,7 +443,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: 2.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/lib/gir_ffi-base/glib.rb

@@ -1,8 +0,0 @@
-# frozen_string_literal: true
-
-# Ensure GLib is defined by GirFFI itself
-raise 'The module GLib was already defined elsewhere' if Kernel.const_defined? :GLib
-
-# Module representing GLib's GLib namespace.
-module GLib
-end

data/test/gir_ffi-base/glib/boolean_test.rb

@@ -1,34 +0,0 @@
-# frozen_string_literal: true
-require 'base_test_helper'
-
-describe GLib::Boolean do
-  it 'has the same native size as an int' do
-    FFI.type_size(GLib::Boolean).must_equal FFI.type_size :int
-  end
-
-  describe '.from_native' do
-    it 'converts 0 to false' do
-      GLib::Boolean.from_native(0, 'whatever').must_equal false
-    end
-
-    it 'converts 1 to true' do
-      GLib::Boolean.from_native(1, 'whatever').must_equal true
-    end
-  end
-
-  describe '.to_native' do
-    it 'converts false to 0' do
-      GLib::Boolean.to_native(false, 'whatever').must_equal 0
-    end
-
-    it 'converts true to 1' do
-      GLib::Boolean.to_native(true, 'whatever').must_equal 1
-    end
-  end
-
-  describe '.size' do
-    it 'returns the correct type size' do
-      GLib::Boolean.size.must_equal FFI.type_size :int
-    end
-  end
-end