gir_ffi 0.0.3 → 0.0.4

data/test/g_object_test.rb

@@ -0,0 +1,22 @@
+require File.expand_path('test_helper.rb', File.dirname(__FILE__))
+require 'gir_ffi/g_object'
+
+class GObjectTest < Test::Unit::TestCase
+  context "The GirFFI::GObject helper module" do
+    should "have type_init as a public method" do
+      assert GirFFI::GObject.respond_to?('type_init')
+    end
+
+    should "not have g_type_init as a public method" do
+      assert GirFFI::GObject.respond_to?('g_type_init') == false
+    end
+
+  end
+  context "the type_init method" do
+    should "not raise an error" do
+      assert_nothing_raised do
+	GirFFI::GObject.type_init
+      end
+    end
+  end
+end

data/test/gobject_overrides_test.rb

@@ -0,0 +1,216 @@
+require File.expand_path('test_helper.rb', File.dirname(__FILE__))
+require 'gir_ffi'
+
+class GObjectOverridesTest < Test::Unit::TestCase
+  context "The GObject module with overridden functions" do
+    setup do
+      GirFFI.setup :GObject
+      GirFFI.setup :Everything
+      GirFFI.setup :Gio
+    end
+
+    context "the wrap_in_g_value function" do
+      should "wrap a boolean false" do
+	gv = GObject.wrap_in_g_value false
+	assert_instance_of GObject::Value, gv
+	assert_equal false, gv.get_boolean
+      end
+
+      should "wrap a boolean true" do
+	gv = GObject.wrap_in_g_value true
+	assert_instance_of GObject::Value, gv
+	assert_equal true, gv.get_boolean
+      end
+    end
+
+    context "the unwrap_g_value function" do
+      should "unwrap a boolean false" do
+	gv = GObject.wrap_in_g_value false
+	result = GObject.unwrap_g_value gv
+	assert_equal false, result
+      end
+
+      should "unwrap a boolean true" do
+	gv = GObject.wrap_in_g_value true
+	result = GObject.unwrap_g_value gv
+	assert_equal true, result
+      end
+    end
+
+    context "the signal_emit function" do
+      should "emit a signal" do
+	a = 1
+	o = Everything::TestSubObj.new
+	GObject.signal_connect_data o, "test", Proc.new { a = 2 }, nil, nil, 0
+	GObject.signal_emit o, "test"
+	assert_equal 2, a
+      end
+
+      should "handle return values" do
+	s = Gio::SocketService.new
+
+	argtypes = [:pointer, :pointer, :pointer, :pointer]
+	callback = FFI::Function.new(:bool, argtypes) { |a,b,c,d| true }
+	GObject.signal_connect_data s, "incoming", callback, nil, nil, 0
+	rv = GObject.signal_emit s, "incoming"
+	assert_equal true, rv.get_boolean
+      end
+
+      should "pass in extra arguments" do
+	o = Everything::TestSubObj.new
+	sb = Everything::TestSimpleBoxedA.new
+	sb[:some_int8] = 31
+	sb[:some_double] = 2.42
+	sb[:some_enum] = :value2
+	b2 = nil
+
+	argtypes = [:pointer, :pointer, :pointer]
+	callback = FFI::Function.new(:void, argtypes) do |a,b,c|
+	  b2 = b
+	end
+	GObject.signal_connect_data o, "test-with-static-scope-arg", callback, nil, nil, 0
+	GObject.signal_emit o, "test-with-static-scope-arg", sb
+
+	sb2 = Everything::TestSimpleBoxedA.new b2
+	assert sb.equals(sb2)
+      end
+    end
+
+    context "the signal_connect function" do
+      should "install a signal handler" do
+	a = 1
+	o = Everything::TestSubObj.new
+	GObject.signal_connect(o, "test") { a = 2 }
+	GObject.signal_emit o, "test"
+	assert_equal 2, a
+      end
+
+      should "pass user data to handler" do
+	a = 1
+	o = Everything::TestSubObj.new
+	GObject.signal_connect(o, "test", 2) { |i, d| a = d }
+	GObject.signal_emit o, "test"
+	assert_equal 2, a
+      end
+
+      should "pass object to handler" do
+	o = Everything::TestSubObj.new
+	o2 = nil
+	GObject.signal_connect(o, "test") { |i, d| o2 = i }
+	GObject.signal_emit o, "test"
+	assert_instance_of Everything::TestSubObj, o2
+	assert_equal o.to_ptr, o2.to_ptr
+      end
+
+      should "not allow connecting an invalid signal" do
+	o = Everything::TestSubObj.new
+	assert_raises RuntimeError do
+	  GObject.signal_connect(o, "not-really-a-signal") {}
+	end
+      end
+
+      should "handle return values" do
+	s = Gio::SocketService.new
+	GObject.signal_connect(s, "incoming") { true }
+	rv = GObject.signal_emit s, "incoming"
+	assert_equal true, rv.get_boolean
+      end
+
+      context "connecting a signal with extra arguments" do
+	setup do
+	  @a = nil
+	  @b = 2
+
+	  o = Everything::TestSubObj.new
+	  sb = Everything::TestSimpleBoxedA.new
+
+	  GObject.signal_connect(o, "test-with-static-scope-arg", 2) { |i, object, d|
+	    @a = d
+	    @b = object
+	  }
+	  GObject.signal_emit o, "test-with-static-scope-arg"
+	end
+
+	should "move the user data argument" do
+	  assert_equal 2, @a
+	end
+
+	should "pass on the extra arguments" do
+	  assert_instance_of Everything::TestSimpleBoxedA, @b
+	end
+      end
+
+    end
+
+    context "The GObject overrides Helper module" do
+      context "#signal_arguments_to_gvalue_array" do
+	context "the result of wrapping test-with-static-scope-arg" do
+	  setup do
+	    o = Everything::TestSubObj.new
+	    b = Everything::TestSimpleBoxedA.new
+
+	    @gva =
+	      GirFFI::Overrides::GObject::Helper.signal_arguments_to_gvalue_array(
+		"test-with-static-scope-arg", o, b)
+	  end
+
+	  should "be a GObject::ValueArray" do
+	    assert_instance_of GObject::ValueArray, @gva
+	  end
+
+	  should "contain two values" do
+	    assert_equal 2, @gva[:n_values]
+	  end
+
+	  should "have a first value with GType for TestSubObj" do
+	    assert_equal Everything::TestSubObj.get_gtype, (@gva.get_nth 0)[:g_type]
+	  end
+
+	  should "have a second value with GType for TestSimpleBoxedA" do
+	    assert_equal Everything::TestSimpleBoxedA.get_gtype, (@gva.get_nth 1)[:g_type]
+	  end
+	end
+      end
+
+      context "#cast_back_signal_arguments" do
+	context "the result of casting pointers for the test-with-static-scope-arg signal" do
+	  setup do
+	    sig_name = "test-with-static-scope-arg"
+	    o = Everything::TestSubObj.new
+	    b = Everything::TestSimpleBoxedA.new
+	    ud = GirFFI::ArgHelper.object_to_inptr "Hello!"
+	    sig = o.class.gir_ffi_builder.find_signal sig_name
+
+	    @gva =
+	      GirFFI::Overrides::GObject::Helper.cast_back_signal_arguments(
+		sig, o.class, o.to_ptr, b.to_ptr, ud)
+	  end
+
+	  should "have three elements" do
+	    assert_equal 3, @gva.length
+	  end
+
+	  context "its first value" do
+	    should "be a TestSubObj" do
+	      assert_instance_of Everything::TestSubObj, @gva[0]
+	    end
+	  end
+
+	  context "its second value" do
+	    should "be a TestSimpleBoxedA" do
+	      assert_instance_of Everything::TestSimpleBoxedA, @gva[1]
+	    end
+	  end
+
+	  context "its third value" do
+	    should "be a 'Hello!'" do
+	      assert_equal "Hello!", @gva[2]
+	    end
+	  end
+	end
+      end
+    end
+  end
+end
+
+

