gir_ffi 0.4.2 → 0.4.3

data/History.txt

@@ -1,3 +1,9 @@
+== 0.4.3 / 2012-11-02
+
+* Remove gobject-introspection version check
+* Make tests pass with gobject-introspection 1.34
+* Ongoing refactoring
+
 == 0.4.2 / 2012-09-22
 
 * Make objects and interfaces wrap poiners in the class that matches

data/lib/ffi-glib/strv.rb

@@ -0,0 +1,22 @@
+module GLib
+  # Extra methods for GLib::Strv.
+  class Strv
+    def self.from it
+      case it
+      when nil
+        nil
+      when FFI::Pointer
+        wrap it
+      when self
+        it
+      else
+        from_enumerable it
+      end
+    end
+
+    def self.from_enumerable enum
+      self.wrap GirFFI::InPointer.from_array :utf8, enum
+    end
+  end
+end
+

data/lib/ffi-glib.rb

@@ -9,6 +9,7 @@ require 'ffi-glib/hash_table'
 require 'ffi-glib/byte_array'
 require 'ffi-glib/array'
 require 'ffi-glib/ptr_array'
+require 'ffi-glib/strv'
 
 module GLib
   # @deprecated Compatibility function. Remove in version 0.5.0.

data/lib/ffi-gobject_introspection/i_constant_info.rb

@@ -2,7 +2,14 @@ module GObjectIntrospection
   # Wraps a GIConstantInfo struct; represents an constant.
   class IConstantInfo < IBaseInfo
     TYPE_TAG_TO_UNION_MEMBER = {
+      :gint8 => :v_int8,
+      :gint16 => :v_int16,
       :gint32 => :v_int32,
+      :gint64 => :v_int64,
+      :guint8 => :v_uint8,
+      :guint16 => :v_uint16,
+      :guint32 => :v_uint32,
+      :guint64 => :v_uint64,
       :gdouble => :v_double,
       :utf8 => :v_string
     }

data/lib/ffi-gobject_introspection/lib.rb

@@ -3,19 +3,7 @@ require 'ffi'
 module GObjectIntrospection
   module Lib
     extend FFI::Library
-    begin
-      ffi_lib "girepository-1.0.so.1"
-    rescue LoadError
-      begin
-        ffi_lib "girepository-1.0.so.0"
-        warn "This old version of gobject-introspection is not supported by GirFFI."
-        warn "Please upgrade to at least version 0.10.0."
-      rescue LoadError
-        ffi_lib "girepository-1.0"
-        warn "This platform and/or version of gobject-introspection are not supported by GirFFI."
-        warn "Please file bugs for any errors found."
-      end
-    end
+    ffi_lib "girepository-1.0"
 
     # IRepository
     enum :IRepositoryLoadFlags, [:LAZY, (1<<0)]

data/lib/gir_ffi/builder/argument/base.rb

@@ -1,3 +1,5 @@
+require 'gir_ffi/info_ext/i_registered_type_info'
+
 module GirFFI
   module Builder
     module Argument
@@ -17,7 +19,7 @@ module GirFFI
 
         attr_accessor :length_arg, :array_arg
 
-        def initialize var_gen, name, typeinfo
+        def initialize var_gen, name, typeinfo, direction
           @typeinfo = typeinfo
           @inarg = nil
           @retname = nil
@@ -35,6 +37,14 @@ module GirFFI
           type_info.tag
         end
 
