gir_ffi 0.14.1 → 0.15.4

data/lib/gir_ffi/builders/method_template.rb

@@ -18,10 +18,10 @@ module GirFFI
       end
 
       def method_definition
-        code = "def #{qualified_method_name}"
-        code += "(#{method_arguments.join(', ')})" if method_arguments.any?
-        method_lines.each { |line| code += "\n  #{line}" }
-        code + "\nend\n"
+        code = +"def #{qualified_method_name}"
+        code << "(#{method_arguments.join(', ')})" if method_arguments.any?
+        method_lines.each { |line| code << "\n  #{line}" }
+        code << "\nend\n"
       end
 
       private
@@ -68,7 +68,7 @@ module GirFFI
 
       def result_name_list
         @result_name_list ||=
-          @argument_builder_collection.capture_variable_names.join(', ')
+          @argument_builder_collection.capture_variable_names.join(", ")
       end
 
       def capturing_invocation

data/lib/gir_ffi/builders/module_builder.rb

@@ -1,10 +1,8 @@
 # frozen_string_literal: true
 
-require 'gir_ffi/builder_helper'
-require 'gir_ffi/module_base'
-require 'gir_ffi/builders/function_builder'
-
-require 'indentation'
+require "gir_ffi/builder_helper"
+require "gir_ffi/module_base"
+require "gir_ffi/builders/function_builder"
 
 module GirFFI
   module Builders
@@ -68,7 +66,7 @@ module GirFFI
       def build_dependencies
         deps = gir.dependencies @namespace
         deps.each do |dep|
-          name, version = dep.split '-'
+          name, version = dep.split "-"
           Builder.build_module name, version
         end
       end
@@ -90,7 +88,9 @@ module GirFFI
         lib.extend FFI::Library
         lib.extend FFI::BitMasks
         lib.ffi_lib_flags :global, :lazy
-        lib.ffi_lib(*shared_library_specification.split(/,/)) if shared_library_specification
+        if shared_library_specification
+          lib.ffi_lib(*shared_library_specification.split(/,/))
+        end
       end
 
       def shared_library_specification

data/lib/gir_ffi/builders/null_argument_builder.rb

@@ -3,8 +3,6 @@
 module GirFFI
   # Argument builder that does nothing. Implements the Null Object pattern.
   class NullArgumentBuilder
-    def initialize(*); end
-
     def pre_conversion
       []
     end

data/lib/gir_ffi/builders/null_return_value_builder.rb

@@ -4,8 +4,6 @@ module GirFFI
   module Builders
     # Implements a blank return value matching ReturnValueBuilder's interface.
     class NullReturnValueBuilder
-      def initialize; end
-
       def array_length_idx
         -1
       end

data/lib/gir_ffi/builders/object_builder.rb

@@ -1,10 +1,11 @@
 # frozen_string_literal: true
 
-require 'gir_ffi/builders/registered_type_builder'
-require 'gir_ffi/builders/with_layout'
-require 'gir_ffi/builders/property_builder'
-require 'gir_ffi/object_base'
-require 'gir_ffi/struct'
+require "gir_ffi/builders/registered_type_builder"
+require "gir_ffi/builders/with_layout"
+require "gir_ffi/builders/property_builder"
+require "gir_ffi/builders/class_struct_builder"
+require "gir_ffi/object_base"
+require "gir_ffi/struct"
 
 module GirFFI
   module Builders
@@ -18,6 +19,10 @@ module GirFFI
           ObjectBase
         end
 
+        def object_class_struct
+          GObject::TypeClass
+        end
+
         def ancestor_infos
           []
         end
@@ -32,7 +37,13 @@ module GirFFI
       end
 
       def object_class_struct
-        @object_class_struct ||= Builder.build_class object_class_struct_info
+        @object_class_struct ||=
+          if object_class_struct_info
+            ClassStructBuilder.new(object_class_struct_info,
+                                   parent_builder.object_class_struct).build_class
+          else
+            parent_builder.object_class_struct
+          end
       end
 
       def ancestor_infos
@@ -48,8 +59,7 @@ module GirFFI
       protected
 
       def object_class_struct_info
-        @object_class_struct_info ||=
-          info.class_struct || parent_builder.object_class_struct_info
+        @object_class_struct_info ||= info.class_struct
       end
 
       private
@@ -107,14 +117,14 @@ module GirFFI
         return if vfunc_name == invoker_name
 
         klass.class_eval <<-DEF, __FILE__, __LINE__ + 1
-          def #{vfunc_name} *args, &block
-            #{invoker_name}(*args, &block)
-          end
+          def #{vfunc_name} *args, &block   # def foo *args, &block
+            #{invoker_name}(*args, &block)  #   foo_invoker *args, &block
+          end                               # end
         DEF
       end
 
       def setup_initializer
-        return if info.find_method 'new'
+        return if info.find_method "new"
 
         if info.abstract?
           define_abstract_initializer

data/lib/gir_ffi/builders/property_argument_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/property_builder.rb

@@ -1,18 +1,17 @@
 # frozen_string_literal: true
 
