gir_ffi 0.6.6 → 0.6.7

data/test/gir_ffi/info_ext/safe_constant_name_test.rb

@@ -12,5 +12,11 @@ describe GirFFI::InfoExt::SafeConstantName do
 
       assert_equal "Private___foo", info.safe_name
     end
+
+    it "makes names with dashes safe" do
+      mock(info).name { "this-could-be-a-signal-name" }
+
+      info.safe_name.must_equal "This_could_be_a_signal_name"
+    end
   end
 end

data/test/gir_ffi/interface_base_test.rb

@@ -2,12 +2,10 @@ require 'gir_ffi_test_helper'
 
 describe GirFFI::InterfaceBase do
   describe "#wrap" do
-    it "dynamically looks op the wrapped object's class" do
+    it "delegates conversion to the wrapped pointer" do
       mod = Module.new { extend GirFFI::InterfaceBase }
-
-      mock(GirFFI::ArgHelper).object_pointer_to_object("some-pointer") { "good-result" }
-
-      mod.wrap("some-pointer").must_equal "good-result"
+      mock(ptr = Object.new).to_object { "good-result" }
+      mod.wrap(ptr).must_equal "good-result"
     end
   end
 end

data/test/gir_ffi/object_base_test.rb

@@ -1,13 +1,17 @@
 require 'gir_ffi_test_helper'
 
 describe GirFFI::ObjectBase do
-  describe "#wrap" do
-    it "dynamically looks op the wrapped object's class" do
-      mod = Class.new GirFFI::ObjectBase
-
-      mock(GirFFI::ArgHelper).object_pointer_to_object("some-pointer") { "good-result" }
+  let(:derived_class) { Class.new GirFFI::ObjectBase }
+  describe ".wrap" do
+    it "delegates conversion to the wrapped pointer" do
+      mock(ptr = Object.new).to_object { "good-result" }
+      derived_class.wrap(ptr).must_equal "good-result"
+    end
+  end
 
-      mod.wrap("some-pointer").must_equal "good-result"
+  describe ".to_ffitype" do
+    it "returns :pointer" do
+      derived_class.to_ffitype.must_equal :pointer
     end
   end
 end

data/test/gir_ffi/type_map_test.rb

@@ -7,9 +7,9 @@ describe GirFFI::TypeMap do
         must_equal GLib::DateMonth::Enum
     end
 
-    it "returns the nested FFI::Struct for an Struct module" do
+    it "returns the class itself for a Struct class" do
       GirFFI::TypeMap.type_specification_to_ffitype(GObject::EnumValue).
-        must_equal GObject::EnumValue::Struct
+        must_equal GObject::EnumValue
     end
   end
 end

data/test/gir_ffi/unintrospectable_type_info_test.rb

@@ -10,7 +10,7 @@ describe GirFFI::UnintrospectableTypeInfo do
   end
 
   describe "#parent" do
-    context "when the GIR knows about the parent gtype" do
+    describe "when the GIR knows about the parent gtype" do
       it "finds the parent's info by gtype" do
         gobject = Object.new
         gir = Object.new
@@ -24,7 +24,7 @@ describe GirFFI::UnintrospectableTypeInfo do
       end
     end
 
-    context "when the GIR does not know about the parent gtype" do
+    describe "when the GIR does not know about the parent gtype" do
       it "creates a new UnintrospectableTypeInfo from the parent gtype" do
         gobject = Object.new
         gir = Object.new

data/test/gir_ffi_test_helper.rb

@@ -2,10 +2,6 @@ require 'introspection_test_helper'
 
 require 'gir_ffi'
 
-# Need a dummy module for some tests.
-module DummyLib
-end
-
 # Global sequence provider. Needed to make unique class names.
 class Sequence
   @@seq = 0
@@ -19,10 +15,22 @@ class Minitest::Test
     code.gsub(/(^\s*|\s*$)/, "")
   end
 
+  def get_field_introspection_data namespace, klass, name
+    get_introspection_data(namespace, klass).find_field name
+  end
+
   def get_method_introspection_data namespace, klass, name
     get_introspection_data(namespace, klass).find_method name
   end
 
