gir_ffi 0.14.1 → 0.15.4

data/lib/gir_ffi/info_ext/i_registered_type_info.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'gir_ffi/builder_helper'
+require "gir_ffi/builder_helper"
 
 module GirFFI
   module InfoExt
@@ -20,15 +20,14 @@ module GirFFI
 
       def find_instance_method(method)
         info = find_method method
-        return info if info && info.method?
+        return info if info&.method?
       end
 
       def find_method(_method)
-        raise 'Must be overridden in subclass'
+        raise "Must be overridden in subclass"
       end
     end
   end
 end
 
-GObjectIntrospection::IRegisteredTypeInfo.send :include,
-                                               GirFFI::InfoExt::IRegisteredTypeInfo
+GObjectIntrospection::IRegisteredTypeInfo.include GirFFI::InfoExt::IRegisteredTypeInfo

data/lib/gir_ffi/info_ext/i_signal_info.rb

@@ -17,8 +17,8 @@ module GirFFI
       end
 
       def arguments_to_gvalues(instance, arguments)
-        arg_g_values = args.zip(arguments).map do |info, arg|
-          info.argument_type.make_g_value.tap { |it| it.set_value arg }
+        arg_g_values = argument_types.zip(arguments).map do |type, arg|
+          type.make_g_value.tap { |it| it.set_value arg }
         end
 
         arg_g_values.unshift GObject::Value.wrap_instance(instance)
@@ -27,8 +27,12 @@ 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
 
-GObjectIntrospection::ISignalInfo.send :include, GirFFI::InfoExt::ISignalInfo
+GObjectIntrospection::ISignalInfo.include GirFFI::InfoExt::ISignalInfo

data/lib/gir_ffi/info_ext/i_type_info.rb

@@ -1,13 +1,34 @@
 # frozen_string_literal: true
 
-require 'gir_ffi/builder_helper'
+require "gir_ffi/builder_helper"
 
 module GirFFI
   module InfoExt
     # Extensions for GObjectIntrospection::ITypeInfo needed by 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
+      }.freeze
+
+      FLATTENED_TAG_POINTER_TO_GTYPE_MAP = {
+        array: GObject::TYPE_ARRAY,
+        ghash: GObject::TYPE_HASH_TABLE,
+        strv:  GObject::TYPE_STRV,
+        utf8:  GObject::TYPE_STRING
+      }.freeze
+
       def gtype
-        TypeMap.type_info_to_gtype self
+        return interface.gtype if tag == :interface
+
+        if pointer?
+          FLATTENED_TAG_POINTER_TO_GTYPE_MAP.fetch(flattened_tag, GObject::TYPE_POINTER)
+        else
+          FLATTENED_TAG_TO_GTYPE_MAP.fetch(flattened_tag)
+        end
       end
 
       def make_g_value
@@ -24,14 +45,15 @@ module GirFFI
       end
 
       def flattened_tag
-        case tag
-        when :interface
-          interface_type
-        when :array
-          flattened_array_type
-        else
-          tag
-        end
+        @flattened_tag ||=
+          case tag
+          when :interface
+            interface_type
+          when :array
+            flattened_array_type
+          else
+            tag
+          end
       end
 
       def interface_type
@@ -59,22 +81,22 @@ module GirFFI
       end
 
       def interface_class
-        Builder.build_class interface if tag == :interface
+        @interface_class ||= Builder.build_class interface if tag == :interface
       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
-        zero_terminated: 'GirFFI::ZeroTerminated'
+        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
 
       # TODO: Use class rather than class name
@@ -144,7 +166,7 @@ module GirFFI
       end
 
       def needs_c_to_ruby_conversion_for_closures?
-        [:array, :c, :ghash, :glist, :struct, :strv].include?(flattened_tag)
+        [:array, :c, :error, :ghash, :glist, :struct, :strv].include?(flattened_tag)
       end
 
       def needs_ruby_to_c_conversion_for_closures?
@@ -170,7 +192,7 @@ module GirFFI
         end
       end
 
-      GOBJECT_VALUE_NAME = 'GObject::Value'.freeze
+      GOBJECT_VALUE_NAME = "GObject::Value"
 
       def gvalue?
         argument_class_name == GOBJECT_VALUE_NAME
@@ -220,4 +242,4 @@ module GirFFI
   end
 end
 
-GObjectIntrospection::ITypeInfo.send :include, GirFFI::InfoExt::ITypeInfo
+GObjectIntrospection::ITypeInfo.include GirFFI::InfoExt::ITypeInfo

data/lib/gir_ffi/info_ext/i_unresolved_info.rb

@@ -11,4 +11,4 @@ module GirFFI
   end
 end
 
