gir_ffi 0.11.4 → 0.12.0

data/test/base_test_helper.rb

@@ -1,19 +1,18 @@
 # frozen_string_literal: true
 
-require 'rubygems' if RUBY_PLATFORM == 'java'
-
-begin
-  require 'simplecov'
-  SimpleCov.start do
-    track_files 'lib/**/*.rb'
-    add_filter '/test/'
-  end
+require 'simplecov'
+SimpleCov.start do
+  track_files 'lib/**/*.rb'
+  add_filter '/test/'
+end
 
-  if ENV['CI']
+if ENV['CI']
+  begin
     require 'coveralls'
     Coveralls.wear!
+  rescue LoadError
+    nil
   end
-rescue LoadError
 end
 
 require 'minitest/autorun'

data/test/ffi-gobject/object_test.rb

@@ -121,9 +121,7 @@ describe GObject::Object do
 
   describe 'upon garbage collection' do
     it 'lowers the reference count' do
-      if jruby? || rubinius?
-        skip 'cannot be reliably tested on JRuby and Rubinius'
-      end
+      skip 'cannot be reliably tested on JRuby and Rubinius' if jruby? || rubinius?
 
       ptr = GObject::Object.new.to_ptr
       ref_count(ptr).must_equal 1

data/test/ffi-gobject/value_test.rb

@@ -349,9 +349,7 @@ describe GObject::Value do
 
   describe 'upon garbage collection' do
     it 'restores the underlying GValue to its pristine state' do
-      if jruby? || rubinius?
-        skip 'cannot be reliably tested on JRuby and Rubinius'
-      end
+      skip 'cannot be reliably tested on JRuby and Rubinius' if jruby? || rubinius?
 
       value = GObject::Value.from 42
 

data/test/ffi-gobject_introspection/i_base_info_test.rb

@@ -33,9 +33,7 @@ describe GObjectIntrospection::IBaseInfo do
 
   describe 'upon garbage collection' do
     it 'calls g_base_info_unref' do
-      if jruby? || rubinius?
-        skip 'cannot be reliably tested on JRuby and Rubinius'
-      end
+      skip 'cannot be reliably tested on JRuby and Rubinius' if jruby? || rubinius?
 
       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

data/test/ffi-gobject_introspection/i_repository_test.rb

@@ -62,11 +62,13 @@ describe GObjectIntrospection::IRepository do
 
   describe '#dependencies' do
     it 'returns a list of dependencies of the given namespace' do
+      gir.require 'GObject', '2.0'
       result = gir.dependencies('GObject')
       result.must_equal ['GLib-2.0']
     end
 
     it 'passes its struct pointer to the c function just in case' do
+      gir.require 'GObject', '2.0'
       ptr = gir.instance_variable_get(:@gobj)
       allow(GObjectIntrospection::Lib).to receive(:g_irepository_get_dependencies).
         and_call_original

data/test/gir_ffi/arg_helper_test.rb

@@ -69,25 +69,25 @@ describe GirFFI::ArgHelper do
     describe 'when passing a broken typespec' do
       it 'raises on unknown symbol' do
         ptr = FFI::Pointer.new(0xffffffff)
-        exception = -> { GirFFI::ArgHelper.cast_from_pointer(:foo, ptr) }.must_raise
+        exception = -> { GirFFI::ArgHelper.cast_from_pointer(:foo, ptr) }.must_raise RuntimeError
         exception.message.must_equal "Don't know how to cast foo"
       end
 
       it 'raises on unexpected main type for complex type' do
         ptr = FFI::Pointer.new(0xffffffff)
-        exception = -> { GirFFI::ArgHelper.cast_from_pointer([:utf8], ptr) }.must_raise
+        exception = -> { GirFFI::ArgHelper.cast_from_pointer([:utf8], ptr) }.must_raise RuntimeError
         exception.message.must_equal "Don't know how to cast [:utf8]"
       end
 
       it 'raises on unexpected sub type for complex type' do
         ptr = FFI::Pointer.new(0xffffffff)