+  def get_property_introspection_data namespace, klass, name
+    get_introspection_data(namespace, klass).find_property name
+  end
+
+  def get_signal_introspection_data namespace, klass, name
+    get_introspection_data(namespace, klass).find_signal name
+  end
+
   SAVED_MODULES = {}
 
   def save_module name

data/test/integration/generated_gimarshallingtests_test.rb

@@ -8,38 +8,38 @@ GirFFI.setup :GIMarshallingTests
 # Tests generated methods and functions in the GIMarshallingTests namespace.
 describe GIMarshallingTests do
   describe "GIMarshallingTests::BoxedStruct" do
+    let(:instance) { GIMarshallingTests::BoxedStruct.new }
+
+    it "has a writable field long_" do
+      instance.long_ = 42
+      assert_equal 42, instance.long_
+      instance.long_ = 43
+      assert_equal 43, instance.long_
+    end
+
+    it "has a writable field string_" do
+      skip unless get_field_introspection_data("GIMarshallingTests", "BoxedStruct", "string_")
+      instance.string_ = "foobar"
+      instance.string_.must_equal "foobar"
+    end
+
+    it "has a writable field g_strv" do
+      instance.g_strv.must_be :==, []
+      instance.g_strv = ["foo", "bar"]
+      instance.g_strv.must_be :==, ["foo", "bar"]
+    end
+
     it "creates an instance using #new" do
       bx = GIMarshallingTests::BoxedStruct.new
       assert_instance_of GIMarshallingTests::BoxedStruct, bx
     end
 
-    let(:instance) { GIMarshallingTests::BoxedStruct.new }
-
     it "has a working method #inv" do
       instance.long_ = 42
       instance.inv
       pass
     end
 
-    describe "an instance" do
-      before do
-        @bx = instance
-        @bx.long_ = 42
-      end
-
-      it "has a writable field long_" do
-        assert_equal 42, @bx.long_
-        @bx.long_ = 43
-        assert_equal 43, @bx.long_
-      end
-
-      it "has a writable field g_strv" do
-        @bx.g_strv.must_be :==, []
-        @bx.g_strv = ["foo", "bar"]
-        @bx.g_strv.must_be :==, ["foo", "bar"]
-      end
-    end
-
     it "has a working function #inout" do
       bx = GIMarshallingTests::BoxedStruct.new
       bx.long_ = 42
@@ -200,10 +200,14 @@ describe GIMarshallingTests do
   end
 
   describe "GIMarshallingTests::NestedStruct" do
-    it "contains a SimpleStruct" do
-      ns = GIMarshallingTests::NestedStruct.new
+    let(:instance) { GIMarshallingTests::NestedStruct.new }
+    it "has a writable field simple_struct" do
       assert_instance_of GIMarshallingTests::SimpleStruct,
-        ns.simple_struct
+        instance.simple_struct
+      new_struct = GIMarshallingTests::SimpleStruct.new
+      new_struct.int8 = 42
+      instance.simple_struct = new_struct
+      instance.simple_struct.int8.must_equal 42
     end
   end
 
@@ -214,7 +218,7 @@ describe GIMarshallingTests do
     it "has the member :value2" do
       assert_equal 2, GIMarshallingTests::NoTypeFlags[:value2]
     end
-    it "has the member :value3" do
+    it "has the member :value" do
       assert_equal 4, GIMarshallingTests::NoTypeFlags[:value3]
     end
     it "has the member :mask" do
@@ -226,7 +230,14 @@ describe GIMarshallingTests do
   end
 
   describe "GIMarshallingTests::NotSimpleStruct" do
-    it "must be tested"
+    let(:instance) { GIMarshallingTests::NotSimpleStruct.new }
+
+    it "has a writable field pointer" do
+      instance.pointer.must_be_nil
+      nested = GIMarshallingTests::NestedStruct.new
+      instance.pointer = nested
+      instance.pointer.must_equal nested
+    end
   end
 
   it "has the constant OVERRIDES_CONSTANT" do
