gir_ffi 0.15.7 → 0.15.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ce8934650d918851ad4a5eee0c37f66025c0c5292aa7f556494998741f415de8
-  data.tar.gz: dd13f22a5ca8a3f9d3783827152b402a70f4b096a1443658c967254387bd4379
+  metadata.gz: b7c0566bc2fcd7e7b5ab1381448f4738fdebd617743c524ea18c343e1d3fbce5
+  data.tar.gz: 5008632e7cd2fa2190c12f056257f68a94b03fa4a8f225df54fae006b6127db1
 SHA512:
-  metadata.gz: 6fc02f1d258f98957da87ad2573db3c5300c5652e58cff69cf82ad00c8dcdf410cbad257a2def7c8b2803dc23caa96a33e0178e57f9a123d4f2b79410ff6ec8e
-  data.tar.gz: ba8168148f9a8d3cab2d462096734596d8785e5bb2531b825e38073cbda750d5504fb2b0ec3fa191debad560da98b8d2ca9d8c09836481bfb078ebaf149f1649
+  metadata.gz: 7a0f1e2330171a92b26a1c476e0c5b7beaeb2e38e6e0e81d9bb47247b74b02ed7e0e5261c2e7adf33f93860b284e2eddf61a938c584c5cccaab69b2b85d5109c
+  data.tar.gz: ddb889010ccc55495ffb306e3996fa6ce37367bbc65ff78f0024df244b3663691879be7f78c53c9543f90b4360dfca35b47bf35a9acf7382271a685aea542cbe

data/Changelog.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## 0.15.8 / 2021-11-20
+
+* Drop support for Ruby 2.5
+* Bump minimum supported version of gobject-introspection to 1.56.0
+* Bump minimum supported version of glib to 2.56.0
+* Handle functions that have swapped closure annotation
+* Handle GPtrArray arguments in signal handlers
+
 ## 0.15.7 / 2021-01-15
 
 * Handle sized arrays with interface element types

data/README.md

