gir_ffi 0.14.0 → 0.15.3

data/lib/ffi-gobject_introspection/i_constant_info.rb

@@ -20,7 +20,7 @@ module GObjectIntrospection
     def value
       case type_tag
       when :utf8
-        raw_value.force_encoding('utf-8')
+        raw_value.force_encoding("utf-8")
       when :gboolean
         raw_value.nonzero? ? true : false
       else
@@ -29,7 +29,7 @@ module GObjectIntrospection
     end
 
     def constant_type
-      ITypeInfo.wrap Lib.g_constant_info_get_type self
+      @constant_type ||= ITypeInfo.wrap Lib.g_constant_info_get_type self
     end
 
     private

data/lib/ffi-gobject_introspection/i_enum_info.rb

@@ -13,6 +13,7 @@ module GObjectIntrospection
     end
     ##
     build_array_method :values
+    build_finder_method :find_value, :n_values, :value
 
     def get_n_methods
       Lib.g_enum_info_get_n_methods self

data/lib/ffi-gobject_introspection/i_field_info.rb

@@ -17,7 +17,7 @@ module GObjectIntrospection
     end
 
     def field_type
-      ITypeInfo.wrap Lib.g_field_info_get_type(self)
+      @field_type ||= ITypeInfo.wrap Lib.g_field_info_get_type(self)
     end
 
     def readable?

data/lib/ffi-gobject_introspection/i_function_info.rb

@@ -9,7 +9,7 @@ module GObjectIntrospection
     end
 
     def flags
-      Lib.g_function_info_get_flags self
+      @flags ||= Lib.g_function_info_get_flags self
     end
 
     def method?

data/lib/ffi-gobject_introspection/i_interface_info.rb

@@ -81,7 +81,7 @@ module GObjectIntrospection
     build_array_method :constants
 
     def iface_struct
-      IStructInfo.wrap Lib.g_interface_info_get_iface_struct(self)
+      @iface_struct ||= IStructInfo.wrap Lib.g_interface_info_get_iface_struct(self)
     end
   end
 end

data/lib/ffi-gobject_introspection/i_object_info.rb

@@ -21,7 +21,7 @@ module GObjectIntrospection
     end
 
     def parent
-      IObjectInfo.wrap Lib.g_object_info_get_parent(self)
+      @parent ||= IObjectInfo.wrap Lib.g_object_info_get_parent(self)
     end
 
     def n_interfaces
@@ -59,7 +59,7 @@ module GObjectIntrospection
     end
 
     def find_property(name)
-      name = name.to_s.tr('_', '-')
+      name = name.to_s.tr("_", "-")
       properties.find { |prop| prop.name == name }
     end
 

data/lib/ffi-gobject_introspection/i_property_info.rb

@@ -5,11 +5,11 @@ module GObjectIntrospection
   # Represents a property of an IObjectInfo or an IInterfaceInfo.
   class IPropertyInfo < IBaseInfo
     def property_type
-      ITypeInfo.wrap Lib.g_property_info_get_type(self)
+      @property_type ||= ITypeInfo.wrap Lib.g_property_info_get_type(self)
     end
 
     def flags
-      Lib.g_property_info_get_flags self
+      @flags ||= Lib.g_property_info_get_flags self
     end
 
     def readable?

data/lib/ffi-gobject_introspection/i_repository.rb

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
-require 'singleton'
+require "singleton"
 
-require 'ffi-gobject_introspection/lib'
-require 'ffi-gobject_introspection/strv'
-require 'ffi-gobject_introspection/g_error'
+require "ffi-gobject_introspection/lib"
+require "ffi-gobject_introspection/strv"
+require "ffi-gobject_introspection/g_error"
 
 module GObjectIntrospection
   # The Gobject Introspection Repository. This class is the point of
@@ -58,13 +58,16 @@ module GObjectIntrospection
     end
 
     def find_by_name(namespace, name)
