gir_ffi 0.6.7 → 0.7.0

data/lib/gir_ffi/return_value_info.rb

@@ -0,0 +1,23 @@
+module GirFFI
+  # Represents a return value with the same interface as IArgumentInfo
+  class ReturnValueInfo
+    attr_reader :argument_type
+
+    def initialize type, skip = false
+      @argument_type = type
+      @skip = skip
+    end
+
+    def skip?
+      @skip
+    end
+
+    def direction
+      :return
+    end
+
+    def name
+      nil
+    end
+  end
+end

data/lib/gir_ffi/signal_base.rb

@@ -11,8 +11,8 @@ module GirFFI
     end
 
     def wrap_in_callback_args_mapper prc
+      return if !prc
       return prc if FFI::Function === prc
-      return nil if prc.nil?
       return Proc.new do |*args|
         call_with_argument_mapping(prc, *args)
       end

data/lib/{ffi-glib → gir_ffi}/sized_array.rb

@@ -1,5 +1,4 @@
-# FIXME: SizedArray does not really belong in GLib, does it?
-module GLib
+module GirFFI
   # Class representing an array with a determined size
   class SizedArray
     include Enumerable
@@ -34,6 +33,10 @@ module GLib
       size * element_size
     end
 
+    def self.get_value_from_pointer pointer
+      pointer
+    end
+
     def self.copy_value_to_pointer value, pointer
       size = value.size_in_bytes
       pointer.put_bytes(0, value.to_ptr.read_bytes(size), 0, size)
@@ -70,14 +73,15 @@ module GLib
       private
 
       def from_sized_array size, sized_array
-        check_size(size, sized_array.size)
+        check_size size, sized_array.size
         sized_array
       end
 
-      def from_enumerable element_type, size, arr
-        check_size(size, arr.size)
+      def from_enumerable element_type, expected_size, arr
+        size = arr.size
+        check_size expected_size, size
         ptr = GirFFI::InPointer.from_array element_type, arr
-        self.wrap element_type, arr.size, ptr
+        self.wrap element_type, size, ptr
       end
 
       def check_size(expected_size, size)

data/lib/gir_ffi/struct_base.rb

@@ -1,24 +1,25 @@
+require 'gir_ffi/class_base'
+
 module GirFFI
+  # Base class for generated classes representing GLib structs.
   class StructBase < ClassBase
     extend FFI::DataConverter
-    def self.native_type
-      self::Struct.native_type
-    end
 
-    def self.to_native value, context
-      self::Struct.new(value.to_ptr)
+    def self.native_type
+      FFI::Type::Struct.new(self::Struct)
     end
 
     def self.to_ffitype
       self
     end
 
-    def self.copy_value_to_pointer value, pointer, offset=0
-      self::Struct.copy_value_to_pointer value, pointer, offset
+    def self.get_value_from_pointer pointer
+      pointer.to_ptr
     end
 
-    def self.get_value_from_pointer pointer
-      self::Struct.get_value_from_pointer pointer
+    def self.copy_value_to_pointer value, pointer, offset=0
+      size = self::Struct.size
+      pointer.put_bytes offset, value.to_ptr.read_bytes(size), 0, size
     end
   end
 end

data/lib/gir_ffi/type_base.rb

@@ -1,4 +1,5 @@
 module GirFFI
+  # Base module for all generated GLib types.
   module TypeBase
     def gir_ffi_builder
       self.const_get :GIR_FFI_BUILDER

data/lib/gir_ffi/type_map.rb

@@ -1,3 +1,5 @@
+require 'gir_ffi/sized_array'
+
 module GirFFI
   module TypeMap
     sz = FFI.type_size(:size_t) * 8
@@ -15,6 +17,7 @@ module GirFFI
       :error => :pointer,
       :ptr_array => :pointer,
       :array => :pointer,
+      :c => GirFFI::SizedArray,
       :utf8 => :pointer,
       :GType => gtype_type,
       :gboolean => GLib::Boolean,

data/lib/gir_ffi/unintrospectable_type_info.rb

@@ -21,10 +21,13 @@ module GirFFI
     end
 
     def parent
-      parent_gtype = @gobject.type_parent(@g_type)
       @gir.find_by_gtype(parent_gtype) || self.class.new(parent_gtype, @gir, @gobject)
     end
 
+    def parent_gtype
+      @parent_gtype ||= @gobject.type_parent @g_type
+    end
+
     def namespace
       parent.namespace
     end

data/lib/gir_ffi/union_base.rb

