gir_ffi 0.14.0 → 0.15.3

data/lib/gir_ffi/boolean.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'ffi'
+require "ffi"
 
 module GirFFI
   # Class representing a boolean (natively, an int).

data/lib/gir_ffi/boxed_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 generated classes representing boxed types.

data/lib/gir_ffi/builder.rb

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
-require 'gir_ffi/builders/type_builder'
-require 'gir_ffi/builders/module_builder'
-require 'gir_ffi/builder_helper'
-require 'gir_ffi/unintrospectable_type_info'
-require 'gir_ffi/unintrospectable_boxed_info'
+require "gir_ffi/builders/type_builder"
+require "gir_ffi/builders/module_builder"
+require "gir_ffi/builder_helper"
+require "gir_ffi/unintrospectable_type_info"
+require "gir_ffi/unintrospectable_boxed_info"
 
 module GirFFI
   # Builds modules and classes based on information found in the
@@ -19,11 +19,17 @@ module GirFFI
 
     def self.build_by_gtype(gtype)
       info = GObjectIntrospection::IRepository.default.find_by_gtype gtype
-      info ||= case GObject.type_fundamental gtype
-               when GObject::TYPE_BOXED
-                 UnintrospectableBoxedInfo.new gtype
-               when GObject::TYPE_OBJECT
-                 UnintrospectableTypeInfo.new gtype
+      info ||= begin
+                 fund = GObject.type_fundamental gtype
+                 if fund == GObject::TYPE_BOXED
+                   UnintrospectableBoxedInfo.new gtype
+                 elsif fund == GObject::TYPE_OBJECT
+                   UnintrospectableTypeInfo.new gtype
+                 elsif fund >= GObject::TYPE_RESERVED_USER_FIRST
+                   UnintrospectableTypeInfo.new gtype
+                 else
+                   raise "Unable to handle type #{GObject.type_name gtype}"
+                 end
                end
 
       build_class info
@@ -36,6 +42,8 @@ module GirFFI
         unless modul.const_defined? :GIR_FFI_BUILDER
           raise "The module #{module_name} was already defined elsewhere"
         end
+
+        return modul
       end
       Builders::ModuleBuilder.new(module_name,
                                   namespace: namespace,

data/lib/gir_ffi/builder_helper.rb

@@ -12,7 +12,12 @@ module GirFFI
     end
 
     def get_or_define_class(namespace, name, parent)
-      optionally_define_constant(namespace, name) { Class.new parent }
+      klass = optionally_define_constant(namespace, name) { Class.new parent }
+      unless klass.superclass == parent
+        raise "Expected superclass #{parent}, found #{klass.superclass}"
+      end
+
+      klass
     end
 
     def get_or_define_module(parent, name)

data/lib/gir_ffi/builders/argument_builder.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
-require 'gir_ffi/builders/base_argument_builder'
-require 'gir_ffi/builders/closure_to_pointer_convertor'
-require 'gir_ffi/builders/full_c_to_ruby_convertor'
-require 'gir_ffi/builders/ruby_to_c_convertor'
-require 'gir_ffi/builders/pointer_value_convertor'
-require 'gir_ffi/builders/null_convertor'
+require "gir_ffi/builders/base_argument_builder"
+require "gir_ffi/builders/closure_to_pointer_convertor"
+require "gir_ffi/builders/full_c_to_ruby_convertor"
+require "gir_ffi/builders/ruby_to_c_convertor"
+require "gir_ffi/builders/pointer_value_convertor"
+require "gir_ffi/builders/null_convertor"
 
 module GirFFI
   module Builders
@@ -91,8 +91,8 @@ module GirFFI
       end
 
       def ingoing_value_storage
-        PointerValueConvertor.new(type_spec).
-          value_to_pointer(call_argument_name, ingoing_convertor.conversion)
+        PointerValueConvertor.new(type_spec)
+          .value_to_pointer(call_argument_name, ingoing_convertor.conversion)
       end
 
       def has_post_conversion?
@@ -114,7 +114,7 @@ module GirFFI
 
       def outgoing_convertor(base)
         FullCToRubyConvertor.new(type_info, base, length_argument_name,
-                                 ownership_transfer: @arginfo.ownership_transfer)
+                                 ownership_transfer: arginfo.ownership_transfer)
       end
 
       def sub_type_spec
@@ -138,11 +138,11 @@ module GirFFI
       # is a pointer. For example, an out parameter of type gint8* will always
       # be allocated by the caller (that's us).
       def allocated_by_them?
-        !@arginfo.caller_allocates? && type_info.pointer?
+        !arginfo.caller_allocates? && type_info.pointer?
       end
 
       def length_argument_name
