gir_ffi 0.6.6 → 0.6.7

data/lib/ffi-gobject_introspection/i_arg_info.rb

@@ -23,6 +23,10 @@ module GObjectIntrospection
       Lib.g_arg_info_may_be_null @gobj
     end
 
+    def skip?
+      Lib.g_arg_info_is_skip @gobj
+    end
+
     def ownership_transfer
       Lib.g_arg_info_get_ownership_transfer @gobj
     end

data/lib/ffi-gobject_introspection/i_base_info.rb

@@ -25,13 +25,20 @@ module GObjectIntrospection
     # of the methods returning their number and the individual elements.
     #
     # For example, given the methods +n_foos+ and +foo+(+i+), this method
-    # will create an additional method +foos+ returning all args.
+    # will create an additional method +foos+ returning all foos.
     #
     # Provide the second parameter if the plural is not trivially
     # constructed by adding +s+ to the singular.
+    #
+    # Examples:
+    #
+    #   build_array_method :fields
+    #   build_array_mehtod :properties, :property
+    #   build_array_method :get_methods
+    #
     def self.build_array_method method, single = nil
       method = method.to_s
-      single ||= method[0..-2]
+      single ||= method.to_s[0..-2]
       count = method.sub(/^(get_)?/, "\\1n_")
       self.class_eval <<-CODE
         def #{method}
@@ -42,6 +49,38 @@ module GObjectIntrospection
       CODE
     end
 
