gir_ffi 0.14.1 → 0.15.0

data/lib/gir_ffi/enum_base.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'gir_ffi/enum_like_base'
+require "gir_ffi/enum_like_base"
 
 module GirFFI
   # Base module for enums.

data/lib/gir_ffi/enum_like_base.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'gir_ffi/registered_type_base'
-require 'gir_ffi/method_setup'
+require "gir_ffi/registered_type_base"
+require "gir_ffi/method_setup"
 
 module GirFFI
   # Base module for enums and flags.

data/lib/gir_ffi/error_argument_info.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'gir_ffi/error_type_info'
+require "gir_ffi/error_type_info"
 
 module GirFFI
   # Represents an error argument with the same interface as IArgInfo
@@ -14,7 +14,7 @@ module GirFFI
     end
 
     def name
-      '_error'
+      "_error"
     end
   end
 end

data/lib/gir_ffi/error_type_info.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'gir_ffi/info_ext/i_type_info'
+require "gir_ffi/info_ext/i_type_info"
 
 module GirFFI
   # Represents the type of an error argument for callbacks and functions,

data/lib/gir_ffi/ffi_ext/pointer.rb

@@ -17,7 +17,7 @@ module GirFFI
       end
 
       def to_utf8
-        null? ? nil : read_string.force_encoding('utf-8')
+        null? ? nil : read_string.force_encoding("utf-8")
       end
     end
   end

data/lib/gir_ffi/ffi_ext.rb

@@ -1,3 +1,3 @@
 # frozen_string_literal: true
 
-require 'gir_ffi/ffi_ext/pointer'
+require "gir_ffi/ffi_ext/pointer"

data/lib/gir_ffi/flags_base.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'gir_ffi/enum_like_base'
+require "gir_ffi/enum_like_base"
 
 module GirFFI
   # Base module for flags.

data/lib/gir_ffi/in_pointer.rb

@@ -29,6 +29,8 @@ module GirFFI
       case type
       when :utf8, :filename
         from_utf8 val
+      when :gfloat, :gdouble, :gint64, :guint64
+        from_basic_type type, val
       when :gint32, :guint32, :gint8, :GType
         FFI::Pointer.new val
       when GirFFI::EnumLikeBase
@@ -51,6 +53,14 @@ module GirFFI
     class << self
       private
 
+      def from_basic_type(type, value)
+        ffi_type = TypeMap.type_specification_to_ffi_type type
+        FFI::MemoryPointer.new(ffi_type).tap do |block|
+          block.autorelease = false
+          block.send "put_#{ffi_type}", 0, value
+        end
+      end
+
       def from_simple_type_array(type, ary)
         case type
         when :utf8, :filename

data/lib/gir_ffi/info_ext/full_type_name.rb

@@ -13,6 +13,6 @@ module GirFFI
   end
 end
 
-GObjectIntrospection::ICallbackInfo.send :include, GirFFI::InfoExt::FullTypeName
-GObjectIntrospection::IConstantInfo.send :include, GirFFI::InfoExt::FullTypeName
-GObjectIntrospection::IRegisteredTypeInfo.send :include, GirFFI::InfoExt::FullTypeName
+GObjectIntrospection::ICallbackInfo.include GirFFI::InfoExt::FullTypeName
+GObjectIntrospection::IConstantInfo.include GirFFI::InfoExt::FullTypeName
+GObjectIntrospection::IRegisteredTypeInfo.include GirFFI::InfoExt::FullTypeName

data/lib/gir_ffi/info_ext/i_arg_info.rb

@@ -19,4 +19,4 @@ module GirFFI
   end
 end
 
-GObjectIntrospection::IArgInfo.send :include, GirFFI::InfoExt::IArgInfo
+GObjectIntrospection::IArgInfo.include GirFFI::InfoExt::IArgInfo

data/lib/gir_ffi/info_ext/i_callable_info.rb

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

data/lib/gir_ffi/info_ext/i_callback_info.rb

@@ -23,4 +23,4 @@ module GirFFI
   end
 end
 
-GObjectIntrospection::ICallbackInfo.send :include, GirFFI::InfoExt::ICallbackInfo
+GObjectIntrospection::ICallbackInfo.include GirFFI::InfoExt::ICallbackInfo

data/lib/gir_ffi/info_ext/i_field_info.rb

@@ -16,4 +16,4 @@ module GirFFI
   end
 end
 
-GObjectIntrospection::IFieldInfo.send :include, GirFFI::InfoExt::IFieldInfo
+GObjectIntrospection::IFieldInfo.include GirFFI::InfoExt::IFieldInfo

data/lib/gir_ffi/info_ext/i_function_info.rb

@@ -18,4 +18,4 @@ module GirFFI
   end
 end
 
-GObjectIntrospection::IFunctionInfo.send :include, GirFFI::InfoExt::IFunctionInfo
+GObjectIntrospection::IFunctionInfo.include GirFFI::InfoExt::IFunctionInfo

data/lib/gir_ffi/info_ext/i_property_info.rb

@@ -5,7 +5,7 @@ module GirFFI
     # Extensions for GObjectIntrospection::IPropertyInfo needed by GirFFI
     module IPropertyInfo
       def getter_name
-        name.tr('-', '_')
+        name.tr("-", "_")
       end
 
       def setter_name
@@ -15,4 +15,4 @@ module GirFFI
   end
 end
 
-GObjectIntrospection::IPropertyInfo.send :include, GirFFI::InfoExt::IPropertyInfo
+GObjectIntrospection::IPropertyInfo.include GirFFI::InfoExt::IPropertyInfo

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/info_ext.rb

@@ -1,17 +1,17 @@
 # frozen_string_literal: true
 
-require 'gir_ffi/info_ext/full_type_name'
-require 'gir_ffi/info_ext/i_arg_info'
-require 'gir_ffi/info_ext/i_callable_info'
-require 'gir_ffi/info_ext/i_callback_info'
-require 'gir_ffi/info_ext/i_field_info'
-require 'gir_ffi/info_ext/i_function_info'
-require 'gir_ffi/info_ext/i_property_info'
-require 'gir_ffi/info_ext/i_registered_type_info'
-require 'gir_ffi/info_ext/i_signal_info'
-require 'gir_ffi/info_ext/i_type_info'
-require 'gir_ffi/info_ext/i_unresolved_info'
-require 'gir_ffi/info_ext/i_value_info'
-require 'gir_ffi/info_ext/i_vfunc_info'
-require 'gir_ffi/info_ext/safe_constant_name'
-require 'gir_ffi/info_ext/safe_function_name'
+require "gir_ffi/info_ext/full_type_name"
+require "gir_ffi/info_ext/i_arg_info"
+require "gir_ffi/info_ext/i_callable_info"
+require "gir_ffi/info_ext/i_callback_info"
+require "gir_ffi/info_ext/i_field_info"
+require "gir_ffi/info_ext/i_function_info"
+require "gir_ffi/info_ext/i_property_info"
+require "gir_ffi/info_ext/i_registered_type_info"
+require "gir_ffi/info_ext/i_signal_info"
+require "gir_ffi/info_ext/i_type_info"
+require "gir_ffi/info_ext/i_unresolved_info"
+require "gir_ffi/info_ext/i_value_info"
+require "gir_ffi/info_ext/i_vfunc_info"
+require "gir_ffi/info_ext/safe_constant_name"
+require "gir_ffi/info_ext/safe_function_name"