data/test/i_object_info_test.rb

@@ -0,0 +1,21 @@
+require File.expand_path('test_helper.rb', File.dirname(__FILE__))
+require 'gir_ffi'
+
+module GirFFI
+  class IObjectInfoTest < Test::Unit::TestCase
+    context "An IObjectInfo object" do
+
+      setup do
+	gir = IRepository.default
+	gir.require 'Everything', nil
+	@info = gir.find_by_name 'Everything', 'TestObj'
+      end
+
+      should "find a vfunc by name" do
+	assert_not_nil @info.find_vfunc("matrix")
+      end
+    end
+
+  end
+end
+

data/test/module_builder_test.rb

@@ -0,0 +1,54 @@
+require File.expand_path('test_helper.rb', File.dirname(__FILE__))
+require 'gir_ffi'
+
+class ModuleBuilderTest < Test::Unit::TestCase
+  context "The ModuleBuilder" do
+    context "for Gtk" do
+      setup do
+	@mbuilder = GirFFI::ModuleBuilder.new('Gtk')
+      end
+
+      context "looking at Gtk.main" do
+	setup do
+	  @go = get_function_introspection_data 'Gtk', 'main'
+	end
+
+	should "build correct definition of Gtk.main" do
+	  code = @mbuilder.send :function_definition, @go, Lib
+	  expected = "def main\n::Lib.gtk_main\nend"
+	  assert_equal cws(expected), cws(code)
+	end
+      end
+
+      context "looking at Gtk.init" do
+	setup do
+	  @go = get_function_introspection_data 'Gtk', 'init'
+	end
+
+	should "delegate definition to FunctionDefinitionBuilder" do
+	  code = @mbuilder.send :function_definition, @go, Lib
+	  expected = GirFFI::FunctionDefinitionBuilder.new(@go, Lib).generate
+	  assert_equal cws(expected), cws(code)
+	end
+      end
+    end
+
+    context "for GObject" do
+      setup do
+	@mbuilder = GirFFI::ModuleBuilder.new('GObject')
+      end
+
+      context "looking at GObject.signal_connect_data" do
+	setup do
+	  @go = get_function_introspection_data 'GObject', 'signal_connect_data'
+	end
+
+	should "delegate definition to FunctionDefinitionBuilder" do
+	  code = @mbuilder.send :function_definition, @go, Lib
+	  expected = GirFFI::FunctionDefinitionBuilder.new(@go, Lib).generate
+	  assert_equal cws(expected), cws(code)
+	end
+      end
+    end
+  end
+end

