gir_ffi 0.14.1 → 0.15.4

data/lib/gir_ffi/builders/class_struct_builder.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+require "gir_ffi/builders/struct_builder"
+
+module GirFFI
+  module Builders
+    # Implements the creation of a class representing a Struct.
+    class ClassStructBuilder < RegisteredTypeBuilder
+      include StructLike
+
+      attr_reader :superclass
+
+      def initialize(info, super_class_struct)
+        @superclass = super_class_struct
+        super info
+        raise "Info does not represent gtype_struct" unless info.gtype_struct?
+      end
+
+      def layout_superclass
+        GirFFI::Struct
+      end
+    end
+  end
+end

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
@@ -42,7 +42,7 @@ module GirFFI
       end
 
       def setup_value_constants
-        info.values.each do |vinfo|
+        value_infos.each do |vinfo|
           optionally_define_constant klass, vinfo.constant_name do
             vinfo.value
           end
@@ -51,9 +51,9 @@ module GirFFI
 
       def setup_inspect
         klass.instance_eval <<-RUBY, __FILE__, __LINE__ + 1
-          def self.inspect
-            "#{@namespace}::#{@classname}"
-          end
+          def self.inspect                  # def self.inspect
+            "#{@namespace}::#{@classname}"  #   "GFoo::Bar"
+          end                               # end
         RUBY
       end
 
@@ -64,6 +64,10 @@ module GirFFI
       def superclass
         EnumBase
       end
+
+      def value_infos
+        @value_infos ||= info.values
+      end
     end
   end
 end

data/lib/gir_ffi/builders/field_builder.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
-require 'gir_ffi/builders/argument_builder'
-require 'gir_ffi/builders/base_argument_builder'
-require 'gir_ffi/builders/null_argument_builder'
-require 'gir_ffi/builders/pointer_value_convertor'
-require 'gir_ffi/variable_name_generator'
-require 'gir_ffi/field_argument_info'
+require "gir_ffi/builders/argument_builder"
+require "gir_ffi/builders/base_argument_builder"
+require "gir_ffi/builders/null_argument_builder"
+require "gir_ffi/builders/pointer_value_convertor"
+require "gir_ffi/variable_name_generator"
+require "gir_ffi/field_argument_info"
 
 module GirFFI
   module Builders
@@ -58,7 +58,8 @@ module GirFFI
         private
 
         def pointer_to_value_conversion
-          PointerValueConvertor.new(field_type_tag).pointer_to_value(field_ptr, field_offset)
+          PointerValueConvertor.new(field_type_tag)
+            .pointer_to_value(field_ptr, field_offset)
         end
 
         def field_offset
@@ -208,7 +209,7 @@ module GirFFI
 
         def length_argument_info
           @length_argument_info ||=
-            GetterArgumentInfo.new 'length', array_length_field.field_type
+            GetterArgumentInfo.new "length", array_length_field.field_type
         end
 
         def field_offset
@@ -224,7 +225,7 @@ module GirFFI
         end
 
         def field_argument_info
-          @field_argument_info ||= GetterArgumentInfo.new 'value', field_type
+          @field_argument_info ||= GetterArgumentInfo.new "value", field_type
         end
       end
 
@@ -269,20 +270,20 @@ module GirFFI
 
         field_ptr = builder.new_variable
 
-        <<-CODE.reset_indentation
-        def #{info.name}= #{builder.method_argument_name}
-          #{field_ptr} = @struct.to_ptr
-          #{builder.pre_conversion.join("\n          ")}
-          #{value_storage(field_ptr, builder)}
-        end
+        <<~CODE
+          def #{info.name}= #{builder.method_argument_name}
+            #{field_ptr} = @struct.to_ptr
+            #{builder.pre_conversion.join("\n  ")}
+            #{value_storage(field_ptr, builder)}
+          end
         CODE
       end
 
       private
 
       def value_storage(typed_ptr, builder)
-        PointerValueConvertor.new(field_type_tag).
-          value_to_pointer(typed_ptr, builder.call_argument_name, info.offset)
+        PointerValueConvertor.new(field_type_tag)
+          .value_to_pointer(typed_ptr, builder.call_argument_name, info.offset)
       end
 
       def field_type_tag
@@ -291,6 +292,7 @@ module GirFFI
 
       attr_reader :container_class
 
+      # TODO: Inject container_info on initialization
       def container_info
         @container_info ||= info.container
       end
@@ -300,7 +302,7 @@ module GirFFI
       end
 
       def field_argument_info
-        @field_argument_info ||= FieldArgumentInfo.new 'value', field_type
+        @field_argument_info ||= FieldArgumentInfo.new "value", field_type
       end
 
       def setter_builder

data/lib/gir_ffi/builders/flags_builder.rb

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

data/lib/gir_ffi/builders/full_c_to_ruby_convertor.rb

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

data/lib/gir_ffi/builders/function_builder.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'gir_ffi/builders/return_value_builder'
-require 'gir_ffi/builders/base_method_builder'
+require "gir_ffi/builders/return_value_builder"
+require "gir_ffi/builders/base_method_builder"
 
 module GirFFI
   module Builders
@@ -37,12 +37,18 @@ module GirFFI
       private
 
       def receiver_call_argument
-        if @info.instance_ownership_transfer == :everything
-          'self.ref'
+        container_type_info = ReceiverTypeInfo.new(container_info)
+        if @info.instance_ownership_transfer == :everything &&
+            container_type_info.flattened_tag == :object
+          "self.ref"
         else