+    # This is a helper method to construct a method for finding an element, out
+    # of the methods returning their number and the individual elements.
+    #
+    # For example, given the methods +n_foos+ and +foo+(+i+), this method will
+    # create an additional method +find_foo+ returning the foo with the
+    # matching name.
+    #
+    # Optionally provide counter and fetcher methods if they cannot be
+    # trivially derived from the finder method.
+    #
+    # Examples:
+    #
+    #   build_finder_method :find_field
+    #   build_finder_method :find_property, :n_properties
+    #   build_finder_method :find_method, :get_n_methods, :get_method
+    #
+    def self.build_finder_method method, counter = nil, fetcher = nil
+      method = method.to_s
+      single = method.sub(/^find_/, "")
+      counter ||= "n_#{single}s"
+      fetcher ||= "#{single}"
+      self.class_eval <<-CODE
+        def #{method}(name)
+          (0..(#{counter} - 1)).each do |i|
+            it = #{fetcher}(i)
+            return it if it.name == name
+          end
+          nil
+        end
+      CODE
+    end
+
     def name
       Lib.g_base_info_get_name @gobj
     end
@@ -60,6 +99,7 @@ module GObjectIntrospection
 
     def container
       ptr = Lib.g_base_info_get_container @gobj
+      Lib.g_base_info_ref ptr
       IRepository.wrap_ibaseinfo_pointer ptr
     end
 

data/lib/ffi-gobject_introspection/i_callable_info.rb

@@ -9,20 +9,28 @@ module GObjectIntrospection
     def return_type
       ITypeInfo.wrap(Lib.g_callable_info_get_return_type @gobj)
     end
+
     def caller_owns
       Lib.g_callable_info_get_caller_owns @gobj
     end
+
     def may_return_null?
       Lib.g_callable_info_may_return_null @gobj
     end
+
     def n_args
       Lib.g_callable_info_get_n_args @gobj
     end
+
     def arg(index)
       IArgInfo.wrap(Lib.g_callable_info_get_arg @gobj, index)
     end
     ##
     build_array_method :args
+
+    def skip_return?
+      Lib.g_callable_info_skip_return @gobj
+    end
   end
 end
 

data/lib/ffi-gobject_introspection/i_enum_info.rb

@@ -20,10 +20,7 @@ module GObjectIntrospection
 
     ##
     build_array_method :get_methods
-
-    def find_method name
-      get_methods.find {|m| m.name == name}
-    end
+    build_finder_method :find_method, :get_n_methods, :get_method
 
     def storage_type
       Lib.g_enum_info_get_storage_type @gobj

data/lib/ffi-gobject_introspection/i_interface_info.rb

@@ -41,6 +41,7 @@ module GObjectIntrospection
     end
     ##
     build_array_method :signals
+    build_finder_method :find_signal
 
     def n_vfuncs
       Lib.g_interface_info_get_n_vfuncs @gobj

data/lib/ffi-gobject_introspection/i_object_info.rb

@@ -48,6 +48,7 @@ module GObjectIntrospection
     end
     ##
     build_array_method :properties, :property
+    build_finder_method :find_property, :n_properties
 
     def get_n_methods
       Lib.g_object_info_get_n_methods @gobj
@@ -72,6 +73,7 @@ module GObjectIntrospection
     end
     ##
     build_array_method :signals
+    build_finder_method :find_signal
 
     def n_vfuncs
       Lib.g_object_info_get_n_vfuncs @gobj

data/lib/ffi-gobject_introspection/i_repository.rb

@@ -23,7 +23,7 @@ require 'ffi-gobject_introspection/i_enum_info'
 require 'ffi-gobject_introspection/i_flags_info'
 
 module GObjectIntrospection
-  GObject::Lib::g_type_init
+  GObject.type_init
 
   # The Gobject Introspection Repository. This class is the point of
   # access to the introspection typelibs.
@@ -54,8 +54,6 @@ module GObjectIntrospection
       :unresolved => IBaseInfo
     }
 
-    POINTER_SIZE = FFI.type_size(:pointer)
-
     def initialize
       @gobj = Lib::g_irepository_get_default
     end
@@ -105,6 +103,7 @@ module GObjectIntrospection
     end
 
     def find_by_gtype gtype
+      raise ArgumentError, "Type #{gtype} is not a valid type" if gtype == 0
       ptr = Lib.g_irepository_find_by_gtype @gobj, gtype
       return wrap ptr
     end

data/lib/ffi-gobject_introspection/i_struct_info.rb

@@ -11,6 +11,7 @@ module GObjectIntrospection
 
     ##
     build_array_method :fields
+    build_finder_method :find_field
 
     def get_n_methods
       Lib.g_struct_info_get_n_methods @gobj
@@ -21,14 +22,8 @@ module GObjectIntrospection
 
     ##
     build_array_method :get_methods
-
-    def find_method(name)
-      method_map[name]
-    end
-
-    def method_map
-      @method_map ||= Hash[get_methods.map {|mthd| [mthd.name, mthd] }]
-    end
+    # There is a function g_object_info_find_method but it causes a core dump.
+    build_finder_method :find_method, :get_n_methods, :get_method
 
     def size
       Lib.g_struct_info_get_size @gobj

data/lib/ffi-gobject_introspection/lib.rb

@@ -49,6 +49,7 @@ module GObjectIntrospection
       :unresolved
     ]
 
+    attach_function :g_base_info_ref, [:pointer], :void
     attach_function :g_base_info_unref, [:pointer], :void
     attach_function :g_base_info_get_type, [:pointer], :IInfoType
     attach_function :g_base_info_get_name, [:pointer], :string
@@ -74,6 +75,7 @@ module GObjectIntrospection
     attach_function :g_callable_info_may_return_null, [:pointer], :bool
     attach_function :g_callable_info_get_n_args, [:pointer], :int
     attach_function :g_callable_info_get_arg, [:pointer, :int], :pointer