-        exception = -> { GirFFI::ArgHelper.cast_from_pointer([:pointer, :utf8], ptr) }.must_raise
+        exception = -> { GirFFI::ArgHelper.cast_from_pointer([:pointer, :utf8], ptr) }.must_raise RuntimeError
         exception.message.must_equal "Don't know how to cast [:pointer, :utf8]"
       end
 
       it 'raises on unexpected container type for complex type' do
         ptr = FFI::Pointer.new(0xffffffff)
-        exception = -> { GirFFI::ArgHelper.cast_from_pointer([:pointer, [:gint32]], ptr) }.must_raise
+        exception = -> { GirFFI::ArgHelper.cast_from_pointer([:pointer, [:gint32]], ptr) }.must_raise RuntimeError
         exception.message.must_equal "Don't know how to cast [:pointer, [:gint32]]"
       end
     end

data/test/gir_ffi/boxed_base_test.rb

@@ -38,9 +38,7 @@ describe GirFFI::BoxedBase do
 
   describe 'upon garbage collection' do
     it 'frees and disowns the underlying struct if it is owned' do
-      if jruby? || rubinius?
-        skip 'cannot be reliably tested on JRuby and Rubinius'
-      end
+      skip 'cannot be reliably tested on JRuby and Rubinius' if jruby? || rubinius?
 
       allow(GObject).to receive(:boxed_free)
       gtype = GIMarshallingTests::BoxedStruct.gtype

data/test/gir_ffi/builder_test.rb

@@ -18,7 +18,7 @@ describe GirFFI::Builder do
 
   describe '.build_module' do
     it 'refuses to build existing modules defined elsewhere' do
-      result = -> { GirFFI::Builder.build_module('Array') }.must_raise
+      result = -> { GirFFI::Builder.build_module('Array') }.must_raise RuntimeError
       result.message.must_equal 'The module Array was already defined elsewhere'
     end
 

data/test/gir_ffi/builders/field_builder_test.rb

@@ -3,8 +3,8 @@
 require 'gir_ffi_test_helper'
 
 describe GirFFI::Builders::FieldBuilder do
-  let(:klass) { 'dummy' }
-  let(:instance) { GirFFI::Builders::FieldBuilder.new field_info, klass }
+  let(:target_class) { 'dummy' }
+  let(:instance) { GirFFI::Builders::FieldBuilder.new field_info, target_class }
 
   describe 'for a field of type :gint8 with an offset' do
     let(:field_info) { get_field_introspection_data 'Regress', 'TestSimpleBoxedA', 'some_int8' }
@@ -117,7 +117,7 @@ describe GirFFI::Builders::FieldBuilder do
     let(:n_params_field_info) { get_field_introspection_data 'GObject', 'SignalQuery', 'n_params' }
 
     it 'creates the right getter method' do
-      skip if field_info.field_type.array_length < 0
+      skip if field_info.field_type.array_length.negative?
       expected = <<-CODE.reset_indentation
         def param_types
           _v1 = @struct.to_ptr + #{n_params_field_info.offset}

data/test/gir_ffi/builders/registered_type_builder_test.rb

@@ -24,9 +24,7 @@ describe GirFFI::Builders::RegisteredTypeBuilder do
     end
 
     it 'returns the name of the generated method if different from the info name' do
-      builder = GLib::IConv.gir_ffi_builder
-      result = builder.setup_instance_method ''
-      result.must_equal '_'
+      skip 'Need some way to test this now that GLib::IConv is gone'
     end
   end
 end

data/test/gir_ffi/builders/unintrospectable_boxed_builder_test.rb

@@ -10,7 +10,7 @@ describe GirFFI::Builders::UnintrospectableBoxedBuilder do
   let(:gtype) { property.value_type }
   let(:info) { GirFFI::UnintrospectableBoxedInfo.new(gtype) }
   let(:bldr) { GirFFI::Builders::UnintrospectableBoxedBuilder.new(info) }
