gir_ffi 0.1.0 → 0.2.0

data/test/ffi-gobject/g_object_overrides_test.rb

@@ -30,9 +30,9 @@ class GObjectOverridesTest < MiniTest::Spec
       should "pass in extra arguments" do
 	o = Regress::TestSubObj.new
 	sb = Regress::TestSimpleBoxedA.new
-	sb[:some_int8] = 31
-	sb[:some_double] = 2.42
-	sb[:some_enum] = :value2
+	sb.some_int8 = 31
+	sb.some_double = 2.42
+	sb.some_enum = :value2
 	b2 = nil
 
 	argtypes = [:pointer, :pointer, :pointer]
@@ -101,7 +101,7 @@ class GObjectOverridesTest < MiniTest::Spec
 
 	  o = Regress::TestSubObj.new
 	  sb = Regress::TestSimpleBoxedA.new
-	  sb[:some_int] = 23
+	  sb.some_int = 23
 
 	  GObject.signal_connect(o, "test-with-static-scope-arg", 2) { |i, object, d|
 	    @a = d
@@ -116,7 +116,7 @@ class GObjectOverridesTest < MiniTest::Spec
 
 	should "pass on the extra arguments" do
 	  assert_instance_of Regress::TestSimpleBoxedA, @b
-	  assert_equal 23, @b[:some_int]
+	  assert_equal 23, @b.some_int
 	end
       end
 
@@ -139,15 +139,15 @@ class GObjectOverridesTest < MiniTest::Spec
 	  end
 
 	  should "contain two values" do
-	    assert_equal 2, @gva[:n_values]
+	    assert_equal 2, @gva.n_values
 	  end
 
 	  should "have a first value with GType for TestSubObj" do
-	    assert_equal Regress::TestSubObj.get_gtype, (@gva.get_nth 0)[:g_type]
+	    assert_equal Regress::TestSubObj.get_gtype, (@gva.get_nth 0).current_gtype
 	  end
 
 	  should "have a second value with GType for TestSimpleBoxedA" do
-	    assert_equal Regress::TestSimpleBoxedA.get_gtype, (@gva.get_nth 1)[:g_type]
+	    assert_equal Regress::TestSimpleBoxedA.get_gtype, (@gva.get_nth 1).current_gtype
 	  end
 	end
       end

data/test/ffi-gobject/gobject_test.rb

@@ -18,5 +18,31 @@ describe GObject do
       end
     end
   end
+
+  it "has constants for the fundamental GTypes" do
+    assert_equal GObject.type_from_name("invalid"), GObject::TYPE_INVALID
+    assert_equal GObject.type_from_name("void"), GObject::TYPE_NONE
+    assert_equal GObject.type_from_name("GInterface"), GObject::TYPE_INTERFACE
+    assert_equal GObject.type_from_name("gchar"), GObject::TYPE_CHAR
+    assert_equal GObject.type_from_name("guchar"), GObject::TYPE_UCHAR
+    assert_equal GObject.type_from_name("gboolean"), GObject::TYPE_BOOLEAN
+    assert_equal GObject.type_from_name("gint"), GObject::TYPE_INT
+    assert_equal GObject.type_from_name("guint"), GObject::TYPE_UINT
+    assert_equal GObject.type_from_name("glong"), GObject::TYPE_LONG
+    assert_equal GObject.type_from_name("gulong"), GObject::TYPE_ULONG
+    assert_equal GObject.type_from_name("gint64"), GObject::TYPE_INT64
+    assert_equal GObject.type_from_name("guint64"), GObject::TYPE_UINT64
+    assert_equal GObject.type_from_name("GEnum"), GObject::TYPE_ENUM
+    assert_equal GObject.type_from_name("GFlags"), GObject::TYPE_FLAGS
+    assert_equal GObject.type_from_name("gfloat"), GObject::TYPE_FLOAT
+    assert_equal GObject.type_from_name("gdouble"), GObject::TYPE_DOUBLE
+    assert_equal GObject.type_from_name("gchararray"), GObject::TYPE_STRING
+    assert_equal GObject.type_from_name("gpointer"), GObject::TYPE_POINTER
+    assert_equal GObject.type_from_name("GBoxed"), GObject::TYPE_BOXED
+    assert_equal GObject.type_from_name("GParam"), GObject::TYPE_PARAM
+    assert_equal GObject.type_from_name("GObject"), GObject::TYPE_OBJECT
+    assert_equal GObject.type_from_name("GType"), GObject::TYPE_GTYPE
+    assert_equal GObject.type_from_name("GVariant"), GObject::TYPE_VARIANT
+  end
 end
 

data/test/ffi-gobject/object_test.rb

@@ -0,0 +1,12 @@
+require File.expand_path('../gir_ffi_test_helper.rb', File.dirname(__FILE__))
+
+require 'ffi-gobject'
+
+describe GObject::Object do
+  describe "#get_property" do
+    it "is overridden to have arity 1" do
+      assert_equal 1,
+        GObject::Object.instance_method("get_property").arity
+    end
+  end
+end

data/test/ffi-gobject_introspection/i_constant_info_test.rb

@@ -11,7 +11,11 @@ describe GObjectIntrospection::IConstantInfo do
     end
 
     it "returns a value union with member :v_int32 with value 1" do
-      assert_equal 1, @info.value[:v_int32]
+      assert_equal 1, @info.value_union[:v_int32]
+    end
+
+    it "returns 1 as its value" do
+      assert_equal 1, @info.value
     end
   end
 end

data/test/ffi-gobject_introspection/lib_test.rb

@@ -0,0 +1,56 @@
+require File.expand_path('../test_helper.rb', File.dirname(__FILE__))
+
+describe "loading the shared library" do
+  before do
+    # Avoid cluttering the error stream with method redefinition warnings.
+    stub(GObjectIntrospection::Lib).attach_function { }
+  end
+
+  describe "with ABI version 0 installed" do
+    before do
+      stub(GObjectIntrospection::Lib).ffi_lib("girepository-1.0.so.1") { raise LoadError }
+      stub(GObjectIntrospection::Lib).ffi_lib("girepository-1.0.so.0") { }
+      stub(GObjectIntrospection::Lib).ffi_lib("girepository-1.0") { raise "not expected" }
+    end
+
+    it "prints a warning message" do
+      _, err = capture_io do
+        load 'ffi-gobject_introspection/lib.rb'
+      end
+
+      assert_match(/not supported/, err)
+    end
+  end
+
+  describe "with ABI version 1 installed" do
+    before do
+      stub(GObjectIntrospection::Lib).ffi_lib("girepository-1.0.so.0") { raise LoadError }
+      stub(GObjectIntrospection::Lib).ffi_lib("girepository-1.0.so.1") { }
+      stub(GObjectIntrospection::Lib).ffi_lib("girepository-1.0") { raise "not expected" }
+    end
+
+    it "does not print a warning message" do
+      _, err = capture_io do
+        load 'ffi-gobject_introspection/lib.rb'
+      end
+
+      assert_equal "", err
+    end
+  end
+
+  describe "without being able to determine the ABI version" do
+    before do
+      stub(GObjectIntrospection::Lib).ffi_lib("girepository-1.0.so.0") { raise LoadError }
+      stub(GObjectIntrospection::Lib).ffi_lib("girepository-1.0.so.1") { raise LoadError }
+      stub(GObjectIntrospection::Lib).ffi_lib("girepository-1.0") { }
+    end
+
+    it "prints a warning message" do
+      _, err = capture_io do
+        load 'ffi-gobject_introspection/lib.rb'
+      end
+
+      assert_match(/not supported/, err)
+    end
+  end
+end

data/test/integration/generated_gimarshallingtests_test.rb

@@ -3,12 +3,10 @@ require File.expand_path('../gir_ffi_test_helper.rb', File.dirname(__FILE__))
 
 require 'gir_ffi'
 
+GirFFI.setup :GIMarshallingTests
+
 # Tests generated methods and functions in the GIMarshallingTests namespace.
 describe "GIMarshallingTests" do
-  before do
-    GirFFI.setup :GIMarshallingTests
-  end
-
   describe "BoxedStruct" do
     it "is created with #new" do
       bx = GIMarshallingTests::BoxedStruct.new
@@ -18,7 +16,7 @@ describe "GIMarshallingTests" do
     describe "an instance" do
       before do
         @bx = GIMarshallingTests::BoxedStruct.new
-        @bx[:long_] = 42
+        @bx.long_ = 42
       end
 
       it "has a working method #inv" do
@@ -26,15 +24,38 @@ describe "GIMarshallingTests" do
         pass
       end
 
-      it "has a field :long_" do
-        assert_equal 42, @bx[:long_]
+      it "has a writable field long_" do
+        assert_equal 42, @bx.long_
+        @bx.long_ = 43
+        assert_equal 43, @bx.long_
       end
 
-      # TODO: More friendly access to array fields.
-      it "has a field :g_strv" do
-        assert @bx[:g_strv].null?
+      it "has a writable field g_strv" do
+        assert_equal [], @bx.g_strv
+        @bx.g_strv = ["foo", "bar"]
+        assert_equal ["foo", "bar"], @bx.g_strv
       end
     end
+
+    it "has a working function #inout" do
+      bx = GIMarshallingTests::BoxedStruct.new
+      bx.long_ = 42
+
+      res = GIMarshallingTests::BoxedStruct.inout bx
+      assert_equal 42, bx.long_
+      assert_equal 0, res.long_
+    end
+
+    it "has a working function #out" do
+      res = GIMarshallingTests::BoxedStruct.out
+      assert_equal 42, res.long_
+    end
+
+    it "has a working function #returnv" do
+      res = GIMarshallingTests::BoxedStruct.returnv
+      assert_equal 42, res.long_
+      assert_equal ["0", "1", "2"], res.g_strv
+    end
   end
 
   it "has the constant CONSTANT_GERROR_CODE" do
@@ -90,9 +111,8 @@ describe "GIMarshallingTests" do
   describe "NestedStruct" do
     it "contains a SimpleStruct" do
       ns = GIMarshallingTests::NestedStruct.new
-      # FIXME: Make it an instance of SimpleStruct
-      assert_instance_of GIMarshallingTests::SimpleStruct::Struct,
-        ns[:simple_struct]
+      assert_instance_of GIMarshallingTests::SimpleStruct,
+        ns.simple_struct
     end
   end
 
@@ -116,7 +136,7 @@ describe "GIMarshallingTests" do
     it "creates instances with #new" do
       ob = GIMarshallingTests::Object.new 42
       assert_instance_of GIMarshallingTests::Object, ob
-      assert_equal 42, ob[:int_]
+      assert_equal 42, ob.int_
     end
 
     it "has a working function #full_inout" do
@@ -176,7 +196,7 @@ describe "GIMarshallingTests" do
 
       it "has a working virtual method #method_with_default_implementation" do
         @obj.method_with_default_implementation 104
-        assert_equal 104, @obj[:int_]
+        assert_equal 104, @obj.int_
       end
 
       # This function is only found in the header
@@ -216,20 +236,26 @@ describe "GIMarshallingTests" do
         pass
       end
 
+      it "has a property 'int'" do
+        assert_equal 42, @obj.get_property("int")
+        @obj.set_property("int", 13)
+        assert_equal 13, @obj.get_property("int")
+      end
+
       it "has a working method #overridden_method" do
-        @obj[:int_] = 0
+        @obj.set_property("int", 0)
         @obj.overridden_method
         pass
       end
 
-      it "has a property 'int'"
-
-      it "has a field parent_instance containing the parent struct" do
-        assert_instance_of GObject::Object::Struct, @obj[:parent_instance]
+      it "has a read-only field parent_instance containing the parent struct" do
+        assert_instance_of GObject::Object, @obj.parent_instance
+        assert_raises(NoMethodError) { @obj.parent_instance = nil }
       end
 
-      it "has a field int_ containing the argument to #new" do
-        assert_equal 42, @obj[:int_]
+      it "has a read-only field int_ containing the argument to #new" do
+        assert_equal 42, @obj.int_
+        assert_raises(NoMethodError) { @obj.int_ = 1 }
       end
     end
   end
@@ -250,12 +276,14 @@ describe "GIMarshallingTests" do
         @obj = GIMarshallingTests::OverridesObject.new
       end
 
-      it "has a field parent_instance containing the parent struct" do
-        assert_instance_of GObject::Object::Struct, @obj[:parent_instance]
+      it "has a read-only field parent_instance containing the parent struct" do
+        assert_instance_of GObject::Object, @obj.parent_instance
+        assert_raises(NoMethodError) { @obj.parent_instance = nil }
       end
 
-      it "has a field long_" do
-        assert_equal 0.0, @obj[:long_]
+      it "has a read-only field long_" do
+        assert_equal 0.0, @obj.long_
+        assert_raises(NoMethodError) { @obj.long_ = 1 }
       end
     end
   end
@@ -271,12 +299,14 @@ describe "GIMarshallingTests" do
         @ps = GIMarshallingTests::PointerStruct.new
       end
 
-      it "has a field long_" do
-        assert_equal 0.0, @ps[:long_]
+      it "has a writable field long_" do
+        assert_equal 0, @ps.long_
+        @ps.long_ = 1056
+        assert_equal 1056, @ps.long_
       end
 
       it "has a working method #inv" do
-        @ps[:long_] = 42.0
+        @ps.long_ = 42
         @ps.inv
         pass
       end
@@ -299,17 +329,21 @@ describe "GIMarshallingTests" do
         @ss = GIMarshallingTests::SimpleStruct.new
       end
 
-      it "has a field long_" do
-        assert_equal 0, @ss[:long_]
+      it "has a writable field long_" do
+        assert_equal 0, @ss.long_
+        @ss.long_ = 1056
+        assert_equal 1056, @ss.long_
       end
 
-      it "has a field int8" do
-        assert_equal 0, @ss[:int8]
+      it "has a writable field int8" do
+        assert_equal 0, @ss.int8
+        @ss.int8 = -43
+        assert_equal(-43, @ss.int8)
       end
 
       it "has a working method #inv" do
-        @ss[:long_] = 6
-        @ss[:int8] = 7
+        @ss.long_ = 6
+        @ss.int8 = 7
         @ss.inv
         pass
       end
@@ -337,8 +371,9 @@ describe "GIMarshallingTests" do
         pass
       end
 
-      it "has a field parent_instance containing the parent struct" do
-        assert_instance_of GIMarshallingTests::Object::Struct, @so[:parent_instance]
+      it "has a read-only field parent_instance containing the parent struct" do
+        assert_instance_of GIMarshallingTests::Object, @so.parent_instance
+        assert_raises(NoMethodError) { @so.parent_instance = nil }
       end
 
       it "has a working inherited virtual method #method_int8_in"
@@ -346,14 +381,14 @@ describe "GIMarshallingTests" do
 
       it "has a working inherited virtual method #method_with_default_implementation" do
         @so.method_with_default_implementation 104
-        assert_equal 104, @so[:parent_instance][:int_]
+        assert_equal 104, @so.parent_instance.int_
       end
 
       it "has a working inherited method #int8_in"
       it "has a working inherited method #int8_out"
 
       it "has a working inherited method #method" do
-        @so[:parent_instance][:int_] = 42
+        @so.parent_instance.set_property("int", 42)
         @so.method
         pass
       end
@@ -379,13 +414,13 @@ describe "GIMarshallingTests" do
       end
 
       it "has a working inherited method #none_in" do
-        @so[:parent_instance][:int_] = 42
+        @so.parent_instance.set_property("int", 42)
         @so.none_in
         pass
       end
 
       it "has a working inherited method #overridden_method" do
-        @so[:parent_instance][:int_] = 0
+        @so.parent_instance.set_property("int", 0)
         @so.overridden_method
         pass
       end
@@ -403,18 +438,20 @@ describe "GIMarshallingTests" do
         @it = GIMarshallingTests::Union.new
       end
 
-      it "has a field long_" do
-        assert_equal 0, @it[:long_]
+      it "has a writable field long_" do
+        assert_equal 0, @it.long_
+        @it.long_ = 1056
+        assert_equal 1056, @it.long_
       end
 
       it "has a working method #inv" do
-        @it[:long_] = 42
+        @it.long_ = 42
         @it.inv
         pass
       end
 
       it "has a working method #method" do
-        @it[:long_] = 42
+        @it.long_ = 42
         @it.method
         pass
       end
@@ -443,7 +480,7 @@ describe "GIMarshallingTests" do
 
   it "has a working function #array_fixed_out_struct" do
     res = GIMarshallingTests.array_fixed_out_struct
-    assert_equal [[7, 6], [6, 7]], res.map {|s| [s[:long_], s[:int8]]}
+    assert_equal [[7, 6], [6, 7]], res.map {|s| [s.long_, s.int8]}
   end
 
   it "has a working function #array_fixed_short_in" do
@@ -456,10 +493,15 @@ describe "GIMarshallingTests" do
     assert_equal [-1, 0, 1, 2], res
   end
 
-  it "has a working function #array_gvariant_in" do
+  it "has a working function #array_gvariant_(none)_in" do
     v1 = GLib::Variant.new_int32(27)
     v2 = GLib::Variant.new_string("Hello")
-    GIMarshallingTests.array_gvariant_in [v1, v2]
+    if GIMarshallingTests._builder.setup_method :array_gvariant_in
+      GIMarshallingTests.array_gvariant_in [v1, v2]
+    else
+      GIMarshallingTests.array_gvariant_none_in [v1, v2]
+    end
+
     pass
     # TODO: Can we determine that result should be an array?
     # assert_equal 27, res[0].get_int32
@@ -549,20 +591,20 @@ describe "GIMarshallingTests" do
 
   it "has a working function #boxed_struct_inout" do
     bx = GIMarshallingTests::BoxedStruct.new
-    bx[:long_] = 42
+    bx.long_ = 42
     res = GIMarshallingTests.boxed_struct_inout bx
-    assert_equal 0, res[:long_]
+    assert_equal 0, res.long_
   end
 
   it "has a working function #boxed_struct_out" do
     res = GIMarshallingTests.boxed_struct_out
-    assert_equal 42, res[:long_]
+    assert_equal 42, res.long_
   end
 
   it "has a working function #boxed_struct_returnv" do
     res = GIMarshallingTests.boxed_struct_returnv
-    assert_equal 42, res[:long_]
-    assert_equal ["0", "1", "2"], GirFFI::ArgHelper.strv_to_utf8_array(res[:g_strv])
+    assert_equal 42, res.long_
+    assert_equal ["0", "1", "2"], res.g_strv
   end
 
   it "has a working function #bytearray_full_return" do
@@ -575,8 +617,8 @@ describe "GIMarshallingTests" do
 
   it "has a working function #bytearray_none_in" do
     val = GIMarshallingTests.bytearray_full_return.to_string
-    ba = GLib.byte_array_new
-    GLib.byte_array_append ba, val
+    ba = GLib::ByteArray.new
+    ba = ba.append val
     GIMarshallingTests.bytearray_none_in ba
     pass
   end
@@ -676,8 +718,8 @@ describe "GIMarshallingTests" do
   end
 
   it "has a working function #garray_int_none_in" do
-    arr = GLib.array_new :int
-    GLib.array_append_vals arr, [-1, 0, 1, 2]
+    arr = GLib::Array.new :int
+    arr.append_vals [-1, 0, 1, 2]
     GIMarshallingTests.garray_int_none_in arr
     pass
   end
@@ -699,8 +741,8 @@ describe "GIMarshallingTests" do
 
   # TODO: Allow regular arrays as arguments directly.
   it "has a working function #garray_utf8_full_inout" do
-    arr = GLib.array_new :utf8
-    GLib.array_append_vals arr, ["0", "1", "2"]
+    arr = GLib::Array.new :utf8
+    arr.append_vals ["0", "1", "2"]
     res = GIMarshallingTests.garray_utf8_full_inout arr
     assert_equal ["-2", "-1", "0", "1"], res.to_a
   end
@@ -716,15 +758,15 @@ describe "GIMarshallingTests" do
   end
 
   it "has a working function #garray_utf8_none_in" do
-    arr = GLib.array_new :utf8
-    GLib.array_append_vals arr, ["0", "1", "2"]
+    arr = GLib::Array.new :utf8
+    arr.append_vals ["0", "1", "2"]
     GIMarshallingTests.garray_utf8_none_in arr
     pass
   end
 
   it "has a working function #garray_utf8_none_inout" do
-    arr = GLib.array_new :utf8
-    GLib.array_append_vals arr, ["0", "1", "2"]
+    arr = GLib::Array.new :utf8
+    arr.append_vals ["0", "1", "2"]
     res = GIMarshallingTests.garray_utf8_none_inout arr
     assert_equal ["-2", "-1", "0", "1"], res.to_a
   end
@@ -797,7 +839,7 @@ describe "GIMarshallingTests" do
     assert_equal({-1 => 1, 0 => 0, 1 => -1, 2 => -2}, gh.to_hash)
   end
 
-  # XXX: Only defined in header
+  # This function is defined in the header but not implemented.
   # it "has a working function #ghashtable_utf8_container_in"
 
   it "has a working function #ghashtable_utf8_container_inout" do
@@ -818,7 +860,7 @@ describe "GIMarshallingTests" do
                  res.to_hash)
   end
 