@@ -9,10 +9,9 @@ Ruby bindings for GNOME using the GObject Introspection Repository.
 ## Status
 
 [![Gem Version](https://badge.fury.io/rb/gir_ffi.svg)](http://badge.fury.io/rb/gir_ffi)
-[![Depfu](https://badges.depfu.com/badges/d5a8e9bffd2462a7ab4921d2f7e6fc48/overview.svg)](https://depfu.com/github/mvz/gir_ffi)
-[![Build Status](https://travis-ci.org/mvz/gir_ffi.svg?branch=master)](https://travis-ci.org/mvz/gir_ffi)
+[![Build Status](https://github.com/mvz/gir_ffi/actions/workflows/ruby.yml/badge.svg)](https://github.com/mvz/gir_ffi/actions/workflows/ruby.yml)
 [![Code Climate](https://codeclimate.com/github/mvz/gir_ffi/badges/gpa.svg)](https://codeclimate.com/github/mvz/gir_ffi)
-[![Documentation Status](https://inch-ci.org/github/mvz/gir_ffi.svg?branch=master)](https://inch-ci.org/github/mvz/gir_ffi/branch/master)
+[![Documentation Status](https://inch-ci.org/github/mvz/gir_ffi.svg?branch=master)](https://inch-ci.org/github/mvz/gir_ffi)
 
 ## Features
 
@@ -52,7 +51,7 @@ examples can be found in `gir_ffi-gtk` and `gir_ffi-gst`.
 
 ## Requirements
 
-GirFFI is supported on CRuby 2.5, 2.6, 2.7 and 3.0, and JRuby 9.2.
+GirFFI is supported on CRuby 2.6, 2.7 and 3.0, and JRuby 9.3.
 
 You will also need gobject-introspection installed with some
 introspection data.
@@ -62,7 +61,8 @@ available under the name ending in plain `.so`. If GirFFI complains that it
 cannot find the library, try installing development packages for those
 libraries.
 
-GirFFI should work with gobject-introspection 1.46.0 and up.
+GirFFI should work with gobject-introspection 1.56.0 and up, and glib 2.56.0
+and up.
 
 On Debian and Ubuntu, installing `libgirepository-1.0-1` and `gir1.2-glib-2.0`
 should be enough to use GirFFI in your application.
@@ -89,24 +89,9 @@ already exist:
 * `gir_ffi-tracker`: overrides for Tracker
 * `gir_ffi-gst`: overrides for GStreamer
 
-## Hacking and contributing
+## Contributing
 
-Please feel free to file bugs or send pull requests!
-
-If you just want to help out but don't know where to start, have a look at
-TODO.md, and check the notes in the code (e.g., using `dnote`).
-
-If you want to send pull requests or patches, try to follow the instructions
-below. **If you get stuck, please make a pull request anyway and I'll try to
-help out.**
-
-* Make sure `rake test` runs without reporting any failures.
-* Add tests for your feature. Otherwise, I can't see if it works or if I
-  break it later.
-* Make sure latest master merges cleanly with your branch. Things might
-  have moved around since you forked.
-* Try not to include changes that are irrelevant to your feature in the
-  same commit.
+Please see [CONTRIBUTING.md](CONTRIBUTING.md) for contribution guidelines.
 
 ## Contributors
 
@@ -119,7 +104,7 @@ The following people have contributed to GirFFI over the years:
 
 ## License
 
-Copyright © 2009–2020 [Matijs van Zuijlen](http://www.matijs.net)
+Copyright © 2009–2021 [Matijs van Zuijlen](http://www.matijs.net)
 
 GirFFI is free software, distributed under the terms of the GNU Lesser
 General Public License, version 2.1 or later. See the file COPYING.LIB for

data/lib/ffi-glib/hash_table.rb

@@ -39,7 +39,7 @@ module GLib
     end
 
     def to_hash
-      Hash[to_a]
+      to_a.to_h
     end
 
     # @override

data/lib/ffi-gobject/object.rb

@@ -7,60 +7,40 @@ GObject.load_class :Object
 module GObject
   # Overrides for GObject, GObject's generic base class.
   class Object
-    if GLib.check_version(2, 54, 0)
-      setup_method! "new"
-
-      # Before GLib 2.54.0, use g_object_newv, which takes an array of GParameter.
-      def initialize_with_automatic_gtype(properties = {})
-        gparameters = properties.map do |name, value|
-          name = name.to_s
-          property_param_spec(name)
-          GObject::Parameter.new.tap do |gparam|
-            gparam.name = name
-            gparam.value = value
-          end
-        end
-        initialize_without_automatic_gtype(self.class.gtype, gparameters)
-      end
-
-      alias initialize_without_automatic_gtype initialize
-      alias initialize initialize_with_automatic_gtype
-    else
-      GObject::Lib.attach_function(:g_object_new_with_properties,
-                                   [:size_t, :uint32, :pointer, :pointer],
-                                   :pointer)
-
-      def self.new_with_properties(*args, &block)
-        obj = allocate
-        obj.__send__ :initialize_with_properties, *args, &block
-        obj
-      end
+    GObject::Lib.attach_function(:g_object_new_with_properties,
+                                 [:size_t, :uint32, :pointer, :pointer],
+                                 :pointer)
+
+    def self.new_with_properties(*args, &block)
+      obj = allocate
+      obj.__send__ :initialize_with_properties, *args, &block
+      obj
+    end
 
-      # Starting with GLib 2.54.0, use g_object_new_with_properties, which
-      # takes an array of names and an array of values.
-      def initialize_with_properties(properties = {})
-        names, gvalues = names_and_gvalues_for_properties(properties)
+    # Starting with GLib 2.54.0, use g_object_new_with_properties, which
+    # takes an array of names and an array of values.
+    def initialize_with_properties(properties = {})
+      names, gvalues = names_and_gvalues_for_properties(properties)
 
-        n_properties = names.length
-        names_arr = GirFFI::SizedArray.from(:utf8, -1, names)
-        gvalues_arr = GirFFI::SizedArray.from(GObject::Value, -1, gvalues)
+      n_properties = names.length
+      names_arr = GirFFI::SizedArray.from(:utf8, -1, names)
+      gvalues_arr = GirFFI::SizedArray.from(GObject::Value, -1, gvalues)
 
-        ptr = GObject::Lib.g_object_new_with_properties(self.class.gtype,
-                                                        n_properties,
-                                                        names_arr,
-                                                        gvalues_arr)
-        store_pointer ptr
-      end
+      ptr = GObject::Lib.g_object_new_with_properties(self.class.gtype,
+                                                      n_properties,
+                                                      names_arr,
+                                                      gvalues_arr)
+      store_pointer ptr
+    end
 
-      alias old_initialze initialize
-      alias initialize initialize_with_properties
-      remove_method :old_initialze
+    alias old_initialze initialize
+    alias initialize initialize_with_properties
+    remove_method :old_initialze
 
-      def self.new(*args, &block)
-        obj = allocate
-        obj.__send__ :initialize, *args, &block
-        obj
-      end
+    def self.new(*args, &block)
+      obj = allocate
+      obj.__send__ :initialize, *args, &block
+      obj
     end
 
     alias base_initialize initialize

data/lib/ffi-gobject.rb

@@ -69,7 +69,7 @@ module GObject
     sig_info = object.class.find_signal signal_name
 
     closure = sig_info.wrap_in_closure do |*args|
-      block.call(*args << data)
+      yield(*args << data)
     end
 
     signal_connect_closure object, detailed_signal, closure, after

data/lib/ffi-gobject_introspection/i_base_info.rb

@@ -49,7 +49,7 @@ module GObjectIntrospection
       method = method.to_s
       cache_ivar = "@#{method}_cache"
       single ||= method[0..-2]
-      count = method.sub(/^(get_)?/, '\\1n_')
+      count = method.sub(/^(get_)?/, "\\1n_")
       class_eval <<-CODE, __FILE__, __LINE__ + 1
         def #{method}                       # def fields
           #{cache_ivar} ||=                 #   @fields_cache ||=

data/lib/gir_ffi/builders/argument_builder_collection.rb

@@ -75,7 +75,11 @@ module GirFFI
       def set_up_user_data_relations
         @base_argument_builders.each do |bldr|
           if (idx = bldr.closure_idx) >= 0
-            @base_argument_builders[idx].mark_as_user_data bldr
+            target_bldr = @base_argument_builders[idx]
+            unless target_bldr.specialized_type_tag == :void
+              target_bldr, bldr = bldr, target_bldr
+            end
+            target_bldr.mark_as_user_data bldr
           end
         end
       end

data/lib/gir_ffi/builders/module_builder.rb

@@ -89,7 +89,7 @@ module GirFFI
         lib.extend FFI::BitMasks
         lib.ffi_lib_flags :global, :lazy
         if shared_library_specification
-          lib.ffi_lib(*shared_library_specification.split(/,/))
+          lib.ffi_lib(*shared_library_specification.split(","))
         end
       end
 

data/lib/gir_ffi/core.rb

@@ -42,7 +42,7 @@ module GirFFI
 
       if block_given?
         warn "Using define_type with a block is deprecated." \
-          " Call the relevant functions inside the class definition instead."
+             " Call the relevant functions inside the class definition instead."
         yield info
       end
       Builders::UserDefinedBuilder.new(info).build_class

data/lib/gir_ffi/info_ext/i_type_info.rb

@@ -166,7 +166,8 @@ module GirFFI
       end
 
       def needs_c_to_ruby_conversion_for_closures?
-        [:array, :c, :error, :ghash, :glist, :struct, :strv].include?(flattened_tag)
+        [:array, :c, :error, :ghash, :glist, :ptr_array, :struct, :strv]
+          .include?(flattened_tag)
       end
 
       def needs_ruby_to_c_conversion_for_closures?

data/lib/gir_ffi/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gir_ffi
 version: !ruby/object:Gem::Version
-  version: 0.15.7
+  version: 0.15.8
 platform: ruby
 authors:
 - Matijs van Zuijlen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-15 00:00:00.000000000 Z
+date: 2021-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 2.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.12'
+- !ruby/object:Gem::Dependency
+  name: minitest-focus
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.3.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.3.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -128,28 +142,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: 1.23.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: 1.23.0
 - !ruby/object:Gem::Dependency
   name: rubocop-minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.1
+        version: 0.16.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.1
+        version: 0.16.0
 - !ruby/object:Gem::Dependency
   name: rubocop-packaging
   requirement: !ruby/object:Gem::Requirement
@@ -170,14 +184,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.9.0
+        version: 1.12.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.9.0
+        version: 1.12.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -396,6 +410,7 @@ metadata:
   homepage_uri: http://www.github.com/mvz/ruby-gir-ffi
   source_code_uri: https://github.com/mvz/gir_ffi
   changelog_uri: https://github.com/mvz/gir_ffi/blob/master/Changelog.md
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options:
 - "--main"
@@ -406,14 +421,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.2.22
 signing_key:
 specification_version: 4
 summary: FFI-based GObject binding using the GObject Introspection Repository