-GObjectIntrospection::IUnresolvedInfo.send :include, GirFFI::InfoExt::IUnresolvedInfo
+GObjectIntrospection::IUnresolvedInfo.include GirFFI::InfoExt::IUnresolvedInfo

data/lib/gir_ffi/info_ext/i_value_info.rb

@@ -6,7 +6,7 @@ module GirFFI
     module IValueInfo
       def constant_name
         upcased_name = name.upcase
-        if upcased_name =~ /^[0-9]/
+        if /^[0-9]/.match?(upcased_name)
           "VALUE_#{upcased_name}"
         else
           upcased_name
@@ -22,4 +22,4 @@ module GirFFI
   end
 end
 
-GObjectIntrospection::IValueInfo.send :include, GirFFI::InfoExt::IValueInfo
+GObjectIntrospection::IValueInfo.include GirFFI::InfoExt::IValueInfo

data/lib/gir_ffi/info_ext/i_vfunc_info.rb

@@ -16,7 +16,7 @@ module GirFFI
       end
 
       def invoker_name
-        invoker && invoker.name
+        invoker&.name
       end
 
       def has_invoker?
@@ -26,4 +26,4 @@ module GirFFI
   end
 end
 
-GObjectIntrospection::IVFuncInfo.send :include, GirFFI::InfoExt::IVFuncInfo
+GObjectIntrospection::IVFuncInfo.include GirFFI::InfoExt::IVFuncInfo

data/lib/gir_ffi/info_ext/safe_constant_name.rb

@@ -5,10 +5,10 @@ module GirFFI
     # Extension module provinding a #safe_name method suitable for types.
     module SafeConstantName
       def safe_name
-        name.tr('-', '_').gsub(/^./) do |char|
+        name.tr("-", "_").sub(/^[_a-z]/) do |char|
           case char
-          when '_'
-            'Private___'
+          when "_"
+            "Private___"
           else
             char.upcase
           end
@@ -18,8 +18,8 @@ module GirFFI
   end
 end
 
-GObjectIntrospection::ICallbackInfo.send :include, GirFFI::InfoExt::SafeConstantName
-GObjectIntrospection::IConstantInfo.send :include, GirFFI::InfoExt::SafeConstantName
-GObjectIntrospection::IRegisteredTypeInfo.send :include, GirFFI::InfoExt::SafeConstantName
-GObjectIntrospection::ISignalInfo.send :include, GirFFI::InfoExt::SafeConstantName
-GObjectIntrospection::IVFuncInfo.send :include, GirFFI::InfoExt::SafeConstantName
+GObjectIntrospection::ICallbackInfo.include GirFFI::InfoExt::SafeConstantName
+GObjectIntrospection::IConstantInfo.include GirFFI::InfoExt::SafeConstantName
+GObjectIntrospection::IRegisteredTypeInfo.include GirFFI::InfoExt::SafeConstantName
+GObjectIntrospection::ISignalInfo.include GirFFI::InfoExt::SafeConstantName
+GObjectIntrospection::IVFuncInfo.include GirFFI::InfoExt::SafeConstantName

data/lib/gir_ffi/info_ext/safe_function_name.rb

@@ -6,7 +6,7 @@ module GirFFI
     module SafeFunctionName
       def safe_name
         name = self.name
-        return '_' if name.empty?
+        return "_" if name.empty?
 
         name
       end
@@ -14,4 +14,4 @@ module GirFFI
   end
 end
 
-GObjectIntrospection::IFunctionInfo.send :include, GirFFI::InfoExt::SafeFunctionName
+GObjectIntrospection::IFunctionInfo.include GirFFI::InfoExt::SafeFunctionName

data/lib/gir_ffi/interface_base.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require 'gir_ffi/registered_type_base'
-require 'gir_ffi/method_setup'
-require 'gir_ffi/instance_method_setup'
+require "gir_ffi/registered_type_base"
+require "gir_ffi/method_setup"
+require "gir_ffi/instance_method_setup"
 
 module GirFFI
   # Base module for modules representing GLib interfaces.

data/lib/gir_ffi/lib_c.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'ffi'
+require "ffi"
 
 module GirFFI
   # Library of libc functions.

data/lib/gir_ffi/method_stubber.rb

@@ -9,7 +9,7 @@ module GirFFI
     end
 
     def method_stub
-      <<-STUB.reset_indentation
+      <<~STUB
         def #{@info.method? ? '' : 'self.'}#{@info.safe_name} *args, &block
           setup_and_call "#{@info.name}", args, &block
         end

data/lib/gir_ffi/module_base.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'gir_ffi/method_setup'
+require "gir_ffi/method_setup"
 
 module GirFFI
   # Base module for modules representing GLib namespaces.

data/lib/gir_ffi/object_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 all generated classes of type :object.
@@ -38,7 +38,7 @@ module GirFFI
     end
 
     def self.copy_from(val)
