gir_ffi 0.14.1 → 0.15.0

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"
 
     # 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/ffi-gobject_introspection.rb

@@ -1,26 +1,26 @@
 # frozen_string_literal: true
 
-require 'ffi-gobject_introspection/gobject_type_init'
+require "ffi-gobject_introspection/gobject_type_init"
 GObjectIntrospection::GObjectTypeInit.type_init
 
-require 'ffi-gobject_introspection/i_base_info'
-require 'ffi-gobject_introspection/i_callable_info'
-require 'ffi-gobject_introspection/i_callback_info'
-require 'ffi-gobject_introspection/i_function_info'
-require 'ffi-gobject_introspection/i_constant_info'
-require 'ffi-gobject_introspection/i_field_info'
-require 'ffi-gobject_introspection/i_registered_type_info'
-require 'ffi-gobject_introspection/i_interface_info'
-require 'ffi-gobject_introspection/i_property_info'
-require 'ffi-gobject_introspection/i_vfunc_info'
-require 'ffi-gobject_introspection/i_signal_info'
-require 'ffi-gobject_introspection/i_object_info'
-require 'ffi-gobject_introspection/i_struct_info'
-require 'ffi-gobject_introspection/i_value_info'
-require 'ffi-gobject_introspection/i_union_info'
-require 'ffi-gobject_introspection/i_enum_info'
-require 'ffi-gobject_introspection/i_flags_info'
-require 'ffi-gobject_introspection/i_unresolved_info'
+require "ffi-gobject_introspection/i_base_info"
+require "ffi-gobject_introspection/i_callable_info"
+require "ffi-gobject_introspection/i_callback_info"
+require "ffi-gobject_introspection/i_function_info"
+require "ffi-gobject_introspection/i_constant_info"
+require "ffi-gobject_introspection/i_field_info"
+require "ffi-gobject_introspection/i_registered_type_info"
+require "ffi-gobject_introspection/i_interface_info"
+require "ffi-gobject_introspection/i_property_info"
+require "ffi-gobject_introspection/i_vfunc_info"
+require "ffi-gobject_introspection/i_signal_info"
+require "ffi-gobject_introspection/i_object_info"
+require "ffi-gobject_introspection/i_struct_info"
+require "ffi-gobject_introspection/i_value_info"
+require "ffi-gobject_introspection/i_union_info"
+require "ffi-gobject_introspection/i_enum_info"
+require "ffi-gobject_introspection/i_flags_info"
+require "ffi-gobject_introspection/i_unresolved_info"
 
 module GObjectIntrospection
   # Map info type to class. Default is IBaseInfo.
@@ -49,4 +49,4 @@ module GObjectIntrospection
   }.freeze
 end
 
-require 'ffi-gobject_introspection/i_repository'
+require "ffi-gobject_introspection/i_repository"

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

data/lib/gir_ffi/boolean.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'ffi'
+require "ffi"
 
 module GirFFI
   # Class representing a boolean (natively, an int).

data/lib/gir_ffi/boxed_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 generated classes representing boxed types.

data/lib/gir_ffi/builder.rb

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
-require 'gir_ffi/builders/type_builder'
-require 'gir_ffi/builders/module_builder'
-require 'gir_ffi/builder_helper'
-require 'gir_ffi/unintrospectable_type_info'
-require 'gir_ffi/unintrospectable_boxed_info'
+require "gir_ffi/builders/type_builder"
+require "gir_ffi/builders/module_builder"
+require "gir_ffi/builder_helper"
+require "gir_ffi/unintrospectable_type_info"
+require "gir_ffi/unintrospectable_boxed_info"
 
 module GirFFI
   # Builds modules and classes based on information found in the
@@ -19,11 +19,17 @@ module GirFFI
 
     def self.build_by_gtype(gtype)
       info = GObjectIntrospection::IRepository.default.find_by_gtype gtype
