gir_ffi 0.14.1 → 0.15.4

data/lib/ffi-gobject/object_class.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-GObject.load_class :ObjectClass
+GObject::Object.object_class
 
 module GObject
   # Overrides for GObjectClass, a struct containing GObject's class data

data/lib/ffi-gobject/param_spec.rb

@@ -14,7 +14,7 @@ module GObject
     end
 
     def accessor_name
-      get_name.tr('-', '_')
+      get_name.tr("-", "_")
     end
 
     def value_type

data/lib/ffi-gobject/ruby_closure.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'ffi-gobject/closure'
+require "ffi-gobject/closure"
 
 module GObject
   # Encapsulates Ruby blocks as GObject Closures.
@@ -36,7 +36,7 @@ module GObject
 
       result = rclosure.invoke_block(*args)
 
-      return_value.set_value(result) if return_value
+      return_value&.set_value(result)
     end
 
     # @api private

data/lib/ffi-gobject/value.rb

@@ -5,18 +5,7 @@ GObject.load_class :Value
 module GObject
   # Overrides for GValue, GObject's generic value container structure.
   class Value
-    remove_method :init
-
-    def initialize
-      super
-      struct.owned = true
-      to_ptr.autorelease = nil
-    end
-
-    def init(type)
-      Lib.g_value_init self, type unless [TYPE_NONE, TYPE_INVALID].include? type
-      self
-    end
+    setup_instance_method! :init
 
     def self.make_finalizer(struct)
       proc do
@@ -29,62 +18,31 @@ module GObject
     end
 
     METHOD_MAP = {
-      TYPE_INVALID   => [:get_none,          :set_none],
+      TYPE_INVALID   => [:get_none,           :set_none],
       # TYPE_NONE is skipped
-      TYPE_INTERFACE => [:get_object,        :set_instance_enhanced],
-      TYPE_CHAR      => [:get_schar,         :set_schar],
-      TYPE_UCHAR     => [:get_uchar,         :set_uchar],
-      TYPE_BOOLEAN   => [:get_boolean,       :set_boolean],
-      TYPE_INT       => [:get_int,           :set_int],
-      TYPE_UINT      => [:get_uint,          :set_uint],
-      TYPE_LONG      => [:get_long,          :set_long],
-      TYPE_ULONG     => [:get_ulong,         :set_ulong],
-      TYPE_INT64     => [:get_int64,         :set_int64],
-      TYPE_UINT64    => [:get_uint64,        :set_uint64],
-      TYPE_ENUM      => [:get_enum_enhanced, :set_enum_enhanced],
-      TYPE_FLAGS     => [:get_flags,         :set_flags],
-      TYPE_FLOAT     => [:get_float,         :set_float],
-      TYPE_DOUBLE    => [:get_double,        :set_double],
-      TYPE_STRING    => [:get_string,        :set_string],
-      TYPE_POINTER   => [:get_pointer,       :set_pointer],
-      TYPE_BOXED     => [:get_boxed,         :set_boxed],
-      TYPE_PARAM     => [:get_param,         :set_param],
-      TYPE_OBJECT    => [:get_object,        :set_instance_enhanced],
-      TYPE_GTYPE     => [:get_gtype,         :set_gtype],
-      TYPE_VARIANT   => [:get_variant,       :set_variant]
+      TYPE_INTERFACE => [:get_object,         :set_instance_enhanced],
+      TYPE_CHAR      => [:get_schar,          :set_schar],
+      TYPE_UCHAR     => [:get_uchar,          :set_uchar],
+      TYPE_BOOLEAN   => [:get_boolean,        :set_boolean],
+      TYPE_INT       => [:get_int,            :set_int],
+      TYPE_UINT      => [:get_uint,           :set_uint],
+      TYPE_LONG      => [:get_long,           :set_long],
+      TYPE_ULONG     => [:get_ulong,          :set_ulong],
+      TYPE_INT64     => [:get_int64,          :set_int64],
+      TYPE_UINT64    => [:get_uint64,         :set_uint64],
+      TYPE_ENUM      => [:get_enum_enhanced,  :set_enum_enhanced],
+      TYPE_FLAGS     => [:get_flags_enhanced, :set_flags_enhanced],
+      TYPE_FLOAT     => [:get_float,          :set_float],
+      TYPE_DOUBLE    => [:get_double,         :set_double],
+      TYPE_STRING    => [:get_string,         :set_string],
+      TYPE_POINTER   => [:get_pointer,        :set_pointer],
+      TYPE_BOXED     => [:get_boxed,          :set_boxed],
+      TYPE_PARAM     => [:get_param,          :set_param],
+      TYPE_OBJECT    => [:get_object,         :set_instance_enhanced],
+      TYPE_GTYPE     => [:get_gtype,          :set_gtype],
+      TYPE_VARIANT   => [:get_variant,        :set_variant]
     }.freeze
 