@@ -1,24 +1,7 @@
-module GirFFI
-  class UnionBase < ClassBase
-    extend FFI::DataConverter
-
-    def self.native_type
-      FFI::Type::Struct.new(self::Struct)
-    end
-
-    def self.to_ffitype
-      self
-    end
+require 'gir_ffi/struct_base'
 
-    # FIXME: Duplicate of GirFFI::Struct
-    def self.get_value_from_pointer pointer
-      pointer.to_ptr
-    end
-
-    # FIXME: Duplicate of GirFFI::Struct
-    def self.copy_value_to_pointer value, pointer, offset=0
-      size = self::Struct.size
-      pointer.put_bytes offset, value.to_ptr.read_bytes(size), 0, size
-    end
+module GirFFI
+  # Base class for generated classes representing GLib unions.
+  class UnionBase < StructBase
   end
 end

data/lib/gir_ffi/user_data_argument_info.rb

@@ -0,0 +1,21 @@
+# Class to represent the info for the user data argument of a signal handler.
+# Implements the necessary parts of IArgumentInfo's interface.
+class GirFFI::UserDataArgumentInfo
+  attr_reader :argument_type
+
+  def initialize type
+    @argument_type = type
+  end
+
+  def direction
+    :in
+  end
+
+  def skip?
+    false
+  end
+
+  def name
+    "_user_data"
+  end
+end

data/lib/gir_ffi/user_data_type_info.rb

@@ -0,0 +1,17 @@
+require 'gir_ffi/info_ext/i_type_info'
+
+class GirFFI::UserDataTypeInfo
+  include GirFFI::InfoExt::ITypeInfo
+
+  def tag
+    :void
+  end
+
+  def pointer?
+    true
+  end
+
+  def array_length
+    -1
+  end
+end

data/lib/gir_ffi/user_defined_type_info.rb

@@ -1,13 +1,17 @@
 require 'gir_ffi/user_defined_property_info'
+require 'gir_ffi/vfunc_implementation'
 
 module GirFFI
   # Represents a user defined type, conforming, as needed, to the interface of
   # GObjectIntrospection::IObjectInfo.
   class UserDefinedTypeInfo
-    def initialize klass, &block
+    attr_reader :properties, :vfunc_implementations
+
+    def initialize klass
       @klass = klass
       @properties = []
-      self.instance_eval(&block) if block
+      @vfunc_implementations = []
+      yield self if block_given?
     end
 
     def described_class
@@ -18,8 +22,18 @@ module GirFFI
       @properties << UserDefinedPropertyInfo.new(property)
     end
 
-    def properties
-      @properties
+    def install_vfunc_implementation name, implementation
+      @vfunc_implementations << VFuncImplementation.new(name, implementation)
+    end
+
+    def find_instance_method _method
+      nil
+    end
+
+    attr_writer :g_name
+
+    def g_name
+      @g_name ||= @klass.name
     end
   end
 end

data/lib/gir_ffi/version.rb

@@ -1,3 +1,3 @@
 module GirFFI
-  VERSION = "0.6.7"
+  VERSION = "0.7.0"
 end

data/lib/gir_ffi/vfunc_base.rb

@@ -0,0 +1,8 @@
+require 'gir_ffi/callback_base'
+
+module GirFFI
+  # Base class for virtual methods (vfuncs).
+  class VFuncBase < CallbackBase
+  end
+end
+

data/lib/gir_ffi/vfunc_implementation.rb

@@ -0,0 +1,11 @@
+module GirFFI
+  # Simple wrapper class to represent the implementation of a VFunc.
+  class VFuncImplementation
+    attr_reader :name, :implementation
+
+    def initialize name, implementation
+      @name = name
+      @implementation = implementation
+    end
+  end
+end

data/lib/gir_ffi/zero_terminated.rb

@@ -27,10 +27,7 @@ module GirFFI
       offset = 0
       while val = read_value(offset)
         offset += FFI.type_size(ffi_type)
-        if complex_element_type?
-          val = element_class.wrap val
-        end
-        yield val
+        yield wrap_value(val)
       end
     end
 
@@ -41,39 +38,36 @@ module GirFFI
     private
 
     def read_value offset
-      val = @ptr.send("get_#{ffi_type}", offset)
-      return val unless is_null_value(val)
+      val = @ptr.send(getter_method, offset)
+      return val unless is_null_value?(val)
     end
 
-    def ffi_type
-      @ffi_type ||= TypeMap.type_specification_to_ffitype basic_element_type
-    end
-
-    def complex_element_type?
-      Array === element_type
+    def getter_method
+      @getter_method ||= "get_#{ffi_type}"
     end
 