+        def specialized_type_tag
+          type_info.flattened_tag
+        end
+
+        def type_specification
+          type_info.type_specification
+        end
+
         TAG_TO_WRAPPER_CLASS_MAP = {
           :glist => 'GLib::List',
           :gslist => 'GLib::SList',
@@ -47,14 +57,25 @@ module GirFFI
         def argument_class_name
           case (tag = type_tag)
           when :interface
-            iface = type_info.interface
-            # FIXME: Extract to ITypeInfo.
-            "::#{iface.safe_namespace}::#{iface.name}"
+            type_info.interface_type_name
           when :array
-            if type_info.zero_terminated?
-              'GLib::Strv'
-            else
+            case type_info.array_type
+            when :byte_array
+              'GLib::ByteArray'
+            when :array
               'GLib::Array'
+            when :ptr_array
+              'GLib::PtrArray'
+            else # :c
+              if type_info.zero_terminated?
+                if type_info.element_type == :utf8
+                  'GLib::Strv'
+                else
+                  'GirFFI::InPointer'
+                end
+              else
+                'GirFFI::InPointer'
+              end
             end
           else
             TAG_TO_WRAPPER_CLASS_MAP[tag]
@@ -65,8 +86,7 @@ module GirFFI
           type = type_info.param_type(index)
           tag = type.tag
           base = if tag == :interface
-                   iface = type.interface
-                   "::#{iface.safe_namespace}::#{iface.name}"
+                   type.interface_type_name
                  else
                    tag.inspect
                  end

data/lib/gir_ffi/builder/argument/in_base.rb

@@ -4,12 +4,11 @@ module GirFFI
       # Abstract base class implementing argument processing for arguments
       # with direction :in.
       class InBase < Base
-        def initialize var_gen, name, typeinfo
-          super var_gen, name, typeinfo
+        def initialize var_gen, name, typeinfo, direction
+          super var_gen, name, typeinfo, direction
           @inarg = @name
         end
       end
     end
   end
 end
-

data/lib/gir_ffi/builder/argument/in_out_base.rb

@@ -4,8 +4,8 @@ module GirFFI
       # Abstract base class implementing argument processing for arguments
       # with direction :inout.
       class InOutBase < Base
-        def initialize var_gen, name, typeinfo
-          super var_gen, name, typeinfo
+        def initialize var_gen, name, typeinfo, direction
+          super var_gen, name, typeinfo, direction
           @inarg = @name
         end
 
@@ -16,6 +16,3 @@ module GirFFI
     end
   end
 end
-
-
-

data/lib/gir_ffi/builder/argument.rb

@@ -22,28 +22,22 @@ module GirFFI::Builder
   module InArgument
     def self.build var_gen, arginfo, libmodule
       type = arginfo.argument_type
-      builder_for var_gen, arginfo.name, type, libmodule
+      builder_for var_gen, arginfo.name, type, arginfo.direction, libmodule
     end
 
-    def self.builder_for var_gen, name, type, libmodule
+    def self.builder_for var_gen, name, type, direction, libmodule
       klass = case type.tag
               when :interface
                 case type.interface.info_type
                 when :callback
                   return CallbackInArgument.new var_gen, name, type, libmodule
                 else
-                  RegularInArgument
-                end
-              when :array
-                if type.array_type == :c
-                  CArrayInArgument
-                else
-                  RegularInArgument
+                  RegularArgument
                 end
               else
-                RegularInArgument
+                RegularArgument
               end
-      return klass.new var_gen, name, type
+      return klass.new var_gen, name, type, direction
     end
   end
 
@@ -51,7 +45,7 @@ module GirFFI::Builder
   # :in.
   class CallbackInArgument < Argument::InBase
     def initialize var_gen, name, type, libmodule
-      super var_gen, name, type
+      super var_gen, name, type, :in
       @libmodule = libmodule
     end
 
@@ -62,19 +56,6 @@ module GirFFI::Builder
     end
   end
 
-  # Implements argument processing for array arguments with direction :in.
-  class CArrayInArgument < Argument::InBase
-    def pre
-      pr = []
-      size = type_info.array_fixed_size
-      if size > -1
-        pr << "GirFFI::ArgHelper.check_fixed_array_size #{size}, #{@name}, \"#{@name}\""
-      end
-      pr << "#{callarg} = GirFFI::InPointer.from_array #{elm_t}, #{@name}"
-      pr
-    end
-  end
-
   # Implements argument processing for arguments with direction :in whose
   # type-specific processing is left to FFI (e.g., ints and floats, and
   # objects that implement to_ptr.).
@@ -87,38 +68,160 @@ module GirFFI::Builder
   #
   # Implements argument processing for void pointer arguments with
   # direction :in.
-  class RegularInArgument < Argument::InBase
+  #
+  # Implements argument processing for interface arguments with direction
+  # :inout (structs, objects, etc.).
+  #
+  # Implements argument processing for arguments with direction
+  # :out that are neither arrays nor 'interfaces'.
+  class RegularArgument < Argument::Base
+    def initialize var_gen, name, typeinfo, direction
+      super var_gen, name, typeinfo, direction
+      @direction = direction
+    end
+
+    def inarg
+      if has_input_value?
+        @array_arg.nil? ? @name : nil
+      end
+    end
+
+    def retname
+      if has_output_value?
+        @retname ||= @var_gen.new_var
+      end
+    end
+
     def pre
       pr = []
-      assign_array_length(pr)
-      set_function_call_argument(pr)
+      if has_input_value?
+        pr << fixed_array_size_check if needs_size_check?
+        pr << array_length_assignment if is_array_length_parameter?
+      end
+      pr << set_function_call_argument
       pr
     end
 
-    def assign_array_length(pr)
-      if @array_arg
-        arrname = @array_arg.name
-        pr << "#{@name} = #{arrname}.nil? ? 0 : #{arrname}.length"
+    def post
+      result = []
+      if has_output_value?
+        value = case @direction
+                when :inout
+                  "#{argument_class_name}.wrap(#{output_conversion_arguments})"
+                when :out
+                  "#{callarg}.to_value"
+                end
+        result << "#{retname} = #{value}"
+      end
+      result
+    end
+
+    private
+
+    def is_array_length_parameter?
+      @array_arg
+    end
+
+    def needs_size_check?
+      if type_tag == :array
+        size = type_info.array_fixed_size
+        if size > -1
+          true
+        end
       end
     end
 
-    def set_function_call_argument(pr)
-      if type_tag == :interface && [:object, :struct].include?(type_info.interface.info_type)
-        pr << "#{callarg} = #{argument_class_name}.from #{@name}"
-      elsif [:utf8, :void].include? type_tag
-        pr << "#{callarg} = #{argument_class_name}.from #{type_tag.inspect}, #{@name}"
-      elsif [:glist, :gslist, :ghash].include? type_tag
-        pr << "#{callarg} = #{argument_class_name}.from #{elm_t}, #{@name}"
+    def fixed_array_size_check
+      size = type_info.array_fixed_size
+      "GirFFI::ArgHelper.check_fixed_array_size #{size}, #{@name}, \"#{@name}\""
+    end
+
+    def has_output_value?
+      @direction == :inout || @direction == :out
+    end
+
+    def has_input_value?
+      @direction == :inout || @direction == :in
+    end
+
+    def array_length_assignment
+      arrname = @array_arg.name
+      "#{@name} = #{arrname}.nil? ? 0 : #{arrname}.length"
+    end
+
+    def set_function_call_argument
+      value = if @direction == :out
+                "GirFFI::InOutPointer.for #{type_tag.inspect}"
+              else
+                if needs_ingoing_parameter_conversion?
+                  parameter_conversion
+                else
+                  @name
+                end
+              end
+      "#{callarg} = #{value}"
+    end
+
+    def needs_outgoing_parameter_conversion?
+      case specialized_type_tag
+      when :object, :struct, :utf8, :void, :glist, :gslist, :ghash, :array, :c, :strv
+        true
+      else
+        false
+      end
+    end
+
+    def needs_ingoing_parameter_conversion?
+      case specialized_type_tag
+      when :object, :struct, :utf8, :void, :glist, :gslist, :ghash, :array, :c, :strv
+        true
+      else
+        false
+      end
+    end
+
+    def parameter_conversion
+      base = "#{argument_class_name}.from(#{parameter_conversion_arguments})"
+      if has_output_value?
+        "GirFFI::InOutPointer.from :pointer, #{base}"
       else
-        pr << "#{callarg} = #{@name}"
+        base
       end
     end
+
+    def output_conversion_arguments
+      conversion_arguments "#{callarg}.to_value"
+    end
+
+    def parameter_conversion_arguments
+      conversion_arguments @name
+    end
+
+    def conversion_arguments name
+      case specialized_type_tag
+      when :utf8, :void
+        "#{self_t}, #{name}"
+      when :glist, :gslist, :ghash, :array
+        "#{elm_t}, #{name}"
+      when :c
+        "#{type_specification}, #{name}"
+      when :strv
+        "#{name}"
+      else
+        "#{name}"
+      end
+    end
+
+    def self_t
+      type_tag.inspect
+    end
   end
 
   # Implements argument processing for arguments with direction :out.
   module OutArgument
     def self.build var_gen, arginfo, libmodule
       type = arginfo.argument_type
+      direction = arginfo.direction
       klass = case type.tag
               when :interface
                 case type.interface.info_type
@@ -139,35 +242,19 @@ module GirFFI::Builder
                   when :c
                     CArrayOutArgument
                   when :array
-                    it = PointerLikeOutArgument.new var_gen, arginfo.name, type
+                    it = PointerLikeOutArgument.new var_gen, arginfo.name, type, direction
                     it.extend WithTypedContainerPostMethod
                     return it
                   end
                 end
-              when :glist, :gslist
-                it = PointerLikeOutArgument.new var_gen, arginfo.name, type
-                it.extend WithTypedContainerPostMethod
-                return it
-              when :ghash
-                it = PointerLikeOutArgument.new var_gen, arginfo.name, type
+              when :glist, :gslist, :ghash
+                it = PointerLikeOutArgument.new var_gen, arginfo.name, type, direction
                 it.extend WithTypedContainerPostMethod
                 return it
               else
-                RegularOutArgument
+                RegularArgument
               end
-      klass.new var_gen, arginfo.name, type
-    end
-  end
-
-  # Implements argument processing for arguments with direction
-  # :out that are neither arrays nor 'interfaces'.
-  class RegularOutArgument < Argument::OutBase
-    def pre
-      [ "#{callarg} = GirFFI::InOutPointer.for #{type_tag.inspect}" ]
-    end
-
-    def post
-      [ "#{retname} = #{callarg}.to_value" ]
+      klass.new var_gen, arginfo.name, type, direction
     end
   end
 
@@ -237,13 +324,14 @@ module GirFFI::Builder
   module InOutArgument
     def self.build var_gen, arginfo, libmodule
       type = arginfo.argument_type
+      direction = arginfo.direction
       klass = case type.tag
               when :interface
                 case type.interface.info_type
                 when :enum, :flags
                   EnumInOutArgument
                 else
-                  InterfaceInOutArgument
+                  RegularArgument
                 end
               when :array
                 if type.zero_terminated?
@@ -253,27 +341,16 @@ module GirFFI::Builder
                   when :c
                     CArrayInOutArgument
                   when :array
-                    it = Argument::InOutBase.new var_gen, arginfo.name, type
-                    it.extend WithTypedContainerInOutPreMethod
-                    it.extend WithTypedContainerPostMethod
-                    return it
+                    RegularArgument
                   end
                 end
-              when :glist, :gslist
-                it = Argument::InOutBase.new var_gen, arginfo.name, type
-                it.extend WithTypedContainerInOutPreMethod
-                it.extend WithTypedContainerPostMethod
-                return it
-              when :ghash
-                it = Argument::InOutBase.new var_gen, arginfo.name, type
-                it.extend WithTypedContainerInOutPreMethod
-                it.extend WithTypedContainerPostMethod
-                return it
+              when :glist, :gslist, :ghash
+                RegularArgument
               else
                 RegularInOutArgument
               end
 
-      klass.new var_gen, arginfo.name, type
+      klass.new var_gen, arginfo.name, type, direction
     end
   end
 
@@ -291,23 +368,11 @@ module GirFFI::Builder
     end
   end
 
-  # Implements argument processing for interface arguments with direction
-  # :inout (structs, objects, etc.).
-  class InterfaceInOutArgument < Argument::InOutBase
-    def pre
-      [ "#{callarg} = GirFFI::InOutPointer.from :pointer, #{argument_class_name}.from(#{@name}).to_ptr" ]
-    end
-
-    def post
-      [ "#{retname} = #{argument_class_name}.wrap(#{callarg}.to_value)" ]
-    end
-  end
-
   # Implements argument processing for strv arguments with direction
   # :inout.
   class StrvInOutArgument < Argument::InOutBase
     def pre
-      [ "#{callarg} = GirFFI::InOutPointer.from_array #{elm_t}, #{@name}" ]
+      [ "#{callarg} = GirFFI::InOutPointer.from #{type_specification}, #{@name}" ]
     end
 
     def post
@@ -329,12 +394,6 @@ module GirFFI::Builder
     end
   end
 
-  module WithTypedContainerInOutPreMethod
-    def pre
-      [ "#{callarg} = GirFFI::InOutPointer.from :pointer, #{argument_class_name}.from(#{elm_t}, #{@name})" ]
-    end
-  end
-
   # Implements argument processing for arguments with direction
   # :inout that are neither arrays nor 'interfaces'.
   class RegularInOutArgument < Argument::InOutBase
@@ -357,24 +416,25 @@ module GirFFI::Builder
       builder_for(var_gen,
                   arginfo.name,
                   arginfo.return_type,
+                  :return,
                   arginfo.constructor?)
     end
 
-    def self.builder_for var_gen, name, type, is_constructor
+    def self.builder_for var_gen, name, type, direction, is_constructor
       if type.tag == :interface and
         [:interface, :object].include? type.interface.info_type
         klass = if is_constructor
                   ConstructorReturnValue
                 else
-                  ObjectReturnValue
+                  WrappingReturnValue
                 end
-        klass.new var_gen, name, type
+        klass.new var_gen, name, type, direction
       else
-        builder_for_field_getter var_gen, name, type
+        builder_for_field_getter var_gen, name, type, direction
       end
     end
 
-    def self.builder_for_field_getter var_gen, name, type
+    def self.builder_for_field_getter var_gen, name, type, direction
       klass = case type.tag
               when :void
                 if type.pointer?
@@ -385,33 +445,27 @@ module GirFFI::Builder
               when :interface
                 case type.interface.info_type
                 when :struct, :union, :interface, :object
-                  InterfaceReturnValue
+                  WrappingReturnValue
                 else
                   RegularReturnValue
                 end
               when :array
                 if type.zero_terminated?
-                  StrvReturnValue
+                  WrappingReturnValue
                 else
                   case type.array_type
                   when :c
                     CArrayReturnValue
                   when :array
-                    it = ReturnValue.new var_gen, name, type
+                    it = ReturnValue.new var_gen, name, type, direction
                     it.extend WithTypedContainerPostMethod
                     return it
-                  when :byte_array
-                    ByteArrayReturnValue
                   else
-                    PtrArrayReturnValue
+                    WrappingReturnValue
                   end
                 end
-              when :glist, :gslist
-                it = ReturnValue.new var_gen, name, type
-                it.extend WithTypedContainerPostMethod
-                return it
-              when :ghash
-                it = ReturnValue.new var_gen, name, type
+              when :glist, :gslist, :ghash
+                it = ReturnValue.new var_gen, name, type, direction
                 it.extend WithTypedContainerPostMethod
                 return it
               when :utf8
@@ -419,7 +473,7 @@ module GirFFI::Builder
               else
                 RegularReturnValue
               end
-      klass.new var_gen, name, type
+      klass.new var_gen, name, type, direction
     end
   end
 
@@ -447,14 +501,16 @@ module GirFFI::Builder
   # Implements argument processing for interface return values (interfaces
   # and structs, but not objects, which need special handling for
   # polymorphism and constructors).
-  class InterfaceReturnValue < ReturnValue
-    def post
-      [ "#{retname} = #{argument_class_name}.wrap(#{cvar})" ]
-    end
-  end
-
-  # Implements argument processing for object return values.
-  class ObjectReturnValue < ReturnValue
+  #
+  # Implements argument processing for object return values when the method is
+  # not a constructor.
+  #
+  # Implements argument processing for NULL-terminated string array return values.
+  #
+  # Implements argument processing for GByteArray return values.
+  #
+  # Implements argument processing for GPtrArray return values.
+  class WrappingReturnValue < ReturnValue
     def post
       [ "#{retname} = #{argument_class_name}.wrap(#{cvar})" ]
     end
@@ -476,13 +532,6 @@ module GirFFI::Builder
     end
   end
 
-  # Implements argument processing for NULL-terminated string array return values.
-  class StrvReturnValue < ReturnValue
-    def post
-      [ "#{retname} = GLib::Strv.wrap(#{cvar})" ]
-    end
-  end
-
   # Implements argument processing for UTF8 string return values.
   class Utf8ReturnValue < ReturnValue
     def post
@@ -490,20 +539,6 @@ module GirFFI::Builder
     end
   end
 
-  # Implements argument processing for GByteArray return values.
-  class ByteArrayReturnValue < ReturnValue
-    def post
-      [ "#{retname} = GLib::ByteArray.wrap(#{cvar})" ]
-    end
-  end
-
-  # Implements argument processing for GPtrArray return values.
-  class PtrArrayReturnValue < ReturnValue
-    def post
-      [ "#{retname} = GLib::PtrArray.wrap(#{cvar})" ]
-    end
-  end
-
   # Implements argument processing for other return values.
   class RegularReturnValue < ReturnValue
     def retval

data/lib/gir_ffi/builder/field.rb

@@ -45,13 +45,13 @@ module GirFFI
 
       def return_value_builder
         @rv_builder ||= ReturnValueFactory.builder_for_field_getter(
-          VariableNameGenerator.new, @info.name, @info.field_type)
+          VariableNameGenerator.new, @info.name, @info.field_type, :return)
       end
 
       def setter_builder
         type = @info.field_type
         vargen = VariableNameGenerator.new
