gir_ffi 0.15.9 → 0.16.0

data/lib/gir_ffi/builders/mapping_method_builder.rb

@@ -23,7 +23,7 @@ module GirFFI
 
       def initialize(receiver_info, info, builder_class)
         super(info, CallbackReturnValueBuilder,
-              receiver_info:          receiver_info,
+              receiver_info: receiver_info,
               argument_builder_class: builder_class)
       end
 

data/lib/gir_ffi/builders/marshalling_method_builder.rb

@@ -21,7 +21,7 @@ module GirFFI
 
       def initialize(receiver_info, info)
         super(info, ClosureReturnValueBuilder,
-              receiver_info:          receiver_info,
+              receiver_info: receiver_info,
               argument_builder_class: ClosureArgumentBuilder)
       end
 
@@ -32,7 +32,7 @@ module GirFFI
       end
 
       def method_arguments
-        %w(closure return_value param_values _invocation_hint _marshal_data)
+        %w[closure return_value param_values _invocation_hint _marshal_data]
       end
 
       def preparation

data/lib/gir_ffi/builders/object_builder.rb

@@ -18,7 +18,7 @@ module GirFFI
           ObjectBase
         end
 
-        def object_class_struct
+        def class_struct_class
           GObject::TypeClass
         end
 
@@ -35,12 +35,12 @@ module GirFFI
         seek_in_ancestor_infos { |info| info.find_property property_name }
       end
 
-      def object_class_struct
-        @object_class_struct ||=
+      def class_struct_class
+        @class_struct_class ||=
           begin
