gir_ffi 0.15.2 → 0.15.3

data/test/gir_ffi/info_ext/i_callback_info_test.rb

@@ -12,7 +12,8 @@ describe GirFFI::InfoExt::ICallbackInfo do
 
   describe "#return_ffi_type" do
     it "returns the callback ffi type of the return type" do
-      allow(return_type_info = Object.new).to receive(:to_callback_ffi_type).and_return :some_type
+      allow(return_type_info = Object.new)
+        .to receive(:to_callback_ffi_type).and_return :some_type
       allow(callback_info).to receive(:return_type).and_return return_type_info
 
       _(callback_info.return_ffi_type).must_equal :some_type

data/test/gir_ffi/info_ext/i_type_info_test.rb

@@ -195,7 +195,8 @@ describe GirFFI::InfoExt::ITypeInfo do
         allow(type_info).to receive(:interface).and_return iface_info
         expect(type_info).to receive(:pointer?).and_return false
 
-        expect(GirFFI::Builder).to receive(:build_class).with(iface_info).and_return interface
+        expect(GirFFI::Builder)
+          .to receive(:build_class).with(iface_info).and_return interface
       end
 
       describe "when the interface type is :enum" do

data/test/gir_ffi/method_stubber_test.rb

@@ -50,7 +50,9 @@ describe GirFFI::MethodStubber do
     end
 
     describe "for a method with an empty name" do
-      let(:method_info) { get_method_introspection_data("Regress", "TestObj", "instance_method") }
+      let(:method_info) do
+        get_method_introspection_data("Regress", "TestObj", "instance_method")
+      end
 
       it "creates a method stub with a safe name that sets up the unsafe method" do
         allow(method_info).to receive(:name).and_return ""

data/test/integration/derived_classes_test.rb

@@ -38,6 +38,7 @@ describe "For derived classes" do
     it "works if it calls super" do
       klass = Class.new Regress::TestSubObj do
         attr_reader :animal
+
         def initialize(animal)
           super()
           @animal = animal

data/test/integration/generated_everything_test.rb

@@ -340,7 +340,8 @@ describe Everything do
   end
 
   it "has a working function #passthrough_one_GType" do
-    _(Everything.passthrough_one_GType(GObject::TYPE_OBJECT)).must_equal GObject::TYPE_OBJECT
+    _(Everything.passthrough_one_GType(GObject::TYPE_OBJECT))
+      .must_equal GObject::TYPE_OBJECT
   end
 
   it "has a working function #passthrough_one_filename" do

data/test/integration/generated_gimarshallingtests_test.rb

@@ -357,11 +357,13 @@ describe GIMarshallingTests do
       result = nil
 
       derived_instance = make_derived_instance do |info|
-        info.install_vfunc_implementation :vfunc_with_callback, proc { |_obj, callback, callback_data|
-          cb = callback
-          user_data = callback_data.address
-          result = callback.call(42, callback_data)
-        }
+        info.install_vfunc_implementation(
+          :vfunc_with_callback,
+          proc { |_obj, callback, callback_data|
+            cb = callback
+            user_data = callback_data.address
+            result = callback.call(42, callback_data)
+          })
       end
       derived_instance.call_vfunc_with_callback
 
@@ -379,9 +381,11 @@ describe GIMarshallingTests do
     it "has a working method #get_ref_info_for_vfunc_in_object_transfer_full" do
       obj = nil
       derived_instance = make_derived_instance do |info|
-        info.install_vfunc_implementation :vfunc_in_object_transfer_full, proc { |_this, object|
-          obj = object
-        }
+        info.install_vfunc_implementation(
+          :vfunc_in_object_transfer_full,
+          proc { |_this, object|
+            obj = object
+          })
       end
       result = derived_instance
         .get_ref_info_for_vfunc_in_object_transfer_full GIMarshallingTests::Object.gtype
@@ -392,9 +396,11 @@ describe GIMarshallingTests do
     it "has a working method #get_ref_info_for_vfunc_in_object_transfer_none" do
       obj = nil
       derived_instance = make_derived_instance do |info|
