gir_ffi 0.4.0 → 0.4.1

data/lib/gir_ffi/in_pointer.rb

@@ -5,19 +5,25 @@ module GirFFI
   class InPointer < FFI::Pointer
     def self.from_array type, ary
       return nil if ary.nil?
-      return from_utf8_array ary if type == :utf8
-      return from_interface_pointer_array ary if type == :interface_pointer
-
-      return from_basic_type_array type, ary
+      case type
+      when :utf8, :filename
+        from_utf8_array ary
+      when :interface_pointer
+        from_interface_pointer_array ary
+      else
+        from_basic_type_array type, ary
+      end
     end
 
     def self.from type, val
       return nil if val.nil?
       case type
-      when :utf8
+      when :utf8, :filename
         from_utf8 val
       when :gint32, :gint8
         self.new val
+      when :void
+        ArgHelper.object_to_inptr val
       else
         raise NotImplementedError
       end

data/lib/gir_ffi/info_ext/i_type_info.rb

@@ -23,6 +23,32 @@ module GirFFI
           ffitype
         end
       end
+
+      def subtype_tag index
+        st = param_type(index)
+        tag = st.tag
+        case tag
+        when :interface
+          return :interface_pointer if st.pointer?
+          return :interface
+        when :void
+          return :gpointer if st.pointer?
+          return :void
+        else
+          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/interface_base.rb

@@ -1,10 +1,20 @@
 module GirFFI
   module InterfaceBase
+    # @deprecated Compatibility function. Remove in version 0.5.0.
     def _builder
+      gir_ffi_builder
+    end
+
+    def gir_ffi_builder
       self.const_get :GIR_FFI_BUILDER
     end
 
+    # @deprecated Compatibility function. Remove in version 0.5.0.
     def _setup_instance_method name
+      setup_instance_method name
+    end
+
+    def setup_instance_method name
       _builder.setup_instance_method name
     end
   end

data/lib/gir_ffi/module_base.rb

@@ -1,27 +1,37 @@
 module GirFFI
   module ModuleBase
     def method_missing method, *arguments, &block
-      result = _setup_method method.to_s
+      result = setup_method method.to_s
       return super unless result
       self.send method, *arguments, &block
     end
 
     def const_missing classname
-      klass = _builder.build_namespaced_class classname.to_s
+      klass = load_class classname
       return super if klass.nil?
       klass
     end
 
     def load_class classname
-      _builder.build_namespaced_class classname.to_s
+      gir_ffi_builder.build_namespaced_class classname.to_s
     end
 
+    # @deprecated Compatibility function. Remove in version 0.5.0.
     def _builder
+      gir_ffi_builder
+    end
+
+    def gir_ffi_builder
       self.const_get :GIR_FFI_BUILDER
     end
 
+    # @deprecated Compatibility function. Remove in version 0.5.0.
     def _setup_method name
-      _builder.setup_method name
+      setup_method name
+    end
+
+    def setup_method name
+      gir_ffi_builder.setup_method name
     end
   end
 end

data/lib/gir_ffi/object_base.rb

@@ -0,0 +1,39 @@
+module GirFFI
+  # Base class for all generated classes of type :object.
+  class ObjectBase < ClassBase
+    #
+    # Wraps a pointer retrieved from a constructor method. Here,
+    # it is simply defined as a wrapper around wrap, but, e.g., InitiallyUnowned
+    # overrides it to sink the floating object.
+    #
+    # @param ptr Pointer to the object's C structure
+    #
+    # @return An object of the current class wrapping the pointer
+    #
+    def self.constructor_wrap ptr
+      wrap ptr
+    end
+
+    #
+    # Find property info for the named property.
+    #
+    # @param name The property's name
+    #
+    # @return [GObjectIntrospection::IPropertyInfo] The property's info
+    #
+    def self.find_property name
+      gir_ffi_builder.find_property name
+    end
+
+    #
+    # Find signal info for the named signal.
+    #
+    # @param name The signal's name
+    #
+    # @return [GObjectIntrospection::ISignalInfo] The signal's info
+    #
+    def self.find_signal name
+      gir_ffi_builder.find_signal name
+    end
+  end
+end

data/lib/gir_ffi/type_map.rb