-    def basic_element_type
-      if complex_element_type?
-        element_type.first
+    def wrap_value(val)
+      case element_type
+      when Array
+        element_type.last.wrap val
+      when Class
+        element_type.wrap val
       else
-        element_type
+        val
       end
     end
 
-    def is_null_value value
-      if basic_element_type == :pointer
+    def ffi_type
+      @ffi_type ||= TypeMap.type_specification_to_ffitype element_type
+    end
+
+    def is_null_value? value
+      if ffi_type == :pointer
         value.null?
       else
         value == 0
       end
     end
-
-    def element_class
-      if complex_element_type?
-        element_type.last
-      end
-    end
   end
 end
 

data/test/base_test_helper.rb

@@ -2,11 +2,12 @@ if RUBY_PLATFORM == 'java'
   require 'rubygems'
 end
 
-if RUBY_VERSION >= "1.9"
+begin
   require 'simplecov'
   SimpleCov.start do
     add_filter "/test/"
   end
+rescue LoadError
 end
 
 require 'minitest/autorun'
@@ -37,8 +38,6 @@ end
 Thread.abort_on_exception = true
 
 class Minitest::Test
-  include RR::Adapters::TestUnit
-
   def assert_defines_singleton_method klass, method, msg = nil
     method = method.to_sym
     methods = klass.singleton_methods(false).map { |name| name.to_sym }

data/test/ffi-glib/array_test.rb

@@ -70,18 +70,18 @@ describe GLib::Array do
   describe ".from" do
     it "creates a GArray from an array of :gint32" do
       arr = GLib::Array.from :gint32, [3, 2, 1]
-      arr.data.read_array_of_int32(3).must_equal [3, 2, 1]
+      arr.data_ptr.read_array_of_int32(3).must_equal [3, 2, 1]
     end
 
     it "creates a GArray from an array of :gboolean" do
       arr = GLib::Array.from :gboolean, [true, false, true]
-      arr.data.read_array_of_int(3).must_equal [1, 0, 1]
+      arr.data_ptr.read_array_of_int(3).must_equal [1, 0, 1]
     end
 
     it "return its argument if given a GArray" do
       arr = GLib::Array.new :gint32
       arr.append_vals [3, 2, 1]
-      arr2 = GLib::Array.from :foo, arr
+      arr2 = GLib::Array.from :gint32, arr
       assert arr2.equal? arr
     end
 

data/test/ffi-glib/ruby_closure_test.rb

@@ -24,7 +24,7 @@ describe GObject::RubyClosure do
     it "invokes its closure argument's block" do
       a = 0
       c = GObject::RubyClosure.new { a = 2 }
-      GObject::RubyClosure.marshaller(c, nil, 0, nil, nil, nil)
+      GObject::RubyClosure.marshaller(c, nil, nil, nil, nil)
       assert_equal 2, a
     end
 
@@ -32,14 +32,14 @@ describe GObject::RubyClosure do
       a = 0
       c = GObject::RubyClosure.new { a = 2 }
       c2 = GObject::Closure.wrap(c.to_ptr)
-      GObject::RubyClosure.marshaller(c2, nil, 0, nil, nil, nil)
+      GObject::RubyClosure.marshaller(c2, nil, nil, nil, nil)
       assert_equal 2, a
     end
 
     it "stores the closure's return value in the proper gvalue" do
       c = GObject::RubyClosure.new { 2 }
       gv = GObject::Value.new
-      GObject::RubyClosure.marshaller(c, gv, 0, nil, nil, nil)
+      GObject::RubyClosure.marshaller(c, gv, nil, nil, nil)
       assert_equal 2, gv.get_value
     end
   end

data/test/ffi-gobject/value_test.rb

@@ -1,6 +1,6 @@
 require 'gir_ffi_test_helper'
 
-require 'ffi-gobject'
+GirFFI.setup :Regress
 
 describe GObject::Value do
   describe "::Struct" do
@@ -128,6 +128,20 @@ describe GObject::Value do
       gv.get_value.must_equal value
     end
 
+    it "unwraps an enum value" do
+      value = :value2
+      gv = GObject::Value.for_g_type Regress::TestEnum.get_gtype
+      gv.set_enum Regress::TestEnum[value]
+      gv.get_value.must_equal value
+    end
+
+    it "unwraps a flags value" do
+      value = Regress::TestFlags[:flag1] | Regress::TestFlags[:flag3]
+      gv = GObject::Value.for_g_type Regress::TestFlags.get_gtype
+      gv.set_flags value
+      gv.get_value.must_equal value
+    end
+
     it "unwraps a GType" do
       value = GObject::TYPE_STRING
       gv = GObject::Value.for_g_type GObject::TYPE_GTYPE