gir_ffi 0.1.0 → 0.2.0

data/lib/ffi-gobject/closure.rb

@@ -1,12 +1,13 @@
 module GObject
   load_class :Closure
 
+  # Overrides for GClosure, GObject's base class for closure objects.
   class Closure
     def set_marshal marshal
-      _v1 = GirFFI::CallbackHelper.wrap_in_callback_args_mapper(
+      callback = GirFFI::CallbackHelper.wrap_in_callback_args_mapper(
         "GObject", "ClosureMarshal", marshal)
-        ::GObject::Lib::CALLBACKS << _v1
-        ::GObject::Lib.g_closure_set_marshal self, _v1
+      Lib::CALLBACKS << callback
+      Lib.g_closure_set_marshal self, callback
     end
   end
 end

data/lib/ffi-gobject/helper.rb

@@ -1,12 +1,17 @@
 module GObject
   module Helper
-    TAG_TYPE_TO_GTYPE_NAME_MAP = {
-      :utf8 => "gchararray",
-      :gboolean => "gboolean",
-      :void => "void"
-    }
+    def self.signal_callback klass, signal, &block
+      sig = klass._find_signal signal
+
+      rettype = GirFFI::Builder.itypeinfo_to_ffitype sig.return_type
+      argtypes = GirFFI::Builder.ffi_argument_types_for_signal sig
+      callback_block = Helper.signal_callback_args(sig, klass, &block)
+
+      FFI::Function.new rettype, argtypes, &callback_block
+    end
 
     def self.signal_callback_args sig, klass, &block
+      raise ArgumentError, "Block needed" if block.nil?
       return Proc.new do |*args|
         mapped = cast_back_signal_arguments sig, klass, *args
         block.call(*mapped)
@@ -35,27 +40,8 @@ module GObject
     end
 
     def self.signal_argument_to_gvalue info, arg
-      arg_type = info.argument_type
-
-      val = gvalue_for_type_info arg_type
-
-      if arg_type.tag == :interface
-        interface = arg_type.interface
-        case interface.info_type
-        when :struct
-          val.set_boxed arg
-        when :object
-          val.set_instance arg
-        when :enum
-          val.set_enum arg
-        else
-          raise NotImplementedError, interface.info_type
-        end
-      else
-        val.set_ruby_value arg
-      end
-
-      return val
+      val = gvalue_for_type_info info.argument_type
+      val.set_value arg
     end
 
     def self.gvalue_for_type_info info
@@ -66,9 +52,10 @@ module GObject
               when :void
                 return nil
               else
-                ::GObject.type_from_name(TAG_TYPE_TO_GTYPE_NAME_MAP[tag])
+                TYPE_TAG_TO_GTYPE[tag]
               end
-      ::GObject::Value.new.tap {|val| val.init gtype}
+      raise "GType not found for type info with tag #{tag}" unless gtype
+      Value.new.tap {|val| val.init gtype}
     end
 
     def self.gvalue_for_signal_return_value signal, object
@@ -80,24 +67,14 @@ module GObject
 
     # TODO: Generate cast back methods using existing Argument builders.
     def self.cast_back_signal_arguments signalinfo, klass, *args
-      result = []
+      instance = klass.wrap args.shift
+      user_data = GirFFI::ArgHelper::OBJECT_STORE[args.pop.address]
 
-      # Instance
-      instptr = args.shift
-      instance = klass.wrap instptr
-      result << instance
-
-      # Extra arguments
-      signalinfo.args.each do |info|
-        result << cast_signal_argument(info, args.shift)
+      extra_arguments = signalinfo.args.zip(args).map do |info, arg|
+        cast_signal_argument(info, arg)
       end
 
-      # User Data
-      arg = args.shift
-      arg = GirFFI::ArgHelper::OBJECT_STORE[arg.address]
-      result << arg
-
-      return result
+      return [instance, *extra_arguments].push user_data
     end
 
     def self.cast_signal_argument info, arg

data/lib/ffi-gobject/initially_unowned.rb

@@ -1,6 +1,8 @@
 module GObject
   load_class :InitiallyUnowned
 
+  # Overrides for GInitiallyUnowned, GObject's base class for objects that
+  # start with a floating reference.
   class InitiallyUnowned
     def self.constructor_wrap ptr
       super.tap {|obj| ::GObject.object_ref_sink obj}

data/lib/ffi-gobject/object.rb

@@ -0,0 +1,54 @@
+module GObject
+  load_class :Object
+
+  # Overrides for GObject, GObject's generic base class.
+  class Object
+    _setup_instance_method "get_property"
+    _setup_instance_method "set_property"
+
+    def get_property_with_override property_name
+      prop = self.class._find_property property_name
+      type = prop.property_type
+      v = Helper.gvalue_for_type_info type
+      get_property_without_override property_name, v
+
+      val = v.ruby_value
+      case type.tag
+      when :ghash
+        GLib::HashTable.wrap type.param_type(0).tag, type.param_type(1).tag,
+          val.to_ptr
+      when :glist
+        GLib::List.wrap type.param_type(0).tag, val
+      else
+        val
+      end
+    end
+
+    def set_property_with_override property_name, value
+      prop = self.class._find_property property_name
+      type = prop.property_type
+      v = Helper.gvalue_for_type_info type
+
+      case type.tag
+      when :glist
+        lst = GLib::List.from_array type.param_type(0).tag, value
+        v.set_value lst.to_ptr
+      when :ghash
+        hsh = GLib::HashTable.from_hash type.param_type(0).tag,
+          type.param_type(1).tag, value
+        v.set_value hsh.to_ptr
+      else
+        v.set_value value
+      end
+
+      set_property_without_override property_name, v
+    end
+
+    alias get_property_without_override get_property
+    alias get_property get_property_with_override
+
+    alias set_property_without_override set_property
+    alias set_property set_property_with_override
+  end
+end
+

data/lib/ffi-gobject/ruby_closure.rb

@@ -6,13 +6,21 @@ module GObject
   class RubyClosure < Closure
     BLOCK_STORE = {}
 
+    # Extend the standard GClosure layout with a field block_id to store
+    # the object_id of the associated block.
     class Struct < FFI::Struct
       layout :parent, Closure::Struct, 0,
-        :blockhash, :int64
+        :block_id, :int64
     end
 
     def block
-      self.class::BLOCK_STORE[self[:blockhash]]
+      BLOCK_STORE[@struct[:block_id]]
+    end
+
+    def block= block
+      id = block.object_id
+      BLOCK_STORE[id] = block
+      @struct[:block_id] = id
     end
 
     def invoke_block *args
@@ -21,27 +29,25 @@ module GObject
 
     def self.new &block
       raise ArgumentError unless block_given?
-      wrap(new_simple(self::Struct.size, nil).to_ptr).tap do |it|
-        h = block.object_id
-        self::BLOCK_STORE[h] = block
-        it[:blockhash] = h
-        it.set_marshal Proc.new {|*args| marshaller(*args)}
-      end
+
+      closure = wrap(new_simple(self::Struct.size, nil).to_ptr)
+      closure.block = block
+      closure.set_marshal Proc.new {|*args| marshaller(*args)}
+
+      return closure
     end
 
     def self.marshaller(closure, return_value, n_param_values,
                         param_values, invocation_hint, marshal_data)
-      rclosure = self.wrap(closure.to_ptr)
+      rclosure = wrap(closure.to_ptr)
 
-      args = []
-      n_param_values.times {|i|
-        gv = ::GObject::Value.wrap(param_values.to_ptr +
-                                   i * ::GObject::Value::Struct.size)
-        args << gv.ruby_value
+      args = n_param_values.times.map {|idx|
+        Value.wrap(param_values.to_ptr + idx * Value::Struct.size).ruby_value
       }
 
-      r = rclosure.invoke_block(*args)
-      return_value.set_ruby_value r unless return_value.nil?
+      result = rclosure.invoke_block(*args)
+
+      return_value.set_ruby_value(result) unless return_value.nil?
     end
   end
 end

data/lib/ffi-gobject/value.rb

@@ -1,21 +1,38 @@
 module GObject
   load_class :Value
 
+  # Overrides for GValue, GObject's generic value container structure.
   class Value
     def set_ruby_value val
       if current_gtype == 0
         init_for_ruby_value val
       end
 
-      case current_gtype_name
-      when "gboolean"
+      set_value val
+    end
+
+    def set_value val
+      case current_fundamental_type
+      when TYPE_BOOLEAN
         set_boolean val
-      when "gint"
+      when TYPE_INT
         set_int val
-      when "gchararray"
+      when TYPE_STRING
         set_string val
+      when TYPE_FLOAT
+        set_float val
+      when TYPE_DOUBLE
+        set_double val
+      when TYPE_BOXED
+        set_boxed val
+      when TYPE_OBJECT
+        set_instance val
+      when TYPE_POINTER
+        set_pointer val
+      when TYPE_ENUM
+        set_enum val
       else
-        nil
+        raise "Don't know how to handle #{current_gtype_name}"
       end
       self
     end
@@ -23,36 +40,54 @@ module GObject
     def init_for_ruby_value val
       case val
       when true, false
-        init ::GObject.type_from_name("gboolean")
+        init TYPE_BOOLEAN
       when Integer
-        init ::GObject.type_from_name("gint")
+        init TYPE_INT
       end
       self
     end
 
     def current_gtype
-      self[:g_type]
+      @struct[:g_type]
+    end
+
+    def current_fundamental_type
+      GObject.type_fundamental current_gtype
     end
 
     def current_gtype_name
-      ::GObject.type_name current_gtype
+      GObject.type_name current_gtype
     end
 
     def ruby_value
-      case current_gtype_name.to_sym
-      when :gboolean
+      case current_fundamental_type
+      when TYPE_BOOLEAN
         get_boolean
-      when :gint
+      when TYPE_INT
         get_int
-      when :gchararray
+      when TYPE_STRING
         get_string
-      when :GDate
-        ::GLib::Date.wrap(get_boxed)
-      when :GStrv
-        # FIXME: Extract this method to even lower level module.
-        GirFFI::ArgHelper.strv_to_utf8_array get_boxed
+      when TYPE_FLOAT
+        get_float
+      when TYPE_DOUBLE
+        get_double
+      when TYPE_OBJECT
+        get_object
+      when TYPE_BOXED
+        boxed = get_boxed
+        case current_gtype_name.to_sym
+        when :GStrv
+          # FIXME: Extract this method to even lower level module.
+          GirFFI::ArgHelper.strv_to_utf8_array boxed
+        when :GHashTable
+          GLib::HashTable.wrap :gpointer, :gpointer, boxed
+        else
+          GirFFI::ArgHelper.wrap_object_pointer_by_gtype boxed, current_gtype
+        end
+      when TYPE_POINTER
+        get_pointer
       else
-        nil
+        raise "Don't know how to handle #{current_gtype_name}"
       end
     end
 

data/lib/ffi-gobject_introspection/i_constant_info.rb

@@ -1,12 +1,28 @@
 module GObjectIntrospection
   # Wraps a GIConstantInfo struct; represents an constant.
   class IConstantInfo < IBaseInfo
-    def value
+    TYPE_TAG_TO_UNION_MEMBER = {
+      :gint32 => :v_int32,
+      :gdouble => :v_double,
+      :utf8 => :v_string
+    }
+
+    def value_union
       val = Lib::GIArgument.new
       Lib.g_constant_info_get_value @gobj, val
       return val
     end
 
+    def value
+      tag = constant_type.tag
+      val = value_union[TYPE_TAG_TO_UNION_MEMBER[tag]]
+      if RUBY_VERSION >= "1.9" and tag == :utf8
+        val.force_encoding("utf-8")
+      else
+        val
+      end
+    end
+
     def constant_type
       ITypeInfo.wrap(Lib.g_constant_info_get_type @gobj)
     end

data/lib/ffi-gobject_introspection/i_field_info.rb

@@ -17,5 +17,13 @@ module GObjectIntrospection
     def field_type
       ITypeInfo.wrap(Lib.g_field_info_get_type @gobj)
     end
+
+    def readable?
+      flags & 1 != 0
+    end
+
+    def writable?
+      flags & 2 != 0
+    end
   end
 end

data/lib/ffi-gobject_introspection/i_property_info.rb

@@ -1,7 +1,9 @@
 module GObjectIntrospection
   # Wraps a GIPropertyInfo struct.
   # Represents a property of an IObjectInfo or an IInterfaceInfo.
-  # Not implemented yet.
   class IPropertyInfo < IBaseInfo
+    def property_type
+      ITypeInfo.wrap(Lib.g_property_info_get_type @gobj)
+    end
   end
 end

data/lib/ffi-gobject_introspection/lib.rb

@@ -3,7 +3,19 @@ require 'ffi'
 module GObjectIntrospection
   module Lib
     extend FFI::Library
-    ffi_lib "girepository-1.0"
+    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
 
     # IRepository
     enum :IRepositoryLoadFlags, [:LAZY, (1<<0)]
@@ -148,7 +160,8 @@ module GObjectIntrospection
       :readable, (1 << 0),
       :writable, (1 << 1)
     ]
-    attach_function :g_field_info_get_flags, [:pointer], :IFieldInfoFlags
+    # TODO: return type is bitfield :IFieldInfoFlags
+    attach_function :g_field_info_get_flags, [:pointer], :int
     attach_function :g_field_info_get_size, [:pointer], :int
     attach_function :g_field_info_get_offset, [:pointer], :int
     attach_function :g_field_info_get_type, [:pointer], :pointer
@@ -253,5 +266,9 @@ module GObjectIntrospection
     #
     attach_function :g_constant_info_get_type, [:pointer], :pointer
     attach_function :g_constant_info_get_value, [:pointer, :pointer], :int
+
+    # IPropertyInfo
+    #
+    attach_function :g_property_info_get_type, [:pointer], :pointer
   end
 end