-      val.ref if val
+      val&.ref
     end
 
     #
@@ -49,8 +49,7 @@ module GirFFI
     # @return [GObjectIntrospection::IPropertyInfo] The property's info
     #
     def self.find_property(name)
-      gir_ffi_builder.find_property name or
-        raise GirFFI::PropertyNotFoundError.new(name, self)
+      gir_ffi_builder.find_property name
     end
 
     #
@@ -82,5 +81,32 @@ module GirFFI
         it < GirFFI::ObjectBase || it.singleton_class.include?(InterfaceBase)
       end
     end
+
+    def self.prepare_user_defined_class
+      return if const_defined? :GIR_INFO, false
+
+      info = UserDefinedObjectInfo.new(self)
+      const_set :GIR_INFO, info
+    end
+
+    def self.install_property(param_spec)
+      if const_defined? :GIR_FFI_BUILDER, false
+        raise "Installing a property in a class that is already set up is not supported"
+      end
+
+      prepare_user_defined_class
+
+      gir_info.install_property(param_spec)
+    end
+
+    def self.install_vfunc_implementation(name, implementation = nil)
+      if const_defined? :GIR_FFI_BUILDER, false
+        raise "Installing a property in a class that is already set up is not supported"
+      end
+
+      prepare_user_defined_class
+
+      gir_info.install_vfunc_implementation(name, implementation)
+    end
   end
 end

data/lib/gir_ffi/receiver_argument_info.rb

@@ -21,7 +21,7 @@ module GirFFI
     end
 
     def name
-      '_instance'
+      "_instance"
     end
   end
 end

data/lib/gir_ffi/receiver_type_info.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 module GirFFI
-  # Represents the type of the receiver of a signal or vfunc, conforming, as
-  # needed, to the interface of GObjectIntrospection::ITypeInfo
+  # Represents the type of the receiver of a signal, vfunc, or method,
+  # conforming, as needed, to the interface of GObjectIntrospection::ITypeInfo
   class ReceiverTypeInfo
     include InfoExt::ITypeInfo
 

data/lib/gir_ffi/registered_type_base.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'gir_ffi/type_base'
+require "gir_ffi/type_base"
 
 module GirFFI
   # Base module for generated registered GLib types (these are types that have a

data/lib/gir_ffi/return_value_info.rb

@@ -3,8 +3,7 @@
 module GirFFI
   # Represents a return value with the same interface as IArgInfo
   class ReturnValueInfo
-    attr_reader :argument_type
-    attr_reader :ownership_transfer
+    attr_reader :argument_type, :ownership_transfer
 
     def initialize(type, ownership_transfer, skip)
       @argument_type = type

data/lib/gir_ffi/sized_array.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "gir_ffi/array_element_convertor"
+
 module GirFFI
   # Class representing an array with a determined size
   class SizedArray
@@ -17,8 +19,8 @@ module GirFFI
     end
 
     def index(idx)
-      ptr = InOutPointer.new element_type, @pointer + idx * element_size
-      ptr.to_ruby_value
+      convertor = ArrayElementConvertor.new element_type, @pointer + idx * element_size
+      convertor.to_ruby_value
     end
 
     def each

data/lib/gir_ffi/struct.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'gir_ffi/ownable'
+require "gir_ffi/ownable"
 
 module GirFFI
   # Struct that can be owned.

data/lib/gir_ffi/struct_base.rb

@@ -1,17 +1,9 @@
 # frozen_string_literal: true
 
-require 'gir_ffi/struct_like_base'
+require "gir_ffi/struct_like_base"
 
 module GirFFI
   # Base class for generated classes representing GLib structs.
-  class StructBase < ClassBase
-    extend FFI::DataConverter
-    include GirFFI::StructLikeBase
-
-    def initialize
-      @struct = self.class::Struct.new
-      @struct.owned = true
-      @struct.to_ptr.autorelease = false
-    end
+  class StructBase < StructLikeBase
   end
 end

data/lib/gir_ffi/struct_like_base.rb

@@ -1,15 +1,19 @@
 # frozen_string_literal: true
 
 module GirFFI
-  # Base module providing class methods for generated classes representing GLib
+  # Base class providing methods for generated classes representing GLib
   # structs, unions and boxed types.
-  module StructLikeBase
-    def self.included(base)
-      base.extend ClassMethods
+  class StructLikeBase < ClassBase
+    extend FFI::DataConverter
+
+    def initialize
+      store_pointer(nil)
+      struct.owned = true
+      struct.to_ptr.autorelease = false
     end
 
     # Class methods for struct-like classes.
-    module ClassMethods
+    class << self
       def native_type
         FFI::Type::Struct.new(self::Struct)
       end