-      wrap_info Lib.g_irepository_find_by_name(self, namespace, name)
+      @name_cache ||= {}
+      @name_cache[[namespace, name]] ||=
+        wrap_info Lib.g_irepository_find_by_name(self, namespace, name)
     end
 
     def find_by_gtype(gtype)
       raise ArgumentError, "Type #{gtype} is not a valid type" if gtype == 0
 
-      wrap_info Lib.g_irepository_find_by_gtype(self, gtype)
+      @gtype_cache ||= {}
+      @gtype_cache[gtype] ||= wrap_info Lib.g_irepository_find_by_gtype(self, gtype)
     end
 
     def dependencies(namespace)

data/lib/ffi-gobject_introspection/i_struct_info.rb

@@ -21,7 +21,8 @@ module GObjectIntrospection
     end
 
     def get_method(index)
-      IFunctionInfo.wrap Lib.g_struct_info_get_method(self, index)
+      @method_cache ||= []
+      @method_cache[index] ||= IFunctionInfo.wrap Lib.g_struct_info_get_method(self, index)
     end
 
     ##

data/lib/ffi-gobject_introspection/i_type_info.rb

@@ -5,24 +5,30 @@ module GObjectIntrospection
   # Represents type information, direction, transfer etc.
   class ITypeInfo < IBaseInfo
     def pointer?
-      Lib.g_type_info_is_pointer self
+      return @pointer_eh if defined? @pointer_eh
+
+      @pointer_eh = Lib.g_type_info_is_pointer self
     end
 
     def tag
-      Lib.g_type_info_get_tag self
+      @tag ||= Lib.g_type_info_get_tag self
     end
 
     def param_type(index)
-      ITypeInfo.wrap Lib.g_type_info_get_param_type(self, index)
+      @param_type_cache ||= []
+      @param_type_cache[index] ||=
+        ITypeInfo.wrap Lib.g_type_info_get_param_type(self, index)
     end
 
     def interface
-      ptr = Lib.g_type_info_get_interface self
-      IRepository.wrap_ibaseinfo_pointer ptr
+      @interface ||= begin
+                       ptr = Lib.g_type_info_get_interface self
+                       IRepository.wrap_ibaseinfo_pointer ptr
+                     end
     end
 
     def array_length
-      Lib.g_type_info_get_array_length self
+      @array_length ||= Lib.g_type_info_get_array_length self
     end
 
     def array_fixed_size
@@ -38,7 +44,7 @@ module GObjectIntrospection
     end
 
     def name
-      raise 'Should not call this for ITypeInfo'
+      raise "Should not call this for ITypeInfo"
     end
   end
 end

data/lib/ffi-gobject_introspection/i_unresolved_info.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'ffi-gobject_introspection/i_base_info'
+require "ffi-gobject_introspection/i_base_info"
 
 module GObjectIntrospection
   # Wraps a GIBaseInfo struct in the case where the info type is :unresolved.

data/lib/ffi-gobject_introspection/i_vfunc_info.rb

@@ -13,7 +13,7 @@ module GObjectIntrospection
     end
 
     def invoker
-      IFunctionInfo.wrap Lib.g_vfunc_info_get_invoker self
+      @invoker ||= IFunctionInfo.wrap Lib.g_vfunc_info_get_invoker self
     end
   end
 end

data/lib/ffi-gobject_introspection/lib.rb

@@ -1,14 +1,14 @@
 # frozen_string_literal: true
 
-require 'ffi'
-require 'ffi/bit_masks'
+require "ffi"
+require "ffi/bit_masks"
 
 module GObjectIntrospection
   # Module for attaching functions from the girepository library
   module Lib
     extend FFI::Library
     extend FFI::BitMasks
-    ffi_lib 'girepository-1.0'
+    ffi_lib "girepository-1.0.so.1"
 
     # IRepository
     enum :IRepositoryLoadFlags, [:LAZY, (1 << 0)]
@@ -116,24 +116,35 @@ module GObjectIntrospection
     attach_function :g_arg_info_get_destroy, [:pointer], :int
     attach_function :g_arg_info_get_type, [:pointer], :pointer
 
