gir_ffi 0.14.1 → 0.15.0

data/lib/gir_ffi/interface_base.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require 'gir_ffi/registered_type_base'
-require 'gir_ffi/method_setup'
-require 'gir_ffi/instance_method_setup'
+require "gir_ffi/registered_type_base"
+require "gir_ffi/method_setup"
+require "gir_ffi/instance_method_setup"
 
 module GirFFI
   # Base module for modules representing GLib interfaces.

data/lib/gir_ffi/lib_c.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'ffi'
+require "ffi"
 
 module GirFFI
   # Library of libc functions.

data/lib/gir_ffi/method_stubber.rb

@@ -9,7 +9,7 @@ module GirFFI
     end
 
     def method_stub
-      <<-STUB.reset_indentation
+      <<~STUB
         def #{@info.method? ? '' : 'self.'}#{@info.safe_name} *args, &block
           setup_and_call "#{@info.name}", args, &block
         end

data/lib/gir_ffi/module_base.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'gir_ffi/method_setup'
+require "gir_ffi/method_setup"
 
 module GirFFI
   # Base module for modules representing GLib namespaces.

data/lib/gir_ffi/object_base.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'gir_ffi/class_base'
+require "gir_ffi/class_base"
 
 module GirFFI
   # Base class for all generated classes of type :object.
@@ -38,7 +38,7 @@ module GirFFI
     end
 
     def self.copy_from(val)
-      val.ref if val
+      val&.ref
     end
 
     #
@@ -49,8 +49,7 @@ module GirFFI
     # @return [GObjectIntrospection::IPropertyInfo] The property's info
     #
     def self.find_property(name)
-      gir_ffi_builder.find_property name or
-        raise GirFFI::PropertyNotFoundError.new(name, self)
+      gir_ffi_builder.find_property name
     end
 
     #

data/lib/gir_ffi/receiver_argument_info.rb

@@ -21,7 +21,7 @@ module GirFFI
     end
 
     def name
-      '_instance'
+      "_instance"
     end
   end
 end

data/lib/gir_ffi/receiver_type_info.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 module GirFFI
-  # Represents the type of the receiver of a signal or vfunc, conforming, as
-  # needed, to the interface of GObjectIntrospection::ITypeInfo
+  # Represents the type of the receiver of a signal, vfunc, or method,
+  # conforming, as needed, to the interface of GObjectIntrospection::ITypeInfo
   class ReceiverTypeInfo
     include InfoExt::ITypeInfo
 

data/lib/gir_ffi/registered_type_base.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'gir_ffi/type_base'
+require "gir_ffi/type_base"
 
 module GirFFI
   # Base module for generated registered GLib types (these are types that have a

data/lib/gir_ffi/sized_array.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "gir_ffi/array_element_convertor"
+
 module GirFFI
   # Class representing an array with a determined size
   class SizedArray
@@ -17,8 +19,8 @@ module GirFFI
     end
 
     def index(idx)
-      ptr = InOutPointer.new element_type, @pointer + idx * element_size
-      ptr.to_ruby_value
+      convertor = ArrayElementConvertor.new element_type, @pointer + idx * element_size
+      convertor.to_ruby_value
     end
 
     def each

data/lib/gir_ffi/struct.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'gir_ffi/ownable'
+require "gir_ffi/ownable"
 
 module GirFFI
   # Struct that can be owned.

data/lib/gir_ffi/struct_base.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'gir_ffi/struct_like_base'
+require "gir_ffi/struct_like_base"
 
 module GirFFI
   # Base class for generated classes representing GLib structs.

data/lib/gir_ffi/type_map.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'gir_ffi/boolean'
-require 'gir_ffi/sized_array'
+require "gir_ffi/boolean"
+require "gir_ffi/sized_array"
 
 module GirFFI
   # Maps GObject type tags and type specification to types FFI can handle.
@@ -58,26 +58,5 @@ module GirFFI
         map_basic_type(type)
       end
     end
