gir_ffi 0.7.8 → 0.7.9

data/lib/gir_ffi/builders/user_defined_builder.rb

@@ -19,7 +19,7 @@ module GirFFI
       end
 
       def target_gtype
-        @gtype ||= klass.get_gtype
+        @gtype ||= klass.gtype
       end
 
       private
@@ -30,7 +30,7 @@ module GirFFI
                                               gobject_type_info, 0)
         included_interfaces.each do |interface|
           ifinfo = gobject_interface_info interface
-          GObject.type_add_interface_static @gtype, interface.get_gtype, ifinfo
+          GObject.type_add_interface_static @gtype, interface.gtype, ifinfo
         end
       end
 
@@ -39,11 +39,11 @@ module GirFFI
       end
 
       def parent_gtype
-        @parent_gtype ||= GType.new(klass.superclass.get_gtype)
+        @parent_gtype ||= GType.new(klass.superclass.gtype)
       end
 
       def interface_gtypes
-        included_interfaces.map { |interface| GType.new(interface.get_gtype) }
+        included_interfaces.map { |interface| GType.new(interface.gtype) }
       end
 
       def included_interfaces
@@ -166,11 +166,11 @@ module GirFFI
       def layout_specification
         parent_spec = [:parent, superclass::Struct, 0]
         offset = superclass::Struct.size
-        fields_spec = properties.map do |pinfo|
+        fields_spec = properties.flat_map do |pinfo|
           spec = [pinfo.name.to_sym, :int32, offset]
           offset += FFI.type_size(:int32)
           spec
-        end.flatten(1)
+        end
         parent_spec + fields_spec
       end
 

data/lib/gir_ffi/builders/vfunc_argument_builder.rb

@@ -0,0 +1,44 @@
+require 'gir_ffi/builders/callback_argument_builder'
+
+module GirFFI
+  module Builders
+    # Convertor for arguments for vfuncs. Used when building the
+    # argument mapper for vfuncs.
+    class VFuncArgumentBuilder < CallbackArgumentBuilder
+      def pre_conversion
+        if ingoing_ref_needed
+          super + [pre_ref_count_increase]
+        else
+          super
+        end
+      end
+
+      private
+
+      def ingoing_ref_needed
+        direction == :in &&
+          ownership_transfer == :nothing &&
+          specialized_type_tag == :object
+      end
+
+      def pre_ref_count_increase
+        "#{pre_converted_name}.ref"
+      end
+
+      # SMELL: Override private method
+      def post_convertor_argument
+        if outgoing_ref_needed
+          "#{super}.ref"
+        else
+          super
+        end
+      end
+
+      def outgoing_ref_needed
+        direction == :out &&
+          ownership_transfer == :everything &&
+          specialized_type_tag == :object
+      end
+    end
+  end
+end

data/lib/gir_ffi/builders/vfunc_builder.rb

@@ -26,7 +26,9 @@ module GirFFI
         arg_infos << ErrorArgumentInfo.new if info.throws?
 
         receiver_info = ReceiverArgumentInfo.new receiver_type_info