-    # The values of ITypeTag were changed in an incompatible way between
-    # gobject-introspection version 0.9.0 and 0.9.1. Therefore, we need to
-    # retrieve the correct values before declaring the ITypeTag enum.
-    attach_function :tmp_type_tag_to_string, :g_type_tag_to_string, [:int], :string
-    type_tag_map = (0..31).map do |id|
-      sym = tmp_type_tag_to_string(id).to_sym
-      if sym == :unknown
-        nil
-      else
-        [sym, id]
-      end
-    end.compact.flatten
-    enum :ITypeTag, type_tag_map
-
-    # Now, attach g_type_tag_to_string again under its own name with an
-    # improved signature.
+    # ITypeTag
+    enum :ITypeTag, [
+      :void,
+      :gboolean,
+      :gint8,
+      :guint8,
+      :gint16,
+      :guint16,
+      :gint32,
+      :guint32,
+      :gint64,
+      :guint64,
+      :gfloat,
+      :gdouble,
+      :GType,
+      :utf8,
+      :filename,
+      :array,
+      :interface,
+      :glist,
+      :gslist,
+      :ghash,
+      :error,
+      :gunichar
+    ]
+
     attach_function :g_type_tag_to_string, [:ITypeTag], :string
 
+    # ITypeInfo
     enum :IArrayType, [
       :c,
       :array,

data/lib/ffi-gobject_introspection/strv.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'ffi'
+require "ffi"
 
 module GObjectIntrospection
   # Represents a null-terminated array of strings.

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-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/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.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"

data/lib/gir_ffi/allocation_helper.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'gir_ffi/lib_c'
+require "gir_ffi/lib_c"
 
 module GirFFI
   # Helper module for alloction-related functionality.

data/lib/gir_ffi/arg_helper.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
-require 'gir_ffi/allocation_helper'
-require 'gir_ffi/builder'
-require 'gir_ffi/glib_error'
-require 'gir_ffi/object_store'
+require "gir_ffi/allocation_helper"
+require "gir_ffi/builder"
+require "gir_ffi/glib_error"
+require "gir_ffi/object_store"
 
 module GirFFI
   # Helper module containing methods used during argument conversion in

data/lib/gir_ffi/{in_out_pointer.rb → array_element_convertor.rb}

@@ -1,29 +1,17 @@
 # frozen_string_literal: true
 
 module GirFFI
-  # The InOutPointer class handles conversion between ruby types and
-  # pointers for arguments with direction :inout and :out.
-  #
-  class InOutPointer < FFI::Pointer
+  # The ArrayElementConvertor class handles conversion from C array elements to
+  # ruby values
+  class ArrayElementConvertor
     attr_reader :value_type
+    attr_reader :pointer
 
     def initialize(type, ptr)
       @value_type = type
-      super ptr
+      @pointer = ptr
     end
 
-    def to_value
-      case value_ffi_type
-      when Module
-        value_ffi_type.get_value_from_pointer(self, 0)
-      when Symbol
-        send("get_#{value_ffi_type}", 0)
-      else
-        raise NotImplementedError
-      end
-    end
-
-    # Convert more fully to a ruby value than #to_value
     def to_ruby_value
       bare_value = to_value
       case value_type
@@ -38,14 +26,19 @@ module GirFFI
       end
     end
 
-    def self.allocate_new(type)
-      ffi_type = TypeMap.type_specification_to_ffi_type type
-      ptr = FFI::MemoryPointer.new(ffi_type)
-      new type, ptr
-    end
-
     private
 
+    def to_value
+      case value_ffi_type
+      when Module
+        value_ffi_type.get_value_from_pointer(pointer, 0)
+      when Symbol
+        pointer.send("get_#{value_ffi_type}", 0)
+      else
+        raise NotImplementedError
+      end
+    end
+
     def value_ffi_type
       @value_ffi_type ||= TypeMap.type_specification_to_ffi_type value_type
     end