+    attach_function :g_callable_info_skip_return, [:pointer], :bool
 
     # IArgInfo
     enum :IDirection, [
@@ -93,6 +95,7 @@ module GObjectIntrospection
     attach_function :g_arg_info_is_return_value, [:pointer], :bool
     attach_function :g_arg_info_is_optional, [:pointer], :bool
     attach_function :g_arg_info_is_caller_allocates, [:pointer], :bool
+    attach_function :g_arg_info_is_skip, [:pointer], :bool
     attach_function :g_arg_info_may_be_null, [:pointer], :bool
     attach_function :g_arg_info_get_ownership_transfer, [:pointer], :ITransfer
     attach_function :g_arg_info_get_scope, [:pointer], :IScopeType

data/lib/gir_ffi-base.rb

@@ -1,6 +1,8 @@
 # This section contains code that is needed by GObjectIntrospection, but
 # belongs in modules that can only be created fully once GObjectIntrospection
 # is fully loaded.
+require 'gir_ffi-base/gir_ffi/library'
+require 'gir_ffi-base/gir_ffi/struct'
 require 'gir_ffi-base/glib/boolean'
 require 'gir_ffi-base/glib/strv'
-require 'gir_ffi-base/gobject/lib'
+require 'gir_ffi-base/gobject'

data/lib/gir_ffi-base/gir_ffi/struct.rb

@@ -0,0 +1,27 @@
+module GirFFI
+  class Struct < FFI::Struct
+    extend FFI::DataConverter
+
+    def self.native_type
+      FFI::Type::Struct.new(self)
+    end
+
+    def self.to_native value, context
+      value
+    end
+
+    def self.from_native value, context
+      value
+    end
+
+    # TODO: Find method to directly copy bytes, rather than reading and
+    # putting them.
+    def self.copy_value_to_pointer value, pointer, offset=0
+      pointer.put_bytes offset, value.to_ptr.read_bytes(size), 0, size
+    end
+
+    def self.get_value_from_pointer pointer
+      pointer.to_ptr
+    end
+  end
+end

data/lib/gir_ffi-base/glib/boolean.rb

@@ -4,7 +4,7 @@ module GLib
   # Implementation of gboolean
   class Boolean
     extend FFI::DataConverter
-    native_type :int #FFI::Type::INT
+    native_type FFI::Type::INT
 
     def self.from_native value, context
       value != 0 ? true : false
@@ -13,5 +13,17 @@ module GLib
     def self.to_native value, context
       value ? 1 : 0
     end
+
+    def self.size
+      FFI.type_size FFI::Type::INT
+    end
+
+    def self.copy_value_to_pointer value, pointer
+      pointer.put_int 0, to_native(value, nil)
+    end
+
+    def self.get_value_from_pointer pointer
+      from_native pointer.get_int(0), nil
+    end
   end
 end

data/lib/gir_ffi-base/gobject.rb

@@ -0,0 +1,7 @@
+require 'gir_ffi-base/gobject/lib'
+
+module GObject
+  def self.type_init
+    Lib::g_type_init
+  end
+end

data/lib/gir_ffi-base/gobject/lib.rb

@@ -1,5 +1,3 @@
-require 'gir_ffi-base/gir_ffi/library'
-
 module GObject
   module Lib
     extend GirFFI::Library

data/lib/gir_ffi.rb

@@ -12,8 +12,6 @@ require 'gir_ffi/in_pointer'
 require 'gir_ffi/in_out_pointer'
 require 'gir_ffi/zero_terminated'
 require 'gir_ffi/arg_helper'
-require 'gir_ffi/callback'
-require 'gir_ffi/callback_helper'
 require 'gir_ffi/builder'
 
 module GirFFI
@@ -24,7 +22,7 @@ module GirFFI
 
   def self.define_type klass, &block
     info = UserDefinedTypeInfo.new(klass, &block)
-    Builder::Type::UserDefined.new(info).build_class
+    Builders::UserDefinedBuilder.new(info).build_class
 
     klass.get_gtype
   end

data/lib/gir_ffi/arg_helper.rb

@@ -1,79 +1,13 @@
 require 'gir_ffi/allocation_helper'
-require 'gir_ffi/callback_helper'
 require 'gir_ffi/builder'
 
 module GirFFI
   module ArgHelper
     OBJECT_STORE = {}
 
-    POINTER_SIZE = FFI.type_size(:pointer)
-
-    SIMPLE_G_TYPES = [
-      :gint8, :gint16, :gint, :gint32, :gint64,
-      :guint8, :guint16, :guint32, :guint64,
-      :gfloat, :gdouble
-    ]
-
-    # FIXME: Hideous
-    # TODO: Move this implementation to InPointer
-    def self.object_to_inptr obj
-      return nil if obj.nil?
-      return obj.to_ptr if obj.respond_to? :to_ptr
-      return obj if obj.is_a? FFI::Pointer
-
-      FFI::Pointer.new(obj.object_id).tap {|ptr|
-        OBJECT_STORE[ptr.address] = obj }
-    end
-
-    def self.ptr_to_typed_array type, ptr, size
-      return [] if ptr.nil? or ptr.null?
-
-      case type
-      when Class
-        ptr_to_interface_array type, ptr, size
-      when Module
-        ptr_to_enum_array type, ptr, size
-      when Array
-        ptr_to_interface_pointer_array type[1], ptr, size
-      when :utf8
-        ptr_to_utf8_array ptr, size
-      else
-        ffi_type = TypeMap.map_basic_type type
-        ptr.send "get_array_of_#{ffi_type}", 0, size
-      end
-    end
-
-    def self.ptr_to_utf8_array ptr, size
-      ptrs = ptr.read_array_of_pointer(size)
-      ptrs.map { |pt| ptr_to_utf8 pt }
-    end
-
-    def self.ptr_to_interface_array klass, ptr, size
-      struct_size = klass::Struct.size
-      size.times.map do |idx|
-        klass.wrap(ptr + struct_size * idx)
-      end
-    end
-
-    def self.ptr_to_interface_pointer_array klass, ptr, size
-      ptrs = ptr.read_array_of_pointer(size)
-      ptrs.map do |optr|
-        klass.wrap(optr)
-      end
-    end
-
-    def self.ptr_to_enum_array enum, ptr, size
-      ptr.get_array_of_int32(0, size).map {|val| enum[val] }
-    end
-
-    if RUBY_VERSION < "1.9"
-      def self.ptr_to_utf8 ptr
-        ptr.null? ? nil : ptr.read_string
-      end
-    else
-      def self.ptr_to_utf8 ptr
-        ptr.null? ? nil : ptr.read_string.force_encoding("utf-8")
-      end
+    # @deprecated Compatibility function. Remove in 0.7.0.
+    def self.ptr_to_utf8 ptr
+      ptr.to_utf8
     end
 
     def self.ptr_to_utf8_length ptr, len
@@ -91,25 +25,10 @@ module GirFFI
       end
     end
 
-    def self.allocate_array_of_type type, length
-      AllocationHelper.safe_malloc FFI.type_size(type) * length
-    end
-
-    def self.object_pointer_to_object optr
-      gtype = GObject.type_from_instance_pointer optr
-      wrap_object_pointer_by_gtype optr, gtype
-    end
-
-    def self.wrap_object_pointer_by_gtype optr, gtype
-      return nil if optr.null?
-      klass = Builder.build_by_gtype gtype
-      klass.direct_wrap optr
-    end
-
     def self.cast_from_pointer type, it
       case type
       when :utf8, :filename
-        ptr_to_utf8 it
+        it.to_utf8
       when :gint32
         cast_pointer_to_int32 it
       else

data/lib/gir_ffi/builder.rb

@@ -1,5 +1,5 @@
-require 'gir_ffi/builder/type'
-require 'gir_ffi/builder/module'
+require 'gir_ffi/builders/type_builder'
+require 'gir_ffi/builders/module_builder'
 require 'gir_ffi/builder_helper'
 require 'gir_ffi/unintrospectable_type_info'
 
@@ -11,7 +11,7 @@ module GirFFI
     extend BuilderHelper
 
     def self.build_class info
-      Builder::Type.build(info)
+      Builders::TypeBuilder.build(info)
     end
 
     def self.build_by_gtype gtype
@@ -22,10 +22,10 @@ module GirFFI
     end
 
     def self.build_module namespace, version=nil
-      Builder::Module.new(namespace, version).generate
+      Builders::ModuleBuilder.new(namespace, version).generate
     end
 
-    # TODO: Move elsewhere, perhaps to Builder::Function.
+    # TODO: Move elsewhere, perhaps to FunctionBuilder.
     def self.attach_ffi_function lib, info
       sym = info.symbol
       return if lib.method_defined? sym