gir_ffi 0.0.5 → 0.0.6

data/test/function_definition_builder_test.rb

@@ -1,5 +1,4 @@
 require File.expand_path('test_helper.rb', File.dirname(__FILE__))
-require 'gir_ffi'
 
 class FunctionDefinitionBuilderTest < Test::Unit::TestCase
   context "The FunctionDefinition builder" do
@@ -48,10 +47,10 @@ class FunctionDefinitionBuilderTest < Test::Unit::TestCase
 	"def signal_connect_data instance, detailed_signal, c_handler, data, destroy_data, connect_flags
 	  _v1 = GirFFI::ArgHelper.object_to_inptr instance
 	  _v2 = GirFFI::ArgHelper.utf8_to_inptr detailed_signal
-	  _v3 = GirFFI::ArgHelper.mapped_callback_args c_handler
+	  _v3 = GirFFI::ArgHelper.wrap_in_callback_args_mapper \"GObject\", \"Callback\", c_handler
 	  ::Lib::CALLBACKS << _v3
 	  _v4 = GirFFI::ArgHelper.object_to_inptr data
-	  _v5 = GirFFI::ArgHelper.mapped_callback_args destroy_data
+	  _v5 = GirFFI::ArgHelper.wrap_in_callback_args_mapper \"GObject\", \"ClosureNotify\", destroy_data
 	  ::Lib::CALLBACKS << _v5
 	  _v6 = connect_flags
 	  _v7 = ::Lib.g_signal_connect_data _v1, _v2, _v3, _v4, _v5, _v6
@@ -73,7 +72,6 @@ class FunctionDefinitionBuilderTest < Test::Unit::TestCase
 	  _v2 = ::Lib.test_obj_new_from_file _v1, _v4
 	  GirFFI::ArgHelper.check_error(_v4)
 	  _v3 = ::Everything::TestObj.wrap(_v2)
-	  GirFFI::ArgHelper.sink_if_floating(_v3)
 	  return _v3
 	end"
 

data/test/{gobject_overrides_test.rb → g_object_overrides_test.rb}

@@ -1,5 +1,4 @@
 require File.expand_path('test_helper.rb', File.dirname(__FILE__))
-require 'gir_ffi'
 
 class GObjectOverridesTest < Test::Unit::TestCase
   context "In the GObject module with overridden functions" do

data/test/g_object_test.rb

@@ -1,5 +1,4 @@
 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

data/test/{everything_test.rb → generated_everything_test.rb}

@@ -1,16 +1,7 @@
 require File.expand_path('test_helper.rb', File.dirname(__FILE__))
-require 'gir_ffi'
 
 # Tests generated methods and functions in the Everything namespace.
-class EverythingTest < Test::Unit::TestCase
-  def ref_count object
-    GObject::Object::Struct.new(object.to_ptr)[:ref_count]
-  end
-
-  def is_floating? object
-    (GObject::Object::Struct.new(object.to_ptr)[:qdata].address & 2) == 2
-  end
-
+class GeneratedEverythingTest < Test::Unit::TestCase
   context "The generated Everything module" do
     setup do
       GirFFI.setup :Everything
@@ -117,10 +108,18 @@ class EverythingTest < Test::Unit::TestCase
 	assert_equal 623.0, rv
       end
 
-      should "have a working #static_method_callback" do
-	a = 1
-	Everything::TestObj.static_method_callback Proc.new { a = 2 }
-	assert_equal 2, a
+      context "#static_method_callback" do
+        should "work when called with a Proc" do
+          a = 1
+          Everything::TestObj.static_method_callback Proc.new { a = 2 }
+          assert_equal 2, a
+        end
+
+        should "work when called with nil" do
+          assert_nothing_raised do
+            Everything::TestObj.static_method_callback nil
+          end
+        end
       end
 
       context "an instance" do

data/test/generated_gio_test.rb

@@ -0,0 +1,32 @@
+require File.expand_path('test_helper.rb', File.dirname(__FILE__))
+
+# Tests generated methods and functions in the Gio namespace.
+class GeneratedGioTest < Test::Unit::TestCase
+  context "In the generated Gio module" do
+    setup do
+      GirFFI.setup :Gio
+    end
+
+    should "create a GFile with #file_new_from_path" do
+      assert_nothing_raised {
+	Gio.file_new_for_path('/')
+      }
+    end
+
+    context "the FileInfo class" do
+      context "an instance" do
+	setup do
+	  file = Gio.file_new_for_path('/')
+	  @fileinfo = file.query_info "*", :none, nil
+	end
+
+	should "hava a working #get_attribute_type method" do
+	  assert_nothing_raised {
+	    @fileinfo.get_attribute_type "standard::displayname"
+	  }
+	end
+      end
+    end
+  end
+end
+

data/test/generated_gtk_test.rb