-        return_value_info = ReturnValueInfo.new info.return_type
+        return_value_info = ReturnValueInfo.new(info.return_type,
+                                                info.caller_owns,
+                                                info.skip_return?)
 
         MappingMethodBuilder.for_vfunc(receiver_info,
                                        arg_infos,

data/lib/gir_ffi/callback_base.rb

@@ -24,8 +24,6 @@ module GirFFI
         value.to_native
       when FFI::Function
         value
-      else
-        nil
       end
     end
 
@@ -55,10 +53,15 @@ module GirFFI
       end
     end
 
+    # @deprecated Use .to_ffi_type instead. Will be removed in 0.8.0.
     def self.to_ffitype
       self
     end
 
+    def self.to_ffi_type
+      self
+    end
+
     def to_native
       @to_native ||= begin
                        builder = self.class.gir_ffi_builder

data/lib/gir_ffi/class_base.rb

@@ -46,9 +46,14 @@ module GirFFI
       end
     end
 
+    def self.to_ffi_type
+      self::Struct
+    end
+
     class << self
+      # @deprecated Use .to_ffi_type instead. Will be removed in 0.8.0.
       def to_ffitype
-        self::Struct
+        to_ffi_type
       end
 
       def setup_method name
@@ -77,12 +82,6 @@ module GirFFI
         obj
       end
 
-      def _allocate
-        obj = _real_new
-        obj.instance_variable_set :@struct, self::Struct.new
-        obj
-      end
-
       # Pass-through casting method. This may become a type checking
       # method. It is overridden by GValue to implement wrapping of plain
       # Ruby objects.

data/lib/gir_ffi/enum_base.rb

@@ -48,7 +48,12 @@ module GirFFI
       send method, *arguments, &block
     end
 
+    # @deprecated Use #to_ffi_type instead. Will be removed in 0.8.0.
     def to_ffitype
+      to_ffi_type
+    end
+
+    def to_ffi_type
       self
     end
 

data/lib/gir_ffi/ffi_ext/pointer.rb

@@ -14,6 +14,7 @@ module GirFFI
         null?
       end
 
+      # FIXME: Should probably not be here.
       def to_object
         return nil if self.null?
         gtype = GObject.type_from_instance_pointer self

data/lib/gir_ffi/field_argument_info.rb

@@ -14,6 +14,10 @@ module GirFFI
       :in
     end
 
+    def ownership_transfer
+      :everything
+    end
+
     def skip?
       false
     end

data/lib/gir_ffi/in_out_pointer.rb

@@ -66,7 +66,7 @@ module GirFFI
     private
 
     def value_ffi_type
-      @value_ffi_type ||= TypeMap.type_specification_to_ffitype value_type
+      @value_ffi_type ||= TypeMap.type_specification_to_ffi_type value_type
     end
 
     def value_type_size

data/lib/gir_ffi/in_pointer.rb

@@ -78,7 +78,7 @@ module GirFFI
       end
 
       def from_struct_array type, ary
-        ffi_type = TypeMap.type_specification_to_ffitype type
+        ffi_type = TypeMap.type_specification_to_ffi_type type
         type_size = FFI.type_size(ffi_type)
         length = ary.length
 
@@ -101,7 +101,7 @@ module GirFFI
       end
 
       def from_basic_type_array type, ary
-        ffi_type = TypeMap.type_specification_to_ffitype type
+        ffi_type = TypeMap.type_specification_to_ffi_type type
         ary = ary.dup << null_value(ffi_type)
         type_size = FFI.type_size(ffi_type)
         block = AllocationHelper.safe_malloc type_size * ary.length

data/lib/gir_ffi/info_ext/i_arg_info.rb

@@ -2,14 +2,24 @@ module GirFFI
   module InfoExt
     # Extensions for GObjectIntrospection::IArgInfo needed by GirFFI
     module IArgInfo
+      # @deprecated Use #to_ffi_type instead. Will be removed in 0.8.0.
       def to_ffitype
+        to_ffi_type
+      end
+
+      def to_ffi_type
         return :pointer if direction != :in
-        argument_type.to_ffitype
+        argument_type.to_ffi_type
       end
 
+      # @deprecated Use #to_callback_ffi_type instead. Will be removed in 0.8.0.
       def to_callback_ffitype
+        to_callback_ffi_type
+      end
+
+      def to_callback_ffi_type
         return :pointer if direction != :in
-        argument_type.to_callback_ffitype
+        argument_type.to_callback_ffi_type
       end
     end
   end

data/lib/gir_ffi/info_ext/i_callable_info.rb

@@ -3,7 +3,7 @@ module GirFFI
     # Extensions for GObjectIntrospection::ICallableInfo needed by GirFFI
     module ICallableInfo
       def argument_ffi_types
-        args.map(&:to_ffitype)
+        args.map(&:to_ffi_type)
       end
     end
   end

data/lib/gir_ffi/info_ext/i_callback_info.rb

@@ -2,16 +2,21 @@ module GirFFI
   module InfoExt
     # Extensions for GObjectIntrospection::ICallbackInfo needed by GirFFI
     module ICallbackInfo
+      # @deprecated Use #to_ffi_type instead. Will be removed in 0.8.0.
       def to_ffitype
+        to_ffi_type
+      end
+
+      def to_ffi_type
         Builder.build_class(self)
       end
 
       def argument_ffi_types
-        args.map(&:to_callback_ffitype)
+        args.map(&:to_callback_ffi_type)
       end
 
       def return_ffi_type
-        return_type.to_callback_ffitype
+        return_type.to_callback_ffi_type
       end
     end
   end

data/lib/gir_ffi/info_ext/i_field_info.rb

@@ -3,7 +3,7 @@ module GirFFI
     # Extensions for GObjectIntrospection::IFieldInfo needed by GirFFI
     module IFieldInfo
       def layout_specification
-        [name.to_sym, field_type.to_ffitype, offset]
+        [name.to_sym, field_type.to_ffi_type, offset]
       end
     end
   end

data/lib/gir_ffi/info_ext/i_function_info.rb

@@ -10,7 +10,7 @@ module GirFFI
       end
 
       def return_ffi_type
-        return_type.to_ffitype
+        return_type.to_ffi_type
       end
     end
   end

data/lib/gir_ffi/info_ext/i_registered_type_info.rb

@@ -4,8 +4,13 @@ module GirFFI
   module InfoExt
     # Extensions for GObjectIntrospection::IRegisteredTypeInfo needed by GirFFI
     module IRegisteredTypeInfo
+      # @deprecated Use #to_ffi_type instead. Will be removed in 0.8.0.
       def to_ffitype
-        to_type.to_ffitype
+        to_ffi_type
+      end
+
+      def to_ffi_type
+        to_type.to_ffi_type
       end
 
       def to_type
@@ -21,4 +26,4 @@ module GirFFI
 end
 
 GObjectIntrospection::IRegisteredTypeInfo.send :include,
-  GirFFI::InfoExt::IRegisteredTypeInfo
+                                               GirFFI::InfoExt::IRegisteredTypeInfo

data/lib/gir_ffi/info_ext/i_type_info.rb

@@ -19,9 +19,14 @@ module GirFFI
         }
       end
 