@@ -322,7 +333,6 @@ describe GIMarshallingTests do
       skip "Needs vfunc setup"
     end
 
-    # TODO: Avoid using common method names?
     it "has a working method #method" do
       instance.method
       pass
@@ -423,16 +433,21 @@ describe GIMarshallingTests do
       skip "Needs vfunc setup"
     end
 
-    it "has a property 'int' containing the argument to #new" do
-      assert_equal 42, instance.get_property("int")
-      instance.set_property("int", 13)
-      assert_equal 13, instance.get_property("int")
-    end
-
-    it "has property accessors for the int property" do
-      assert_equal 42, instance.int
-      instance.int = 1
-      assert_equal 1, instance.int
+    describe "its 'int' property" do
+      it "can be retrieved with #get_property" do
+        assert_equal 42, instance.get_property("int")
+      end
+      it "can be retrieved with #int" do
+        assert_equal 42, instance.int
+      end
+      it "can be set with #set_property" do
+        instance.set_property("int", 13)
+        assert_equal 13, instance.get_property("int")
+      end
+      it "can be set with #int=" do
+        instance.int = 1
+        assert_equal 1, instance.int
+      end
     end
   end
 
@@ -465,6 +480,11 @@ describe GIMarshallingTests do
   describe "GIMarshallingTests::OverridesStruct" do
     let(:instance) { GIMarshallingTests::OverridesStruct.new }
 
+    it "has a writable field long_" do
+      instance.long_ = 43
+      instance.long_.must_equal 43
+    end
+
     it "creates an instance using #new" do
       ob = GIMarshallingTests::OverridesStruct.new
       assert_instance_of GIMarshallingTests::OverridesStruct, ob
@@ -478,11 +498,6 @@ describe GIMarshallingTests do
       ob = GIMarshallingTests::OverridesStruct.returnv
       assert_instance_of GIMarshallingTests::OverridesStruct, ob
     end
-
-    it "has a writable field long_" do
-      instance.long_ = 43
-      instance.long_.must_equal 43
-    end
   end
 
   describe "GIMarshallingTests::PointerStruct" do
@@ -493,18 +508,18 @@ describe GIMarshallingTests do
 
     let(:instance) { GIMarshallingTests::PointerStruct.new }
 
-    it "has a working method #inv" do
-      instance.long_ = 42
-      instance.inv
-      pass
-    end
-
     it "has a writable field long_" do
       assert_equal 0, instance.long_
       instance.long_ = 1056
       assert_equal 1056, instance.long_
     end
 
+    it "has a working method #inv" do
+      instance.long_ = 42
+      instance.inv
+      pass
+    end
+
     it "has a working function #returnv" do
       ob = GIMarshallingTests::PointerStruct.returnv
       assert_instance_of GIMarshallingTests::PointerStruct, ob
@@ -517,19 +532,365 @@ describe GIMarshallingTests do
       assert_instance_of GIMarshallingTests::PropertiesObject, ob
     end
 