@@ -4,9 +4,7 @@ module GirFFI
     gtype_type = "uint#{sz}".to_sym
 
     TAG_TYPE_MAP = {
-      #FIXME: Pick one: GType or gtype.
-      :GType => :size_t,
-      :gtype => gtype_type,
+      :GType => gtype_type,
       :gboolean => :bool,
       :gunichar => :uint32,
       :gint8 => :int8,

data/lib/gir_ffi/version.rb

@@ -1,4 +1,4 @@
 module GirFFI
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end
 

data/tasks/test.rake

@@ -1,47 +1,35 @@
 require 'rake/testtask'
 
 namespace :test do
-
-  Rake::TestTask.new(:integration) do |t|
-    t.libs = ['lib']
-    t.test_files = FileList['test/integration/*_test.rb']
-    t.ruby_opts += ["-w"]
-  end
-
-  Rake::TestTask.new(:run) do |t|
-    t.libs = ['lib']
-    t.test_files = FileList['test/*_test.rb']
-    t.ruby_opts += ["-w"]
+  def define_test_task name
+    Rake::TestTask.new(name) do |t|
+      t.libs = ['lib']
+      t.ruby_opts += ["-w -Itest"]
+      yield t
+    end
   end
 
-  Rake::TestTask.new(:unit) do |t|
-    t.libs = ['lib']
-    t.test_files = FileList['test/unit/*_test.rb']
-    t.ruby_opts += ["-w"]
+  define_test_task(:base) do |t|
+    t.test_files = FileList['test/gir_ffi-base/**/*_test.rb']
   end
 
-  Rake::TestTask.new(:gobjectintrospection) do |t|
-    t.libs = ['lib']
-    t.test_files = FileList['test/ffi-gobject_introspection/*_test.rb']
-    t.ruby_opts += ["-w"]
+  define_test_task(:introspection) do |t|
+    t.test_files = FileList['test/ffi-gobject_introspection/**/*_test.rb']
   end
 
-  Rake::TestTask.new(:glib) do |t|
-    t.libs = ['lib']
-    t.test_files = FileList['test/ffi-glib/*_test.rb']
-    t.ruby_opts += ["-w"]
+  define_test_task(:main) do |t|
+    t.test_files = FileList['test/gir_ffi_test.rb',
+                            'test/gir_ffi/**/*_test.rb']
   end
 
-  Rake::TestTask.new(:gobject) do |t|
-    t.libs = ['lib']
-    t.test_files = FileList['test/ffi-gobject/*_test.rb']
-    t.ruby_opts += ["-w"]
+  define_test_task(:overrides) do |t|
+    t.test_files = FileList['test/ffi-gobject_test.rb',
+                            'test/ffi-glib/**/*_test.rb',
+                            'test/ffi-gobject/**/*_test.rb']
   end
 
-  Rake::TestTask.new(:gtk) do |t|
-    t.libs = ['lib']
-    t.test_files = FileList['test/ffi-gtk/*_test.rb']
-    t.ruby_opts += ["-w"]
+  define_test_task(:integration) do |t|
+    t.test_files = FileList['test/integration/**/*_test.rb']
   end
 
   desc 'Build Regress test library and typelib'
@@ -49,17 +37,23 @@ namespace :test do
     sh %{cd test/lib && make}
   end
 
-  task :run => :lib
-  task :unit => :lib
-  task :glib => :lib
-  task :gobject => :lib
+  task :main => :lib
+  task :overrides => :lib
   task :integration => :lib
 
-  desc 'Run rcov for the entire test suite'
-  task :coverage => :lib do
-    rm_f "coverage"
-    system "rcov", "-Ilib", "--exclude", "\.gem\/,\/gems\/", *FileList['test/**/*_test.rb']
+  desc 'Run the entire test suite as one'
+  define_test_task(:all) do |t|
+    t.test_files = FileList['test/**/*_test.rb']
   end
+
+  task :all => :lib
+
+  desc 'Run all individual test suites separately'
+  task :suites => [:base,
+                   :introspection,
+                   :main,
+                   :overrides,
+                   :integration]
 end
 
 file "test/lib/Makefile" => "test/lib/configure" do
@@ -69,8 +63,3 @@ end
 file "test/lib/configure" do
   sh %{cd test/lib && NOCONFIGURE=1 ./autogen.sh}
 end
-
-desc 'Run unit an integration tests'
-task :test => ['test:gobjectintrospection',
-  'test:unit', 'test:run', 'test:glib', 'test:gobject', 'test:gtk',
-  'test:integration']

data/test/{test_helper.rb → base_test_helper.rb}

@@ -12,23 +12,12 @@ end
 require 'minitest/spec'
 require 'minitest/autorun'
 require 'rr'
-require 'ffi'
 
 Thread.abort_on_exception = true
 
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-
-require 'ffi-gobject_introspection'
-
 class MiniTest::Unit::TestCase
   include RR::Adapters::TestUnit
 
-  def get_introspection_data namespace, name
-    gir = GObjectIntrospection::IRepository.default
-    gir.require namespace, nil
-    gir.find_by_name namespace, name
-  end
-
   def assert_nothing_raised
     yield
     assert true
@@ -85,3 +74,5 @@ class MiniTest::Spec
     alias :context :describe
   end
 end
+
+require 'gir_ffi-base'

data/test/ffi-glib/array_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../gir_ffi_test_helper.rb', File.dirname(__FILE__))
+require 'gir_ffi_test_helper'
 
 describe GLib::Array do
   it "knows its element type" do

data/test/ffi-glib/byte_array_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../gir_ffi_test_helper.rb', File.dirname(__FILE__))
+require 'gir_ffi_test_helper'
 
 describe GLib::ByteArray do
   it "can succesfully be created with Glib::ByteArray.new" do

data/test/ffi-glib/hash_table_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../gir_ffi_test_helper.rb', File.dirname(__FILE__))
+require 'gir_ffi_test_helper'
 
 describe GLib::HashTable do
   it "knows its key and value types" do
@@ -30,5 +30,34 @@ describe GLib::HashTable do
       assert_equal hsh.to_hash, hsh2.to_hash
     end
   end
+
+  it "allows key-value pairs to be inserted" do
+    h = GLib::HashTable.new :utf8, :utf8
+    h.insert "foo", "bar"
+    h.to_hash.must_equal "foo" => "bar"
+  end
+
+  it "includes Enumerable" do
+    GLib::HashTable.must_include Enumerable 
+  end
+
+  describe "a HashTable provided by the system" do
+    before do
+      GirFFI.setup :Regress
+      @hash = Regress.test_ghash_container_return
+    end
+
+    it "has a working #each method" do
+      a = {}
+      @hash.each {|k, v| a[k] = v}
+      a.must_be :==, {"foo" => "bar", "baz" => "bat",
+        "qux" => "quux"}
+    end
+
+    it "has a working #to_hash method" do
+      @hash.to_hash.must_be :==, {"foo" => "bar", "baz" => "bat",
+        "qux" => "quux"}
+    end
+  end
 end
 

data/test/ffi-glib/list_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../gir_ffi_test_helper.rb', File.dirname(__FILE__))
+require 'gir_ffi_test_helper'
 
 describe GLib::List do
   it "knows its element type" do

data/test/ffi-glib/ptr_array_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../gir_ffi_test_helper.rb', File.dirname(__FILE__))
+require 'gir_ffi_test_helper'
 
 describe GLib::PtrArray do
   it "knows its element type" do

data/test/ffi-glib/ruby_closure_test.rb

@@ -0,0 +1,54 @@
+require 'gir_ffi_test_helper'
+
+describe GObject::RubyClosure do
+  should "have a constructor with a mandatory block argument" do
+    assert_raises ArgumentError do
+      GObject::RubyClosure.new
+    end
+  end
+
+  should "be a kind of Closure" do
+    c = GObject::RubyClosure.new {}
+    assert_kind_of GObject::Closure, c
+  end
+
+  should "be able to retrieve its block from its struct" do
+    a = 0
+    c = GObject::RubyClosure.new { a = 2 }
+    c2 = GObject::RubyClosure.wrap(c.to_ptr)
+    c2.block.call
+    assert_equal 2, a
+  end
+
+  describe "its #marshaller singleton method" do
+    should "invoke its closure argument's block" do
+      a = 0
+      c = GObject::RubyClosure.new { a = 2 }
+      GObject::RubyClosure.marshaller(c, nil, 0, nil, nil, nil)
+      assert_equal 2, a
+    end
+
+    should "work when its closure argument is a GObject::Closure" 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)
+      assert_equal 2, a
+    end
+
+    should "store 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)
+      assert_equal 2, gv.ruby_value
+    end
+  end
+
+  should "have GObject::Closure#invoke call its block" do
+    a = 0
+    c = GObject::RubyClosure.new { a = 2 }
+    c2 = GObject::Closure.wrap(c.to_ptr)
+    c2.invoke nil, nil, nil
+    assert_equal 2, a
+  end
+end