-        length_arg && length_arg.post_converted_name
+        length_arg&.post_converted_name
       end
 
       def needs_size_check?
@@ -155,12 +155,12 @@ module GirFFI
       end
 
       def skipped_in?
-        @arginfo.skip?
+        arginfo.skip?
       end
 
       def skipped_out?
-        @arginfo.skip? ||
-          @array_arg && @array_arg.specialized_type_tag == :strv
+        arginfo.skip? ||
+          array_arg && array_arg.specialized_type_tag == :strv
       end
 
       def has_output_value?
@@ -176,7 +176,7 @@ module GirFFI
       end
 
       def array_length_assignment
-        arrname = @array_arg.name
+        arrname = array_arg.name
         "#{name} = #{arrname}.nil? ? 0 : #{arrname}.length"
       end
 
@@ -200,14 +200,14 @@ module GirFFI
 
       def caller_allocated_object?
         [:struct, :array].include?(specialized_type_tag) &&
-          @arginfo.caller_allocates?
+          arginfo.caller_allocates?
       end
 
-      DESTROY_NOTIFIER = 'GLib::DestroyNotify.default'.freeze
+      DESTROY_NOTIFIER = "GLib::DestroyNotify.default"
 
       def ingoing_convertor
         if skipped_in?
-          NullConvertor.new('0')
+          NullConvertor.new("0")
         elsif destroy_notifier?
           NullConvertor.new(DESTROY_NOTIFIER)
         elsif user_data?
@@ -233,7 +233,7 @@ module GirFFI
       end
 
       def callback_argument_name
-        @related_callback_builder.call_argument_name
+        related_callback_builder.call_argument_name
       end
     end
   end

data/lib/gir_ffi/builders/argument_builder_collection.rb

@@ -121,8 +121,8 @@ module GirFFI
       end
 
       def sorted_base_argument_builders
-        @sorted_base_argument_builders ||= @base_argument_builders.
-          sort_by.with_index { |arg, i| [arg.array_length_idx, i] }
+        @sorted_base_argument_builders ||= @base_argument_builders
+          .sort_by.with_index { |arg, i| [arg.array_length_idx, i] }
       end
 
       def split_off_block_argument

data/lib/gir_ffi/builders/base_argument_builder.rb

@@ -15,6 +15,7 @@ module GirFFI
       ).freeze
 
       attr_reader :arginfo
+      attr_reader :related_callback_builder
       attr_accessor :length_arg, :array_arg
 
       def initialize(var_gen, arginfo)

data/lib/gir_ffi/builders/base_method_builder.rb

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
-require 'gir_ffi/builders/argument_builder'
-require 'gir_ffi/builders/argument_builder_collection'
-require 'gir_ffi/builders/method_template'
-require 'gir_ffi/builders/null_argument_builder'
-require 'gir_ffi/error_argument_info'
-require 'gir_ffi/return_value_info'
-require 'gir_ffi/variable_name_generator'
+require "gir_ffi/builders/argument_builder"
+require "gir_ffi/builders/argument_builder_collection"
+require "gir_ffi/builders/method_template"
+require "gir_ffi/builders/null_argument_builder"
+require "gir_ffi/error_argument_info"
+require "gir_ffi/return_value_info"
+require "gir_ffi/variable_name_generator"
 
 module GirFFI
   module Builders

data/lib/gir_ffi/builders/base_return_value_builder.rb

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

data/lib/gir_ffi/builders/base_type_builder.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'gir_ffi/builder_helper'
+require "gir_ffi/builder_helper"
 
 module GirFFI
   # Base class for type builders.

data/lib/gir_ffi/builders/c_to_ruby_convertor.rb

@@ -35,19 +35,19 @@ module GirFFI
         when :struct, :union
           case @ownership_transfer
           when :everything
-            'wrap_own'
+            "wrap_own"
           when :nothing
-            'wrap_copy'
+            "wrap_copy"
           else
-            'wrap'
+            "wrap"
           end
         else
-          'wrap'
+          "wrap"
         end
       end
 
       def conversion_argument_list
-        conversion_arguments.join(', ')
+        conversion_arguments.join(", ")
       end
 
       def conversion_arguments

data/lib/gir_ffi/builders/callback_argument_builder.rb

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
-require 'gir_ffi/builders/base_argument_builder'
-require 'gir_ffi/builders/c_to_ruby_convertor'
-require 'gir_ffi/builders/closure_convertor'
-require 'gir_ffi/builders/null_convertor'
-require 'gir_ffi/builders/pointer_value_convertor'
+require "gir_ffi/builders/base_argument_builder"
+require "gir_ffi/builders/c_to_ruby_convertor"
+require "gir_ffi/builders/closure_convertor"
+require "gir_ffi/builders/null_convertor"
+require "gir_ffi/builders/pointer_value_convertor"
 
 module GirFFI
   module Builders