-    def set_value(val)
-      send set_method, val
-    end
-
-    alias value= set_value
-
-    def current_gtype
-      struct[:g_type]
-    end
-
-    def current_fundamental_type
-      GObject.type_fundamental current_gtype
-    end
-
-    def current_gtype_name
-      GObject.type_name current_gtype
-    end
-
-    def get_value
-      value = get_value_plain
-      if current_fundamental_type == TYPE_BOXED
-        wrap_boxed value
-      else
-        value
-      end
-    end
-
-    def get_value_plain
-      send get_method
-    end
-
     # TODO: Give more generic name
     def self.wrap_ruby_value(val)
       new.tap { |gv| gv.__send__ :set_ruby_value, val }
@@ -119,86 +77,138 @@ module GObject
       Lib.g_value_copy value, target unless value.uninitialized?
     end
 
-    def uninitialized?
-      current_gtype == TYPE_INVALID
-    end
-
-    private
-
-    def set_ruby_value(val)
-      init_for_ruby_value val if uninitialized?
-      set_value val
-    end
-
     CLASS_TO_GTYPE_MAP = {
-      NilClass => TYPE_INVALID,
-      TrueClass => TYPE_BOOLEAN,
+      NilClass   => TYPE_INVALID,
+      TrueClass  => TYPE_BOOLEAN,
       FalseClass => TYPE_BOOLEAN,
-      Integer => TYPE_INT,
-      String => TYPE_STRING
+      Integer    => TYPE_INT,
+      String     => TYPE_STRING
     }.freeze
 
-    def init_for_ruby_value(val)
-      return init val.class.gtype if val.class.respond_to? :gtype
+    # Overrides for existing Value methods
+    module Overrides
+      def set_value(val)
+        send set_method, val
+      end
+
+      alias value= set_value
 
-      CLASS_TO_GTYPE_MAP.each do |klass, type|
-        return init type if val.is_a? klass
+      def current_gtype
+        struct[:g_type]
       end
-      raise "Can't handle #{val.class}"
-    end
 
-    def set_none(_val); end
+      def current_fundamental_type
+        GObject.type_fundamental current_gtype
+      end
 
-    def get_none; end
+      def current_gtype_name
+        GObject.type_name current_gtype
+      end
 
-    def set_instance_enhanced(val)
-      check_type_compatibility val if val
-      set_instance val
-    end
+      def get_value
+        value = get_value_plain
+        if current_fundamental_type == TYPE_BOXED
+          wrap_boxed value
+        else
+          value
+        end
+      end
 
-    def set_enum_enhanced(val)
-      val = current_gtype_class[val] if val.is_a? Symbol
-      set_enum val
-    end
+      def get_value_plain
+        send get_method
+      end
 
-    def get_enum_enhanced
-      current_gtype_class.wrap(get_enum)
-    end
+      def uninitialized?
+        current_gtype == TYPE_INVALID
+      end
 
