gir_ffi 0.0.14 → 0.1.0

data/lib/{gir_ffi → ffi-gobject_introspection}/i_signal_info.rb

@@ -1,4 +1,4 @@
-module GirFFI
+module GObjectIntrospection
   # Wraps a GISignalInfo struct.
   # Represents a signal.
   # Not implemented yet.

data/lib/{gir_ffi → ffi-gobject_introspection}/i_struct_info.rb

@@ -1,4 +1,4 @@
-module GirFFI
+module GObjectIntrospection
   # Wraps a GIStructInfo struct.
   # Represents a struct.
   class IStructInfo < IRegisteredTypeInfo

data/lib/{gir_ffi → ffi-gobject_introspection}/i_type_info.rb

@@ -1,4 +1,4 @@
-module GirFFI
+module GObjectIntrospection
   # Wraps a GITypeInfo struct.
   # Represents type information, direction, transfer etc.
   class ITypeInfo < IBaseInfo
@@ -33,7 +33,7 @@ module GirFFI
     end
 
     def name
-      raise "Should not call this for gir 0.6.5 ..."
+      raise "Should not call this for ITypeInfo"
     end
   end
 end

data/lib/{gir_ffi → ffi-gobject_introspection}/i_union_info.rb

@@ -1,4 +1,4 @@
-module GirFFI
+module GObjectIntrospection
   # Wraps a GIUnionInfo struct.
   # Represents a union.
   # Not implemented yet.

data/lib/{gir_ffi → ffi-gobject_introspection}/i_value_info.rb

@@ -1,4 +1,4 @@
-module GirFFI
+module GObjectIntrospection
   # Wraps a GIValueInfo struct.
   # Represents one of the enum values of an IEnumInfo.
   class IValueInfo < IBaseInfo

data/lib/{gir_ffi → ffi-gobject_introspection}/i_vfunc_info.rb

@@ -1,4 +1,4 @@
-module GirFFI
+module GObjectIntrospection
   # Wraps a GIVFuncInfo struct.
   # Represents a virtual function.
   class IVFuncInfo < IBaseInfo

data/lib/{gir_ffi → ffi-gobject_introspection}/lib.rb

@@ -1,6 +1,6 @@
 require 'ffi'
 
-module GirFFI
+module GObjectIntrospection
   module Lib
     extend FFI::Library
     ffi_lib "girepository-1.0"

data/lib/ffi-gtk/base.rb

@@ -0,0 +1,17 @@
+module Gtk
+  _setup_method "init"
+
+  def self.init_with_auto_argv
+    my_args = init_without_auto_argv [$0, *ARGV]
+    my_args.shift
+    ARGV.replace my_args
+  end
+  class << self
+    alias init_without_auto_argv init
+    alias init init_with_auto_argv
+  end
+end
+
+Gtk.class_eval do
+end
+

data/lib/ffi-gtk2.rb

@@ -0,0 +1,5 @@
+require 'gir_ffi'
+
+GirFFI.setup :Gtk, '2.0'
+
+require 'ffi-gtk/base'

data/lib/ffi-gtk3.rb

@@ -0,0 +1,5 @@
+require 'gir_ffi'
+
+GirFFI.setup :Gtk, '3.0'
+
+require 'ffi-gtk/base'

data/lib/gir_ffi.rb

@@ -1,12 +1,19 @@
-require 'gir_ffi/g_object'
-require 'gir_ffi/i_repository'
+require 'ffi'
+
+require 'gir_ffi/class_base'
+require 'gir_ffi/type_map'
+
+require 'ffi-gobject_introspection'
+
+require 'gir_ffi/arg_helper'
 require 'gir_ffi/builder'
 
 module GirFFI
-  GObject.type_init
-
   def self.setup module_name, version=nil
     module_name = module_name.to_s
     GirFFI::Builder.build_module module_name, version
   end
 end
