gir_ffi 0.15.2 → 0.15.3

data/test/gir_ffi/builders/initializer_builder_test.rb

@@ -21,7 +21,9 @@ describe GirFFI::Builders::InitializerBuilder do
     end
 
     describe "for constructors with a custom name" do
-      let(:function_info) { get_method_introspection_data "Regress", "TestObj", "new_from_file" }
+      let(:function_info) do
+        get_method_introspection_data "Regress", "TestObj", "new_from_file"
+      end
       it "builds a custom initializer" do
         _(code).must_equal <<~CODE
           def initialize_from_file(x)

data/test/gir_ffi/builders/object_builder_test.rb

@@ -17,20 +17,20 @@ describe GirFFI::Builders::ObjectBuilder do
   end
 
   describe "#find_signal" do
-    it 'finds the signal "test" for TestObj' do
+    it 'finds a signal defined on the class itself' do
       sig = obj_builder.find_signal "test"
       _(sig.name).must_equal "test"
     end
 
-    it 'finds the signal "test" for TestSubObj' do
+    it 'finds a signal defined on a superclass' do
       sig = sub_obj_builder.find_signal "test"
       _(sig.name).must_equal "test"
     end
 
-    it 'finds the signal "changed" for Gtk::Entry' do
-      builder = GirFFI::Builders::ObjectBuilder.new get_introspection_data("Gtk", "Entry")
-      sig = builder.find_signal "changed"
-      _(sig.name).must_equal "changed"
+    it 'finds signals defined on interfaces' do
+      skip_below "1.57.2"
+      sig = sub_obj_builder.find_signal "interface-signal"
+      _(sig.name).must_equal "interface-signal"
     end
 
     it "returns nil for a signal that doesn't exist" do

data/test/gir_ffi/builders/property_builder_test.rb

@@ -32,7 +32,9 @@ describe GirFFI::Builders::PropertyBuilder do
   end
 
   describe "for a property of type :ghash" do
-    let(:property_info) { get_property_introspection_data("Regress", "TestObj", "hash-table") }
+    let(:property_info) do
+      get_property_introspection_data("Regress", "TestObj", "hash-table")
+    end
     it "generates the correct getter definition" do
       expected = <<~CODE
         def hash_table
@@ -148,7 +150,8 @@ describe GirFFI::Builders::PropertyBuilder do
     before do
       allow(property_info).to receive(:container).and_return container_info
       allow(property_info).to receive(:name).and_return "foo-bar"
-      allow(container_info).to receive(:find_instance_method).with("foo_bar").and_return true
+      allow(container_info)
+        .to receive(:find_instance_method).with("foo_bar").and_return true
     end
 
     it "finds methods with underscores for properties with dashes" do

data/test/gir_ffi/builders/return_value_builder_test.rb

@@ -6,7 +6,9 @@ describe GirFFI::Builders::ReturnValueBuilder do
   let(:var_gen) { GirFFI::VariableNameGenerator.new }
   let(:type_info) { method_info.return_type }
   let(:ownership_transfer) { method_info.caller_owns }
-  let(:return_type_info) { GirFFI::ReturnValueInfo.new(type_info, ownership_transfer, false) }
+  let(:return_type_info) do
+    GirFFI::ReturnValueInfo.new(type_info, ownership_transfer, false)
+  end
   let(:builder) do
     GirFFI::Builders::ReturnValueBuilder.new(var_gen, return_type_info)
   end
@@ -37,7 +39,8 @@ describe GirFFI::Builders::ReturnValueBuilder do
 
       it "wraps and copies the result in #post_conversion" do
         _(builder.capture_variable_name).must_equal "_v1"
-        _(builder.post_conversion).must_equal ["_v2 = GIMarshallingTests::BoxedStruct.wrap_copy(_v1)"]
+        _(builder.post_conversion)
+          .must_equal ["_v2 = GIMarshallingTests::BoxedStruct.wrap_copy(_v1)"]
       end
 
       it "returns the copied result" do
@@ -56,7 +59,8 @@ describe GirFFI::Builders::ReturnValueBuilder do
 
     it "wraps the result in #post_conversion" do
       _(builder.capture_variable_name).must_equal "_v1"
-      _(builder.post_conversion).must_equal ["_v2 = GIMarshallingTests::Union.wrap_copy(_v1)"]
+      _(builder.post_conversion)
+        .must_equal ["_v2 = GIMarshallingTests::Union.wrap_copy(_v1)"]
     end
 
     it "returns the wrapped result" do