-            parent_struct = parent_builder.object_class_struct
-            if object_class_struct_info
-              StructBuilder.new(object_class_struct_info,
+            parent_struct = parent_builder.class_struct_class
+            if class_struct_info
+              StructBuilder.new(class_struct_info,
                                 superclass: parent_struct).build_class
             else
               parent_struct
@@ -58,12 +58,6 @@ module GirFFI
         end
       end
 
-      protected
-
-      def object_class_struct_info
-        @object_class_struct_info ||= info.class_struct
-      end
-
       private
 
       def setup_class
@@ -76,6 +70,10 @@ module GirFFI
         setup_initializer
       end
 
+      def class_struct_info
+        @class_struct_info ||= info.class_struct
+      end
+
       # FIXME: Private method only used in subclass
       def layout_superclass
         GirFFI::Struct

data/lib/gir_ffi/builders/type_builder.rb

@@ -21,16 +21,16 @@ module GirFFI
       CACHE = {}
 
       TYPE_MAP = {
-        callback:               CallbackBuilder,
-        constant:               ConstantBuilder,
-        enum:                   EnumBuilder,
-        flags:                  FlagsBuilder,
-        interface:              InterfaceBuilder,
-        object:                 ObjectBuilder,
-        struct:                 StructBuilder,
-        union:                  UnionBuilder,
+        callback: CallbackBuilder,
+        constant: ConstantBuilder,
+        enum: EnumBuilder,
+        flags: FlagsBuilder,
+        interface: InterfaceBuilder,
+        object: ObjectBuilder,
+        struct: StructBuilder,
+        union: UnionBuilder,
         unintrospectable_boxed: UnintrospectableBoxedBuilder,
-        unintrospectable:       UnintrospectableBuilder
+        unintrospectable: UnintrospectableBuilder
       }.freeze
 
       def self.build(info)

data/lib/gir_ffi/builders/user_defined_builder.rb

@@ -78,17 +78,17 @@ module GirFFI
       end
 
       def class_init_proc
-        proc do |type_class_or_ptr, _data|
-          object_class_ptr = type_class_or_ptr.to_ptr
-          setup_properties object_class_ptr
-          setup_vfuncs object_class_ptr
+        proc do |type_class, _data|
+          class_struct_ptr = type_class.to_ptr
+          setup_properties class_struct_ptr
+          setup_vfuncs class_struct_ptr
         end
       end
 
       def interface_init_proc(interface)
-        proc do |interface_or_ptr, _data|
-          interface_ptr = interface_or_ptr.to_ptr
-          setup_interface_vfuncs interface, interface_ptr
+        proc do |type_interface, _data|
+          interface_struct_ptr = type_interface.to_ptr
+          setup_interface_vfuncs interface, interface_struct_ptr
         end
       end
 
@@ -108,42 +108,44 @@ module GirFFI
         parent_gtype.class_size + interface_gtypes.sum(&:class_size)
       end
 
-      def setup_properties(object_class_ptr)
-        object_class = GObject::ObjectClass.wrap object_class_ptr
+      def setup_properties(class_struct_ptr)
+        class_struct = GObject::ObjectClass.wrap class_struct_ptr
 
-        object_class.get_property = property_getter
-        object_class.set_property = property_setter
+        class_struct.struct[:get_property] = property_getter_func
+        class_struct.struct[:set_property] = property_setter_func
 
         property_fields.each_with_index do |property, index|
-          object_class.install_property index + 1, property.param_spec
+          class_struct.install_property index + 1, property.param_spec
         end
       end
 
-      def property_getter
-        proc do |object, _property_id, value, pspec|
+      def property_getter_func
+        getter = proc do |object, _property_id, value, pspec|
           value.set_value object.send(pspec.accessor_name)
         end
+        GObject::ObjectGetPropertyFunc.from getter
       end
 
-      def property_setter
-        proc do |object, _property_id, value, pspec|
+      def property_setter_func
+        setter = proc do |object, _property_id, value, pspec|
           object.send("#{pspec.accessor_name}=", value.get_value)
         end
+        GObject::ObjectSetPropertyFunc.from setter
       end
 
-      def setup_vfuncs(object_class_ptr)
+      def setup_vfuncs(class_struct_ptr)
         super_class_struct =
-          superclass.gir_ffi_builder.object_class_struct::Struct.new(object_class_ptr)
+          superclass.gir_ffi_builder.class_struct_class.wrap(class_struct_ptr)
 
         info.vfunc_implementations.each do |impl|
           setup_vfunc parent_info, super_class_struct, impl
         end
       end
 
-      def setup_interface_vfuncs(interface, interface_ptr)
+      def setup_interface_vfuncs(interface, interface_struct_ptr)
         interface_builder = interface.gir_ffi_builder
 
-        interface_struct = interface_builder.interface_struct::Struct.new(interface_ptr)
+        interface_struct = interface_builder.interface_struct.wrap(interface_struct_ptr)
         interface_info = interface_builder.info
 
         info.vfunc_implementations.each do |impl|
@@ -156,12 +158,8 @@ module GirFFI
         vfunc_info = ancestor_info.find_vfunc vfunc_name.to_s
         return unless vfunc_info
 
-        install_vfunc ancestor_struct, vfunc_name, vfunc_info, impl.implementation
-      end
-
-      def install_vfunc(container_struct, vfunc_name, vfunc_info, implementation)
-        vfunc = VFuncBuilder.new(vfunc_info).build_class
-        container_struct[vfunc_name] = vfunc.from implementation
+        vfunc_class = VFuncBuilder.new(vfunc_info).build_class
+        ancestor_struct.struct[vfunc_name] = vfunc_class.from(impl.implementation)
       end
 
       def properties

data/lib/gir_ffi/class_base.rb

@@ -29,10 +29,8 @@ module GirFFI
       send method_name, *arguments, &block
     end
 
-    # NOTE: JRuby should fix FFI::MemoryPointer#== to return true for
-    # equivalent FFI::Pointer. For now, user to_ptr.address
     def ==(other)
-      other.class == self.class && to_ptr.address == other.to_ptr.address
+      other.class == self.class && to_ptr == other.to_ptr
     end
 
     def self.setup_and_call(method, arguments, &block)

data/lib/gir_ffi/core.rb

@@ -40,11 +40,6 @@ module GirFFI
         raise ArgumentError, "#{klass} is not a user-defined class"
       end
 
-      if block_given?
-        warn "Using define_type with a block is deprecated." \
-             " Call the relevant functions inside the class definition instead."
-        yield info
-      end
       Builders::UserDefinedBuilder.new(info).build_class
 
       klass.gtype

data/lib/gir_ffi/in_pointer.rb

@@ -75,13 +75,13 @@ module GirFFI
       end
 
       def from_module_type_array(type, ary)
-        if type == GObject::Value
-          from_gvalue_array type, ary
-        elsif type < GirFFI::ClassBase ||
-              type.singleton_class < GirFFI::InterfaceBase
-          from_struct_array type, ary
-        elsif type.singleton_class < GirFFI::EnumBase
+        return from_gvalue_array(type, ary) if type == GObject::Value
+
+        case type
+        when GirFFI::EnumLikeBase
           from_enum_array type, ary
+        when GirFFI::RegisteredTypeBase
+          from_struct_array type, ary
         else
           raise NotImplementedError, type
         end

data/lib/gir_ffi/info_ext/i_signal_info.rb

@@ -17,8 +17,14 @@ module GirFFI
       end
 
       def arguments_to_gvalues(instance, arguments)
-        arg_g_values = argument_types.zip(arguments).map do |type, arg|
-          type.make_g_value.tap { |it| it.set_value arg }
+        arg_g_values = args.zip(arguments).map do |arg_info, arg|
+          case arg_info.direction
+          when :in
+            type = arg_info.argument_type
+            type.make_g_value.tap { |it| it.set_value arg }
+          else
+            raise NotImplementedError
+          end
         end
 
         arg_g_values.unshift GObject::Value.wrap_instance(instance)
@@ -27,10 +33,6 @@ module GirFFI
       def gvalue_for_return_value
         return_type.make_g_value
       end
-
-      def argument_types
-        @argument_types ||= args.map(&:argument_type)
-      end
     end
   end
 end

data/lib/gir_ffi/info_ext/i_type_info.rb

@@ -8,17 +8,17 @@ module GirFFI
     module ITypeInfo
       FLATTENED_TAG_TO_GTYPE_MAP = {
         gboolean: GObject::TYPE_BOOLEAN,
-        gint32:   GObject::TYPE_INT,
-        gint64:   GObject::TYPE_INT64,
-        guint64:  GObject::TYPE_UINT64,
-        void:     GObject::TYPE_NONE
+        gint32: GObject::TYPE_INT,
+        gint64: GObject::TYPE_INT64,
+        guint64: GObject::TYPE_UINT64,
+        void: GObject::TYPE_NONE
       }.freeze
 
       FLATTENED_TAG_POINTER_TO_GTYPE_MAP = {
         array: GObject::TYPE_ARRAY,
         ghash: GObject::TYPE_HASH_TABLE,
-        strv:  GObject::TYPE_STRV,
-        utf8:  GObject::TYPE_STRING
+        strv: GObject::TYPE_STRV,
+        utf8: GObject::TYPE_STRING
       }.freeze
 
       def gtype
@@ -85,17 +85,17 @@ module GirFFI
       end
 
       TAG_TO_WRAPPER_CLASS_MAP = {
-        array:           "GLib::Array",
-        byte_array:      "GLib::ByteArray",
-        c:               "GirFFI::SizedArray",
-        error:           "GLib::Error",
-        ghash:           "GLib::HashTable",
-        glist:           "GLib::List",
-        gslist:          "GLib::SList",
-        ptr_array:       "GLib::PtrArray",
-        strv:            "GLib::Strv",
-        utf8:            "GirFFI::InPointer", # TODO: Create a string-like class
-        void:            "GirFFI::InPointer", # TODO: Create a void-pointer class
+        array: "GLib::Array",
+        byte_array: "GLib::ByteArray",
+        c: "GirFFI::SizedArray",
+        error: "GLib::Error",
+        ghash: "GLib::HashTable",
+        glist: "GLib::List",
+        gslist: "GLib::SList",
+        ptr_array: "GLib::PtrArray",
+        strv: "GLib::Strv",
+        utf8: "GirFFI::InPointer", # TODO: Create a string-like class
+        void: "GirFFI::InPointer", # TODO: Create a void-pointer class
         zero_terminated: "GirFFI::ZeroTerminated"
       }.freeze
 
@@ -214,13 +214,7 @@ module GirFFI
       end
 
       def subtype_ffi_type(index)
-        subtype = param_type(index).to_ffi_type
-        if subtype == :pointer
-          # NOTE: Don't use pointer directly to appease JRuby.
-          :"uint#{FFI.type_size(:pointer) * 8}"
-        else
-          subtype
-        end
+        param_type(index).to_ffi_type
       end
 
       def flattened_array_type

data/lib/gir_ffi/instance_method_setup.rb

@@ -1,7 +1,9 @@
 # frozen_string_literal: true
 
 module GirFFI
-  # Methods for setting up instance methods
+  # Methods for setting up instance methods.
+  #
+  # Depends on .gir_ffi_builder being defined in the extending class.
   module InstanceMethodSetup
     def setup_instance_method(name)
       gir_ffi_builder.setup_instance_method name

data/lib/gir_ffi/object_base.rb

@@ -7,8 +7,8 @@ module GirFFI
   class ObjectBase < ClassBase
     extend FFI::DataConverter
 
-    def object_class
-      self.class.object_class
+    def class_struct
+      self.class.class_struct
     end
 
     def self.native_type
@@ -64,11 +64,11 @@ module GirFFI
         raise GirFFI::SignalNotFoundError.new(name, self)
     end
 
-    def self.object_class
-      @object_class ||=
+    def self.class_struct
+      @class_struct ||=
         begin
           ptr = GObject::Lib.g_type_class_ref(gtype)
-          gir_ffi_builder.object_class_struct.wrap ptr
+          gir_ffi_builder.class_struct_class.wrap ptr
         end
     end
 

data/lib/gir_ffi/struct_like_base.rb

@@ -22,7 +22,6 @@ module GirFFI
         self
       end
 
-      # NOTE: Needed for JRuby's FFI
       def to_native(value, _context)
         value.struct
       end

data/lib/gir_ffi/type_map.rb

@@ -10,38 +10,38 @@ module GirFFI
     gsize_type = "uint#{sz}".to_sym
 
     TAG_TYPE_MAP = {
-      enum:      :int32,
-      flags:     :int32,
-      ghash:     :pointer,
-      glist:     :pointer,
-      gslist:    :pointer,
-      strv:      :pointer,
+      enum: :int32,
+      flags: :int32,
+      ghash: :pointer,
+      glist: :pointer,
+      gslist: :pointer,
+      strv: :pointer,
       interface: :pointer,
-      error:     :pointer,
+      error: :pointer,
       ptr_array: :pointer,
-      array:     :pointer,
-      c:         GirFFI::SizedArray,
-      utf8:      :pointer,
-      filename:  :pointer,
-      GType:     gsize_type,
-      gboolean:  GirFFI::Boolean,
-      gunichar:  :uint32,
-      gint8:     :int8,
-      guint8:    :uint8,
-      gint16:    :int16,
-      guint16:   :uint16,
-      gint:      :int,
-      guint:     :uint,
-      gint32:    :int32,
-      guint32:   :uint32,
-      gint64:    :int64,
-      guint64:   :uint64,
-      glong:     :long,
-      gulong:    :ulong,
-      gsize:     gsize_type,
-      gfloat:    :float,
-      gdouble:   :double,
-      void:      :void
+      array: :pointer,
+      c: GirFFI::SizedArray,
+      utf8: :pointer,
+      filename: :pointer,
+      GType: gsize_type,
+      gboolean: GirFFI::Boolean,
+      gunichar: :uint32,
+      gint8: :int8,
+      guint8: :uint8,
+      gint16: :int16,
+      guint16: :uint16,
+      gint: :int,
+      guint: :uint,
+      gint32: :int32,
+      guint32: :uint32,
+      gint64: :int64,
+      guint64: :uint64,
+      glong: :long,
+      gulong: :ulong,
+      gsize: gsize_type,
+      gfloat: :float,
+      gdouble: :double,
+      void: :void
     }.freeze
 
     def self.map_basic_type(type)

data/lib/gir_ffi/unintrospectable_type_info.rb

@@ -37,9 +37,9 @@ module GirFFI
     end
 
     def interfaces
-      @gobject.type_interfaces(@g_type).map do |gtype|
+      @gobject.type_interfaces(@g_type).filter_map do |gtype|
         @gir.find_by_gtype gtype
-      end.compact
+      end
     end
 
     def fields

data/lib/gir_ffi/user_defined_object_info.rb

@@ -13,9 +13,6 @@ module GirFFI
       @klass = klass
       @properties = []
       @vfunc_implementations = []
-
-      # FIXME: Limit access to only install_property and install_vfunc_implementation.
-      yield self if block_given?
     end
 
     def described_class

data/lib/gir_ffi/user_defined_property_info.rb

@@ -15,21 +15,21 @@ module GirFFI
       # TODO: Unify with InfoExt::ITypeInfo.flattened_tag_to_gtype_map
       G_TYPE_TAG_MAP = {
         GObject::TYPE_BOOLEAN => :gboolean,
-        GObject::TYPE_CHAR    => :gint8,
-        GObject::TYPE_UCHAR   => :guint8,
-        GObject::TYPE_FLOAT   => :gfloat,
-        GObject::TYPE_DOUBLE  => :gdouble,
-        GObject::TYPE_INT     => :gint,
-        GObject::TYPE_UINT    => :guint,
-        GObject::TYPE_LONG    => :glong,
-        GObject::TYPE_ULONG   => :gulong,
-        GObject::TYPE_INT64   => :gint64,
-        GObject::TYPE_UINT64  => :guint64,
-        GObject::TYPE_ENUM    => :interface,
-        GObject::TYPE_FLAGS   => :interface,
-        GObject::TYPE_STRING  => :utf8,
-        GObject::TYPE_BOXED   => :interface,
-        GObject::TYPE_OBJECT  => :interface
+        GObject::TYPE_CHAR => :gint8,
+        GObject::TYPE_UCHAR => :guint8,
+        GObject::TYPE_FLOAT => :gfloat,
+        GObject::TYPE_DOUBLE => :gdouble,
+        GObject::TYPE_INT => :gint,
+        GObject::TYPE_UINT => :guint,
+        GObject::TYPE_LONG => :glong,
+        GObject::TYPE_ULONG => :gulong,
+        GObject::TYPE_INT64 => :gint64,
+        GObject::TYPE_UINT64 => :guint64,
+        GObject::TYPE_ENUM => :interface,
+        GObject::TYPE_FLAGS => :interface,
+        GObject::TYPE_STRING => :utf8,
+        GObject::TYPE_BOXED => :interface,
+        GObject::TYPE_OBJECT => :interface
       }.freeze
 
       def tag
@@ -39,21 +39,21 @@ module GirFFI
       # TODO: Unify with InfoExt::ITypeInfo.flattened_tag_to_gtype_map
       G_TYPE_POINTER_MAP = {
         GObject::TYPE_BOOLEAN => false,
-        GObject::TYPE_CHAR    => false,
-        GObject::TYPE_UCHAR   => false,
-        GObject::TYPE_FLOAT   => false,
-        GObject::TYPE_DOUBLE  => false,
-        GObject::TYPE_INT     => false,
-        GObject::TYPE_UINT    => false,
-        GObject::TYPE_LONG    => false,
-        GObject::TYPE_ULONG   => false,
-        GObject::TYPE_INT64   => false,
-        GObject::TYPE_UINT64  => false,
-        GObject::TYPE_ENUM    => false,
-        GObject::TYPE_FLAGS   => false,
-        GObject::TYPE_STRING  => true,
-        GObject::TYPE_BOXED   => true,
-        GObject::TYPE_OBJECT  => true
+        GObject::TYPE_CHAR => false,
+        GObject::TYPE_UCHAR => false,
+        GObject::TYPE_FLOAT => false,
+        GObject::TYPE_DOUBLE => false,
+        GObject::TYPE_INT => false,
+        GObject::TYPE_UINT => false,
+        GObject::TYPE_LONG => false,
+        GObject::TYPE_ULONG => false,
+        GObject::TYPE_INT64 => false,
+        GObject::TYPE_UINT64 => false,
+        GObject::TYPE_ENUM => false,
+        GObject::TYPE_FLAGS => false,
+        GObject::TYPE_STRING => true,
+        GObject::TYPE_BOXED => true,
+        GObject::TYPE_OBJECT => true
       }.freeze
 
       def pointer?
@@ -61,9 +61,9 @@ module GirFFI
       end
 
       G_TYPE_INTERFACE_TAG_MAP = {
-        GObject::TYPE_ENUM   => :enum,
-        GObject::TYPE_FLAGS  => :flags,
-        GObject::TYPE_BOXED  => :struct,
+        GObject::TYPE_ENUM => :enum,
+        GObject::TYPE_FLAGS => :flags,
+        GObject::TYPE_BOXED => :struct,
         GObject::TYPE_OBJECT => :object
       }.freeze
 

data/lib/gir_ffi/version.rb

@@ -2,5 +2,5 @@
 
 # Current GirFFI version
 module GirFFI
-  VERSION = "0.15.9"
+  VERSION = "0.16.0"
 end

data/lib/gir_ffi/zero_terminated.rb

@@ -85,7 +85,7 @@ module GirFFI
           :pointer
         elsif ffi_type.is_a? Symbol
           :numeric
-        elsif ffi_type < GirFFI::ClassBase
+        elsif ffi_type < GirFFI::ClassBase # rubocop:disable Lint/DuplicateBranch
           :pointer
         elsif ffi_type.singleton_class.include? GirFFI::EnumBase
           :enum

data/lib/gir_ffi-base/gobject.rb

@@ -7,7 +7,7 @@ require "gir_ffi-base/gobject/lib"
 
 # The part of the GObject namespace that is needed by GirFFI.
 #
-# :reek:TooManyConstants: because it needs to hold the type constants.
+# :reek:TooManyConstants because it needs to hold the type constants.
 module GObject
   def self.type_from_name(name)
     Lib.g_type_from_name name