-        Builder::InArgument.builder_for vargen, "value", type, @libmodule
+        Builder::InArgument.builder_for vargen, "value", type, :in, @libmodule
       end
     end
   end

data/lib/gir_ffi/builder/function.rb

@@ -37,7 +37,7 @@ module GirFFI::Builder
 
     def setup_error_argument vargen
       klass = @info.throws? ? ErrorArgument : NullArgument
-      @errarg = klass.new vargen, nil, nil
+      @errarg = klass.new vargen, nil, nil, :error
     end
 
     def filled_out_template

data/lib/gir_ffi/in_out_pointer.rb

@@ -26,19 +26,6 @@ module GirFFI
       ArgHelper.ptr_to_typed_array @sub_type, block, size
     end
 
-    private
-
-    def adjust_value_out value
-      case @value_type
-      when :gboolean
-        (value != 0)
-      when :utf8
-        ArgHelper.ptr_to_utf8 value
-      else
-        value
-      end
-    end
-
     def self.for type, sub_type=nil
       ffi_type = TypeMap.map_basic_type_or_string type
       ptr = AllocationHelper.safe_malloc(FFI.type_size ffi_type)
@@ -47,6 +34,11 @@ module GirFFI
     end
 
     def self.from type, value, sub_type=nil
+      if Array === type
+        arr_t, sub_t = *type
+        # TODO: Take array type into account (zero-terminated or not)
+        return self.from_array sub_t, value
+      end
       value = adjust_value_in type, value
       ffi_type = TypeMap.map_basic_type_or_string type
       ptr = AllocationHelper.safe_malloc(FFI.type_size ffi_type)