@@ -112,7 +116,9 @@ describe GirFFI::Builders::ReturnValueBuilder do
       it "wraps the result in #post_conversion" do
         _(builder.capture_variable_name).must_equal "_v1"
         _(builder.post_conversion)
-          .must_equal ["_v2 = GIMarshallingTests::Object.wrap(_v1).tap { |it| it && it.ref }"]
+          .must_equal [
+            "_v2 = GIMarshallingTests::Object.wrap(_v1).tap { |it| it && it.ref }"
+          ]
       end
 
       it "returns the wrapped result" do
@@ -149,7 +155,8 @@ describe GirFFI::Builders::ReturnValueBuilder do
 
     it "wraps the result in #post_conversion" do
       _(builder.capture_variable_name).must_equal "_v1"
-      _(builder.post_conversion).must_equal ["_v2 = GirFFI::ZeroTerminated.wrap(:guint8, _v1)"]
+      _(builder.post_conversion)
+        .must_equal ["_v2 = GirFFI::ZeroTerminated.wrap(:guint8, _v1)"]
     end
 
     it "returns the wrapped result" do
@@ -234,7 +241,8 @@ describe GirFFI::Builders::ReturnValueBuilder do
 
     it "wraps the result in #post_conversion" do
       _(builder.capture_variable_name).must_equal "_v1"
-      _(builder.post_conversion).must_equal ["_v2 = GLib::HashTable.wrap([:gint32, :gint32], _v1)"]
+      _(builder.post_conversion)
+        .must_equal ["_v2 = GLib::HashTable.wrap([:gint32, :gint32], _v1)"]
     end
 
     it "returns the wrapped result" do
@@ -286,7 +294,8 @@ describe GirFFI::Builders::ReturnValueBuilder do
 
       it "converts the result in #post_conversion" do
         _(builder.capture_variable_name).must_equal "_v1"
-        _(builder.post_conversion).must_equal ["_v2 = GirFFI::SizedArray.wrap(:gint32, 4, _v1)"]
+        _(builder.post_conversion)
+          .must_equal ["_v2 = GirFFI::SizedArray.wrap(:gint32, 4, _v1)"]
       end
 
       it "returns the wrapped result" do
@@ -310,7 +319,8 @@ describe GirFFI::Builders::ReturnValueBuilder do
 
       it "converts the result in #post_conversion" do
         _(builder.capture_variable_name).must_equal "_v1"
-        _(builder.post_conversion).must_equal ["_v2 = GirFFI::SizedArray.wrap(:gint32, bar, _v1)"]
+        _(builder.post_conversion)
+          .must_equal ["_v2 = GirFFI::SizedArray.wrap(:gint32, bar, _v1)"]
       end
 
       it "returns the wrapped result" do
@@ -403,7 +413,8 @@ describe GirFFI::Builders::ReturnValueBuilder do
 
     it "fetches the stored object in #post_conversion" do
       _(builder.capture_variable_name).must_equal "_v1"
-      _(builder.post_conversion).must_equal ["_v2 = GirFFI::ArgHelper::OBJECT_STORE.fetch(_v1)"]
+      _(builder.post_conversion)
+        .must_equal ["_v2 = GirFFI::ArgHelper::OBJECT_STORE.fetch(_v1)"]
     end
 
     it "returns the stored object" do

data/test/gir_ffi/builders/signal_closure_builder_test.rb

@@ -134,19 +134,21 @@ describe GirFFI::Builders::SignalClosureBuilder do
       end
     end
 
-    describe "for a signal returning an string" do
+    describe "for a signal returning a string" do
       let(:signal_info) do
-        get_signal_introspection_data "Gtk", "Scale", "format-value"
+        get_signal_introspection_data "Regress", "AnnotationObject", "attribute-signal"
       end
 
-      it "returns a mapping method that passes the string result to return_value directly" do
+      it "returns a mapping method that passes the string result to return_value directly" \
+        do
         expected = <<~CODE
           def self.marshaller(closure, return_value, param_values, _invocation_hint, _marshal_data)
-            _instance, value = param_values.map(&:get_value_plain)
+            _instance, arg1, arg2 = param_values.map(&:get_value_plain)
             _v1 = _instance