-
-    FLATTENED_TAG_TO_GTYPE_MAP = {
-      [:array, true]     => GObject::TYPE_ARRAY,
-      [:c, true]         => GObject::TYPE_POINTER,
-      [:gboolean, false] => GObject::TYPE_BOOLEAN,
-      [:ghash, true]     => GObject::TYPE_HASH_TABLE,
-      [:glist, true]     => GObject::TYPE_POINTER,
-      [:gint32, false]   => GObject::TYPE_INT,
-      [:gint64, false]   => GObject::TYPE_INT64,
-      [:guint64, false]  => GObject::TYPE_UINT64,
-      [:strv, true]      => GObject::TYPE_STRV,
-      [:utf8, true]      => GObject::TYPE_STRING,
-      [:void, true]      => GObject::TYPE_POINTER,
-      [:void, false]     => GObject::TYPE_NONE
-    }.freeze
-
-    def self.type_info_to_gtype(type_info)
-      return type_info.interface.gtype if type_info.tag == :interface
-
-      FLATTENED_TAG_TO_GTYPE_MAP.fetch [type_info.flattened_tag, type_info.pointer?]
-    end
   end
 end

data/lib/gir_ffi/unintrospectable_boxed_info.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'gir_ffi/info_ext/full_type_name'
+require "gir_ffi/info_ext/full_type_name"
 
 module GirFFI
   # Represents a boxed type not found in the GIR, conforming, as needed, to the
@@ -20,7 +20,7 @@ module GirFFI
       GObject.type_name g_type
     end
 
-    DEFAULT_BOXED_NAMESPACE = 'GLib'.freeze
+    DEFAULT_BOXED_NAMESPACE = "GLib"
 
     def namespace
       DEFAULT_BOXED_NAMESPACE

data/lib/gir_ffi/unintrospectable_type_info.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'gir_ffi/info_ext/full_type_name'
+require "gir_ffi/info_ext/full_type_name"
 
 module GirFFI
   # Represents a type not found in the GIR, conforming, as needed, to the

data/lib/gir_ffi/union.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'gir_ffi/ownable'
+require "gir_ffi/ownable"
 
 module GirFFI
   # Union that can be owned.

data/lib/gir_ffi/union_base.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'gir_ffi/boxed_base'
+require "gir_ffi/boxed_base"
 
 module GirFFI
   # Base class for generated classes representing GLib unions.

data/lib/gir_ffi/user_defined_object_info.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'gir_ffi/user_defined_property_info'
-require 'gir_ffi/vfunc_implementation'
+require "gir_ffi/user_defined_property_info"
+require "gir_ffi/vfunc_implementation"
 
 module GirFFI
   # Represents a user defined type, conforming, as needed, to the interface of
@@ -37,6 +37,10 @@ module GirFFI
       nil
     end
 
+    def find_property(_property)
+      nil
+    end
+
     def parent_gtype
       @parent_gtype ||= GType.new(@klass.superclass.gtype)
     end

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.14.1'.freeze
+  VERSION = "0.15.0"
 end

data/lib/gir_ffi-base/gobject/lib.rb

@@ -1,17 +1,18 @@
 # frozen_string_literal: true
 
-require 'ffi/bit_masks'
+require "ffi/bit_masks"
 
 module GObject
   # Module for attaching functions from the gobject library
   module Lib
     extend FFI::Library
     extend FFI::BitMasks
-    ffi_lib 'gobject-2.0'
+    ffi_lib "gobject-2.0"
     attach_function :g_type_from_name, [:string], :size_t
     attach_function :g_type_fundamental, [:size_t], :size_t
     attach_function :g_array_get_type, [], :size_t
     attach_function :g_byte_array_get_type, [], :size_t
+    attach_function :g_error_get_type, [], :size_t
     attach_function :g_hash_table_get_type, [], :size_t
     attach_function :g_strv_get_type, [], :size_t
   end

data/lib/gir_ffi-base/gobject.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
 # Ensure GObject is defined by GirFFI itself