@@ -53,7 +53,7 @@ module GirFFI
         when :inout
           [out_parameter_preparation, ingoing_pre_conversion]
         when :error
-          [out_parameter_preparation, 'begin']
+          [out_parameter_preparation, "begin"]
         end
       end
 
@@ -65,7 +65,7 @@ module GirFFI
           [
             "rescue => #{result_name}",
             value_to_pointer_conversion,
-            'end'
+            "end"
           ]
         else
           []
@@ -166,7 +166,7 @@ module GirFFI
       end
 
       def length_argument_name
-        length_arg && length_arg.pre_converted_name
+        length_arg&.pre_converted_name
       end
     end
   end

data/lib/gir_ffi/builders/callback_builder.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require 'gir_ffi/builders/base_type_builder'
-require 'gir_ffi/builders/mapping_method_builder'
-require 'gir_ffi/callback_base'
+require "gir_ffi/builders/base_type_builder"
+require "gir_ffi/builders/mapping_method_builder"
+require "gir_ffi/callback_base"
 
 module GirFFI
   module Builders
@@ -23,7 +23,19 @@ module GirFFI
       end
 
       def klass
-        @klass ||= get_or_define_class namespace_module, @classname, CallbackBase
+        @klass ||= get_or_define_class container_module, @classname, CallbackBase
+      end
+
+      def container_module
+        @container_module ||=
+          if @info.container
+            type_info = @info.container
+            field_info = type_info.container
+            container_class_info = field_info.container
+            namespace_module.const_get container_class_info.safe_name
+          else
+            namespace_module
+          end
       end
 
       def mapping_method_definition

data/lib/gir_ffi/builders/callback_return_value_builder.rb

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

data/lib/gir_ffi/builders/closure_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/closure_return_value_builder.rb

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

data/lib/gir_ffi/builders/constant_builder.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'gir_ffi/builders/base_type_builder'
+require "gir_ffi/builders/base_type_builder"
 module GirFFI
   module Builders
     # Implements the creation of a constant. Though semantically not a

data/lib/gir_ffi/builders/constructor_builder.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require 'gir_ffi/builders/argument_builder_collection'
-require 'gir_ffi/builders/method_template'
-require 'gir_ffi/builders/null_return_value_builder'
+require "gir_ffi/builders/argument_builder_collection"
+require "gir_ffi/builders/method_template"
+require "gir_ffi/builders/null_return_value_builder"
 
 module GirFFI
   module Builders
@@ -30,16 +30,16 @@ module GirFFI
       end
 
       def method_arguments
-        ['*args', '&block']
+        ["*args", "&block"]
       end
 
       def preparation
-        if @info.safe_name == 'new'
-          ['obj = allocate']
+        if @info.safe_name == "new"
+          ["obj = allocate"]
         else
           [
             "raise NoMethodError unless self == #{@info.container.full_type_name}",
-            'obj = allocate'
+            "obj = allocate"
           ]
         end
       end
@@ -49,13 +49,13 @@ module GirFFI
       end
 
       def result
-        ['obj']
+        ["obj"]
       end
 
       private
 
       def initializer_name
-        @info.safe_name.sub(/^new/, 'initialize')
+        @info.safe_name.sub(/^new/, "initialize")
       end
     end
   end

data/lib/gir_ffi/builders/enum_builder.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'gir_ffi/builders/registered_type_builder'
-require 'gir_ffi/enum_base'
+require "gir_ffi/builders/registered_type_builder"
+require "gir_ffi/enum_base"
 
 module GirFFI
   module Builders
@@ -16,7 +16,7 @@ module GirFFI
       end
 
       def value_spec
-        info.values.map do |vinfo|
+        value_infos.map do |vinfo|
           val = GirFFI::ArgHelper.cast_uint32_to_int32(vinfo.value)
           [vinfo.name.to_sym, val]
         end.flatten
@@ -26,6 +26,7 @@ module GirFFI
         setup_ffi_type
         klass.extend superclass
         setup_constants
+        setup_value_constants
         stub_methods
         setup_inspect
       end
@@ -40,6 +41,14 @@ module GirFFI
         end
       end
 
+      def setup_value_constants
+        value_infos.each do |vinfo|
+          optionally_define_constant klass, vinfo.constant_name do
+            vinfo.value
+          end
+        end
+      end
+
       def setup_inspect
         klass.instance_eval <<-RUBY, __FILE__, __LINE__ + 1
           def self.inspect
@@ -55,6 +64,10 @@ module GirFFI
       def superclass
         EnumBase
       end
+
+      def value_infos
+        @value_infos ||= info.values
+      end
     end
   end
 end