-      info ||= case GObject.type_fundamental gtype
-               when GObject::TYPE_BOXED
-                 UnintrospectableBoxedInfo.new gtype
-               when GObject::TYPE_OBJECT
-                 UnintrospectableTypeInfo.new gtype
+      info ||= begin
+                 fund = GObject.type_fundamental gtype
+                 if fund == GObject::TYPE_BOXED
+                   UnintrospectableBoxedInfo.new gtype
+                 elsif fund == GObject::TYPE_OBJECT
+                   UnintrospectableTypeInfo.new gtype
+                 elsif fund >= GObject::TYPE_RESERVED_USER_FIRST
+                   UnintrospectableTypeInfo.new gtype
+                 else
+                   raise "Unable to handle type #{GObject.type_name gtype}"
+                 end
                end
 
       build_class info
@@ -36,6 +42,8 @@ module GirFFI
         unless modul.const_defined? :GIR_FFI_BUILDER
           raise "The module #{module_name} was already defined elsewhere"
         end
+
+        return modul
       end
       Builders::ModuleBuilder.new(module_name,
                                   namespace: namespace,

data/lib/gir_ffi/builders/argument_builder.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
-require 'gir_ffi/builders/base_argument_builder'
-require 'gir_ffi/builders/closure_to_pointer_convertor'
-require 'gir_ffi/builders/full_c_to_ruby_convertor'
-require 'gir_ffi/builders/ruby_to_c_convertor'
-require 'gir_ffi/builders/pointer_value_convertor'
-require 'gir_ffi/builders/null_convertor'
+require "gir_ffi/builders/base_argument_builder"
+require "gir_ffi/builders/closure_to_pointer_convertor"
+require "gir_ffi/builders/full_c_to_ruby_convertor"
+require "gir_ffi/builders/ruby_to_c_convertor"
+require "gir_ffi/builders/pointer_value_convertor"
+require "gir_ffi/builders/null_convertor"
 
 module GirFFI
   module Builders
@@ -114,7 +114,7 @@ module GirFFI
 
       def outgoing_convertor(base)
         FullCToRubyConvertor.new(type_info, base, length_argument_name,
-                                 ownership_transfer: @arginfo.ownership_transfer)
+                                 ownership_transfer: arginfo.ownership_transfer)
       end
 
       def sub_type_spec
@@ -138,11 +138,11 @@ module GirFFI
       # is a pointer. For example, an out parameter of type gint8* will always
       # be allocated by the caller (that's us).
       def allocated_by_them?
-        !@arginfo.caller_allocates? && type_info.pointer?
+        !arginfo.caller_allocates? && type_info.pointer?
       end
 
       def length_argument_name
-        length_arg && length_arg.post_converted_name
+        length_arg&.post_converted_name
       end
 
       def needs_size_check?
@@ -155,12 +155,12 @@ module GirFFI
       end
 
       def skipped_in?
-        @arginfo.skip?
+        arginfo.skip?
       end
 
       def skipped_out?
-        @arginfo.skip? ||
-          @array_arg && @array_arg.specialized_type_tag == :strv
+        arginfo.skip? ||
+          array_arg && array_arg.specialized_type_tag == :strv
       end
 
       def has_output_value?
@@ -176,7 +176,7 @@ module GirFFI
       end
 
       def array_length_assignment
-        arrname = @array_arg.name
+        arrname = array_arg.name
         "#{name} = #{arrname}.nil? ? 0 : #{arrname}.length"
       end
 
@@ -200,14 +200,14 @@ module GirFFI
 
       def caller_allocated_object?
         [:struct, :array].include?(specialized_type_tag) &&
-          @arginfo.caller_allocates?
+          arginfo.caller_allocates?
       end
 
-      DESTROY_NOTIFIER = 'GLib::DestroyNotify.default'.freeze
+      DESTROY_NOTIFIER = "GLib::DestroyNotify.default"
 
       def ingoing_convertor
         if skipped_in?
-          NullConvertor.new('0')
+          NullConvertor.new("0")
         elsif destroy_notifier?
           NullConvertor.new(DESTROY_NOTIFIER)
         elsif user_data?
@@ -233,7 +233,7 @@ module GirFFI
       end
 
       def callback_argument_name
-        @related_callback_builder.call_argument_name
+        related_callback_builder.call_argument_name
       end
     end
   end