@@ -85,6 +77,20 @@ module GirFFI
         end
       end
     end
+
+    private
+
+    def adjust_value_out value
+      case @value_type
+      when :gboolean
+        (value != 0)
+      when :utf8
+        ArgHelper.ptr_to_utf8 value
+      else
+        value
+      end
+    end
+
   end
 end
 

data/lib/gir_ffi/in_pointer.rb

@@ -18,6 +18,10 @@ module GirFFI
     def self.from type, val
       return nil if val.nil?
       case type
+      when Array
+        arr_t, sub_t = *type
+        # TODO: Take array type into account (zero-terminated or not)
+        self.from_array sub_t, val
       when :utf8, :filename
         from_utf8 val
       when :gint32, :gint8

data/lib/gir_ffi/info_ext/i_registered_type_info.rb

@@ -0,0 +1,14 @@
+require 'gir_ffi/builder_helper'
+
+module GirFFI
+  module InfoExt
+    module IRegisteredTypeInfo
+      def full_type_name
+	"::#{safe_namespace}::#{name}"
+      end
+    end
+  end
+end
+
+GObjectIntrospection::IRegisteredTypeInfo.send :include, GirFFI::InfoExt::IRegisteredTypeInfo
+

data/lib/gir_ffi/info_ext/i_type_info.rb