data/test/test_helper.rb

@@ -30,13 +30,15 @@ class Test::Unit::TestCase
   end
 
   def get_function_introspection_data namespace, function
-    GirFFI::IRepository.default.require namespace, nil
-    GirFFI::Builder.send :function_introspection_data, namespace, function
+    gir = GirFFI::IRepository.default
+    gir.require namespace, nil
+    gir.find_by_name namespace, function
   end
 
   def get_method_introspection_data namespace, klass, function
-    GirFFI::IRepository.default.require namespace, nil
-    GirFFI::Builder.send :method_introspection_data, namespace, klass, function
+    gir = GirFFI::IRepository.default
+    gir.require namespace, nil
+    gir.find_by_name(namespace, klass).find_method function
   end
 
   def cleanup_module name

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gir_ffi
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: false
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Matijs van Zuijlen
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-19 00:00:00 +01:00
+date: 2010-12-14 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -87,12 +87,10 @@ files:
 - lib/gir_ffi/g_error.rb
 - lib/gir_ffi/i_object_info.rb
 - lib/gir_ffi/builder.rb
-- lib/gir_ffi/constructor_definition_builder.rb
 - lib/gir_ffi/i_enum_info.rb
-- lib/gir_ffi/base.rb
 - lib/gir_ffi/i_value_info.rb