-        info.install_vfunc_implementation :vfunc_in_object_transfer_none, proc { |_this, object|
-          obj = object
-        }
+        info.install_vfunc_implementation(
+          :vfunc_in_object_transfer_none,
+          proc { |_this, object|
+            obj = object
+          })
       end
       result = derived_instance
         .get_ref_info_for_vfunc_in_object_transfer_none GIMarshallingTests::Object.gtype
@@ -489,9 +495,11 @@ describe GIMarshallingTests do
 
     it "has a working method #method_int8_arg_and_out_callee" do
       derived_instance = make_derived_instance do |info|
-        info.install_vfunc_implementation :method_int8_arg_and_out_callee, proc { |_obj, arg|
-          2 * arg
-        }
+        info.install_vfunc_implementation(
+          :method_int8_arg_and_out_callee,
+          proc { |_obj, arg|
+            2 * arg
+          })
       end
       result = derived_instance.method_int8_arg_and_out_callee 32
       _(result).must_equal 64
@@ -499,9 +507,11 @@ describe GIMarshallingTests do
 
     it "has a working method #method_int8_arg_and_out_caller" do
       derived_instance = make_derived_instance do |info|
-        info.install_vfunc_implementation :method_int8_arg_and_out_caller, proc { |_obj, arg|
-          2 * arg
-        }
+        info.install_vfunc_implementation(
+          :method_int8_arg_and_out_caller,
+          proc { |_obj, arg|
+            2 * arg
+          })
       end
       result = derived_instance.method_int8_arg_and_out_caller 32
       _(result).must_equal 64
@@ -524,7 +534,8 @@ describe GIMarshallingTests do
 
     it "has a working method #method_str_arg_out_ret" do
       derived_instance = make_derived_instance do |info|
-        info.install_vfunc_implementation :method_str_arg_out_ret, proc { |_obj, arg| [arg, 42] }
+        info.install_vfunc_implementation(:method_str_arg_out_ret,
+                                          proc { |_obj, arg| [arg, 42] })
       end
       _(derived_instance.method_str_arg_out_ret("foo")).must_equal ["foo", 42]
     end
@@ -565,9 +576,11 @@ describe GIMarshallingTests do
 
     it "has a working method #vfunc_caller_allocated_out_parameter" do
       derived_instance = make_derived_instance do |info|
-        info.install_vfunc_implementation :vfunc_caller_allocated_out_parameter, proc { |_obj|
-          "Hello!"
-        }
+        info.install_vfunc_implementation(
+          :vfunc_caller_allocated_out_parameter,
+          proc { |_obj|
+            "Hello!"
+          })
       end
       result = derived_instance.vfunc_caller_allocated_out_parameter
       _(result).must_equal "Hello!"
@@ -648,7 +661,8 @@ describe GIMarshallingTests do
 
     it "has a working method #vfunc_return_value_only" do
       derived_instance = make_derived_instance do |info|
-        info.install_vfunc_implementation :vfunc_return_value_only, proc { |_obj| 0x1234_5678 }
+        info.install_vfunc_implementation(:vfunc_return_value_only,
+                                          proc { |_obj| 0x1234_5678 })
       end
       result = derived_instance.vfunc_return_value_only
       _(result).must_equal 0x1234_5678
@@ -658,9 +672,11 @@ describe GIMarshallingTests do
       result = 1
 
       derived_instance = make_derived_instance do |info|
-        info.install_vfunc_implementation :vfunc_with_callback, proc { |_obj, callback, callback_data|
-          callback.call(42, callback_data)
-        }
+        info.install_vfunc_implementation(
+          :vfunc_with_callback,
+          proc { |_obj, callback, callback_data|
+            callback.call(42, callback_data)
+          })
       end
 
       derived_instance.vfunc_with_callback { |val, user_data| result = val + user_data }
@@ -1696,9 +1712,10 @@ describe GIMarshallingTests do
   end
 
   it "has a working function #callback_return_value_and_multiple_out_parameters" do