-    it "has the property 'some-boolean'"
-    it "has the property 'some-boxed-struct'"
-    it "has the property 'some-char'"
-    it "has the property 'some-double'"
-    it "has the property 'some-float'"
-    it "has the property 'some-int'"
-    it "has the property 'some-int64'"
-    it "has the property 'some-long'"
-    it "has the property 'some-strv'"
-    it "has the property 'some-uchar'"
-    it "has the property 'some-uint'"
-    it "has the property 'some-uint64'"
-    it "has the property 'some-ulong'"
+    let(:instance) { GIMarshallingTests::PropertiesObject.new }
+
+    describe "its 'some-boolean' property" do
+      it "can be retrieved with #get_property" do
+        instance.get_property("some-boolean").must_equal false
+      end
+
+      it "can be retrieved with #some_boolean" do
+        instance.some_boolean.must_equal false
+      end
+
+      it "can be set with #set_property" do
+        instance.set_property("some-boolean", true)
+        instance.get_property("some-boolean").must_equal true
+      end
+
+      it "can be set with #some_boolean=" do
+        instance.some_boolean = true
+        instance.get_property("some-boolean").must_equal true
+      end
+    end
+
+    describe "its 'some-boxed-glist' property" do
+      before do
+        skip unless get_property_introspection_data('GIMarshallingTests',
+                                                    'PropertiesObject',
+                                                    'some-boxed-glist')
+      end
+
+      it "can be retrieved with #get_property" do
+        instance.get_property("some-boxed-glist").must_equal nil
+      end
+
+      it "can be retrieved with #some_boxed_glist" do
+        instance.some_boxed_glist.must_equal nil
+      end
+
+      it "can be set with #set_property" do
+        instance.set_property("some-boxed-glist", [1, 2, 3])
+        instance.get_property("some-boxed-glist").to_a.must_equal [1, 2, 3]
+      end
+
+      it "can be set with #some_boxed_glist=" do
+        instance.some_boxed_glist = [1, 2, 3]
+        instance.some_boxed_glist.to_a.must_equal [1, 2, 3]
+      end
+    end
+
+    describe "its 'some-boxed-struct' property" do
+      before do
+        skip unless get_property_introspection_data('GIMarshallingTests',
+                                                    'PropertiesObject',
+                                                    'some-boxed-struct')
+      end
+
+      it "can be retrieved with #get_property" do
+        instance.get_property("some-boxed-struct").must_equal nil
+      end
+
+      it "can be retrieved with #some_boxed_struct" do
+        instance.some_boxed_struct.must_equal nil
+      end
+
+      it "can be set with #set_property" do
+        boxed = GIMarshallingTests::BoxedStruct.new
+        boxed.long_ = 42
+        instance.set_property("some-boxed-struct", boxed)
+        instance.get_property("some-boxed-struct").long_.must_equal 42
+      end
+
+      it "can be set with #some_boxed_struct=" do
+        boxed = GIMarshallingTests::BoxedStruct.new
+        boxed.long_ = 43
+        instance.some_boxed_struct = boxed
+        instance.some_boxed_struct.long_.must_equal 43
+      end
+    end
+
+    describe "its 'some-char' property" do
+      it "can be retrieved with #get_property" do
+        instance.get_property("some-char").must_equal 0
+      end
+
+      it "can be retrieved with #some_char" do
+        instance.some_char.must_equal 0
+      end
+
+      it "can be set with #set_property" do
+        instance.set_property "some-char", 42
+        instance.get_property("some-char").must_equal 42
+      end
+
+      it "can be set with #some_char=" do
+        instance.some_char = 43
+        instance.some_char.must_equal 43
+      end
+    end
+
+    describe "its 'some-double' property" do
+      it "can be retrieved with #get_property" do
+        instance.get_property("some-double").must_equal 0.0
+      end
+
+      it "can be retrieved with #some_double" do
+        instance.some_double.must_equal 0.0
+      end
+
+      it "can be set with #set_property" do
+        instance.set_property("some-double", 3.14)
+        instance.get_property("some-double").must_equal 3.14
+      end
+
+      it "can be set with #some_double=" do
+        instance.some_double = 3.14
+        instance.some_double.must_equal 3.14
+      end
+    end
+
+    describe "its 'some-float' property" do
+      it "can be retrieved with #get_property" do
+        instance.get_property("some-float").must_equal 0.0
+      end
+
+      it "can be retrieved with #some_float" do
+        instance.some_float.must_equal 0.0
+      end
+
+      it "can be set with #set_property" do
+        instance.set_property("some-float", 3.14)
+        instance.get_property("some-float").must_be_close_to 3.14
+      end
+
+      it "can be set with #some_float=" do
+        instance.some_float = 3.14
+        instance.some_float.must_be_close_to 3.14
+      end
+    end
+
+    describe "its 'some-int' property" do
+      it "can be retrieved with #get_property" do
+        instance.get_property("some-int").must_equal 0
+      end
+
+      it "can be retrieved with #some_int" do
+        instance.some_int.must_equal 0
+      end
+
+      it "can be set with #set_property" do
+        instance.set_property "some-int", 4242
+        instance.get_property("some-int").must_equal 4242
+      end
+
+      it "can be set with #some_int=" do
+        instance.some_int = 4243
+        instance.some_int.must_equal 4243
+      end
+    end
+
+    describe "its 'some-int64' property" do
+      it "can be retrieved with #get_property" do
+        instance.get_property("some-int64").must_equal 0
+      end
+
+      it "can be retrieved with #some_int64" do
+        instance.some_int64.must_equal 0
+      end
+
+      it "can be set with #set_property" do
+        instance.set_property "some-int64", 42_000_000_000_000
+        instance.get_property("some-int64").must_equal 42_000_000_000_000
+      end
+
+      it "can be set with #some_int64=" do
+        instance.some_int64 = 43_000_000_000_000
+        instance.some_int64.must_equal 43_000_000_000_000
+      end
+    end
+
+    describe "its 'some-long' property" do
+      it "can be retrieved with #get_property" do
+        instance.get_property("some-long").must_equal 0
+      end
+
+      it "can be retrieved with #some_long" do
+        instance.some_long.must_equal 0
+      end
+
+      it "can be set with #set_property" do
+        instance.set_property "some-long", 4242
+        instance.get_property("some-long").must_equal 4242
+      end
+
+      it "can be set with #some_long=" do
+        instance.some_long = 4243
+        instance.some_long.must_equal 4243
+      end
+    end
+
+    describe "its 'some-object' property" do
+      before do
+        skip unless get_property_introspection_data('GIMarshallingTests',
+                                                    'PropertiesObject',
+                                                    'some-object')
+      end
+
+      it "can be retrieved with #get_property" do
+        instance.get_property("some-object").must_be_nil
+      end
+
+      it "can be retrieved with #some_object" do
+        instance.some_object.must_be_nil
+      end
+
+      it "can be set with #set_property" do
+        ob = GIMarshallingTests::Object.new 42
+        instance.set_property "some-object", ob
+        instance.get_property("some-object").must_equal ob
+      end
+
+      it "can be set with #some_object=" do
+        ob = GIMarshallingTests::Object.new 42
+        instance.some_object = ob
+        instance.some_object.must_equal ob
+      end
+    end
+
+    describe "its 'some-strv' property" do
+      before do
+        skip unless get_property_introspection_data('GIMarshallingTests',
+                                                    'PropertiesObject',
+                                                    'some-strv')
+      end
+
+      it "can be retrieved with #get_property" do
+        instance.get_property("some-strv").must_be :==, []
+      end
+
+      it "can be retrieved with #some_strv" do
+        instance.some_strv.must_be :==, []
+      end
+
+      it "can be set with #set_property" do
+        instance.set_property("some-strv", ["foo", "bar"])
+        instance.get_property("some-strv").must_be :==, ["foo", "bar"]
+      end
+
+      it "can be set with #some_strv=" do
+        instance.some_strv = ["foo", "bar"]
+        instance.some_strv.must_be :==, ["foo", "bar"]
+      end
+    end
+
+    describe "its 'some-uchar' property" do
+      it "can be retrieved with #get_property" do
+        instance.get_property("some-uchar").must_equal 0
+      end
+
+      it "can be retrieved with #some_uchar" do
+        instance.some_uchar.must_equal 0
+      end
+
+      it "can be set with #set_property" do
+        instance.set_property "some-uchar", 42
+        instance.get_property("some-uchar").must_equal 42
+      end
+
+      it "can be set with #some_uchar=" do
+        instance.some_uchar = 43
+        instance.some_uchar.must_equal 43
+      end
+    end
+
+    describe "its 'some-uuint' property" do
+      it "can be retrieved with #get_property" do
+        instance.get_property("some-uint").must_equal 0
+      end
+
+      it "can be retrieved with #some_uint" do
+        instance.some_uint.must_equal 0
+      end
+
+      it "can be set with #set_property" do
+        instance.set_property "some-uint", 4242
+        instance.get_property("some-uint").must_equal 4242
+      end
+
+      it "can be set with #some_uint=" do
+        instance.some_uint = 4243
+        instance.some_uint.must_equal 4243
+      end
+    end
+
+    describe "its 'some-uint64' property" do
+      it "can be retrieved with #get_property" do
+        instance.get_property("some-uint64").must_equal 0
+      end
+
+      it "can be retrieved with #some_uint64" do
+        instance.some_uint64.must_equal 0
+      end
+
+      it "can be set with #set_property" do
+        instance.set_property "some-uint64", 42_000_000_000_000
+        instance.get_property("some-uint64").must_equal 42_000_000_000_000
+      end
+
+      it "can be set with #some_uint64=" do
+        instance.some_uint64 = 43_000_000_000_000
+        instance.some_uint64.must_equal 43_000_000_000_000
+      end
+    end
+
+    describe "its 'some-ulong' property" do
+      it "can be retrieved with #get_property" do
+        instance.get_property("some-ulong").must_equal 0
+      end
+
+      it "can be retrieved with #some_ulong" do
+        instance.some_ulong.must_equal 0
+      end
+
+      it "can be set with #set_property" do
+        instance.set_property "some-ulong", 4242
+        instance.get_property("some-ulong").must_equal 4242
+      end
+
+      it "can be set with #some_ulong=" do
+        instance.some_ulong = 4243
+        instance.some_ulong.must_equal 4243
+      end
+    end
+
+    describe "its 'some-variant' property" do
+      before do
+        skip unless get_property_introspection_data('GIMarshallingTests',
+                                                    'PropertiesObject',
+                                                    'some-variant')
+      end
+
+      it "can be retrieved with #get_property" do
+        instance.get_property("some-variant").must_be_nil
+      end
+
+      it "can be retrieved with #some_variant" do
+        instance.some_variant.must_be_nil
+      end
+
+      it "can be set with #set_property" do
+        value = GLib::Variant.new_string("Foo")
+        instance.set_property "some-variant", value
+        instance.get_property("some-variant").must_equal value
+      end
+
+      it "can be set with #some_variant=" do
+        value = GLib::Variant.new_string("Foo")
+        instance.some_variant = value
+        instance.some_variant.must_equal value
+      end
+    end
   end
 
   describe "GIMarshallingTests::SecondEnum" do