+
+require 'ffi-glib'
+require 'ffi-gobject'

data/lib/gir_ffi/arg_helper.rb

@@ -53,14 +53,14 @@ module GirFFI
       if type == :utf8
         ptr_to_utf8_array ptr, size
       else
-        ffi_type = GirFFI::Builder::TAG_TYPE_MAP[type] || type
+        ffi_type = TypeMap.map_basic_type type
         ptr.send "get_array_of_#{ffi_type}", 0, size
       end
     end
 
     def self.setup_ptr_to_type_array_handler_for *types
       types.flatten.each do |type|
-        ffi_type = GirFFI::Builder::TAG_TYPE_MAP[type] || type
+        ffi_type = TypeMap.map_basic_type type
         defn =
           "def self.ptr_to_#{type}_array ptr, size
             ptr.get_array_of_#{ffi_type}(0, size)
@@ -74,7 +74,7 @@ module GirFFI
     def self.ptr_to_utf8_array ptr, size
       ptrs = ptr.read_array_of_pointer(size)
 
-      ptrs.map { |ptr| ptr_to_utf8 ptr }
+      ptrs.map { |pt| ptr_to_utf8 pt }
     end
 
     def self.ptr_to_interface_array klass, ptr, size
@@ -160,7 +160,8 @@ module GirFFI
 
     def self.check_error errpp
       errp = errpp.read_pointer
-      raise GError.new(errp)[:message] unless errp.null?
+      # FIXME: Do not depend on GError from GObjectIntrospection namespace.
+      raise GObjectIntrospection::GError.new(errp)[:message] unless errp.null?
     end
 
     def self.check_fixed_array_size size, arr, name

data/lib/gir_ffi/builder.rb

@@ -10,34 +10,12 @@ module GirFFI
   module Builder
     extend BuilderHelper
 
-    sz = FFI.type_size(:size_t) * 8
-    gtype_type = "uint#{sz}".to_sym
-
-    TAG_TYPE_MAP = {
-      :GType => :size_t,
-      :gtype => gtype_type,
-      :gboolean => :bool,
-      :gunichar => :uint32,
-      :gint8 => :int8,
-      :guint8 => :uint8,
-      :gint16 => :int16,
-      :guint16 => :uint16,
-      :gint => :int,
-      :gint32 => :int32,
-      :guint32 => :uint32,
-      :gint64 => :int64,
-      :guint64 => :uint64,
-      :gfloat => :float,
-      :gdouble => :double,
-      :void => :void
-    }
-
     def self.build_class info
       Builder::Type.build(info)
     end
 
     def self.build_by_gtype gtype
-      info = IRepository.default.find_by_gtype gtype
+      info = GObjectIntrospection::IRepository.default.find_by_gtype gtype
       if info.nil?
         Builder::Type::Unintrospectable.new(gtype).build_class
       else
@@ -100,7 +78,7 @@ module GirFFI
           :pointer
         end
       else
-        return TAG_TYPE_MAP[tag] || tag
+        return TypeMap.map_basic_type tag
       end
     end
 
@@ -111,7 +89,7 @@ module GirFFI
       if tag == :interface
         return build_class info.interface
       else
-        return TAG_TYPE_MAP[tag] || tag
+        return TypeMap.map_basic_type tag
       end
     end
 

data/lib/gir_ffi/builder/argument.rb

@@ -450,8 +450,6 @@ module GirFFI::Builder
 
   # Implements argument processing for return values.
   class ReturnValue < Argument::Base
-    attr_reader :cvar
-
     def cvar
       @cvar ||= @function_builder.new_var
     end

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

@@ -10,7 +10,7 @@ module GirFFI
         end
 
         def val_t
-          val_t = subtype_tag(1).inspect
+          subtype_tag(1).inspect
         end
       end
     end

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

@@ -7,7 +7,7 @@ module GirFFI
         private
 
         def elm_t