-    def current_gtype_class
-      GirFFI::Builder.build_by_gtype(current_gtype)
-    end
+      def init(type)
+        Lib.g_value_init self, type unless [TYPE_NONE, TYPE_INVALID].include? type
+        self
+      end
 
-    def check_type_compatibility(val)
-      return if GObject::Value.type_compatible(GObject.type_from_instance(val), current_gtype)
+      private
 
-      raise ArgumentError, "#{val.class} is incompatible with #{current_gtype_name}"
-    end
+      def set_ruby_value(val)
+        init_for_ruby_value val if uninitialized?
+        set_value val
+      end
 
-    def wrap_boxed(boxed)
-      case current_gtype
-      when TYPE_STRV
-        GLib::Strv.wrap boxed
-      when TYPE_HASH_TABLE
-        GLib::HashTable.wrap [:gpointer, :gpointer], boxed
-      when TYPE_ARRAY
-        GLib::Array.wrap nil, boxed
-      else
-        current_gtype_class.wrap(boxed) unless boxed.null?
+      def init_for_ruby_value(val)
+        return init val.class.gtype if val.class.respond_to? :gtype
+
+        CLASS_TO_GTYPE_MAP.each do |klass, type|
+          return init type if val.is_a? klass
+        end
+        raise "Can't handle #{val.class}"
       end
-    end
 
-    def get_method
-      method_map_entry.first
-    end
+      def set_none(_val); end
 
-    def set_method
-      method_map_entry.last
-    end
+      def get_none; end
+
+      def set_instance_enhanced(val)
+        check_type_compatibility val if val
+        set_instance val
+      end
+
+      def set_enum_enhanced(val)
+        val = current_gtype_class.to_native(val, nil)
+        set_enum val
+      end
+
+      def get_enum_enhanced
+        current_gtype_class.wrap(get_enum)
+      end
+
+      def set_flags_enhanced(val)
+        val = current_gtype_class.to_native(val, nil)
+        set_flags val
+      end
 
-    def method_map_entry
-      METHOD_MAP[current_gtype] || METHOD_MAP[current_fundamental_type] ||
-        raise("No method map entry for #{current_gtype_name}")
+      def get_flags_enhanced
+        current_gtype_class.wrap(get_flags)
+      end
+
+      def current_gtype_class
+        GirFFI::Builder.build_by_gtype(current_gtype)
+      end
+
+      def check_type_compatibility(val)
+        if GObject::Value.type_compatible(GObject.type_from_instance(val), current_gtype)
+          return
+        end
+
+        raise ArgumentError, "#{val.class} is incompatible with #{current_gtype_name}"
+      end
+
+      def wrap_boxed(boxed)
+        case current_gtype
+        when TYPE_STRV
+          GLib::Strv.wrap boxed
+        when TYPE_HASH_TABLE
+          GLib::HashTable.wrap [:gpointer, :gpointer], boxed
+        when TYPE_ARRAY
+          GLib::Array.wrap nil, boxed
+        else
+          current_gtype_class.wrap(boxed) unless boxed.null?
+        end
+      end
+
+      def get_method
+        method_map_entry.first
+      end
+
+      def set_method
+        method_map_entry.last
+      end
+
+      def method_map_entry
+        METHOD_MAP[current_gtype] || METHOD_MAP[current_fundamental_type] ||
+          raise("No method map entry for '#{current_gtype_name}'")
+      end
     end
+
+    prepend Overrides
   end
 end

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'ffi'
+require "ffi"
 
 module GObjectIntrospection
   # Provides access to the g_type_init function.
@@ -12,7 +12,7 @@ module GObjectIntrospection
     # Module for attaching g_type_init from the gobject library.
     module Lib
       extend FFI::Library
-      ffi_lib 'gobject-2.0'
+      ffi_lib "gobject-2.0"
       attach_function :g_type_init, [], :void
     end
   end

data/lib/ffi-gobject_introspection/i_arg_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 GIArgInfo struct.
   # Represents an argument.