@@ -24,6 +24,61 @@ module GirFFI
         end
       end
 
+      def element_type
+        case tag
+        when :glist, :gslist, :array
+          subtype_tag 0
+        when :ghash
+          [subtype_tag(0), subtype_tag(1)]
+        else
+          nil
+        end
+      end
+
+      def interface_type_name
+        interface.full_type_name
+      end
+
+      def type_specification
+        tag = self.tag
+        if tag == :array
+          "[#{flattened_array_type.inspect}, #{element_type.inspect}]"
+        else
+          tag.inspect
+        end
+      end
+
+      def flattened_tag
+        case tag
+        when :interface
+          interface_type
+        when :array
+          flattened_array_type
+        else
+          tag
+        end
+      end
+
+      def interface_type
+        interface.info_type
+      end
+
+      def flattened_array_type
+        if zero_terminated?
+          if element_type == :utf8
+            :strv
+          else
+            # TODO: Check that array_type == :c
+            # TODO: Perhaps distinguish :c from zero-terminated :c
+            :c
+          end
+        else
+          array_type
+        end
+      end
+
+      private
+
       def subtype_tag index
         st = param_type(index)
         tag = st.tag
@@ -38,17 +93,6 @@ module GirFFI
           return tag
         end
       end
-
-      def element_type
-        case tag
-        when :glist, :gslist, :array
-          subtype_tag 0
-        when :ghash
-          [subtype_tag(0), subtype_tag(1)]
-        else
-          nil
-        end
-      end
     end
   end
 end

