gir_ffi 0.14.0 → 0.15.3

data/lib/gir_ffi/builders/ruby_to_c_convertor.rb

@@ -17,7 +17,7 @@ module GirFFI
       end
 
       def conversion_arguments(name)
-        @type_info.extra_conversion_arguments.map(&:inspect).push(name).join(', ')
+        @type_info.extra_conversion_arguments.map(&:inspect).push(name).join(", ")
       end
 
       private
@@ -25,18 +25,18 @@ module GirFFI
       def conversion_method
         case @type_info.flattened_tag
         when :utf8
-          'from_utf8'
+          "from_utf8"
         when :struct, :c
           case @ownership_transfer
           when :everything
-            'copy_from'
+            "copy_from"
           else
-            'from'
+            "from"
           end
         when :enum
-          'to_int'
+          "to_int"
         else
-          'from'
+          "from"
         end
       end
     end

data/lib/gir_ffi/builders/signal_closure_builder.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'gir_ffi/builders/base_type_builder'
-require 'gir_ffi/builders/marshalling_method_builder'
+require "gir_ffi/builders/base_type_builder"
+require "gir_ffi/builders/marshalling_method_builder"
 
 module GirFFI
   module Builders

data/lib/gir_ffi/builders/struct_builder.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require 'gir_ffi/builders/registered_type_builder'
-require 'gir_ffi/builders/struct_like'
-require 'gir_ffi/struct_base'
+require "gir_ffi/builders/registered_type_builder"
+require "gir_ffi/builders/struct_like"
+require "gir_ffi/struct_base"
 
 module GirFFI
   module Builders
@@ -16,7 +16,9 @@ module GirFFI
 
       def superclass
         # HACK: Inheritance chain is not expressed in GObject's code correctly.
-        return GObject::ObjectClass if info.full_type_name == 'GObject::InitiallyUnownedClass'
+        if info.full_type_name == "GObject::InitiallyUnownedClass"
+          return GObject::ObjectClass
+        end
         return parent_field_type.tag_or_class if info.gtype_struct?
         return BoxedBase if GObject.type_fundamental(info.gtype) == GObject::TYPE_BOXED
 

data/lib/gir_ffi/builders/struct_like.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'gir_ffi/builders/with_layout'
+require "gir_ffi/builders/with_layout"
 
 module GirFFI
   module Builders

data/lib/gir_ffi/builders/type_builder.rb

@@ -1,17 +1,17 @@
 # frozen_string_literal: true
 
-require 'gir_ffi/builders/callback_builder'
-require 'gir_ffi/builders/constant_builder'
-require 'gir_ffi/builders/enum_builder'
-require 'gir_ffi/builders/flags_builder'
-require 'gir_ffi/builders/interface_builder'
-require 'gir_ffi/builders/object_builder'
-require 'gir_ffi/builders/struct_builder'
-require 'gir_ffi/builders/signal_closure_builder'
-require 'gir_ffi/builders/unintrospectable_boxed_builder'
-require 'gir_ffi/builders/unintrospectable_builder'
-require 'gir_ffi/builders/union_builder'
-require 'gir_ffi/builders/vfunc_builder'
+require "gir_ffi/builders/callback_builder"
+require "gir_ffi/builders/constant_builder"
+require "gir_ffi/builders/enum_builder"
+require "gir_ffi/builders/flags_builder"
+require "gir_ffi/builders/interface_builder"
+require "gir_ffi/builders/object_builder"
+require "gir_ffi/builders/struct_builder"
+require "gir_ffi/builders/signal_closure_builder"
+require "gir_ffi/builders/unintrospectable_boxed_builder"
+require "gir_ffi/builders/unintrospectable_builder"
+require "gir_ffi/builders/union_builder"
+require "gir_ffi/builders/vfunc_builder"
 
 module GirFFI
   module Builders

data/lib/gir_ffi/builders/unintrospectable_boxed_builder.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'gir_ffi/builders/registered_type_builder'
-require 'gir_ffi/builders/struct_like'
+require "gir_ffi/builders/registered_type_builder"
+require "gir_ffi/builders/struct_like"
 
 module GirFFI
   module Builders

data/lib/gir_ffi/builders/unintrospectable_builder.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'gir_ffi/builders/object_builder'
-require 'gir_ffi/unintrospectable_signal_info'
+require "gir_ffi/builders/object_builder"
+require "gir_ffi/unintrospectable_signal_info"
 
 module GirFFI
   module Builders

data/lib/gir_ffi/builders/union_builder.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
-require 'gir_ffi/builders/registered_type_builder'
-require 'gir_ffi/builders/struct_like'
-require 'gir_ffi/union_base'
-require 'gir_ffi/union'
+require "gir_ffi/builders/registered_type_builder"
+require "gir_ffi/builders/struct_like"
+require "gir_ffi/union_base"
+require "gir_ffi/union"
 
 module GirFFI
   module Builders

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

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

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.
@@ -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.

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

@@ -1,16 +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_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