gir_ffi 0.14.0 → 0.15.3

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

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
@@ -30,12 +30,12 @@ module GirFFI
       ## 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
@@ -25,7 +25,7 @@ module GirFFI
       ## Methods used by MethodTemplate
 
       def method_name
-        'marshaller'
+        "marshaller"
       end
 
       def method_arguments
@@ -59,7 +59,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

data/lib/gir_ffi/builders/method_template.rb

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

@@ -1,10 +1,10 @@
 # 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/object_base"
+require "gir_ffi/struct"
 
 module GirFFI
   module Builders
@@ -114,7 +114,7 @@ module GirFFI
       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,11 +1,11 @@
 # 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
@@ -101,11 +101,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 +132,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 +143,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