data/lib/gir_ffi/version.rb

@@ -1,4 +1,4 @@
 module GirFFI
-  VERSION = "0.4.2"
+  VERSION = "0.4.3"
 end
 

data/test/gir_ffi/builder/argument/base_test.rb

@@ -9,7 +9,7 @@ describe GirFFI::Builder::Argument::Base do
 
         mock(info = Object.new).param_type(0) { subtype }
 
-        builder = GirFFI::Builder::Argument::Base.new nil, 'foo', info
+        builder = GirFFI::Builder::Argument::Base.new nil, 'foo', info, :direction
         assert_equal ":void", builder.subtype_tag_or_class_name
       end
     end
@@ -21,24 +21,21 @@ describe GirFFI::Builder::Argument::Base do
 
         mock(info = Object.new).param_type(0) { subtype }
 
-        builder = GirFFI::Builder::Argument::Base.new nil, 'bar', info
+        builder = GirFFI::Builder::Argument::Base.new nil, 'bar', info, :direction
         assert_equal ":foo", builder.subtype_tag_or_class_name
       end
     end
 
-    describe "for an array of interface class Foo::Bar" do
-      it "returns the string '::Foo::Bar'" do
-        mock(interface = Object.new).safe_namespace { "Foo" }
-        mock(interface).name { "Bar" }
-
+    describe "for an array of an interface class" do
+      it "returns the interface's full class name" do
         mock(subtype = Object.new).tag { :interface }
