gir_ffi 0.14.0 → 0.15.3

data/lib/ffi-gobject/object.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'gir_ffi/property_not_found_error'
+require "gir_ffi/property_not_found_error"
 
 GObject.load_class :Object
 
@@ -44,7 +44,7 @@ module GObject
         obj
       end
     else
-      setup_method! 'new'
+      setup_method! "new"
 
       # Before GLib 2.54.0, use g_object_newv, which takes an array of GParameter.
       def initialize_with_automatic_gtype(properties = {})
@@ -90,22 +90,6 @@ module GObject
       end
     end
 
-    # TODO: Generate accessor methods from GIR at class definition time
-    def method_missing(method, *args)
-      getter_name = "get_#{method}"
-      return send(getter_name, *args) if respond_to?(getter_name)
-
-      if method.to_s =~ /(.*)=$/
-        setter_name = "set_#{Regexp.last_match[1]}"
-        return send(setter_name, *args) if respond_to?(setter_name)
-      end
-      super
-    end
-
-    def respond_to_missing?(*)
-      false
-    end
-
     def signal_connect(event, data = nil, &block)
       GObject.signal_connect(self, event, data, &block)
     end
@@ -114,30 +98,37 @@ module GObject
       GObject.signal_connect_after(self, event, data, &block)
     end
 
-    setup_instance_method! 'get_property'
-    setup_instance_method! 'set_property'
+    setup_instance_method! "get_property"
+    setup_instance_method! "set_property"
 
+    # @deprecated
     def get_property_extended(property_name)
-      value = get_property(property_name)
-      type_info = get_property_type property_name
-      property_value_post_conversion value, type_info
+      get_property(property_name)
     end
 
     def get_property_with_override(property_name)
       gvalue = gvalue_for_property property_name
       get_property_without_override property_name, gvalue
-      gvalue.get_value
+      value = gvalue.get_value
+
+      type_info = get_property_type property_name
+      value = property_value_post_conversion(value, type_info) if type_info
+
+      value
     end
 
+    # @deprecated
     def set_property_extended(property_name, value)
-      type_info = get_property_type property_name
-      adjusted_value = property_value_pre_conversion(value, type_info)
-      set_property property_name, adjusted_value
+      set_property property_name, value
     end
 
     def set_property_with_override(property_name, value)
+      type_info = get_property_type property_name
+      value = property_value_pre_conversion(value, type_info) if type_info
+
       gvalue = gvalue_for_property(property_name)
       gvalue.set_value value
+
       set_property_without_override property_name, gvalue
     end
 
@@ -147,7 +138,7 @@ module GObject
     alias set_property_without_override set_property
     alias set_property set_property_with_override
 
-    setup_instance_method! 'is_floating'
+    setup_instance_method! "is_floating"
     alias floating? is_floating
 
     private
@@ -165,8 +156,7 @@ module GObject
     end
 
     def get_property_type(property_name)
-      prop = self.class.find_property(property_name)
-      prop.property_type
+      self.class.find_property(property_name)&.property_type
     end
 
     def gvalue_for_property(property_name)
@@ -175,8 +165,7 @@ module GObject
     end
 
     def property_gtype(property_name)
-      pspec = property_param_spec(property_name)
-      pspec.value_type
+      property_param_spec(property_name).value_type
     end
 
     def property_param_spec(property_name)
@@ -207,6 +196,8 @@ module GObject
         GLib::List.from type_info.element_type, val
       when :strv
         GLib::Strv.from val
+      when :byte_array
+        GLib::ByteArray.from val
       when :callback
         GirFFI::Builder.build_class(type_info.interface).from val
       else

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,12 +165,23 @@ 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
 
     def check_type_compatibility(val)
-      return if GObject::Value.type_compatible(GObject.type_from_instance(val), current_gtype)
+      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
@@ -198,7 +209,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_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)
 
@@ -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
 
     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?

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