-  # XXX: Only defined in header
+  # This function is defined in the header but not implemented.
   # it "has a working function #ghashtable_utf8_full_in"
 
   it "has a working function #ghashtable_utf8_full_inout" do
@@ -873,7 +915,7 @@ describe "GIMarshallingTests" do
     assert_equal [-1, 0, 1, 2], res.to_a
   end
 
-  # XXX: Only defined in header
+  # This function is defined in the header but not implemented.
   # it "has a working function #glist_utf8_container_in"
 
   it "has a working function #glist_utf8_container_inout" do
@@ -891,7 +933,7 @@ describe "GIMarshallingTests" do
     assert_equal ["0", "1", "2"], res.to_a
   end
 
-  # XXX: Only defined in header
+  # This function is defined in the header but not implemented.
   # it "has a working function #glist_utf8_full_in"
 
   it "has a working function #glist_utf8_full_inout" do
@@ -938,7 +980,7 @@ describe "GIMarshallingTests" do
     assert_equal [-1, 0, 1, 2], res.to_a
   end
 
-  # XXX: Only defined in header
+  # This function is defined in the header but not implemented.
   # it "has a working function #gslist_utf8_container_in"
 
   it "has a working function #gslist_utf8_container_inout" do
@@ -956,7 +998,7 @@ describe "GIMarshallingTests" do
     assert_equal ["0", "1", "2"], res.to_a
   end
 