@@ -549,6 +910,18 @@ describe GIMarshallingTests do
 
     let(:instance) { GIMarshallingTests::SimpleStruct.new }
 
+    it "has a writable field long_" do
+      instance.long_.must_equal 0
+      instance.long_ = 1056
+      instance.long_.must_equal 1056
+    end
+
+    it "has a writable field int8" do
+      instance.int8.must_equal 0
+      instance.int8 = -43
+      instance.int8.must_equal(-43)
+    end
+
     it "has a working method #inv" do
       instance.long_ = 6
       instance.int8 = 7
@@ -563,18 +936,6 @@ describe GIMarshallingTests do
       pass
     end
 
-    it "has a writable field long_" do
-      assert_equal 0, instance.long_
-      instance.long_ = 1056
-      assert_equal 1056, instance.long_
-    end
-
-    it "has a writable field int8" do
-      assert_equal 0, instance.int8
-      instance.int8 = -43
-      assert_equal(-43, instance.int8)
-    end
-
     it "has a working function #returnv" do
       ss = GIMarshallingTests::SimpleStruct.returnv
       assert_instance_of GIMarshallingTests::SimpleStruct, ss
@@ -1523,9 +1884,8 @@ describe GIMarshallingTests do
   end
 
   it "has a working function #gvalue_flat_array" do
-    # TODO: Convert array of Ruby values to GValues automatically?
-    arr = [42, "42", true].map { |val| GObject::Value.wrap_ruby_value val }
-    GIMarshallingTests.gvalue_flat_array arr
+    GIMarshallingTests.gvalue_flat_array [42, "42", true]
+    pass
   end
 
   it "has a working function #gvalue_flat_array_round_trip" do