-          'self'
+          "self"
         end
       end
+
+      def container_info
+        @container_info ||= @info.container
+      end
     end
   end
 end

data/lib/gir_ffi/builders/initializer_builder.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'gir_ffi/builders/initializer_return_value_builder'
-require 'gir_ffi/builders/base_method_builder'
+require "gir_ffi/builders/initializer_return_value_builder"
+require "gir_ffi/builders/base_method_builder"
 
 module GirFFI
   module Builders
@@ -17,7 +17,7 @@ module GirFFI
       end
 
       def method_name
-        @info.safe_name.sub(/^new/, 'initialize')
+        @info.safe_name.sub(/^new/, "initialize")
       end
 
       def result

data/lib/gir_ffi/builders/initializer_return_value_builder.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'gir_ffi/builders/base_return_value_builder'
+require "gir_ffi/builders/base_return_value_builder"
 
 module GirFFI
   module Builders
@@ -9,7 +9,7 @@ module GirFFI
       def post_conversion
         result = []
         result << "store_pointer(#{capture_variable_name})"
-        result << '@struct.owned = true' if specialized_type_tag == :struct
+        result << "@struct.owned = true" if specialized_type_tag == :struct
         result
       end
     end

data/lib/gir_ffi/builders/interface_builder.rb

@@ -1,14 +1,16 @@
 # frozen_string_literal: true
 
-require 'gir_ffi/builders/registered_type_builder'
-require 'gir_ffi/interface_base'
+require "gir_ffi/builders/registered_type_builder"
+require "gir_ffi/interface_base"
 
 module GirFFI
   module Builders
     # Implements the creation of a module representing an Interface.
     class InterfaceBuilder < RegisteredTypeBuilder
       def interface_struct
-        @interface_struct ||= Builder.build_class iface_struct_info
+        @interface_struct ||=
+          ClassStructBuilder.new(iface_struct_info,
+                                 GObject::TypeInterface).build_class
       end
 
       private

data/lib/gir_ffi/builders/mapping_method_builder.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
-require 'gir_ffi/variable_name_generator'
-require 'gir_ffi/builders/callback_argument_builder'
-require 'gir_ffi/builders/vfunc_argument_builder'
-require 'gir_ffi/builders/callback_return_value_builder'
-require 'gir_ffi/builders/argument_builder_collection'
-require 'gir_ffi/builders/base_method_builder'
+require "gir_ffi/variable_name_generator"
+require "gir_ffi/builders/callback_argument_builder"
+require "gir_ffi/builders/vfunc_argument_builder"
+require "gir_ffi/builders/callback_return_value_builder"
+require "gir_ffi/builders/argument_builder_collection"
+require "gir_ffi/builders/base_method_builder"
 
 module GirFFI
   module Builders
@@ -23,19 +23,19 @@ module GirFFI
 
       def initialize(receiver_info, info, builder_class)
         super(info, CallbackReturnValueBuilder,
-              receiver_info: receiver_info,
+              receiver_info:          receiver_info,
               argument_builder_class: builder_class)
       end
 
       ## Methods used by MethodTemplate
 
       def method_name
-        'call_with_argument_mapping'
+        "call_with_argument_mapping"
       end
 
       def method_arguments
         @method_arguments ||=
-          argument_builder_collection.method_argument_names.dup.unshift('_proc')
+          argument_builder_collection.method_argument_names.dup.unshift("_proc")
       end
 
       def invocation
@@ -57,7 +57,7 @@ module GirFFI
       private
 
       def call_argument_list
-        argument_builder_collection.call_argument_names.join(', ')
+        argument_builder_collection.call_argument_names.join(", ")
       end
     end
   end

data/lib/gir_ffi/builders/marshalling_method_builder.rb

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
-require 'gir_ffi/variable_name_generator'
-require 'gir_ffi/builders/closure_argument_builder'
-require 'gir_ffi/builders/closure_return_value_builder'
-require 'gir_ffi/builders/argument_builder_collection'
-require 'gir_ffi/builders/method_template'
+require "gir_ffi/variable_name_generator"
+require "gir_ffi/builders/closure_argument_builder"
+require "gir_ffi/builders/closure_return_value_builder"
+require "gir_ffi/builders/argument_builder_collection"
+require "gir_ffi/builders/method_template"
 
 module GirFFI
   module Builders
@@ -12,20 +12,23 @@ module GirFFI
     # handler. This method converts arguments from C to Ruby, and the
     # result from Ruby to C.
     class MarshallingMethodBuilder < BaseMethodBuilder
-      def self.for_signal(receiver_info, info)
+      def self.for_signal(info)
+        container_info = info.container
+        container_type_info = ReceiverTypeInfo.new(container_info)
+        receiver_info = ReceiverArgumentInfo.new(container_type_info)
         new receiver_info, info
       end
 
       def initialize(receiver_info, info)
         super(info, ClosureReturnValueBuilder,
-              receiver_info: receiver_info,
+              receiver_info:          receiver_info,
               argument_builder_class: ClosureArgumentBuilder)
       end
 
       ## Methods used by MethodTemplate
 
       def method_name
-        'marshaller'
+        "marshaller"
       end
 
       def method_arguments
@@ -59,7 +62,7 @@ module GirFFI
       private
 
       def call_argument_list
-        @argument_builder_collection.call_argument_names.join(', ')
+        @argument_builder_collection.call_argument_names.join(", ")
       end
 
       def param_names