@@ -46,7 +46,7 @@ module GObjectIntrospection
     end
 
     def argument_type
-      ITypeInfo.wrap Lib.g_arg_info_get_type(self)
+      @argument_type ||= ITypeInfo.wrap Lib.g_arg_info_get_type(self)
     end
   end
 end

data/lib/ffi-gobject_introspection/i_base_info.rb

@@ -5,7 +5,7 @@ module GObjectIntrospection
   # Decendant types will be implemented as needed.
   class IBaseInfo
     def initialize(ptr, lib = Lib)
-      raise ArgumentError, 'ptr must not be null' if ptr.null?
+      raise ArgumentError, "ptr must not be null" if ptr.null?
 
       ObjectSpace.define_finalizer self, self.class.make_finalizer(lib, ptr)
 
@@ -35,19 +35,21 @@ module GObjectIntrospection
     # Examples:
     #
     #   build_array_method :fields
-    #   build_array_mehtod :properties, :property
+    #   build_array_method :properties, :property
     #   build_array_method :get_methods
     #
     def self.build_array_method(method, single = nil)
       method = method.to_s
+      cache_ivar = "@#{method}_cache"
       single ||= method[0..-2]
       count = method.sub(/^(get_)?/, '\\1n_')
       class_eval <<-CODE, __FILE__, __LINE__ + 1
-        def #{method}
-          (0..(#{count} - 1)).map do |i|
-            #{single} i
-          end
-        end
+        def #{method}                       # def fields
+          #{cache_ivar} ||=                 #   @fields_cache ||=
+            (0..(#{count} - 1)).map do |i|  #     (0..(n_fields - 1)).map do |i|
+              #{single} i                   #       field i
+            end                             #     end
+        end                                 # end
       CODE
     end
 
@@ -69,41 +71,50 @@ module GObjectIntrospection
     #
     def self.build_finder_method(method, counter = nil, fetcher = nil)
       method = method.to_s
-      single = method.sub(/^find_/, '')
+      cache_ivar = "@#{method}_cache"
+      single = method.sub(/^find_/, "")
       counter ||= "n_#{single}s"
       fetcher ||= single
       class_eval <<-CODE, __FILE__, __LINE__ + 1
-        def #{method}(name)
-          name = name.to_s
-          #{counter}.times do |i|
-            it = #{fetcher}(i)
-            return it if it.name == name
-          end
-          nil
-        end
+        def #{method}(name)           # def find_field(name)
+          #{cache_ivar} ||= begin     #   @find_field_cache ||= begin
+              hash = {}               #       hash = {}
+              #{counter}.times do |i| #       n_fields.times do |i|
+                it = #{fetcher}(i)    #         it = field(i)
+                hash[it.name] = it    #         hash[it.name] = it
+              end                     #       end
+              hash                    #       hash
+            end                       #     end
+          name = name.to_s            #   name = name.to_s
+          #{cache_ivar}[name]         #   @find_field_cache[name]
+        end                           # end
       CODE
     end
 
     def name
-      Lib.g_base_info_get_name self
+      @name ||= Lib.g_base_info_get_name self
     end
 
     def info_type
-      Lib.g_base_info_get_type self
+      @info_type ||= Lib.g_base_info_get_type self
     end
 
     def namespace
-      Lib.g_base_info_get_namespace self
+      @namespace ||= Lib.g_base_info_get_namespace self
     end
 
     def safe_namespace
-      namespace.gsub(/^./, &:upcase)
+      namespace.sub(/^[a-z]/, &:upcase)
     end
 
     def container
-      ptr = Lib.g_base_info_get_container self
-      Lib.g_base_info_ref ptr
-      IRepository.wrap_ibaseinfo_pointer ptr
+      @container ||= begin
+                       ptr = Lib.g_base_info_get_container self
+                       return if ptr.null?
+
+                       Lib.g_base_info_ref ptr
+                       IRepository.wrap_ibaseinfo_pointer ptr
+                     end
     end
 
     def deprecated?