gir_ffi 0.15.7 → 0.16.0

data/lib/gir_ffi/instance_method_setup.rb

@@ -1,7 +1,9 @@
 # frozen_string_literal: true
 
 module GirFFI
-  # Methods for setting up instance methods
+  # Methods for setting up instance methods.
+  #
+  # Depends on .gir_ffi_builder being defined in the extending class.
   module InstanceMethodSetup
     def setup_instance_method(name)
       gir_ffi_builder.setup_instance_method name

data/lib/gir_ffi/object_base.rb

@@ -7,8 +7,8 @@ module GirFFI
   class ObjectBase < ClassBase
     extend FFI::DataConverter
 
-    def object_class
-      self.class.object_class
+    def class_struct
+      self.class.class_struct
     end
 
     def self.native_type
@@ -64,11 +64,11 @@ module GirFFI
         raise GirFFI::SignalNotFoundError.new(name, self)
     end
 
-    def self.object_class
-      @object_class ||=
+    def self.class_struct
+      @class_struct ||=
         begin
           ptr = GObject::Lib.g_type_class_ref(gtype)
-          gir_ffi_builder.object_class_struct.wrap ptr
+          gir_ffi_builder.class_struct_class.wrap ptr
         end
     end
 

data/lib/gir_ffi/struct_like_base.rb

@@ -22,7 +22,6 @@ module GirFFI
         self
       end
 
-      # NOTE: Needed for JRuby's FFI
       def to_native(value, _context)
         value.struct
       end

data/lib/gir_ffi/type_map.rb

@@ -10,38 +10,38 @@ module GirFFI
     gsize_type = "uint#{sz}".to_sym
 
     TAG_TYPE_MAP = {
-      enum:      :int32,
-      flags:     :int32,
-      ghash:     :pointer,
-      glist:     :pointer,
-      gslist:    :pointer,
-      strv:      :pointer,
+      enum: :int32,
+      flags: :int32,
+      ghash: :pointer,
+      glist: :pointer,
+      gslist: :pointer,
+      strv: :pointer,
       interface: :pointer,
-      error:     :pointer,
+      error: :pointer,
       ptr_array: :pointer,
-      array:     :pointer,
-      c:         GirFFI::SizedArray,
-      utf8:      :pointer,
-      filename:  :pointer,
-      GType:     gsize_type,
-      gboolean:  GirFFI::Boolean,
-      gunichar:  :uint32,
-      gint8:     :int8,
-      guint8:    :uint8,
-      gint16:    :int16,
-      guint16:   :uint16,
-      gint:      :int,
-      guint:     :uint,
-      gint32:    :int32,
-      guint32:   :uint32,
-      gint64:    :int64,
-      guint64:   :uint64,
-      glong:     :long,
-      gulong:    :ulong,
-      gsize:     gsize_type,
-      gfloat:    :float,
-      gdouble:   :double,
-      void:      :void
+      array: :pointer,
+      c: GirFFI::SizedArray,
+      utf8: :pointer,
+      filename: :pointer,
+      GType: gsize_type,
+      gboolean: GirFFI::Boolean,
+      gunichar: :uint32,
+      gint8: :int8,
+      guint8: :uint8,
+      gint16: :int16,
+      guint16: :uint16,
+      gint: :int,
+      guint: :uint,
+      gint32: :int32,
+      guint32: :uint32,
+      gint64: :int64,
+      guint64: :uint64,
+      glong: :long,
+      gulong: :ulong,
+      gsize: gsize_type,
+      gfloat: :float,
+      gdouble: :double,
+      void: :void
     }.freeze
 
     def self.map_basic_type(type)

data/lib/gir_ffi/unintrospectable_type_info.rb

@@ -37,9 +37,9 @@ module GirFFI
     end
 
     def interfaces
-      @gobject.type_interfaces(@g_type).map do |gtype|
+      @gobject.type_interfaces(@g_type).filter_map do |gtype|
         @gir.find_by_gtype gtype
-      end.compact
+      end
     end
 
     def fields

data/lib/gir_ffi/user_defined_object_info.rb

@@ -13,9 +13,6 @@ module GirFFI
       @klass = klass
       @properties = []
       @vfunc_implementations = []
-
-      # FIXME: Limit access to only install_property and install_vfunc_implementation.
-      yield self if block_given?
     end
 
     def described_class

data/lib/gir_ffi/user_defined_property_info.rb