-    result = GIMarshallingTests.callback_return_value_and_multiple_out_parameters do |*_args|
-      [42, -142, 3]
-    end
+    result =
+      GIMarshallingTests.callback_return_value_and_multiple_out_parameters do |*_args|
+        [42, -142, 3]
+      end
     _(result).must_equal [42, -142, 3]
   end
 
@@ -1951,25 +1968,21 @@ describe GIMarshallingTests do
   end
 
   it "has a working function #gerror" do
-    begin
-      GIMarshallingTests.gerror
-      flunk "Error should have been raised"
-    rescue GirFFI::GLibError => e
-      _(e.message).must_equal GIMarshallingTests::CONSTANT_GERROR_MESSAGE
-      _(e.domain).must_equal GIMarshallingTests::CONSTANT_GERROR_DOMAIN
-      _(e.code).must_equal GIMarshallingTests::CONSTANT_GERROR_CODE
-    end
+    GIMarshallingTests.gerror
+    flunk "Error should have been raised"
+  rescue GirFFI::GLibError => e
+    _(e.message).must_equal GIMarshallingTests::CONSTANT_GERROR_MESSAGE
+    _(e.domain).must_equal GIMarshallingTests::CONSTANT_GERROR_DOMAIN
+    _(e.code).must_equal GIMarshallingTests::CONSTANT_GERROR_CODE
   end
 
   it "has a working function #gerror_array_in" do
-    begin
-      GIMarshallingTests.gerror_array_in [1, 2, 3]
-      flunk "Error should have been raised"
-    rescue GirFFI::GLibError => e
-      _(e.message).must_equal GIMarshallingTests::CONSTANT_GERROR_MESSAGE
-      _(e.domain).must_equal GIMarshallingTests::CONSTANT_GERROR_DOMAIN
-      _(e.code).must_equal GIMarshallingTests::CONSTANT_GERROR_CODE
-    end
+    GIMarshallingTests.gerror_array_in [1, 2, 3]
+    flunk "Error should have been raised"
+  rescue GirFFI::GLibError => e
+    _(e.message).must_equal GIMarshallingTests::CONSTANT_GERROR_MESSAGE
+    _(e.domain).must_equal GIMarshallingTests::CONSTANT_GERROR_DOMAIN
+    _(e.code).must_equal GIMarshallingTests::CONSTANT_GERROR_CODE
   end
 
   it "has a working function #gerror_out" do

data/test/integration/generated_gtk_source_test.rb

@@ -2,7 +2,7 @@
 
 require "gir_ffi_test_helper"
 
-GirFFI.setup :GtkSource
+GirFFI.setup :GtkSource, "3.0"
 
 # Tests behavior of objects in the generated GtkSource namespace.
 describe "The generated GtkSource module" do
@@ -10,22 +10,11 @@ describe "The generated GtkSource module" do
     let(:instance) { GtkSource::CompletionContext.new }
 
     it "allows adding proposals" do
-      # Interface changed in GtkSourceView 3.24
-      proposals = if GtkSource::CompletionItem.instance_methods.include? :set_label
-                    Array.new(3) do |i|
-                      GtkSource::CompletionItem.new.tap do |item|
-                        item.label = "Proposal #{i}"
-                        item.text =  "Proposal #{i}"
-                        item.info = "blah #{i}"
-                      end
-                    end
-                  else
-                    [
-                      GtkSource::CompletionItem.new("Proposal 1", "Proposal 1", nil, "blah 1"),
-                      GtkSource::CompletionItem.new("Proposal 2", "Proposal 2", nil, "blah 2"),
-                      GtkSource::CompletionItem.new("Proposal 3", "Proposal 3", nil, "blah 3")
-                    ]
-                  end
+      proposals = [
+        GtkSource::CompletionItem.new("Proposal 1", "Proposal 1", nil, "blah 1"),
+        GtkSource::CompletionItem.new("Proposal 2", "Proposal 2", nil, "blah 2"),
+        GtkSource::CompletionItem.new("Proposal 3", "Proposal 3", nil, "blah 3")
+      ]
       instance.add_proposals nil, proposals, true
     end
   end