-  # XXX: Only defined in header
+  # This function is defined in the header but not implemented.
   # it "has a working function #gslist_utf8_full_in"
 
   it "has a working function #gslist_utf8_full_inout" do
@@ -1356,7 +1398,7 @@ describe "GIMarshallingTests" do
   it "has a working function #pointer_struct_returnv" do
     res = GIMarshallingTests.pointer_struct_returnv
     assert_instance_of GIMarshallingTests::PointerStruct, res
-    assert_equal 42, res[:long_]
+    assert_equal 42, res.long_
   end
 
   it "has a working function #short_in_max" do
@@ -1402,8 +1444,8 @@ describe "GIMarshallingTests" do
   it "has a working function #simple_struct_returnv" do
     res = GIMarshallingTests.simple_struct_returnv
     assert_instance_of GIMarshallingTests::SimpleStruct, res
-    assert_equal 6, res[:long_]
-    assert_equal 7, res[:int8]
+    assert_equal 6, res.long_
+    assert_equal 7, res.int8
   end
 
   it "has a working function #size_in" do
@@ -1604,16 +1646,16 @@ describe "GIMarshallingTests" do
     assert_equal max_ulong, res
   end
 
-  # XXX: Only defined in header
+  # This function is defined in the header but not implemented.
   # it "has a working function #union_inout"
 
-  # XXX: Only defined in header
+  # This function is defined in the header but not implemented.
   # it "has a working function #union_out"
 
   it "has a working function #union_returnv" do
     res = GIMarshallingTests.union_returnv
     assert_instance_of GIMarshallingTests::Union, res
-    assert_equal 42, res[:long_]
+    assert_equal 42, res.long_
   end
 
   it "has a working function #ushort_in" do
@@ -1641,7 +1683,7 @@ describe "GIMarshallingTests" do
     assert_nil res
   end
 
-  # XXX: Only defined in header
+  # This function is defined in the header but not implemented.
   # it "has a working function #utf8_full_in"
 
   it "has a working function #utf8_full_inout" do