-          elm_t = subtype_tag.inspect
+          subtype_tag.inspect
         end
       end
     end

data/lib/gir_ffi/builder/module.rb

@@ -74,11 +74,6 @@ module GirFFI
     def setup_module
       @module.extend ModuleBase
       @module.const_set :GIR_FFI_BUILDER, self
-      begin
-        require "gir_ffi/overrides/#{@namespace.downcase}"
-        @module.class_eval "include GirFFI::Overrides::#{@namespace}"
-      rescue LoadError
-      end
     end
 
     def already_set_up
@@ -112,7 +107,7 @@ module GirFFI
 
     def gir
       unless defined? @gir
-        @gir = IRepository.default
+        @gir = GObjectIntrospection::IRepository.default
         @gir.require @namespace, @version
       end
       @gir

data/lib/gir_ffi/builder/type/unintrospectable.rb

@@ -54,7 +54,7 @@ module GirFFI
         end
 
         def gir
-          @gir ||= GirFFI::IRepository.default
+          @gir ||= GObjectIntrospection::IRepository.default
         end
       end
     end

data/lib/gir_ffi/callback_helper.rb

@@ -3,7 +3,7 @@ module GirFFI
     def self.wrap_in_callback_args_mapper namespace, name, prc
       return prc if FFI::Function === prc
       return nil if prc.nil?
-      info = IRepository.default.find_by_name namespace, name
+      info = GObjectIntrospection::IRepository.default.find_by_name namespace, name
       return Proc.new do |*args|
 	prc.call(*map_callback_args(args, info))
       end
@@ -11,25 +11,32 @@ module GirFFI
 
     def self.map_callback_args args, info
       args.zip(info.args).map { |arg, inf|
-	map_single_callback_arg arg, inf }
+	map_single_callback_arg arg, inf.argument_type }
     end
 
     # TODO: Use GirFFI::ReturnValue classes for mapping.
-    def self.map_single_callback_arg arg, info
-      case info.argument_type.tag
+    def self.map_single_callback_arg arg, type
+      case type.tag
       when :interface
-        map_interface_callback_arg arg, info
+        map_interface_callback_arg arg, type
       when :utf8
 	ArgHelper.ptr_to_utf8 arg
       when :void
         map_void_callback_arg arg
+      when :array
+	subtype = type.param_type(0)
+        if subtype.tag == :interface and arg.is_a?(FFI::Pointer)
+	  map_interface_callback_arg arg, subtype
+	else
+	  raise NotImplementedError
+	end
       else
 	arg
       end
     end
 
-    def self.map_interface_callback_arg arg, info
-      iface = info.argument_type.interface
+    def self.map_interface_callback_arg arg, type
+      iface = type.interface
       case iface.info_type
       when :object
         ArgHelper.object_pointer_to_object arg

data/lib/gir_ffi/in_out_pointer.rb

@@ -56,7 +56,7 @@ module GirFFI
         when :utf8
           :pointer
         else
-          GirFFI::Builder::TAG_TYPE_MAP[type] || type
+          TypeMap.map_basic_type type
         end
       end
 

data/lib/gir_ffi/in_pointer.rb

@@ -8,7 +8,7 @@ module GirFFI
       return from_utf8_array ary if type == :utf8
       return from_interface_pointer_array ary if type == :interface_pointer
 
-      ffi_type = GirFFI::Builder::TAG_TYPE_MAP[type] || type
+      ffi_type = TypeMap.map_basic_type type
       block = ArgHelper.allocate_array_of_type ffi_type, ary.length
       block.send "put_array_of_#{ffi_type}", 0, ary
 

data/lib/gir_ffi/module_base.rb

@@ -12,6 +12,10 @@ module GirFFI
       klass
     end
 
+    def load_class classname
+      _builder.build_namespaced_class classname.to_s
+    end
+
     def _builder
       self.const_get :GIR_FFI_BUILDER
     end