-            _v2 = value
-            _v3 = wrap(closure.to_ptr).invoke_block(_v1, _v2)
-            return_value.set_value _v3
+            _v2 = arg1
+            _v3 = arg2
+            _v4 = wrap(closure.to_ptr).invoke_block(_v1, _v2, _v3)
+            return_value.set_value _v4
           end
         CODE
 

data/test/gir_ffi/builders/struct_builder_test.rb

@@ -34,9 +34,12 @@ describe GirFFI::Builders::StructBuilder do
 
     describe "for a struct with a layout with a complex type" do
       it "does not flatten the complex type specification" do
-        expect(simplefield = Object.new).to receive(:layout_specification).and_return [:bar, :foo, 0]
-        expect(complexfield = Object.new).to receive(:layout_specification).and_return [:baz, [:qux, 2], 0]
-        expect(struct = Object.new).to receive(:fields).and_return [simplefield, complexfield]
+        expect(simplefield = Object.new)
+          .to receive(:layout_specification).and_return [:bar, :foo, 0]
+        expect(complexfield = Object.new)
+          .to receive(:layout_specification).and_return [:baz, [:qux, 2], 0]
+        expect(struct = Object.new)
+          .to receive(:fields).and_return [simplefield, complexfield]
 
         allow(struct).to receive(:safe_name).and_return "Bar"
         allow(struct).to receive(:namespace).and_return "Foo"

data/test/gir_ffi/builders/user_defined_builder_test.rb

@@ -94,11 +94,14 @@ describe GirFFI::Builders::UserDefinedBuilder do
         _(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
+      it "creates fields for the parents and properties in the type's Struct" do
         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]]
+        _(offsets).must_equal [[:parent, 0],
+                               [:string_prop, 32],
+                               [:int_prop, 40],
+                               [:long_prop, 48]]
       end
 
       it "creates accessor functions for the string property" do
@@ -194,7 +197,8 @@ describe GirFFI::Builders::UserDefinedBuilder do
 
         _(object_ref_count(object)).must_equal 1
         obj.set_property("object_prop", object)
-        _(object_ref_count(object)).must_equal 4 # Due to extra Value#set_value + Value#get_value
+        # Expect 4 due to extra Value#set_value + Value#get_value
+        _(object_ref_count(object)).must_equal 4
       end
     end
 

data/test/gir_ffi/builders/vfunc_argument_builder_test.rb

@@ -23,7 +23,8 @@ describe GirFFI::Builders::VFuncArgumentBuilder do
 
   describe "for a transfer-none in argument" do
     let(:vfunc_info) do
-      get_vfunc_introspection_data "GIMarshallingTests", "Object", "vfunc_in_object_transfer_none"
+      get_vfunc_introspection_data "GIMarshallingTests", "Object",
+                                   "vfunc_in_object_transfer_none"
     end
     let(:arg_info) { vfunc_info.args[0] }
 
@@ -38,7 +39,8 @@ describe GirFFI::Builders::VFuncArgumentBuilder do
 
   describe "for a transfer-none outgoing object argument" do
     let(:vfunc_info) do
-      get_vfunc_introspection_data "GIMarshallingTests", "Object", "vfunc_out_object_transfer_none"
+      get_vfunc_introspection_data "GIMarshallingTests", "Object",
+                                   "vfunc_out_object_transfer_none"
     end
     let(:arg_info) { vfunc_info.args[0] }
 
@@ -53,7 +55,8 @@ describe GirFFI::Builders::VFuncArgumentBuilder do
 
   describe "for a full-transfer outgoing object argument" do
     let(:vfunc_info) do
-      get_vfunc_introspection_data "GIMarshallingTests", "Object", "vfunc_out_object_transfer_full"
+      get_vfunc_introspection_data "GIMarshallingTests", "Object",
+                                   "vfunc_out_object_transfer_full"
     end
     let(:arg_info) { vfunc_info.args[0] }
 
@@ -63,7 +66,8 @@ describe GirFFI::Builders::VFuncArgumentBuilder do
 
     it "has the correct value for #post_conversion" do
       builder.pre_conversion
-      _(builder.post_conversion).must_equal ["_v2.ref", "_v1.put_pointer 0, GObject::Object.from(_v2)"]
+      _(builder.post_conversion)
+        .must_equal ["_v2.ref", "_v1.put_pointer 0, GObject::Object.from(_v2)"]
     end
   end
 
