gir_ffi 0.15.8 → 0.15.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b7c0566bc2fcd7e7b5ab1381448f4738fdebd617743c524ea18c343e1d3fbce5
-  data.tar.gz: 5008632e7cd2fa2190c12f056257f68a94b03fa4a8f225df54fae006b6127db1
+  metadata.gz: 240502b5086fedd9c4f52a114faf67c5021f03c4fedc10dd6fbfabd064a64aca
+  data.tar.gz: b89d501796ee980af6d731758f144a9eba21472353bae02029548f6541787db4
 SHA512:
-  metadata.gz: 7a0f1e2330171a92b26a1c476e0c5b7beaeb2e38e6e0e81d9bb47247b74b02ed7e0e5261c2e7adf33f93860b284e2eddf61a938c584c5cccaab69b2b85d5109c
-  data.tar.gz: ddb889010ccc55495ffb306e3996fa6ce37367bbc65ff78f0024df244b3663691879be7f78c53c9543f90b4360dfca35b47bf35a9acf7382271a685aea542cbe
+  metadata.gz: a6f7df11953d3b1a88c3fa515207d3f15883e79de7114fb6ad55bf1545e1e023a6b1b7b83199fd3ef0a45ab762d240a9b59eec8c4aac660b1d8d83363de51c0a
+  data.tar.gz: 18ca30c7f7f54daeff80c3045d24e1231d0a927e68f0ae8877a548b95cdc8602298b602925e3ad20e6b26049b62a7541b85d7f2d56b328594d22ca39b960146c

data/Changelog.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 0.15.9 / 2021-12-05
+
+* Skip setting destroy notifier state if types don't make sense
+* Handle functions with multiple user-supplied callback arguments
+
 ## 0.15.8 / 2021-11-20
 
 * Drop support for Ruby 2.5

data/lib/gir_ffi/builders/argument_builder_collection.rb

@@ -87,7 +87,14 @@ module GirFFI
       def set_up_destroy_notifier_relations
         @base_argument_builders.each do |bldr|
           if (idx = bldr.destroy_idx) >= 0
-            @base_argument_builders[idx].mark_as_destroy_notifier bldr
+            target = @base_argument_builders[idx]
+            if target.specialized_type_tag == :callback &&
+               bldr.specialized_type_tag == :callback
+              target.mark_as_destroy_notifier bldr
+            else
+              warn "Not marking #{target.name} (#{target.specialized_type_tag})" \
+                   " as destroy notifier for #{bldr.name} (#{bldr.specialized_type_tag})"
+            end
           end
         end
       end
@@ -132,7 +139,12 @@ module GirFFI
       def split_off_block_argument
         builders_with_name = argument_builders.select(&:method_argument_name)
         blocks, base = builders_with_name.partition(&:block_argument?)
-        return base, blocks.first
+        case blocks.count
+        when 1
+          return base, blocks.first
+        else
+          return builders_with_name, nil
+        end
       end
 
       def base_argument_names(arguments)

data/lib/gir_ffi/builders/constructor_builder.rb

@@ -38,7 +38,7 @@ module GirFFI
           ["obj = allocate"]
         else
           [
-            "raise NoMethodError unless self == #{@info.container.full_type_name}",
+            "raise NoMethodError unless self == #{@info.container.full_name}",
             "obj = allocate"
           ]
         end

data/lib/gir_ffi/builders/struct_builder.rb

@@ -44,7 +44,7 @@ module GirFFI
       end
 
       def gtype_struct_parent
-        full_name = info.full_type_name
+        full_name = info.full_name
         if full_name == "GObject::InitiallyUnownedClass"
           GObject::ObjectClass
         else

data/lib/gir_ffi/info_ext/full_type_name.rb

@@ -2,11 +2,12 @@
 
 module GirFFI
   module InfoExt
-    # Extension module provinding a #full_type_name method suitable for
+    # Extension module provinding a #full_name method suitable for
     # callbacks, constants and registered types. Signals and vfuncs need a
     # different implementation.
+    #
     module FullTypeName
-      def full_type_name
+      def full_name
         "#{safe_namespace}::#{safe_name}"
       end
     end

data/lib/gir_ffi/info_ext/i_function_info.rb

@@ -14,6 +14,16 @@ module GirFFI
       def return_ffi_type
         return_type.to_ffi_type
       end
+
+      def full_name
+        if method?
+          "#{container.full_name}##{safe_name}"
+        elsif container
+          "#{container.full_name}.#{safe_name}"
+        else
+          "#{safe_namespace}.#{safe_name}"
+        end
+      end
     end
   end
 end

data/lib/gir_ffi/info_ext/i_type_info.rb

@@ -106,7 +106,7 @@ module GirFFI
       end
 
       def interface_class_name
-        interface.full_type_name if tag == :interface
+        interface.full_name if tag == :interface
       end
 
       def to_ffi_type

data/lib/gir_ffi/info_ext/i_vfunc_info.rb

@@ -22,6 +22,10 @@ module GirFFI
       def has_invoker?
         invoker
       end
+
+      def full_name
+        "#{container.full_name}::#{safe_name}"
+      end
     end
   end
 end

data/lib/gir_ffi/version.rb

@@ -2,5 +2,5 @@
 
 # Current GirFFI version
 module GirFFI
-  VERSION = "0.15.8"
+  VERSION = "0.15.9"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gir_ffi
 version: !ruby/object:Gem::Version
-  version: 0.15.8
+  version: 0.15.9
 platform: ruby
 authors:
 - Matijs van Zuijlen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-20 00:00:00.000000000 Z
+date: 2021-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -156,14 +156,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.16.0
+        version: 0.17.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.16.0
+        version: 0.17.0
 - !ruby/object:Gem::Dependency
   name: rubocop-packaging
   requirement: !ruby/object:Gem::Requirement
@@ -428,7 +428,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.2.32
 signing_key:
 specification_version: 4
 summary: FFI-based GObject binding using the GObject Introspection Repository