@@ -0,0 +1,65 @@
+require File.expand_path('test_helper.rb', File.dirname(__FILE__))
+
+# Tests generated methods and functions in the Gtk namespace.
+class GeneratedGtkTest < Test::Unit::TestCase
+  context "In the generated Gtk module" do
+    setup do
+      GirFFI.setup :Gtk
+    end
+
+    context "a Gtk::Builder instance" do
+      setup do
+	@builder = Gtk::Builder.new
+	@spec = '
+	<interface>
+	<object class="GtkButton" id="foo">
+	<signal handler="on_button_clicked" name="clicked"/>
+	</object>
+	</interface>
+	'
+      end
+
+      should "load spec" do
+	assert_nothing_raised { @builder.add_from_string @spec, @spec.length }
+      end
+
+      context "its #get_object method" do
+	should "return objects of the proper class" do
+	  @builder.add_from_string @spec, @spec.length
+	  o = @builder.get_object "foo"
+	  assert_instance_of Gtk::Button, o
+	end
+      end
+
+      context "its #connect_signals_full method" do
+	setup do
+	  @builder.add_from_string @spec, @spec.length
+	end
+	should "pass arguments correctly" do
+	  aa = nil
+	  @builder.connect_signals_full Proc.new {|*args| aa = args}, nil
+	  b, o, sn, hn, co, f, ud = aa
+	  assert_instance_of Gtk::Builder, b
+	  assert_equal b.to_ptr, @builder.to_ptr
+	  assert_instance_of Gtk::Button, o
+	  assert_equal "clicked", sn
+	  assert_equal "on_button_clicked", hn
+	  assert_equal nil, co
+	  assert_equal :after, f
+	  assert_equal nil, ud
+	end
+      end
+    end
+
+    context "a Gtk::Window instance" do
+      setup do
+        @w = Gtk::Window.new :toplevel
+      end
+
+      should "start with a refcount of 2 (one for us, one for GTK+)" do
+        assert_equal 2, ref_count(@w)
+      end
+    end
+  end
+end
+

data/test/girffi_test.rb

@@ -1,5 +1,4 @@
 require File.expand_path('test_helper.rb', File.dirname(__FILE__))
-require 'gir_ffi'
 
 class GirFFITest < Test::Unit::TestCase
   context "GirFFI" do

data/test/gtk_overrides_test.rb

@@ -1,5 +1,4 @@
 require File.expand_path('test_helper.rb', File.dirname(__FILE__))
-require 'gir_ffi'
 
 class GtkOverridesTest < Test::Unit::TestCase
   context "The Gtk.init function" do
@@ -10,6 +9,7 @@ class GtkOverridesTest < Test::Unit::TestCase
 
     should "not take any arguments" do
       assert_raises(ArgumentError) { Gtk.init 1, ["foo"] }
+      assert_raises(ArgumentError) { Gtk.init ["foo"] }
       assert_nothing_raised { Gtk.init }
     end
 

data/test/i_object_info_test.rb

@@ -1,5 +1,4 @@
 require File.expand_path('test_helper.rb', File.dirname(__FILE__))
-require 'gir_ffi'
 
 module GirFFI
   class IObjectInfoTest < Test::Unit::TestCase

data/test/i_repository_test.rb

@@ -1,5 +1,4 @@
 require File.expand_path('test_helper.rb', File.dirname(__FILE__))
-require 'gir_ffi/i_repository'
 
 module GirFFI
   class IRepositoryTest < Test::Unit::TestCase

data/test/module_builder_test.rb

@@ -1,5 +1,4 @@
 require File.expand_path('test_helper.rb', File.dirname(__FILE__))
-require 'gir_ffi'
 
 class ModuleBuilderTest < Test::Unit::TestCase
   context "The ModuleBuilder" do

data/test/test_helper.rb

@@ -1,8 +1,11 @@
 require 'shoulda'
 require 'rr'
 require 'ffi'
+
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 
+require 'gir_ffi'
+
 if RUBY_PLATFORM == 'java'
   require 'java'
   JRuby.objectspace = true
@@ -51,4 +54,12 @@ class Test::Unit::TestCase
       Object.send(:remove_const, name)
     end
   end
+
+  def ref_count object
+    GObject::Object::Struct.new(object.to_ptr)[:ref_count]
+  end
+
+  def is_floating? object
+    (GObject::Object::Struct.new(object.to_ptr)[:qdata].address & 2) == 2
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gir_ffi
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: false
   segments: 
   - 0
   - 0
-  - 5
-  version: 0.0.5
+  - 6
+  version: 0.0.6
 platform: ruby
 authors: 
 - Matijs van Zuijlen
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-30 00:00:00 +01:00
+date: 2011-03-01 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -111,6 +111,7 @@ files:
 - lib/gir_ffi/i_base_info.rb
 - lib/gir_ffi/module_builder.rb
 - lib/gir_ffi/arg_helper.rb
+- lib/gir_ffi/argument_builder.rb
 - lib/gir_ffi/g_object.rb
 - lib/gir_ffi/i_union_info.rb
 - lib/gir_ffi/class_builder.rb
@@ -121,16 +122,18 @@ files:
 - 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/module_builder_test.rb
 - test/i_object_info_test.rb
-- test/everything_test.rb
+- test/generated_everything_test.rb
+- test/g_object_overrides_test.rb
+- test/generated_gtk_test.rb
 - test/builder_test.rb
 - test/gtk_overrides_test.rb
+- test/generated_gio_test.rb
 - tasks/test.rake
 - tasks/setup.rb
 - tasks/notes.rake
@@ -186,11 +189,13 @@ test_files:
 - test/builder_test.rb
 - test/class_base_test.rb
 - test/class_builder_test.rb
-- test/everything_test.rb
 - test/function_definition_builder_test.rb
+- test/g_object_overrides_test.rb
 - test/g_object_test.rb
+- test/generated_everything_test.rb
+- test/generated_gio_test.rb
+- test/generated_gtk_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