gir_ffi 0.14.1 → 0.15.0

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

@@ -29,29 +29,29 @@ 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)
@@ -131,11 +131,11 @@ module GObject
     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)
@@ -157,7 +157,7 @@ module GObject
     end
 
     def set_enum_enhanced(val)
-      val = current_gtype_class[val] if val.is_a? Symbol
+      val = current_gtype_class.to_native(val, nil)
       set_enum val
     end
 
@@ -165,6 +165,15 @@ module GObject
       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 get_flags_enhanced
+      current_gtype_class.wrap(get_flags)
+    end
+
     def current_gtype_class
       GirFFI::Builder.build_by_gtype(current_gtype)
     end
@@ -198,7 +207,7 @@ module GObject
 
     def method_map_entry
       METHOD_MAP[current_gtype] || METHOD_MAP[current_fundamental_type] ||
-        raise("No method map entry for #{current_gtype_name}")
+        raise("No method map entry for '#{current_gtype_name}'")
     end
   end
 end

data/lib/ffi-gobject.rb

@@ -1,18 +1,18 @@
 # frozen_string_literal: true
 
-require 'gir_ffi/core'
+require "gir_ffi/core"
 
 # Bypass check for existing modules
-GirFFI::Builders::ModuleBuilder.new('GObject').generate
+GirFFI::Builders::ModuleBuilder.new("GObject").generate
 
-require 'ffi-gobject/value'
-require 'ffi-gobject/initially_unowned'
-require 'ffi-gobject/closure'
-require 'ffi-gobject/object'
-require 'ffi-gobject/object_class'
-require 'ffi-gobject/param_spec'
-require 'ffi-gobject/ruby_closure'
-require 'gir_ffi/signal_not_found_error'
+require "ffi-gobject/value"
+require "ffi-gobject/initially_unowned"
+require "ffi-gobject/closure"
+require "ffi-gobject/object"
+require "ffi-gobject/object_class"
+require "ffi-gobject/param_spec"
+require "ffi-gobject/ruby_closure"
+require "gir_ffi/signal_not_found_error"
 
 # Module representing GLib's GObject namespace.
 module GObject
@@ -47,7 +47,7 @@ module GObject
   end
 
   def self.signal_emit(object, detailed_signal, *args)
-    signal, detail = detailed_signal.split('::')
+    signal, detail = detailed_signal.split("::")
     signal_id = signal_lookup_from_instance signal, object
     detail_quark = GLib.quark_from_string(detail)
 
@@ -63,9 +63,9 @@ module GObject
   end
 
   def self.signal_connect(object, detailed_signal, data = nil, after = false, &block)
-    raise ArgumentError, 'Block needed' unless block_given?
+    raise ArgumentError, "Block needed" unless block_given?
 
-    signal_name, = detailed_signal.split('::')
+    signal_name, = detailed_signal.split("::")
     sig_info = object.class.find_signal signal_name
 
     closure = sig_info.wrap_in_closure do |*args|

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)
 
@@ -40,13 +40,15 @@ module GObjectIntrospection
     #
     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
+          #{cache_ivar} ||=
+            (0..(#{count} - 1)).map do |i|
+              #{single} i
+            end
         end
       CODE
     end
@@ -69,41 +71,49 @@ 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)
+          #{cache_ivar} ||= begin
+              hash = {}
+              #{counter}.times do |i|
+                it = #{fetcher}(i)
+                hash[it.name] = it
+              end
+              hash
+            end
           name = name.to_s
-          #{counter}.times do |i|
-            it = #{fetcher}(i)
-            return it if it.name == name
-          end
-          nil
+          #{cache_ivar}[name]
         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
 
+    # TODO: Avoid calling for IStructInfo
     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
+                       Lib.g_base_info_ref ptr
+                       IRepository.wrap_ibaseinfo_pointer ptr
+                     end
     end
 
     def deprecated?

data/lib/ffi-gobject_introspection/i_callable_info.rb

@@ -1,15 +1,15 @@
 # frozen_string_literal: true
 
-require 'ffi-gobject_introspection/i_base_info'
-require 'ffi-gobject_introspection/i_type_info'
-require 'ffi-gobject_introspection/i_arg_info'
+require "ffi-gobject_introspection/i_base_info"
+require "ffi-gobject_introspection/i_type_info"
+require "ffi-gobject_introspection/i_arg_info"
 
 module GObjectIntrospection
   # Wraps a GICallableInfo struct; represents a callable, either
   # IFunctionInfo, ICallbackInfo or IVFuncInfo.
   class ICallableInfo < IBaseInfo
     def return_type
-      ITypeInfo.wrap Lib.g_callable_info_get_return_type(self)
+      @return_type ||= ITypeInfo.wrap Lib.g_callable_info_get_return_type(self)
     end
 
     def caller_owns

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)