-raise 'The module GObject was already defined elsewhere' if Kernel.const_defined? :GObject
+raise "The module GObject was already defined elsewhere" if Kernel.const_defined? :GObject
 
-require 'gir_ffi-base/gobject/lib'
+require "gir_ffi-base/gobject/lib"
 
 # The part of the GObject namespace that is needed by GirFFI.
 #
@@ -17,32 +17,33 @@ module GObject
     Lib.g_type_fundamental gtype
   end
 
-  TYPE_INVALID = type_from_name('invalid')
-  TYPE_NONE = type_from_name('void')
-  TYPE_INTERFACE = type_from_name('GInterface')
-  TYPE_CHAR = type_from_name('gchar')
-  TYPE_UCHAR = type_from_name('guchar')
-  TYPE_BOOLEAN = type_from_name('gboolean')
-  TYPE_INT = type_from_name('gint')
-  TYPE_UINT = type_from_name('guint')
-  TYPE_LONG = type_from_name('glong')
-  TYPE_ULONG = type_from_name('gulong')
-  TYPE_INT64 = type_from_name('gint64')
-  TYPE_UINT64 = type_from_name('guint64')
-  TYPE_ENUM = type_from_name('GEnum')
-  TYPE_FLAGS = type_from_name('GFlags')
-  TYPE_FLOAT = type_from_name('gfloat')
-  TYPE_DOUBLE = type_from_name('gdouble')
-  TYPE_STRING = type_from_name('gchararray')
-  TYPE_POINTER = type_from_name('gpointer')
-  TYPE_BOXED = type_from_name('GBoxed')
-  TYPE_PARAM = type_from_name('GParam')
-  TYPE_OBJECT = type_from_name('GObject')
-  TYPE_GTYPE = type_from_name('GType')
-  TYPE_VARIANT = type_from_name('GVariant')
+  TYPE_INVALID = type_from_name("invalid")
+  TYPE_NONE = type_from_name("void")
+  TYPE_INTERFACE = type_from_name("GInterface")
+  TYPE_CHAR = type_from_name("gchar")
+  TYPE_UCHAR = type_from_name("guchar")
+  TYPE_BOOLEAN = type_from_name("gboolean")
+  TYPE_INT = type_from_name("gint")
+  TYPE_UINT = type_from_name("guint")
+  TYPE_LONG = type_from_name("glong")
+  TYPE_ULONG = type_from_name("gulong")
+  TYPE_INT64 = type_from_name("gint64")
+  TYPE_UINT64 = type_from_name("guint64")
+  TYPE_ENUM = type_from_name("GEnum")
+  TYPE_FLAGS = type_from_name("GFlags")
+  TYPE_FLOAT = type_from_name("gfloat")
+  TYPE_DOUBLE = type_from_name("gdouble")
+  TYPE_STRING = type_from_name("gchararray")
+  TYPE_POINTER = type_from_name("gpointer")
+  TYPE_BOXED = type_from_name("GBoxed")
+  TYPE_PARAM = type_from_name("GParam")
+  TYPE_OBJECT = type_from_name("GObject")
+  TYPE_GTYPE = type_from_name("GType")
+  TYPE_VARIANT = type_from_name("GVariant")
 
   TYPE_ARRAY = Lib.g_array_get_type
   TYPE_BYTE_ARRAY = Lib.g_byte_array_get_type
+  TYPE_ERROR = Lib.g_error_get_type
   TYPE_HASH_TABLE = Lib.g_hash_table_get_type
   TYPE_STRV = Lib.g_strv_get_type
 end

data/lib/gir_ffi-base.rb

@@ -5,4 +5,4 @@
 # that can only be created fully once GirFFI is fully loaded.
 
 # Some base GObject functions and constants are needed by GirFFI.
-require 'gir_ffi-base/gobject'
+require "gir_ffi-base/gobject"

data/lib/gir_ffi.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'gir_ffi/core'
+require "gir_ffi/core"
 
-require 'ffi-glib'
-require 'ffi-gobject'
+require "ffi-glib"
+require "ffi-gobject"