-        mock(subtype).interface { interface }
+        mock(subtype).interface_type_name { "-full-type-name-" }
         mock(subtype).pointer? { false }
 
         mock(info = Object.new).param_type(0) { subtype }
 
-        builder = GirFFI::Builder::Argument::Base.new nil, 'bar', info
-        assert_equal "::Foo::Bar", builder.subtype_tag_or_class_name
+        builder = GirFFI::Builder::Argument::Base.new nil, 'bar', info, :direction
+        assert_equal "-full-type-name-", builder.subtype_tag_or_class_name
       end
     end
 
@@ -49,11 +46,10 @@ describe GirFFI::Builder::Argument::Base do
 
         mock(info = Object.new).param_type(0) { subtype }
 
-        builder = GirFFI::Builder::Argument::Base.new nil, 'bar', info
+        builder = GirFFI::Builder::Argument::Base.new nil, 'bar', info, :direction
         assert_equal "[:pointer, :foo]", builder.subtype_tag_or_class_name
       end
     end
-
   end
 end
 

data/test/gir_ffi/builder/function_test.rb

@@ -38,7 +38,7 @@ describe GirFFI::Builder::Function do
       def self.test_array_gint16_in ints
         n_ints = ints.nil? ? 0 : ints.length
         _v1 = n_ints
-        _v2 = GirFFI::InPointer.from_array :gint16, ints
+        _v2 = GirFFI::InPointer.from([:c, :gint16], ints)
         _v3 = DummyLib.regress_test_array_gint16_in _v1, _v2
         return _v3
       end
@@ -56,7 +56,7 @@ describe GirFFI::Builder::Function do
       def self.test_callback_destroy_notify callback, user_data, notify
         _v1 = GirFFI::CallbackHelper.wrap_in_callback_args_mapper \"Regress\", \"TestCallbackUserData\", callback
         DummyLib::CALLBACKS << _v1
-        _v2 = GirFFI::InPointer.from :void, user_data
+        _v2 = GirFFI::InPointer.from(:void, user_data)
         _v3 = GirFFI::CallbackHelper.wrap_in_callback_args_mapper \"GLib\", \"DestroyNotify\", notify
         DummyLib::CALLBACKS << _v3
         _v4 = DummyLib.regress_test_callback_destroy_notify _v1, _v2, _v3
@@ -74,7 +74,7 @@ describe GirFFI::Builder::Function do
 
     expected = <<-CODE
       def self.new_from_file x
-        _v1 = GirFFI::InPointer.from :utf8, x
+        _v1 = GirFFI::InPointer.from(:utf8, x)
         _v2 = FFI::MemoryPointer.new(:pointer).write_pointer nil
         _v3 = DummyLib.regress_test_obj_new_from_file _v1, _v2
         GirFFI::ArgHelper.check_error(_v2)
@@ -93,7 +93,7 @@ describe GirFFI::Builder::Function do
 
     expected = <<-CODE
       def self.gvalue_in value
-        _v1 = ::GObject::Value.from value
+        _v1 = ::GObject::Value.from(value)
         DummyLib.gi_marshalling_tests_gvalue_in _v1
         
       end
@@ -109,7 +109,7 @@ describe GirFFI::Builder::Function do
 
     expected = <<-CODE
       def self.test_array_int_null_in arr
-        _v1 = GirFFI::InPointer.from_array :gint32, arr
+        _v1 = GirFFI::InPointer.from([:c, :gint32], arr)
         len = arr.nil? ? 0 : arr.length
         _v2 = len
         DummyLib.regress_test_array_int_null_in _v1, _v2

data/test/gir_ffi/builder/type/struct_test.rb

@@ -64,6 +64,7 @@ describe GirFFI::Builder::Type::Struct do
 
       stub(type = Object.new).pointer? { false }
       stub(type).tag { :gint32 }
+      stub(type).flattened_tag { :gint32 }
 
       stub(@field).field_type { type }
       stub(@field).name { "bar" }

data/test/gir_ffi/info_ext/i_type_info_test.rb

@@ -21,19 +21,6 @@ describe GirFFI::InfoExt::ITypeInfo do
     end
   end
 
-  describe "#subtype_tag" do
-    it "returns :gpointer if the param_type is a pointer with tag :void" do
-      type_info = testclass.new
-
-      stub(subtype0 = Object.new).tag { :void }
-      stub(subtype0).pointer? { true }
-
-      mock(type_info).param_type(0) { subtype0 }
-
-      assert_equal :gpointer, type_info.subtype_tag(0)
-    end
-  end
-
   describe "#element_type" do
     it "returns the element type for lists" do
       type_info = testclass.new