@@ -15,21 +15,21 @@ module GirFFI
       # TODO: Unify with InfoExt::ITypeInfo.flattened_tag_to_gtype_map
       G_TYPE_TAG_MAP = {
         GObject::TYPE_BOOLEAN => :gboolean,
-        GObject::TYPE_CHAR    => :gint8,
-        GObject::TYPE_UCHAR   => :guint8,
-        GObject::TYPE_FLOAT   => :gfloat,
-        GObject::TYPE_DOUBLE  => :gdouble,
-        GObject::TYPE_INT     => :gint,
-        GObject::TYPE_UINT    => :guint,
-        GObject::TYPE_LONG    => :glong,
-        GObject::TYPE_ULONG   => :gulong,
-        GObject::TYPE_INT64   => :gint64,
-        GObject::TYPE_UINT64  => :guint64,
-        GObject::TYPE_ENUM    => :interface,
-        GObject::TYPE_FLAGS   => :interface,
-        GObject::TYPE_STRING  => :utf8,
-        GObject::TYPE_BOXED   => :interface,
-        GObject::TYPE_OBJECT  => :interface
+        GObject::TYPE_CHAR => :gint8,
+        GObject::TYPE_UCHAR => :guint8,
+        GObject::TYPE_FLOAT => :gfloat,
+        GObject::TYPE_DOUBLE => :gdouble,
+        GObject::TYPE_INT => :gint,
+        GObject::TYPE_UINT => :guint,
+        GObject::TYPE_LONG => :glong,
+        GObject::TYPE_ULONG => :gulong,
+        GObject::TYPE_INT64 => :gint64,
+        GObject::TYPE_UINT64 => :guint64,
+        GObject::TYPE_ENUM => :interface,
+        GObject::TYPE_FLAGS => :interface,
+        GObject::TYPE_STRING => :utf8,
+        GObject::TYPE_BOXED => :interface,
+        GObject::TYPE_OBJECT => :interface
       }.freeze
 
       def tag
@@ -39,21 +39,21 @@ module GirFFI
       # TODO: Unify with InfoExt::ITypeInfo.flattened_tag_to_gtype_map
       G_TYPE_POINTER_MAP = {
         GObject::TYPE_BOOLEAN => false,
-        GObject::TYPE_CHAR    => false,
-        GObject::TYPE_UCHAR   => false,
-        GObject::TYPE_FLOAT   => false,
-        GObject::TYPE_DOUBLE  => false,
-        GObject::TYPE_INT     => false,
-        GObject::TYPE_UINT    => false,
-        GObject::TYPE_LONG    => false,
-        GObject::TYPE_ULONG   => false,
-        GObject::TYPE_INT64   => false,
-        GObject::TYPE_UINT64  => false,
-        GObject::TYPE_ENUM    => false,
-        GObject::TYPE_FLAGS   => false,
-        GObject::TYPE_STRING  => true,
-        GObject::TYPE_BOXED   => true,
-        GObject::TYPE_OBJECT  => true
+        GObject::TYPE_CHAR => false,
+        GObject::TYPE_UCHAR => false,
+        GObject::TYPE_FLOAT => false,
+        GObject::TYPE_DOUBLE => false,
+        GObject::TYPE_INT => false,
+        GObject::TYPE_UINT => false,
+        GObject::TYPE_LONG => false,
+        GObject::TYPE_ULONG => false,
+        GObject::TYPE_INT64 => false,
+        GObject::TYPE_UINT64 => false,
+        GObject::TYPE_ENUM => false,
+        GObject::TYPE_FLAGS => false,
+        GObject::TYPE_STRING => true,
+        GObject::TYPE_BOXED => true,
+        GObject::TYPE_OBJECT => true
       }.freeze
 
       def pointer?
@@ -61,9 +61,9 @@ module GirFFI
       end
 
       G_TYPE_INTERFACE_TAG_MAP = {
-        GObject::TYPE_ENUM   => :enum,
-        GObject::TYPE_FLAGS  => :flags,
-        GObject::TYPE_BOXED  => :struct,
+        GObject::TYPE_ENUM => :enum,
+        GObject::TYPE_FLAGS => :flags,
+        GObject::TYPE_BOXED => :struct,
         GObject::TYPE_OBJECT => :object
       }.freeze
 

data/lib/gir_ffi/version.rb

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

data/lib/gir_ffi/zero_terminated.rb

@@ -85,7 +85,7 @@ module GirFFI
           :pointer
         elsif ffi_type.is_a? Symbol
           :numeric
-        elsif ffi_type < GirFFI::ClassBase
+        elsif ffi_type < GirFFI::ClassBase # rubocop:disable Lint/DuplicateBranch
           :pointer
         elsif ffi_type.singleton_class.include? GirFFI::EnumBase
           :enum

data/lib/gir_ffi-base/gobject.rb

@@ -7,7 +7,7 @@ require "gir_ffi-base/gobject/lib"
 
 # The part of the GObject namespace that is needed by GirFFI.
 #
-# :reek:TooManyConstants: because it needs to hold the type constants.
+# :reek:TooManyConstants because it needs to hold the type constants.
 module GObject
   def self.type_from_name(name)
     Lib.g_type_from_name name

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gir_ffi
 version: !ruby/object:Gem::Version
-  version: 0.15.7
+  version: 0.16.0
 platform: ruby
 authors:
 - Matijs van Zuijlen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-15 00:00:00.000000000 Z
+date: 2022-05-21 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'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -66,6 +66,26 @@ 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'
+    - - ">="
+      - !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'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.3.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -128,28 +148,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: '1.25'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: '1.25'
 - !ruby/object:Gem::Dependency
   name: rubocop-minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.1
+        version: 0.19.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.1
+        version: 0.19.0
 - !ruby/object:Gem::Dependency
   name: rubocop-packaging
   requirement: !ruby/object:Gem::Requirement
@@ -170,14 +190,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.9.0
+        version: '1.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.9.0
+        version: '1.13'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -396,6 +416,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 +427,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: FFI-based GObject binding using the GObject Introspection Repository