-require 'gir_ffi/builders/method_template'
-require 'gir_ffi/builders/argument_builder_collection'
-require 'gir_ffi/builders/property_argument_builder'
-require 'gir_ffi/builders/property_return_value_builder'
-require 'gir_ffi/variable_name_generator'
-require 'gir_ffi/field_argument_info'
+require "gir_ffi/builders/method_template"
+require "gir_ffi/builders/argument_builder_collection"
+require "gir_ffi/builders/property_argument_builder"
+require "gir_ffi/builders/property_return_value_builder"
+require "gir_ffi/variable_name_generator"
+require "gir_ffi/field_argument_info"
 
 module GirFFI
   module Builders
     # Method builder used for the creation of property getter methods.
     class PropertyGetterBuilder
-      attr_reader :info
-      attr_reader :return_value_builder
+      attr_reader :info, :return_value_builder
 
       def initialize(info, return_value_builder)
         @return_value_builder = return_value_builder
@@ -101,11 +100,11 @@ module GirFFI
       end
 
       def converting_setter_def
-        <<-CODE.reset_indentation
-        def #{setter_name} value
-          #{setter_builder.pre_conversion.join("\n")}
-          set_property("#{property_name}", #{setter_builder.call_argument_name})
-        end
+        <<~CODE
+          def #{setter_name} value
+            #{setter_builder.pre_conversion.join("\n")}
+            set_property("#{property_name}", #{setter_builder.call_argument_name})
+          end
         CODE
       end
 
@@ -132,7 +131,7 @@ module GirFFI
       end
 
       def argument_info
-        @argument_info ||= FieldArgumentInfo.new('value', type_info)
+        @argument_info ||= FieldArgumentInfo.new("value", type_info)
       end
 
       def container_class
@@ -143,6 +142,7 @@ module GirFFI
         @container_module ||= Object.const_get(container_info.safe_namespace)
       end
 
+      # TODO: Inject container_info on initialization
       def container_info
         @container_info ||= @info.container
       end

data/lib/gir_ffi/builders/property_return_value_builder.rb

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

data/lib/gir_ffi/builders/registered_type_builder.rb

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
-require 'gir_ffi/builders/base_type_builder'
-require 'gir_ffi/method_stubber'
-require 'gir_ffi/builders/function_builder'
-require 'gir_ffi/builders/constructor_builder'
-require 'gir_ffi/builders/initializer_builder'
+require "gir_ffi/builders/base_type_builder"
+require "gir_ffi/method_stubber"
+require "gir_ffi/builders/function_builder"
+require "gir_ffi/builders/constructor_builder"
+require "gir_ffi/builders/initializer_builder"
 
 module GirFFI
   module Builders
@@ -77,6 +77,7 @@ module GirFFI
       def stub_methods
         info.get_methods.each do |minfo|
           klass.class_eval MethodStubber.new(minfo).method_stub, __FILE__, __LINE__
+          alias_accessors(minfo) if minfo.method?
         end
       end
 
@@ -92,6 +93,14 @@ module GirFFI
       def fields
         info.fields
       end
+
+      def alias_accessors(minfo)
+        if minfo.name =~ /^get_(.*)/
+          klass.send :alias_method, Regexp.last_match(1), minfo.name
+        elsif minfo.n_args == 1 && minfo.name =~ /^set_(.*)/
+          klass.send :alias_method, "#{Regexp.last_match(1)}=", minfo.name
+        end
+      end
     end
   end
 end

data/lib/gir_ffi/builders/return_value_builder.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require 'gir_ffi/builders/base_return_value_builder'
-require 'gir_ffi/builders/full_c_to_ruby_convertor'
-require 'gir_ffi/builders/closure_convertor'
+require "gir_ffi/builders/base_return_value_builder"
+require "gir_ffi/builders/full_c_to_ruby_convertor"
+require "gir_ffi/builders/closure_convertor"
 
 module GirFFI
   module Builders
@@ -39,7 +39,7 @@ module GirFFI
       end
 
       def length_argument_name
-        length_arg && length_arg.post_converted_name
+        length_arg&.post_converted_name
       end
     end
   end

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
@@ -18,13 +18,11 @@ module GirFFI
       end
 
       def marshaller_definition
-        container_type_info = ReceiverTypeInfo.new(container_info)
-        receiver_info = ReceiverArgumentInfo.new(container_type_info)
-
-        MarshallingMethodBuilder.for_signal(receiver_info,
-                                            info).method_definition
+        MarshallingMethodBuilder.for_signal(info).method_definition
       end
 
+      private
+
       def klass
         @klass ||= get_or_define_class container_class, @classname, GObject::RubyClosure
       end

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
@@ -15,14 +15,16 @@ module GirFFI
       end
 
       def superclass
-        # HACK: Inheritance chain is not expressed in GObject's code correctly.
-        return GObject::ObjectClass if info.full_type_name == 'GObject::InitiallyUnownedClass'
-        return parent_field_type.tag_or_class if info.gtype_struct?
+        raise "Use ClassStructBuilder to build #{info.full_type_name}" if info.gtype_struct?
         return BoxedBase if GObject.type_fundamental(info.gtype) == GObject::TYPE_BOXED
 
         StructBase
       end
 
+      def klass
+        @klass ||= get_or_define_class(namespace_module, @classname) { superclass }
+      end
+
       def parent_field_type
         fields.first.field_type
       end

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