@@ -76,7 +80,9 @@ describe GirFFI::Builders::VFuncArgumentBuilder do
 
     it "has the correct value for #pre_conversion" do
       _(builder.pre_conversion)
-        .must_equal ["_v1 = FFI::MemoryPointer.new(:int8).tap { |ptr| out.put_pointer 0, ptr }"]
+        .must_equal [
+          "_v1 = FFI::MemoryPointer.new(:int8).tap { |ptr| out.put_pointer 0, ptr }"
+        ]
     end
 
     it "has the correct value for #post_conversion" do

data/test/gir_ffi/builders/vfunc_builder_test.rb

@@ -85,7 +85,7 @@ describe GirFFI::Builders::VFuncBuilder do
       end
     end
 
-    describe "for a vfunc with an out argument allocated by us, the callee" do
+    describe "for a vfunc with an out argument allocated by the callee" do
       let(:vfunc_info) do
         get_vfunc_introspection_data("GIMarshallingTests", "Object",
                                      "method_int8_arg_and_out_callee")
@@ -106,7 +106,7 @@ describe GirFFI::Builders::VFuncBuilder do
       end
     end
 
-    describe "for a vfunc with a GObject::Value out argument allocated by them, the caller" do
+    describe "for a vfunc with a GObject::Value out argument allocated by the caller" do
       let(:vfunc_info) do
         get_vfunc_introspection_data("GIMarshallingTests", "Object",
                                      "vfunc_caller_allocated_out_parameter")
@@ -153,7 +153,8 @@ describe GirFFI::Builders::VFuncBuilder do
 
     describe "for a vfunc with a full-transfer return value" do
       let(:vfunc_info) do
-        get_vfunc_introspection_data "GIMarshallingTests", "Object", "vfunc_return_object_transfer_full"
+        get_vfunc_introspection_data "GIMarshallingTests", "Object",
+                                     "vfunc_return_object_transfer_full"
       end
 
       it "returns a valid mapping method" do
@@ -173,7 +174,8 @@ describe GirFFI::Builders::VFuncBuilder do
 
     describe "for a vfunc with a transfer-none in argument" do
       let(:vfunc_info) do
-        get_vfunc_introspection_data "GIMarshallingTests", "Object", "vfunc_in_object_transfer_none"
+        get_vfunc_introspection_data "GIMarshallingTests", "Object",
+                                     "vfunc_in_object_transfer_none"
       end
 
       it "returns a valid mapping method" do
@@ -192,7 +194,8 @@ describe GirFFI::Builders::VFuncBuilder do
 
     describe "for a vfunc with a full-transfer outgoing argument" do
       let(:vfunc_info) do
-        get_vfunc_introspection_data "GIMarshallingTests", "Object", "vfunc_out_object_transfer_full"
+        get_vfunc_introspection_data "GIMarshallingTests", "Object",
+                                     "vfunc_out_object_transfer_full"
       end
 
       it "returns a valid mapping method" do
@@ -230,7 +233,8 @@ describe GirFFI::Builders::VFuncBuilder do
 
     describe "for a vfunc returning an object" do
       let(:vfunc_info) do
-        get_vfunc_introspection_data "GIMarshallingTests", "Object", "vfunc_return_object_transfer_full"
+        get_vfunc_introspection_data "GIMarshallingTests", "Object",
+                                     "vfunc_return_object_transfer_full"
       end
 
       it "returns :pointer" do

data/test/gir_ffi/class_base_test.rb

@@ -19,14 +19,14 @@ describe GirFFI::ClassBase do
     end
 
     describe "#==" do
-      it "returns true when comparing to an object of the same class and pointer" do
+      it "returns true for an object of the same class and pointer" do
         other = object_class.wrap object.to_ptr
 
         _(object).must_be :==, other
         _(other).must_be :==, object
       end
 
-      it "returns true when comparing to an object of the same class and a pointer with the same address" do
+      it "returns true for an object of the same class and pointer with the same address" do
         ptr = FFI::Pointer.new object.to_ptr
         other = object_class.wrap ptr
 
@@ -34,7 +34,7 @@ describe GirFFI::ClassBase do
         _(other).must_be :==, object
       end
 
-      it "returns false when comparing to an object of a sub/superclass and the same pointer" do
+      it "returns false for an object of a sub/superclass and the same pointer" do
         subclass = Class.new(object_class)
         other = subclass.wrap object.to_ptr
 