data/test/integration/generated_regress_test.rb

@@ -1621,6 +1621,11 @@ describe Regress do
       _(instance).wont_be :floating?
     end
 
+    it "defines callback type Matrix in the metaclass namespace" do
+      _(Regress::TestObjClass.const_defined? :Matrix).must_equal true
+      _(Regress.const_defined? :Matrix).must_equal false
+    end
+
     it "has a working method #matrix" do
       _(instance.matrix("bar")).must_equal 42
     end
@@ -1674,6 +1679,13 @@ describe Regress do
       instance.emit_sig_with_int64
     end
 
+    it "defines signal type Sig_with_int64_prop in the class namespace" do
+      instance.signal_connect("sig-with-int64-prop") { |_obj, i, _ud| i }
+      instance.emit_sig_with_int64
+      _(Regress::TestObj.const_defined? :Sig_with_int64_prop).must_equal true
+      _(Regress.const_defined? :Sig_with_int64_prop).must_equal false
+    end
+
     it "has a working method #emit_sig_with_null_error" do
       skip_below "1.61.1"
       error = nil
@@ -3655,7 +3667,8 @@ describe Regress do
   end
 
   it "has a working function #test_glist_gtype_container_in" do
-    Regress.test_glist_gtype_container_in [Regress::TestObj.gtype, Regress::TestSubObj.gtype]
+    Regress.test_glist_gtype_container_in [Regress::TestObj.gtype,
+                                           Regress::TestSubObj.gtype]
     pass
   end
 
@@ -4057,6 +4070,7 @@ describe Regress do
 
   it "raises an appropriate NoMethodError when a function is not found" do
     result = _(proc { Regress.this_method_does_not_exist }).must_raise(NoMethodError)
-    _(result.message).must_match(/^undefined method `this_method_does_not_exist' (for Regress:Module|on Regress \(Module\))$/)
+    _(result.message)
+      .must_equal "undefined method `this_method_does_not_exist' for Regress:Module"
   end
 end

data/test/integration/generated_warnlib_test.rb

@@ -14,8 +14,10 @@ describe "The generated WarnLib module" do
       @result = nil
       derived_klass.class_eval { include WarnLib::Whatever }
       GirFFI.define_type derived_klass do |info|
-        info.install_vfunc_implementation :do_boo, proc { |_obj, x, _y| @result = "boo#{x}" }
-        info.install_vfunc_implementation :do_moo, proc { |_obj, x, _y| @result = "moo#{x}" }
+        info.install_vfunc_implementation :do_boo,
+                                          proc { |_obj, x, _y| @result = "boo#{x}" }
+        info.install_vfunc_implementation :do_moo,
+                                          proc { |_obj, x, _y| @result = "moo#{x}" }
       end
     end
 

data/test/introspection_test_helper.rb

@@ -4,7 +4,8 @@ require "base_test_helper"
 
 require "ffi-gobject_introspection"
 
-GObjectIntrospection::IRepository.prepend_search_path File.join(File.dirname(__FILE__), "lib")
+GObjectIntrospection::IRepository
+  .prepend_search_path File.join(File.dirname(__FILE__), "lib")
 
 module LocalSharedLibrary
   def shared_library(namespace)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gir_ffi
 version: !ruby/object:Gem::Version
-  version: 0.15.2
+  version: 0.15.3
 platform: ruby
 authors:
 - Matijs van Zuijlen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-29 00:00:00.000000000 Z
+date: 2020-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.1
+        version: 1.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.1
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -80,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '13.0'
+- !ruby/object:Gem::Dependency
+  name: rexml
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rspec-mocks
   requirement: !ruby/object:Gem::Requirement
@@ -100,14 +114,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.17.0
+        version: 0.18.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.17.0
+        version: 0.18.0
 description: |2
       GirFFI creates bindings for GObject-based libraries at runtime based on introspection
       data provided by the GObject Introspection Repository (GIR) system. Bindings are created
@@ -443,14 +457,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: FFI-based GObject binding using the GObject Introspection Repository