data/lib/gir_ffi/type_map.rb

@@ -0,0 +1,29 @@
+module GirFFI
+  module TypeMap
+    sz = FFI.type_size(:size_t) * 8
+    gtype_type = "uint#{sz}".to_sym
+
+    TAG_TYPE_MAP = {
+      :GType => :size_t,
+      :gtype => gtype_type,
+      :gboolean => :bool,
+      :gunichar => :uint32,
+      :gint8 => :int8,
+      :guint8 => :uint8,
+      :gint16 => :int16,
+      :guint16 => :uint16,
+      :gint => :int,
+      :gint32 => :int32,
+      :guint32 => :uint32,
+      :gint64 => :int64,
+      :guint64 => :uint64,
+      :gfloat => :float,
+      :gdouble => :double,
+      :void => :void
+    }
+
+    def self.map_basic_type type
+      TAG_TYPE_MAP[type] || type
+    end
+  end
+end

data/lib/gir_ffi/version.rb

@@ -1,4 +1,4 @@
 module GirFFI
-  VERSION = "0.0.14"
+  VERSION = "0.1.0"
 end
 

data/tasks/test.rake

@@ -20,6 +20,24 @@ namespace :test do
     t.ruby_opts += ["-w"]
   end
 
+  Rake::TestTask.new(:gobjectintrospection) do |t|
+    t.libs = ['lib']
+    t.test_files = FileList['test/ffi-gobject_introspection/*_test.rb']
+    t.ruby_opts += ["-w"]
+  end
+
+  Rake::TestTask.new(:glib) do |t|
+    t.libs = ['lib']
+    t.test_files = FileList['test/ffi-glib/*_test.rb']
+    t.ruby_opts += ["-w"]
+  end
+
+  Rake::TestTask.new(:gobject) do |t|
+    t.libs = ['lib']
+    t.test_files = FileList['test/ffi-gobject/*_test.rb']
+    t.ruby_opts += ["-w"]
+  end
+
   desc 'Build Regress test library and typelib'
   task :lib => "test/lib/Makefile" do
     sh %{cd test/lib && make}
@@ -44,4 +62,5 @@ file "test/lib/configure" do
 end
 
 desc 'Run unit an integration tests'
-task :test => ['test:unit', 'test:run', 'test:integration']
+task :test => ['test:gobjectintrospection',
+  'test:unit', 'test:run', 'test:glib', 'test:gobject', 'test:integration']

data/test/arg_helper_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('test_helper.rb', File.dirname(__FILE__))
+require File.expand_path('gir_ffi_test_helper.rb', File.dirname(__FILE__))
 
 class ArgHelperTest < MiniTest::Spec
   context "The outptr_to_utf8_array method" do
@@ -63,20 +63,17 @@ class ArgHelperTest < MiniTest::Spec
     end
   end
 
-  context "The object_pointer_to_object method" do
-    setup do
-      GirFFI.setup :Regress
-      @o = Regress::TestSubObj.new
-      @o2 = GirFFI::ArgHelper.object_pointer_to_object @o.to_ptr
-    end
+  describe "::object_pointer_to_object" do
+    it "finds the wrapping class by gtype and wraps the pointer in it" do
+      klsptr = GirFFI::InOutPointer.from :gtype, 0xdeadbeef
+      objptr = GirFFI::InOutPointer.from :pointer, klsptr
 
-    should "return an object of the correct class" do
-      assert_instance_of Regress::TestSubObj, @o2
-    end
+      object_class = Class.new
+      mock(GirFFI::Builder).build_by_gtype(0xdeadbeef) { object_class }
+      mock(object_class).wrap(objptr) { "good-result" }
 
-    should "return an object pointing to the original struct" do
-      assert_equal @o.to_ptr, @o2.to_ptr
+      r = GirFFI::ArgHelper.object_pointer_to_object objptr
+      assert_equal "good-result", r
     end
   end
-
 end