gir_ffi 0.14.1 → 0.15.4

data/lib/gir_ffi/builders/user_defined_builder.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'gir_ffi/builders/object_builder'
-require 'gir_ffi/g_type'
+require "gir_ffi/builders/object_builder"
+require "gir_ffi/g_type"
 
 module GirFFI
   module Builders
@@ -12,6 +12,7 @@ module GirFFI
       end
 
       def setup_class
+        check_ancestry
         setup_layout
         register_type
         setup_constants
@@ -26,6 +27,12 @@ module GirFFI
 
       private
 
+      def check_ancestry
+        unless klass < GirFFI::ObjectBase
+          raise ArgumentError, "#{klass} is not a GObject class"
+        end
+      end
+
       def register_type
         @gtype = GObject.type_register_static(parent_gtype.to_i,
                                               info.g_name,
@@ -98,7 +105,7 @@ module GirFFI
       end
 
       def class_size
-        parent_gtype.class_size + interface_gtypes.map(&:class_size).inject(0, :+)
+        parent_gtype.class_size + interface_gtypes.map(&:class_size).sum
       end
 
       def setup_properties(object_class_ptr)

data/lib/gir_ffi/builders/vfunc_argument_builder.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'gir_ffi/builders/callback_argument_builder'
+require "gir_ffi/builders/callback_argument_builder"
 
 module GirFFI
   module Builders
@@ -9,7 +9,7 @@ module GirFFI
     class VFuncArgumentBuilder < CallbackArgumentBuilder
       def pre_conversion
         if ingoing_ref_needed?
-          super + ["#{pre_converted_name}.ref"]
+          super + ["#{pre_converted_name}&.ref"]
         else
           super
         end

data/lib/gir_ffi/builders/vfunc_builder.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
-require 'gir_ffi/return_value_info'
-require 'gir_ffi/builders/base_type_builder'
-require 'gir_ffi/builders/mapping_method_builder'
-require 'gir_ffi/receiver_type_info'
-require 'gir_ffi/receiver_argument_info'
-require 'gir_ffi/callback_base'
+require "gir_ffi/return_value_info"
+require "gir_ffi/builders/base_type_builder"
+require "gir_ffi/builders/mapping_method_builder"
+require "gir_ffi/receiver_type_info"
+require "gir_ffi/receiver_argument_info"
+require "gir_ffi/callback_base"
 
 module GirFFI
   module Builders
@@ -42,8 +42,8 @@ module GirFFI
       end
 
       def argument_ffi_types
-        @argument_ffi_types ||= info.argument_ffi_types.
-          unshift(receiver_type_info.to_callback_ffi_type)
+        @argument_ffi_types ||= info.argument_ffi_types
+          .unshift(receiver_type_info.to_callback_ffi_type)
       end
 
       def return_ffi_type

data/lib/gir_ffi/builders/with_layout.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'gir_ffi/builders/field_builder'
+require "gir_ffi/builders/field_builder"
 
 module GirFFI
   module Builders
@@ -35,7 +35,7 @@ module GirFFI
       end
 
       def base_layout_specification
-        fields.map(&:layout_specification).flatten(1)
+        fields.flat_map(&:layout_specification)
       end
 
       def klass

data/lib/gir_ffi/callback_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 callbacks and vfuncs.
@@ -35,14 +35,14 @@ module GirFFI
       from_native ptr, nil
     end
 
-    CALLBACKS = {}
+    CALLBACKS = Set.new
 
     def self.store_callback(prc)
-      CALLBACKS[prc.object_id] = prc
+      CALLBACKS.add prc
     end
 
     def self.drop_callback(prc)
-      CALLBACKS.delete prc.object_id
+      CALLBACKS.delete prc
     end
 
     # Create Callback from a Proc. Makes sure arguments are properly wrapped,
@@ -57,11 +57,9 @@ module GirFFI
       return unless prc
 
       new do |*args|
-        begin
-          call_with_argument_mapping(prc, *args)
-        rescue StandardError => e
-          GLib::MainLoop.handle_exception e
-        end
+        call_with_argument_mapping(prc, *args)
+      rescue StandardError => e
+        GLib::MainLoop.handle_exception e
       end
     end
 

data/lib/gir_ffi/class_base.rb

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
-require 'forwardable'
-require 'gir_ffi/registered_type_base'
-require 'gir_ffi/builders/null_class_builder'
-require 'gir_ffi/method_setup'
-require 'gir_ffi/instance_method_setup'
+require "forwardable"
+require "gir_ffi/registered_type_base"
+require "gir_ffi/builders/null_class_builder"
+require "gir_ffi/method_setup"
+require "gir_ffi/instance_method_setup"
 
 module GirFFI
   # Base class for all generated classes and structs. Contains code for dealing
@@ -18,6 +18,7 @@ module GirFFI
     GIR_FFI_BUILDER = Builders::NullClassBuilder.new
 
     attr_reader :struct
+
     def_delegators :@struct, :to_ptr
 
     def setup_and_call(method, arguments, &block)

data/lib/gir_ffi/core.rb

@@ -1,25 +1,24 @@
 # frozen_string_literal: true
 
-require 'ffi'
-require 'ffi/bit_masks'
-
-require 'ffi-gobject_introspection'
-
-require 'gir_ffi-base'
-
-require 'gir_ffi/ffi_ext'
-require 'gir_ffi/class_base'
-require 'gir_ffi/type_map'
-require 'gir_ffi/info_ext'
-require 'gir_ffi/in_pointer'
-require 'gir_ffi/in_out_pointer'
-require 'gir_ffi/sized_array'
-require 'gir_ffi/zero_terminated'
-require 'gir_ffi/arg_helper'
-require 'gir_ffi/builder'
-require 'gir_ffi/user_defined_object_info'
-require 'gir_ffi/builders/user_defined_builder'
-require 'gir_ffi/version'
+require "ffi"
+require "ffi/bit_masks"
+
+require "ffi-gobject_introspection"
+
+require "gir_ffi-base"
+
+require "gir_ffi/ffi_ext"
+require "gir_ffi/class_base"
+require "gir_ffi/type_map"
+require "gir_ffi/info_ext"
+require "gir_ffi/in_pointer"
+require "gir_ffi/sized_array"
+require "gir_ffi/zero_terminated"
+require "gir_ffi/arg_helper"
+require "gir_ffi/builder"
+require "gir_ffi/user_defined_object_info"
+require "gir_ffi/builders/user_defined_builder"
+require "gir_ffi/version"
 
 module GirFFI
   # Core GirFFI interface.
@@ -29,8 +28,23 @@ module GirFFI
       Builder.build_module namespace, version
     end
 
-    def define_type(klass, &block)
-      info = UserDefinedObjectInfo.new(klass, &block)
+    def define_type(klass)
+      unless klass < GirFFI::ObjectBase
+        raise ArgumentError, "#{klass} is not a GObject class"
+      end
+
+      klass.prepare_user_defined_class
+      info = klass.gir_info
+
+      unless info.is_a? UserDefinedObjectInfo
+        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/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.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/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/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/glib_error.rb

@@ -4,8 +4,7 @@ module GirFFI
   # Exception class to be raised whenever an error is signaled through
   # GLib::Error.
   class GLibError < RuntimeError
-    attr_reader :domain_quark
-    attr_reader :code
+    attr_reader :domain_quark, :code
 
     def initialize(g_error)
       @domain_quark = g_error.domain

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,12 +53,22 @@ 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
           from_utf8_array ary
         when :gboolean
           from_boolean_array ary
+        when :guint8
+          from_char_array ary
         else
           from_basic_type_array type, ary
         end
@@ -82,6 +94,11 @@ module GirFFI
         from_basic_type_array :int, ary.map { |val| val ? 1 : 0 }
       end
 
+      def from_char_array(ary)
+        ary = ary.bytes if ary.is_a? String
+        from_basic_type_array :int8, ary
+      end
+
       def from_pointer_array(type, ary)
         from_basic_type_array :pointer, ary.map { |elem| from type, elem }
       end

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"

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