+- lib/gir_ffi/module_base.rb
 - lib/gir_ffi/i_signal_info.rb
-- lib/gir_ffi/g_type.rb
 - lib/gir_ffi/i_callback_info.rb
 - lib/gir_ffi/lib.rb
 - lib/gir_ffi/i_property_info.rb
@@ -100,6 +98,7 @@ files:
 - lib/gir_ffi/i_repository.rb
 - lib/gir_ffi/i_vfunc_info.rb
 - lib/gir_ffi/i_constant_info.rb
+- lib/gir_ffi/class_base.rb
 - lib/gir_ffi/i_struct_info.rb
 - lib/gir_ffi/i_callable_info.rb
 - lib/gir_ffi/function_definition_builder.rb
@@ -107,25 +106,28 @@ files:
 - lib/gir_ffi/i_error_domain_info.rb
 - lib/gir_ffi/version.rb
 - lib/gir_ffi/overrides/gtk.rb
+- lib/gir_ffi/overrides/gobject.rb
 - lib/gir_ffi/allocation_helper.rb
 - lib/gir_ffi/i_base_info.rb
 - lib/gir_ffi/module_builder.rb
-- lib/gir_ffi/method_missing_definition_builder.rb
 - lib/gir_ffi/arg_helper.rb
+- lib/gir_ffi/g_object.rb
 - lib/gir_ffi/i_union_info.rb
 - lib/gir_ffi/class_builder.rb
 - lib/gir_ffi/i_interface_info.rb
 - lib/gir_ffi/i_arg_info.rb
 - lib/gir_ffi/i_type_info.rb
 - test/i_repository_test.rb
-- test/g_type_test.rb
 - test/function_definition_builder_test.rb
+- test/g_object_test.rb
 - test/arg_helper_test.rb
+- test/gobject_overrides_test.rb
+- test/class_base_test.rb
 - test/test_helper.rb
 - test/class_builder_test.rb
 - test/girffi_test.rb
-- test/constructor_definition_builder_test.rb
-- test/base_test.rb
+- test/module_builder_test.rb
+- test/i_object_info_test.rb
 - test/everything_test.rb
 - test/builder_test.rb
 - test/gtk_overrides_test.rb
@@ -183,14 +185,16 @@ specification_version: 3
 summary: Ruby-FFI-based binding of the GObject Introspection Repository
 test_files: 
 - test/arg_helper_test.rb
-- test/base_test.rb
 - test/builder_test.rb
+- test/class_base_test.rb
 - test/class_builder_test.rb
-- test/constructor_definition_builder_test.rb
 - test/everything_test.rb
 - test/function_definition_builder_test.rb
-- test/g_type_test.rb
+- test/g_object_test.rb
 - test/girffi_test.rb
+- test/gobject_overrides_test.rb
 - test/gtk_overrides_test.rb
+- test/i_object_info_test.rb
 - test/i_repository_test.rb
+- test/module_builder_test.rb
 - test/test_helper.rb

data/lib/gir_ffi/base.rb

@@ -1,25 +0,0 @@
-require 'forwardable'
-module GirFFI
-  # Base class for all generated classes. Contains code for dealing with
-  # the generated Struct classes.
-  class Base
-    extend Forwardable
-    def_delegators :@struct, :[], :[]=, :to_ptr
-
-    def initialize(*args)
-      @struct = ffi_structure.new(*args)
-    end
-
-    def ffi_structure
-      self.class.ffi_structure
-    end
-
-    class << self
-      def ffi_structure
-	self.const_get(:Struct)
-      end
-      alias_method :_real_new, :new
-      undef new
-    end
-  end
-end