-  let(:klass) { bldr.build_class }
+  let(:boxed_class) { bldr.build_class }
 
   before do
     skip unless get_property_introspection_data('GIMarshallingTests',
@@ -19,17 +19,17 @@ describe GirFFI::Builders::UnintrospectableBoxedBuilder do
   end
 
   it 'builds a class' do
-    klass.must_be_instance_of Class
+    boxed_class.must_be_instance_of Class
   end
 
   it 'builds a class derived from GirFFI::BoxedBase' do
-    klass.ancestors.must_include GirFFI::BoxedBase
+    boxed_class.ancestors.must_include GirFFI::BoxedBase
   end
 
   it 'returns the same class when built again' do
     other_bldr = GirFFI::Builders::UnintrospectableBoxedBuilder.new(info)
-    other_klass = other_bldr.build_class
+    other_class = other_bldr.build_class
 
-    other_klass.must_equal klass
+    other_class.must_equal boxed_class
   end
 end

data/test/gir_ffi/builders/unintrospectable_builder_test.rb

@@ -55,8 +55,8 @@ describe GirFFI::Builders::UnintrospectableBuilder do
 
   describe 'building the GstFakeSink type' do
     let(:instance) { Gst::ElementFactory.make('fakesink', 'sink') }
-    let(:klass) { instance.class }
-    let(:builder) { klass.gir_ffi_builder }
+    let(:sink_class) { instance.class }
+    let(:builder) { sink_class.gir_ffi_builder }
 
     before do
       Gst.init []

data/test/gir_ffi/builders/user_defined_builder_test.rb

@@ -6,12 +6,12 @@ GirFFI.setup :GIMarshallingTests
 GirFFI.setup :Regress
 
 describe GirFFI::Builders::UserDefinedBuilder do
-  let(:base_klass) { GIMarshallingTests::Object }
-  let(:klass) do
-    Object.const_set("DerivedClass#{Sequence.next}", Class.new(base_klass))
+  let(:base_class) { GIMarshallingTests::Object }
+  let(:derived_class) do
+    Object.const_set("DerivedClass#{Sequence.next}", Class.new(base_class))
   end
   let(:builder) { GirFFI::Builders::UserDefinedBuilder.new info }
-  let(:info) { GirFFI::UserDefinedObjectInfo.new klass }
+  let(:info) { GirFFI::UserDefinedObjectInfo.new derived_class }
 
   describe '#build_class' do
     before do
@@ -20,7 +20,7 @@ describe GirFFI::Builders::UserDefinedBuilder do
 
     describe 'with type info containing one integer property' do
       let(:info) do
-        GirFFI::UserDefinedObjectInfo.new klass do |it|
+        GirFFI::UserDefinedObjectInfo.new derived_class do |it|
           it.install_property GObject.param_spec_int('foo-bar', 'foo bar',
                                                      'The Foo Bar Property',
                                                      10, 20, 15,
@@ -29,41 +29,41 @@ describe GirFFI::Builders::UserDefinedBuilder do
       end
 
       it 'registers a type that is bigger than the parent' do
-        gtype = klass.gtype
+        gtype = derived_class.gtype
         q = GObject.type_query gtype
         q.instance_size.must_be :>, GIMarshallingTests::Object::Struct.size
       end
 
       it "gives the type's Struct fields for the parent and the property" do
-        klass::Struct.members.must_equal [:parent, :foo_bar]
+        derived_class::Struct.members.must_equal [:parent, :foo_bar]
       end
 
       it 'creates accessor functions for the property' do
-        obj = klass.new
+        obj = derived_class.new
         obj.foo_bar = 13
         obj.foo_bar.must_equal 13
       end
 
       it 'makes the property retrievable using #get_property' do
-        obj = klass.new
+        obj = derived_class.new
         obj.foo_bar = 13
         obj.get_property('foo-bar').must_equal 13
       end
 
       it 'makes the property settable using #set_property' do
-        obj = klass.new
+        obj = derived_class.new
         obj.set_property('foo-bar', 20)
         obj.foo_bar.must_equal 20
       end
 
       it 'keeps parent properties accessible through their accessors' do
-        obj = klass.new
+        obj = derived_class.new
         obj.int = 24
         obj.int.must_equal 24
       end
 
       it 'keeps parent properties accessible through get_property and set_property' do
-        obj = klass.new
+        obj = derived_class.new
         obj.set_property('int', 24)
         obj.get_property('int').must_equal 24
       end
@@ -71,7 +71,7 @@ describe GirFFI::Builders::UserDefinedBuilder do
 
     describe 'with type info containing properties of several different types' do
       let(:info) do
-        GirFFI::UserDefinedObjectInfo.new klass do |it|
+        GirFFI::UserDefinedObjectInfo.new derived_class do |it|
           it.install_property GObject.param_spec_string('string-prop', 'string property',
                                                         'The String Property',
                                                         'this is the default value',
@@ -88,27 +88,27 @@ describe GirFFI::Builders::UserDefinedBuilder do
       end
 
       it 'registers a type of the proper size' do
-        expected_size = klass::Struct.size
-        gtype = klass.gtype
+        expected_size = derived_class::Struct.size
+        gtype = derived_class.gtype
         q = GObject.type_query gtype
         q.instance_size.must_equal expected_size
       end
 
       it "gives the type's Struct fields for the parent and the properties with the correct offsets" do
-        offsets = klass::Struct.offsets
-        alignment = klass::Struct.alignment
+        offsets = derived_class::Struct.offsets
+        alignment = derived_class::Struct.alignment
         alignment.must_equal 8 # TODO: Fix tests for platforms where this fails.
         offsets.must_equal [[:parent, 0], [:string_prop, 32], [:int_prop, 40], [:long_prop, 48]]
       end
 
       it 'creates accessor functions for the string property' do
-        obj = klass.new
+        obj = derived_class.new
         obj.string_prop = 'hello!'
         obj.string_prop.must_equal 'hello!'
       end
 
       it 'creates accessor functions for the integer property' do
-        obj = klass.new
+        obj = derived_class.new
         obj.int_prop = 13
         obj.int_prop.must_equal 13
       end
@@ -117,7 +117,7 @@ describe GirFFI::Builders::UserDefinedBuilder do
     describe 'with a boxed property' do
       let(:boxed_gtype) { GIMarshallingTests::BoxedStruct.gtype }
       let(:info) do
-        GirFFI::UserDefinedObjectInfo.new klass do |it|
+        GirFFI::UserDefinedObjectInfo.new derived_class do |it|
           it.install_property GObject.param_spec_boxed('boxed-prop', 'boxed property',
                                                        'The Boxed Property',
                                                        boxed_gtype,
@@ -126,18 +126,18 @@ describe GirFFI::Builders::UserDefinedBuilder do
       end
 
       it 'registers a type of the proper size' do
-        expected_size = klass::Struct.size
-        gtype = klass.gtype
+        expected_size = derived_class::Struct.size
+        gtype = derived_class.gtype
         q = GObject.type_query gtype
         q.instance_size.must_equal expected_size
       end
 
       it "gives the type's Struct fields for the parent and the property" do
-        klass::Struct.members.must_equal [:parent, :boxed_prop]
+        derived_class::Struct.members.must_equal [:parent, :boxed_prop]
       end
 
       it 'creates accessor functions for the property' do
-        obj = klass.new
+        obj = derived_class.new
         boxed = GIMarshallingTests::BoxedStruct.new
         boxed.long_ = 423
         obj.boxed_prop = boxed
@@ -148,7 +148,7 @@ describe GirFFI::Builders::UserDefinedBuilder do
     describe 'with an object property' do
       let(:object_gtype) { GIMarshallingTests::Object.gtype }
       let(:info) do
-        GirFFI::UserDefinedObjectInfo.new klass do |it|
+        GirFFI::UserDefinedObjectInfo.new derived_class do |it|
           it.install_property GObject.param_spec_object('object-prop', 'object property',
                                                         'The Object Property',
                                                         object_gtype,
@@ -157,18 +157,18 @@ describe GirFFI::Builders::UserDefinedBuilder do
       end
 
       it 'registers a type of the proper size' do
-        expected_size = klass::Struct.size
-        gtype = klass.gtype
+        expected_size = derived_class::Struct.size
+        gtype = derived_class.gtype
         q = GObject.type_query gtype
         q.instance_size.must_equal expected_size
       end
 
       it "gives the type's Struct fields for the parent and the property" do
-        klass::Struct.members.must_equal [:parent, :object_prop]
+        derived_class::Struct.members.must_equal [:parent, :object_prop]
       end
 
       it 'creates accessor functions for the property' do
-        obj = klass.new
+        obj = derived_class.new
         object = GIMarshallingTests::Object.new 42
         object.int = 423
         obj.object_prop = object
@@ -176,20 +176,20 @@ describe GirFFI::Builders::UserDefinedBuilder do
       end
 
       it 'allows clearing the property throught the setter method' do
-        obj = klass.new
+        obj = derived_class.new
         obj.object_prop = nil
         obj.object_prop.must_be_nil
       end
 
       it 'handles reference counting correctly when using the accessor' do
-        obj = klass.new
+        obj = derived_class.new
         object = GIMarshallingTests::Object.new 42
         obj.object_prop = object
         object.ref_count.must_equal 2
       end
 
       it 'handles reference counting correctly when using the set_property method' do
-        obj = klass.new
+        obj = derived_class.new
         object = GIMarshallingTests::Object.new 42
         object.ref_count.must_equal 1
         obj.set_property('object_prop', object)
@@ -200,7 +200,7 @@ describe GirFFI::Builders::UserDefinedBuilder do
     describe 'with a boolean property' do
       let(:object_gtype) { GIMarshallingTests::Object.gtype }
       let(:info) do
-        GirFFI::UserDefinedObjectInfo.new klass do |it|
+        GirFFI::UserDefinedObjectInfo.new derived_class do |it|
           it.install_property GObject.param_spec_boolean('the-prop', 'the property',
                                                          'The Property',
                                                          true,
@@ -209,7 +209,7 @@ describe GirFFI::Builders::UserDefinedBuilder do
       end
 
       it 'creates accessor functions for the property' do
-        obj = klass.new
+        obj = derived_class.new
         obj.the_prop = true
         obj.the_prop.must_equal true
       end
@@ -218,7 +218,7 @@ describe GirFFI::Builders::UserDefinedBuilder do
     describe 'with a char property' do
       let(:object_gtype) { GIMarshallingTests::Object.gtype }
       let(:info) do
-        GirFFI::UserDefinedObjectInfo.new klass do |it|
+        GirFFI::UserDefinedObjectInfo.new derived_class do |it|
           it.install_property GObject.param_spec_char('the-prop', 'the property',
                                                       'The Property',
                                                       -20, 100, 15,
@@ -227,7 +227,7 @@ describe GirFFI::Builders::UserDefinedBuilder do
       end
 
       it 'creates accessor functions for the property' do
-        obj = klass.new
+        obj = derived_class.new
         obj.the_prop = -13
         obj.the_prop.must_equal(-13)
       end
@@ -236,7 +236,7 @@ describe GirFFI::Builders::UserDefinedBuilder do
     describe 'with a uchar property' do
       let(:object_gtype) { GIMarshallingTests::Object.gtype }
       let(:info) do
-        GirFFI::UserDefinedObjectInfo.new klass do |it|
+        GirFFI::UserDefinedObjectInfo.new derived_class do |it|
           it.install_property GObject.param_spec_uchar('the-prop', 'the property',
                                                        'The Property',
                                                        10, 100, 15,
@@ -245,7 +245,7 @@ describe GirFFI::Builders::UserDefinedBuilder do
       end
 
       it 'creates accessor functions for the property' do
-        obj = klass.new
+        obj = derived_class.new
         obj.the_prop = 13
         obj.the_prop.must_equal 13
       end
@@ -254,7 +254,7 @@ describe GirFFI::Builders::UserDefinedBuilder do
     describe 'with a uint property' do
       let(:object_gtype) { GIMarshallingTests::Object.gtype }
       let(:info) do
-        GirFFI::UserDefinedObjectInfo.new klass do |it|
+        GirFFI::UserDefinedObjectInfo.new derived_class do |it|
           it.install_property GObject.param_spec_uint('the-prop', 'the property',
                                                       'The Property',
                                                       10, 100, 15,
@@ -263,7 +263,7 @@ describe GirFFI::Builders::UserDefinedBuilder do
       end
 
       it 'creates accessor functions for the property' do
-        obj = klass.new
+        obj = derived_class.new
         obj.the_prop = 423
         obj.the_prop.must_equal 423
       end
@@ -272,7 +272,7 @@ describe GirFFI::Builders::UserDefinedBuilder do
     describe 'with a ulong property' do
       let(:object_gtype) { GIMarshallingTests::Object.gtype }
       let(:info) do
-        GirFFI::UserDefinedObjectInfo.new klass do |it|
+        GirFFI::UserDefinedObjectInfo.new derived_class do |it|
           it.install_property GObject.param_spec_ulong('the-prop', 'the property',
                                                        'The Property',
                                                        10, 100, 15,
@@ -281,7 +281,7 @@ describe GirFFI::Builders::UserDefinedBuilder do
       end
 
       it 'creates accessor functions for the property' do
-        obj = klass.new
+        obj = derived_class.new
         obj.the_prop = 423_432
         obj.the_prop.must_equal 423_432
       end
@@ -290,7 +290,7 @@ describe GirFFI::Builders::UserDefinedBuilder do
     describe 'with a int64 property' do
       let(:object_gtype) { GIMarshallingTests::Object.gtype }
       let(:info) do
-        GirFFI::UserDefinedObjectInfo.new klass do |it|
+        GirFFI::UserDefinedObjectInfo.new derived_class do |it|
           it.install_property GObject.param_spec_int64('the-prop', 'the property',
                                                        'The Property',
                                                        10, 100, 15,
@@ -299,7 +299,7 @@ describe GirFFI::Builders::UserDefinedBuilder do
       end
 
       it 'creates accessor functions for the property' do
-        obj = klass.new
+        obj = derived_class.new
         obj.the_prop = -423_432
         obj.the_prop.must_equal(-423_432)
       end
@@ -308,7 +308,7 @@ describe GirFFI::Builders::UserDefinedBuilder do
     describe 'with a uint64 property' do
       let(:object_gtype) { GIMarshallingTests::Object.gtype }
       let(:info) do
-        GirFFI::UserDefinedObjectInfo.new klass do |it|
+        GirFFI::UserDefinedObjectInfo.new derived_class do |it|
           it.install_property GObject.param_spec_uint64('the-prop', 'the property',
                                                         'The Property',
                                                         10, 100, 15,
@@ -317,7 +317,7 @@ describe GirFFI::Builders::UserDefinedBuilder do
       end
 
       it 'creates accessor functions for the property' do
-        obj = klass.new
+        obj = derived_class.new
         obj.the_prop = 423_432
         obj.the_prop.must_equal 423_432
       end
@@ -326,7 +326,7 @@ describe GirFFI::Builders::UserDefinedBuilder do
     describe 'with a float property' do
       let(:object_gtype) { GIMarshallingTests::Object.gtype }
       let(:info) do
-        GirFFI::UserDefinedObjectInfo.new klass do |it|
+        GirFFI::UserDefinedObjectInfo.new derived_class do |it|
           it.install_property GObject.param_spec_float('the-prop', 'the property',
                                                        'The Property',
                                                        10.0, 100.0, 15.0,
@@ -335,7 +335,7 @@ describe GirFFI::Builders::UserDefinedBuilder do
       end
 
       it 'creates accessor functions for the property' do
-        obj = klass.new
+        obj = derived_class.new
         obj.the_prop = 42.23
         obj.the_prop.must_be_within_epsilon 42.23
       end
@@ -344,7 +344,7 @@ describe GirFFI::Builders::UserDefinedBuilder do
     describe 'with a double property' do
       let(:object_gtype) { GIMarshallingTests::Object.gtype }
       let(:info) do
-        GirFFI::UserDefinedObjectInfo.new klass do |it|
+        GirFFI::UserDefinedObjectInfo.new derived_class do |it|
           it.install_property GObject.param_spec_double('the-prop', 'the property',
                                                         'The Property',
                                                         10.0, 100.0, 15.0,
@@ -353,7 +353,7 @@ describe GirFFI::Builders::UserDefinedBuilder do
       end
 
       it 'creates accessor functions for the property' do
-        obj = klass.new
+        obj = derived_class.new
         obj.the_prop = 42.23
         obj.the_prop.must_equal 42.23
       end
@@ -362,7 +362,7 @@ describe GirFFI::Builders::UserDefinedBuilder do
     describe 'with an enum property' do
       let(:object_gtype) { GIMarshallingTests::Object.gtype }
       let(:info) do
-        GirFFI::UserDefinedObjectInfo.new klass do |it|
+        GirFFI::UserDefinedObjectInfo.new derived_class do |it|
           prop = GObject.param_spec_enum('the-prop', 'the property',
                                          'The Property',
                                          GIMarshallingTests::GEnum.gtype, 0,
@@ -372,7 +372,7 @@ describe GirFFI::Builders::UserDefinedBuilder do
       end
 
       it 'creates accessor functions for the property' do
-        obj = klass.new
+        obj = derived_class.new
         obj.the_prop = :value2
         obj.the_prop.must_equal :value2
       end
@@ -381,7 +381,7 @@ describe GirFFI::Builders::UserDefinedBuilder do
     describe 'with a flags property' do
       let(:object_gtype) { GIMarshallingTests::Object.gtype }
       let(:info) do
-        GirFFI::UserDefinedObjectInfo.new klass do |it|
+        GirFFI::UserDefinedObjectInfo.new derived_class do |it|
           prop = GObject.param_spec_flags('the-prop', 'the property',
                                           'The Property',
                                           GIMarshallingTests::Flags.gtype, 0,
@@ -391,7 +391,7 @@ describe GirFFI::Builders::UserDefinedBuilder do
       end
 
       it 'creates accessor functions for the property' do
-        obj = klass.new
+        obj = derived_class.new
         obj.the_prop = { value2: true }
         obj.the_prop.must_equal value2: true
       end
@@ -402,11 +402,11 @@ describe GirFFI::Builders::UserDefinedBuilder do
       let(:parent_size) do
         GObject.type_query(parent_class.gtype).instance_size
       end
-      let(:klass) do
+      let(:derived_class) do
         Object.const_set("DerivedClass#{Sequence.next}", Class.new(parent_class))
       end
       let(:info) do
-        GirFFI::UserDefinedObjectInfo.new klass do |it|
+        GirFFI::UserDefinedObjectInfo.new derived_class do |it|
           it.install_property GObject.param_spec_int('int-prop', 'integer property',
                                                      'Integer Property',
                                                      10, 20, 15,
@@ -415,33 +415,33 @@ describe GirFFI::Builders::UserDefinedBuilder do
       end
 
       it 'registers a type that is bigger than the parent' do
-        klass_size = GObject.type_query(klass.gtype).instance_size
-        klass_size.must_be :>, parent_size
+        class_size = GObject.type_query(derived_class.gtype).instance_size
+        class_size.must_be :>, parent_size
       end
 
       it 'leaves enough space in derived struct layout' do
-        struct_size = klass::Struct.size
+        struct_size = derived_class::Struct.size
         struct_size.must_be :>, parent_size
       end
     end
 
     describe 'with type info containing an overridden g_name' do
       let(:info) do
-        GirFFI::UserDefinedObjectInfo.new klass do |it|
+        GirFFI::UserDefinedObjectInfo.new derived_class do |it|
           it.g_name = "OtherName#{Sequence.next}"
         end
       end
 
       it 'registers a type under the overridden name' do
-        registered_name = GObject.type_name(klass.gtype)
+        registered_name = GObject.type_name(derived_class.gtype)
         registered_name.must_equal info.g_name
-        registered_name.wont_equal klass.name
+        registered_name.wont_equal derived_class.name
       end
     end
 
     describe 'with type info containing a vfunc' do
       let(:info) do
-        GirFFI::UserDefinedObjectInfo.new klass do |it|
+        GirFFI::UserDefinedObjectInfo.new derived_class do |it|
           it.install_vfunc_implementation :method_int8_in, proc { |instance, in_|
             instance.int = in_
           }
@@ -449,22 +449,22 @@ describe GirFFI::Builders::UserDefinedBuilder do
       end
 
       it 'allows the vfunc to be called through its invoker' do
-        obj = klass.new
+        obj = derived_class.new
         obj.method_int8_in 12
         obj.int.must_equal 12
       end
     end
 
     describe 'when using a default vfunc implementation' do
-      let(:base_klass) { Regress::TestObj }
+      let(:base_class) { Regress::TestObj }
       let(:info) do
-        GirFFI::UserDefinedObjectInfo.new klass do |it|
+        GirFFI::UserDefinedObjectInfo.new derived_class do |it|
           it.install_vfunc_implementation :matrix
         end
       end
 
       before do
-        klass.class_eval do
+        derived_class.class_eval do
           def matrix(_arg)
             44
           end
@@ -472,15 +472,15 @@ describe GirFFI::Builders::UserDefinedBuilder do
       end
 
       it 'allows the vfunc to be called through its invoker' do
-        obj = klass.new
+        obj = derived_class.new
         obj.do_matrix('bar').must_equal 44
       end
     end
 
     describe 'with type info containing a vfunc from an included Interface' do
       let(:info) do
-        klass.class_eval { include GIMarshallingTests::Interface }
-        GirFFI::UserDefinedObjectInfo.new klass do |it|
+        derived_class.class_eval { include GIMarshallingTests::Interface }
+        GirFFI::UserDefinedObjectInfo.new derived_class do |it|
           it.install_vfunc_implementation :test_int8_in,
                                           proc { |instance, in_| instance.int = in_ }
         end
@@ -488,30 +488,30 @@ describe GirFFI::Builders::UserDefinedBuilder do
 
       it 'marks the type as conforming to the included Interface' do
         iface_gtype = GIMarshallingTests::Interface.gtype
-        GObject.type_interfaces(klass.gtype).to_a.must_equal [iface_gtype]
+        GObject.type_interfaces(derived_class.gtype).to_a.must_equal [iface_gtype]
       end
 
       it 'allows the vfunc to be called through its invoker' do
-        obj = klass.new
+        obj = derived_class.new
         obj.test_int8_in 12
         obj.int.must_equal 12
       end
     end
 
     it 'keeps the gtype for an already registered class' do
-      gtype = klass.gtype
+      gtype = derived_class.gtype
       other_builder = GirFFI::Builders::UserDefinedBuilder.new info
-      other_klass = other_builder.build_class
-      other_klass.gtype.must_equal gtype
+      other_class = other_builder.build_class
+      other_class.gtype.must_equal gtype
     end
 
     it 'creates a class with a new GType' do
-      klass.gtype.wont_equal GIMarshallingTests::Object.gtype
+      derived_class.gtype.wont_equal GIMarshallingTests::Object.gtype
     end
 
     it 'makes the registered class return objects with the correct GType' do
-      obj = klass.new
-      GObject.type_from_instance(obj).must_equal klass.gtype
+      obj = derived_class.new
+      GObject.type_from_instance(obj).must_equal derived_class.gtype
     end
   end