@@ -67,5 +54,38 @@ describe GirFFI::InfoExt::ITypeInfo do
       result = type_info.element_type
       result.must_be_nil
     end
+
+    it "returns :gpointer if the element type is a pointer with tag :void" do
+      type_info = testclass.new
+
+      stub(elm_type = Object.new).tag { :void }
+      stub(elm_type).pointer? { true }
+
+      mock(type_info).tag {:glist}
+      mock(type_info).param_type(0) { elm_type }
+
+      assert_equal :gpointer, type_info.element_type
+    end
+  end
+
+  describe "#type_specification" do
+    describe "for a simple type" do
+      it "returns the type tag" do
+	type_info = testclass.new
+	mock(type_info).tag { :uint32 }
+	type_info.type_specification.must_equal ":uint32"
+      end
+    end
+
+    describe "for a zero-terminated array" do
+      it "returns the pair [:strv, element_type]" do
+	type_info = testclass.new
+	mock(type_info).tag { :array }
+	stub(type_info).element_type { :utf8 }
+	stub(type_info).zero_terminated? { true }
+	stub(type_info).array_type { :c }
+	type_info.type_specification.must_equal "[:strv, :utf8]"
+      end
+    end
   end
 end

data/test/integration/generated_gimarshallingtests_test.rb

@@ -490,20 +490,24 @@ describe "GIMarshallingTests" do
     assert_equal [-1, 0, 1, 2], res
   end
 
-  it "has a working function #array_gvariant_(none)_in" do
-    v1 = GLib::Variant.new_int32(27)
-    v2 = GLib::Variant.new_string("Hello")
-    if GIMarshallingTests._builder.setup_method :array_gvariant_in
-      GIMarshallingTests.array_gvariant_in [v1, v2]
-    else
-      GIMarshallingTests.array_gvariant_none_in [v1, v2]
-    end
-
-    pass
-    # TODO: Can we determine that result should be an array?
-    # assert_equal 27, res[0].get_int32
-    # assert_equal "Hello", res[1].get_string
-  end
+  it "has a working function #array_gvariant_(none)_in"
+  # FIXME: Test was disabled since the implementation of the return value
+  # handling was never correct.
+  #
+  #do
+    #v1 = GLib::Variant.new_int32(27)
+    #v2 = GLib::Variant.new_string("Hello")
+    #if GIMarshallingTests._builder.setup_method :array_gvariant_in
+      #GIMarshallingTests.array_gvariant_in [v1, v2]
+    #else
+      #GIMarshallingTests.array_gvariant_none_in [v1, v2]
+    #end
+
+    #pass
+    ## TODO: Can we determine that result should be an array?
+    ## assert_equal 27, res[0].get_int32
+    ## assert_equal "Hello", res[1].get_string
+  #end
 
   it "has a working function #array_in" do
     GIMarshallingTests.array_in [-1, 0, 1, 2]

data/test/lib/Makefile.am

@@ -19,7 +19,7 @@ libgimarshallingtests_la_LDFLAGS = -module -avoid-version
 # g-i doesn't ship these as shared libraries anymore; we build them here
 Regress-1.0.gir: libregress.la Makefile
 	$(AM_V_GEN) g-ir-scanner --include=cairo-1.0 --include=Gio-2.0 \
-	--namespace=Regress --nsversion=1.0 \
+	--namespace=Regress --nsversion=1.0 --pkg=cairo-gobject \
 	--warn-all --warn-error \
 	--library=libregress.la \
 	--libtool="$(top_builddir)/libtool" \

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gir_ffi
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-22 00:00:00.000000000 Z
+date: 2012-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -150,6 +150,7 @@ files:
 - lib/gir_ffi/info_ext/i_type_info.rb
 - lib/gir_ffi/info_ext/i_field_info.rb
 - lib/gir_ffi/info_ext/i_property_info.rb
+- lib/gir_ffi/info_ext/i_registered_type_info.rb
 - lib/gir_ffi/module_base.rb
 - lib/gir_ffi/class_base.rb
 - lib/gir_ffi/object_base.rb
@@ -169,6 +170,7 @@ files:
 - lib/ffi-glib/list.rb
 - lib/ffi-glib/hash_table.rb
 - lib/ffi-glib/list_methods.rb
+- lib/ffi-glib/strv.rb
 - lib/ffi-glib/byte_array.rb
 - lib/ffi-glib/ptr_array.rb
 - lib/ffi-glib/s_list.rb