+      # @deprecated Use #gtype instead. Will be removed in 0.8.0.
       def g_type
+        gtype
+      end
+
+      def gtype
         if tag == :interface
-          return interface.g_type
+          return interface.gtype
         elsif (type = ITypeInfo.flattened_tag_to_gtype_map[flattened_tag])
           return type
         else
@@ -30,7 +35,7 @@ module GirFFI
       end
 
       def make_g_value
-        GObject::Value.for_g_type g_type
+        GObject::Value.for_gtype gtype
       end
 
       def element_type
@@ -39,8 +44,6 @@ module GirFFI
           enumerable_element_type
         when :ghash
           dictionary_element_type
-        else
-          nil
         end
       end
 
@@ -99,21 +102,30 @@ module GirFFI
         end
       end
 
+      # @deprecated Use #to_ffi_type instead. Will be removed in 0.8.0.
       def to_ffitype
+        to_ffi_type
+      end
+
+      def to_ffi_type
         return :pointer if pointer?
 
         case tag
         when :interface
-          interface.to_ffitype
+          interface.to_ffi_type
         when :array
-          [subtype_ffitype(0), array_fixed_size]
+          [subtype_ffi_type(0), array_fixed_size]
         else
           TypeMap.map_basic_type tag
         end
       end
 
-      # TODO: Use either ffitype or ffi_type everywhere
+      # @deprecated Use #to_callback_ffi_type instead. Will be removed in 0.8.0.
       def to_callback_ffitype
+        to_callback_ffi_type
+      end
+
+      def to_callback_ffi_type
         return :pointer if pointer?
 
         case tag
@@ -193,8 +205,8 @@ module GirFFI
         subtype_tag_or_class 0
       end
 
-      def subtype_ffitype index
-        subtype = param_type(index).to_ffitype
+      def subtype_ffi_type index
+        subtype = param_type(index).to_ffi_type
         if subtype == :pointer
           # NOTE: Don't use pointer directly to appease JRuby.
           :"uint#{FFI.type_size(:pointer) * 8}"

data/lib/gir_ffi/info_ext/i_unresolved_info.rb

@@ -2,7 +2,12 @@ module GirFFI
   module InfoExt
     # Extensions for GObjectIntrospection::IUnresolvedInfo needed by GirFFI
     module IUnresolvedInfo
+      # @deprecated Use #to_ffi_type instead. Will be removed in 0.8.0.
       def to_ffitype
+        to_ffi_type
+      end
+
+      def to_ffi_type
         :pointer
       end
     end

data/lib/gir_ffi/interface_base.rb

@@ -13,7 +13,12 @@ module GirFFI
       ptr.to_object
     end
 
+    # @deprecated Use #to_ffi_type instead. Will be removed in 0.8.0.
     def to_ffitype
+      to_ffi_type
+    end
+
+    def to_ffi_type
       :pointer
     end
   end

data/lib/gir_ffi/object_base.rb

@@ -29,7 +29,12 @@ module GirFFI
       gir_ffi_builder.find_signal name
     end
 
+    # @deprecated Use #to_ffi_type instead. Will be removed in 0.8.0.
     def self.to_ffitype
+      to_ffi_type
+    end
+
+    def self.to_ffi_type
       :pointer
     end
 

data/lib/gir_ffi/receiver_argument_info.rb

@@ -13,6 +13,11 @@ module GirFFI
       :in
     end
 
+    def ownership_transfer
+      # FIXME: Make an informed choice for this.
+      :everything
+    end
+
     def name
       '_instance'
     end