@@ -42,29 +42,30 @@ describe GirFFI::ClassBase do
         _(other).wont_be :==, object
       end
 
-      it "returns false when comparing to an object of the same class and different pointer" do
+      it "returns false for an object of the same class and different pointer" do
         other = object_class.wrap FFI::MemoryPointer.new(:int32)
 
         _(object).wont_be :==, other
         _(other).wont_be :==, object
       end
 
-      it "returns false when comparing to an object that doesn't respond to #to_ptr" do
+      it "returns false for an object that doesn't respond to #to_ptr" do
         other = Object.new
 
         _(object).wont_be :==, other
         _(other).wont_be :==, object
       end
 
-      it "returns false when comparing to an object of a different class and same pointer" do
+      it "returns false for an object of a different class and same pointer" do
         allow(other = Object.new).to receive(:to_ptr).and_return object.to_ptr
 
         _(object).wont_be :==, other
         _(other).wont_be :==, object
       end
 
-      it "returns false when comparing to an object of a different class and different pointer" do
-        allow(other = Object.new).to receive(:to_ptr).and_return FFI::MemoryPointer.new(:int32)
+      it "returns false for an object of a different class and different pointer" do
+        allow(other = Object.new)
+          .to receive(:to_ptr).and_return FFI::MemoryPointer.new(:int32)
 
         _(object).wont_be :==, other
         _(other).wont_be :==, object
@@ -116,11 +117,13 @@ describe GirFFI::ClassBase do
 
   describe "#setup_and_call" do
     it "looks up instance methods in all builders" do
-      expect(builder = Object.new).to receive(:setup_instance_method).with("foo").and_return "foo"
+      expect(builder = Object.new)
+        .to receive(:setup_instance_method).with("foo").and_return "foo"
       klass = Class.new GirFFI::ClassBase
       klass.const_set :GIR_FFI_BUILDER, builder
 
-      expect(sub_builder = Object.new).to receive(:setup_instance_method).with("foo").and_return nil
+      expect(sub_builder = Object.new)
+        .to receive(:setup_instance_method).with("foo").and_return nil
       sub_klass = Class.new klass do
         def foo; end
 
@@ -134,7 +137,8 @@ describe GirFFI::ClassBase do
     end
 
     it "calls the method given by the result of .setup_instance_method" do
-      expect(builder = Object.new).to receive(:setup_instance_method).with("foo").and_return "bar"
+      expect(builder = Object.new)
+        .to receive(:setup_instance_method).with("foo").and_return "bar"
       klass = Class.new GirFFI::ClassBase do
         def bar
           "correct-result"
@@ -151,7 +155,8 @@ describe GirFFI::ClassBase do
     end
 
     it "raises a sensible error if the method is not found" do
-      expect(builder = Object.new).to receive(:setup_instance_method).with("foo").and_return nil
+      expect(builder = Object.new)
+        .to receive(:setup_instance_method).with("foo").and_return nil
       klass = Class.new GirFFI::ClassBase do
         def initialize; end
       end

data/test/gir_ffi/core_test.rb

@@ -18,12 +18,13 @@ describe GirFFI::Core do
   end
 
   it "sets up dependencies" do
-    save_module :GObject
+    save_module :Utility
     save_module :Regress
+    refute Object.const_defined?(:Utility)
     GirFFI.setup :Regress
-    assert Object.const_defined?(:GObject)
+    assert Object.const_defined?(:Utility)
     restore_module :Regress
-    restore_module :GObject
+    restore_module :Utility
   end
 
   describe ".setup" do

data/test/gir_ffi/ffi_ext/pointer_test.rb

@@ -10,8 +10,10 @@ describe GirFFI::FFIExt::Pointer do
       expect(ptr).to receive(:null?).and_return false
       object_class = Class.new
 
-      expect(GObject).to receive(:type_from_instance_pointer).with(ptr).and_return 0xdeadbeef
-      expect(GirFFI::Builder).to receive(:build_by_gtype).with(0xdeadbeef).and_return object_class
+      expect(GObject)
+        .to receive(:type_from_instance_pointer).with(ptr).and_return 0xdeadbeef
+      expect(GirFFI::Builder)
+        .to receive(:build_by_gtype).with(0xdeadbeef).and_return object_class
       expect(object_class).to receive(:direct_wrap).with(ptr).and_return "good-result"
 
       _(ptr.to_object).must_equal "good-result"