gir_ffi 0.7.7 → 0.7.8

data/test/ffi-glib/variant_test.rb

@@ -1,10 +1,10 @@
 require 'gir_ffi_test_helper'
 
 describe GLib::Variant do
-  describe "#get_string" do
-    it "returns just the contained string" do
-      var = GLib::Variant.new_string("Foo")
-      var.get_string.must_equal "Foo"
+  describe '#get_string' do
+    it 'returns just the contained string' do
+      var = GLib::Variant.new_string('Foo')
+      var.get_string.must_equal 'Foo'
     end
   end
 end

data/test/ffi-gobject/gobject_test.rb

@@ -5,45 +5,45 @@ require 'ffi-gobject'
 GirFFI.setup :GIMarshallingTests
 
 describe GObject do
-  describe ".type_init" do
-    it "does not raise an error" do
+  describe '.type_init' do
+    it 'does not raise an error' do
       GObject.type_init
       pass
     end
   end
 
-  it "has constants for the fundamental GTypes" do
-    assert_equal GObject.type_from_name("invalid"), GObject::TYPE_INVALID
+  it 'has constants for the fundamental GTypes' do
+    assert_equal GObject.type_from_name('invalid'), GObject::TYPE_INVALID
     assert_equal nil, GObject.type_name(GObject::TYPE_INVALID)
 
-    assert_equal "void", GObject.type_name(GObject::TYPE_NONE)
-    assert_equal "GInterface", GObject.type_name(GObject::TYPE_INTERFACE)
-    assert_equal "gchar", GObject.type_name(GObject::TYPE_CHAR)
-    assert_equal "guchar", GObject.type_name(GObject::TYPE_UCHAR)
-    assert_equal "gboolean", GObject.type_name(GObject::TYPE_BOOLEAN)
-    assert_equal "gint", GObject.type_name(GObject::TYPE_INT)
-    assert_equal "guint", GObject.type_name(GObject::TYPE_UINT)
-    assert_equal "glong", GObject.type_name(GObject::TYPE_LONG)
-    assert_equal "gulong", GObject.type_name(GObject::TYPE_ULONG)
-    assert_equal "gint64", GObject.type_name(GObject::TYPE_INT64)
-    assert_equal "guint64", GObject.type_name(GObject::TYPE_UINT64)
-    assert_equal "GEnum", GObject.type_name(GObject::TYPE_ENUM)
-    assert_equal "GFlags", GObject.type_name(GObject::TYPE_FLAGS)
-    assert_equal "gfloat", GObject.type_name(GObject::TYPE_FLOAT)
-    assert_equal "gdouble", GObject.type_name(GObject::TYPE_DOUBLE)
-    assert_equal "gchararray", GObject.type_name(GObject::TYPE_STRING)
-    assert_equal "gpointer", GObject.type_name(GObject::TYPE_POINTER)
-    assert_equal "GBoxed", GObject.type_name(GObject::TYPE_BOXED)
-    assert_equal "GParam", GObject.type_name(GObject::TYPE_PARAM)
-    assert_equal "GObject", GObject.type_name(GObject::TYPE_OBJECT)
-    assert_equal "GType", GObject.type_name(GObject::TYPE_GTYPE)
-    assert_equal "GVariant", GObject.type_name(GObject::TYPE_VARIANT)
-    assert_equal "GStrv", GObject.type_name(GObject::TYPE_STRV)
-    assert_equal "GHashTable", GObject.type_name(GObject::TYPE_HASH_TABLE)
+    assert_equal 'void', GObject.type_name(GObject::TYPE_NONE)
+    assert_equal 'GInterface', GObject.type_name(GObject::TYPE_INTERFACE)
+    assert_equal 'gchar', GObject.type_name(GObject::TYPE_CHAR)
+    assert_equal 'guchar', GObject.type_name(GObject::TYPE_UCHAR)
+    assert_equal 'gboolean', GObject.type_name(GObject::TYPE_BOOLEAN)
+    assert_equal 'gint', GObject.type_name(GObject::TYPE_INT)
+    assert_equal 'guint', GObject.type_name(GObject::TYPE_UINT)
+    assert_equal 'glong', GObject.type_name(GObject::TYPE_LONG)
+    assert_equal 'gulong', GObject.type_name(GObject::TYPE_ULONG)
+    assert_equal 'gint64', GObject.type_name(GObject::TYPE_INT64)
+    assert_equal 'guint64', GObject.type_name(GObject::TYPE_UINT64)
+    assert_equal 'GEnum', GObject.type_name(GObject::TYPE_ENUM)
+    assert_equal 'GFlags', GObject.type_name(GObject::TYPE_FLAGS)
+    assert_equal 'gfloat', GObject.type_name(GObject::TYPE_FLOAT)
+    assert_equal 'gdouble', GObject.type_name(GObject::TYPE_DOUBLE)
+    assert_equal 'gchararray', GObject.type_name(GObject::TYPE_STRING)
+    assert_equal 'gpointer', GObject.type_name(GObject::TYPE_POINTER)
+    assert_equal 'GBoxed', GObject.type_name(GObject::TYPE_BOXED)
+    assert_equal 'GParam', GObject.type_name(GObject::TYPE_PARAM)
+    assert_equal 'GObject', GObject.type_name(GObject::TYPE_OBJECT)
+    assert_equal 'GType', GObject.type_name(GObject::TYPE_GTYPE)
+    assert_equal 'GVariant', GObject.type_name(GObject::TYPE_VARIANT)
+    assert_equal 'GStrv', GObject.type_name(GObject::TYPE_STRV)
+    assert_equal 'GHashTable', GObject.type_name(GObject::TYPE_HASH_TABLE)
   end
 
-  describe "::object_class_from_instance" do
-    it "returns a GObject::ObjectClass with the correct GType" do
+  describe '::object_class_from_instance' do
+    it 'returns a GObject::ObjectClass with the correct GType' do
       obj = GIMarshallingTests::OverridesObject.new
       object_class = GObject.object_class_from_instance obj
       gtype = object_class.g_type_class.g_type
@@ -53,11 +53,11 @@ describe GObject do
     end
   end
 
-  describe "creating ParamSpecs" do
-    describe "#param_spec_int" do
-      it "creates a GObject::ParamSpecInt" do
-        spec = GObject.param_spec_int("foo", "foo bar",
-                                      "The Foo Bar Property",
+  describe 'creating ParamSpecs' do
+    describe '#param_spec_int' do
+      it 'creates a GObject::ParamSpecInt' do
+        spec = GObject.param_spec_int('foo', 'foo bar',
+                                      'The Foo Bar Property',
                                       10, 20, 15,
                                       3)
         spec.must_be_instance_of GObject::ParamSpecInt

data/test/ffi-gobject/object_class_test.rb

@@ -3,7 +3,7 @@ require 'gir_ffi_test_helper'
 require 'ffi-gobject'
 
 describe GObject::ObjectClass do
-  describe "#list_properties" do
+  describe '#list_properties' do
     it "returns GIMarshallingTests::OverridesObject's properties" do
       obj = GIMarshallingTests::OverridesObject.new
       object_class = GObject.object_class_from_instance obj

data/test/ffi-gobject/object_test.rb

@@ -3,19 +3,20 @@ require 'gir_ffi_test_helper'
 require 'ffi-gobject'
 
 describe GObject::Object do
-  describe "#get_property" do
-    it "is overridden to have arity 1" do
+  describe '#get_property' do
+    it 'is overridden to have arity 1' do
       assert_equal 1,
-        GObject::Object.instance_method("get_property").arity
+        GObject::Object.instance_method('get_property').arity
     end
   end
 
-  describe "automatic accessor methods" do
+  describe 'automatic accessor methods' do
     class AccessorTest < GObject::Object
       def get_x
         @x
       end
-      def set_x(val)
+
+      def set_x val
         @x = val
       end
     end
@@ -33,7 +34,7 @@ describe GObject::Object do
     end
   end
 
-  describe "#signal_connect" do
+  describe '#signal_connect' do
     subject { GObject::Object.new GObject::TYPE_OBJECT, nil }
 
     it 'delegates to GObject' do
@@ -54,4 +55,26 @@ describe GObject::Object do
       RR.verify
     end
   end
+
+  describe '#signal_connect_after' do
+    subject { GObject::Object.new GObject::TYPE_OBJECT, nil }
+
+    it 'delegates to GObject' do
+      mock(GObject).signal_connect_after(subject, 'some-event', nil)
+      subject.signal_connect_after('some-event') do
+        nothing
+      end
+
+      RR.verify
+    end
+
+    it 'delegates to GObject if an optional data argument is passed' do
+      mock(GObject).signal_connect_after(subject, 'some-event', 'data')
+      subject.signal_connect_after('some-event', 'data') do
+        nothing
+      end
+
+      RR.verify
+    end
+  end
 end

data/test/ffi-gobject/value_test.rb

@@ -3,104 +3,118 @@ require 'gir_ffi_test_helper'
 GirFFI.setup :Regress
 
 describe GObject::Value do
-  describe "::Struct" do
-    describe "layout" do
+  describe '::Struct' do
+    describe 'layout' do
       let(:layout) { GObject::Value::Struct.layout }
 
-      it "consists of :g_type and :data" do
+      it 'consists of :g_type and :data' do
         layout.members.must_equal [:g_type, :data]
       end
 
-      it "has an array as its second element" do
+      it 'has an array as its second element' do
         types = layout.fields.map(&:type)
         types[1].class.must_equal FFI::Type::Array
       end
     end
   end
 
-  describe "::wrap_ruby_value" do
-    it "wraps a boolean false" do
+  describe '::wrap_ruby_value' do
+    it 'wraps a boolean false' do
       gv = GObject::Value.wrap_ruby_value false
       assert_instance_of GObject::Value, gv
       assert_equal false, gv.get_boolean
     end
 
-    it "wraps a boolean true" do
+    it 'wraps a boolean true' do
       gv = GObject::Value.wrap_ruby_value true
       assert_instance_of GObject::Value, gv
       assert_equal true, gv.get_boolean
     end
 
-    it "wraps an Integer" do
+    it 'wraps an Integer' do
       gv = GObject::Value.wrap_ruby_value 42
       assert_equal 42, gv.get_int
     end
 
-    it "wraps a String" do
-      gv = GObject::Value.wrap_ruby_value "Some Random String"
-      assert_equal "Some Random String", gv.get_string
+    it 'wraps a String' do
+      gv = GObject::Value.wrap_ruby_value 'Some Random String'
+      assert_equal 'Some Random String', gv.get_string
     end
   end
 
-  describe "#set_value" do
-    it "handles char values" do
+  describe '#set_value' do
+    it 'handles char values' do
       value = 83
       gv = GObject::Value.for_g_type GObject::TYPE_CHAR
       gv.set_value value
       gv.get_char.must_equal value
     end
 
-    it "handles GType values" do
+    it 'handles enum values presented as symbols' do
+      value = :value2
+      gv = GObject::Value.for_g_type Regress::TestEnum.get_gtype
+      gv.set_value value
+      gv.get_value.must_equal value
+    end
+
+    it 'handles enum values presented as numbers' do
+      value = :value2
+      gv = GObject::Value.for_g_type Regress::TestEnum.get_gtype
+      gv.set_value Regress::TestEnum[value]
+      gv.get_value.must_equal value
+    end
+
+    it 'handles GType values' do
       value = GObject::TYPE_STRING
       gv = GObject::Value.for_g_type GObject::TYPE_GTYPE
       gv.set_value value
       gv.get_gtype.must_equal value
     end
 
-    it "handles int64 values" do
+    it 'handles int64 values' do
       value = 0x1234_5678_9012_3456
       gv = GObject::Value.for_g_type GObject::TYPE_INT64
       gv.set_value value
       gv.get_int64.must_equal value
     end
 
-    it "handles long values" do
+    it 'handles long values' do
       value = FFI.type_size(:long) == 8 ? 0x1234_5678_9012_3456 : 0x1234_5678
       gv = GObject::Value.for_g_type GObject::TYPE_LONG
       gv.set_value value
       gv.get_long.must_equal value
     end
 
-    it "handles uchar values" do
+    it 'handles uchar values' do
       value = 83
       gv = GObject::Value.for_g_type GObject::TYPE_UCHAR
       gv.set_value value
       gv.get_uchar.must_equal value
     end
 
-    it "handles uint values" do
+    it 'handles uint values' do
       value = 0x1234_5678
       gv = GObject::Value.for_g_type GObject::TYPE_UINT
       gv.set_value value
       gv.get_uint.must_equal value
     end
 
-    it "handles uint64 values" do
+    it 'handles uint64 values' do
       value = 0x1234_5678_9012_3456
       gv = GObject::Value.for_g_type GObject::TYPE_UINT64
       gv.set_value value
       gv.get_uint64.must_equal value
     end
 
-    it "handles ulong values" do
+    it 'handles ulong values' do
       value = FFI.type_size(:long) == 8 ? 0x1234_5678_9012_3456 : 0x1234_5678
       gv = GObject::Value.for_g_type GObject::TYPE_ULONG
       gv.set_value value
       gv.get_ulong.must_equal value
     end
 
-    it "handles variant values" do
-      value = GLib::Variant.new_string("Foo")
+    it 'handles variant values' do
+      value = GLib::Variant.new_string('Foo')
       gv = GObject::Value.for_g_type GObject::TYPE_VARIANT
       gv.set_value value
       gv.get_variant.must_equal value
@@ -108,108 +122,108 @@ describe GObject::Value do
 
   end
 
-  describe "#get_value" do
-    it "unwraps a boolean false" do
+  describe '#get_value' do
+    it 'unwraps a boolean false' do
       gv = GObject::Value.wrap_ruby_value false
       result = gv.get_value
       assert_equal false, result
     end
 
-    it "unwraps a boolean true" do
+    it 'unwraps a boolean true' do
       gv = GObject::Value.wrap_ruby_value true
       result = gv.get_value
       assert_equal true, result
     end
 
-    it "unwraps a char" do
+    it 'unwraps a char' do
       value = 3
       gv = GObject::Value.for_g_type GObject::TYPE_CHAR
       gv.set_char value
       gv.get_value.must_equal value
     end
 
-    it "unwraps an enum value" do
+    it 'unwraps an enum value' do
       value = :value2
       gv = GObject::Value.for_g_type Regress::TestEnum.get_gtype
       gv.set_enum Regress::TestEnum[value]
       gv.get_value.must_equal value
     end
 
-    it "unwraps a flags value" do
+    it 'unwraps a flags value' do
       value = Regress::TestFlags[:flag1] | Regress::TestFlags[:flag3]
       gv = GObject::Value.for_g_type Regress::TestFlags.get_gtype
       gv.set_flags value
       gv.get_value.must_equal value
     end
 
-    it "unwraps a GType" do
+    it 'unwraps a GType' do
       value = GObject::TYPE_STRING
       gv = GObject::Value.for_g_type GObject::TYPE_GTYPE
       gv.set_gtype value
       gv.get_value.must_equal value
     end
 
-    it "unwraps an int64" do
+    it 'unwraps an int64' do
       value = 0x1234_5678_9012_3456
       gv = GObject::Value.for_g_type GObject::TYPE_INT64
       gv.set_int64 value
       gv.get_value.must_equal value
     end
 
-    it "unwraps a long" do
+    it 'unwraps a long' do
       value = FFI.type_size(:long) == 8 ? 0x1234_5678_9012_3456 : 0x1234_5678
       gv = GObject::Value.for_g_type GObject::TYPE_LONG
       gv.set_long value
       gv.get_value.must_equal value
     end
 
-    it "unwraps an uchar" do
+    it 'unwraps an uchar' do
       value = 3
       gv = GObject::Value.for_g_type GObject::TYPE_UCHAR
       gv.set_uchar value
       gv.get_value.must_equal value
     end
 
-    it "unwraps an uint" do
+    it 'unwraps an uint' do
       value = 0x1234_5678
       gv = GObject::Value.for_g_type GObject::TYPE_UINT
       gv.set_uint value
       gv.get_value.must_equal value
     end
 
-    it "unwraps an uint64" do
+    it 'unwraps an uint64' do
       value = 0x1234_5678_9012_3456
       gv = GObject::Value.for_g_type GObject::TYPE_UINT64
       gv.set_uint64 value
       gv.get_value.must_equal value
     end
 
-    it "unwraps a ulong" do
+    it 'unwraps a ulong' do
       value = FFI.type_size(:long) == 8 ? 0x1234_5678_9012_3456 : 0x1234_5678
       gv = GObject::Value.for_g_type GObject::TYPE_ULONG
       gv.set_ulong value
       gv.get_value.must_equal value
     end
 
-    it "unwraps a variant" do
-      value = GLib::Variant.new_string("Foo")
+    it 'unwraps a variant' do
+      value = GLib::Variant.new_string('Foo')
       gv = GObject::Value.for_g_type GObject::TYPE_VARIANT
       gv.set_variant value
       gv.get_value.must_equal value
     end
 
-    it "works with a ByteArray" do
-      ba = GLib::ByteArray.new.append("some bytes")
+    it 'works with a ByteArray' do
+      ba = GLib::ByteArray.new.append('some bytes')
       v = GObject::Value.for_g_type GObject::TYPE_BYTE_ARRAY
       v.set_boxed ba
 
       result = v.get_value
 
-      result.to_string.must_equal "some bytes"
+      result.to_string.must_equal 'some bytes'
       result.must_be_kind_of GLib::ByteArray
     end
 
-    it "works with an Array" do
+    it 'works with an Array' do
       arr = GLib::Array.from(:uint, [1, 2, 3])
       v = GObject::Value.for_g_type GObject::TYPE_ARRAY
       v.set_boxed arr
@@ -221,37 +235,37 @@ describe GObject::Value do
     end
   end
 
-  describe "::from" do
-    it "creates a gint GValue from a Ruby Integer" do
+  describe '::from' do
+    it 'creates a gint GValue from a Ruby Integer' do
       gv = GObject::Value.from 21
-      gv.current_gtype_name.must_equal "gint"
+      gv.current_gtype_name.must_equal 'gint'
       gv.get_value.must_equal 21
     end
 
-    it "returns its argument if given a GValue" do
+    it 'returns its argument if given a GValue' do
       gv = GObject::Value.from 21
       gv2 = GObject::Value.from gv
-      gv2.current_gtype_name.must_equal "gint"
+      gv2.current_gtype_name.must_equal 'gint'
       gv2.get_value.must_equal 21
     end
   end
 
-  describe "#set_value" do
+  describe '#set_value' do
     before do
       GirFFI.setup :GIMarshallingTests
     end
 
-    it "raises an error when setting an incompatible object type" do
+    it 'raises an error when setting an incompatible object type' do
       o = GIMarshallingTests::Object.new 1
       v = GObject::Value.new.init(GIMarshallingTests::OverridesObject.get_gtype)
       proc { v.set_value o }.must_raise ArgumentError
     end
 
-    it "works with a ByteArray" do
-      ba = GLib::ByteArray.new.append("some bytes")
-      v = GObject::Value.new.init(GObject.type_from_name("GByteArray"))
+    it 'works with a ByteArray' do
+      ba = GLib::ByteArray.new.append('some bytes')
+      v = GObject::Value.new.init(GObject.type_from_name('GByteArray'))
       v.set_value ba
-      v.get_value.to_string.must_equal "some bytes"
+      v.get_value.to_string.must_equal 'some bytes'
     end
   end
 end

data/test/ffi-gobject_introspection/i_base_info_test.rb

@@ -2,37 +2,37 @@ require 'introspection_test_helper'
 
 describe GObjectIntrospection::IBaseInfo do
   let(:described_class) { GObjectIntrospection::IBaseInfo }
-  describe "#initialize" do
-    it "raises an error if a null pointer is passed" do
+  describe '#initialize' do
+    it 'raises an error if a null pointer is passed' do
       mock(ptr = Object.new).null? { true }
       proc { described_class.new ptr }.must_raise ArgumentError
     end
 
-    it "raises no error if a non-null pointer is passed" do
+    it 'raises no error if a non-null pointer is passed' do
       mock(ptr = Object.new).null? { false }
       described_class.new ptr
       pass
     end
   end
 
-  describe "#deprecated?" do
+  describe '#deprecated?' do
     let(:deprecated_info) { get_introspection_data 'Regress', 'test_versioning' }
     let(:other_info) { get_introspection_data 'Regress', 'test_value_return' }
 
-    it "returns true for a deprecated item" do
+    it 'returns true for a deprecated item' do
       skip unless deprecated_info
       deprecated_info.must_be :deprecated?
     end
 
-    it "returns false for a non-deprecated item" do
+    it 'returns false for a non-deprecated item' do
       other_info.wont_be :deprecated?
     end
   end
 
-  describe "upon garbage collection" do
-    it "calls g_base_info_unref" do
-      if defined?(RUBY_ENGINE) && ['jruby', 'rbx'].include?(RUBY_ENGINE)
-        skip "cannot be reliably tested on JRuby and Rubinius"
+  describe 'upon garbage collection' do
+    it 'calls g_base_info_unref' do
+      if defined?(RUBY_ENGINE) && %w(jruby rbx).include?(RUBY_ENGINE)
+        skip 'cannot be reliably tested on JRuby and Rubinius'
       end
 
       mock(ptr = Object.new).null? { false }
@@ -51,4 +51,3 @@ describe GObjectIntrospection::IBaseInfo do
     end
   end
 end
-

data/test/ffi-gobject_introspection/i_constant_info_test.rb

@@ -1,30 +1,30 @@
 require 'introspection_test_helper'
 
 describe GObjectIntrospection::IConstantInfo do
-  describe "for GLib::USEC_PER_SEC, a constant of type :gint32" do
+  describe 'for GLib::USEC_PER_SEC, a constant of type :gint32' do
     let(:constant_info) { get_introspection_data 'GLib', 'USEC_PER_SEC' }
 
-    it "returns :gint32 as its type" do
+    it 'returns :gint32 as its type' do
       assert_equal :gint32, constant_info.constant_type.tag
     end
 
-    it "returns 1_000_000 as its value" do
+    it 'returns 1_000_000 as its value' do
       assert_equal 1_000_000, constant_info.value
     end
   end
 
-  describe "for GLib::SOURCE_CONTINUE, a constant of type :gboolean" do
+  describe 'for GLib::SOURCE_CONTINUE, a constant of type :gboolean' do
     let(:constant_info) { get_introspection_data 'GLib', 'SOURCE_CONTINUE' }
 
     before do
       skip unless constant_info
     end
 
-    it "returns :gboolean as its type" do
+    it 'returns :gboolean as its type' do
       assert_equal :gboolean, constant_info.constant_type.tag
     end
 
-    it "returns true as its value" do
+    it 'returns true as its value' do
       assert_equal true, constant_info.value
     end
   end

data/test/ffi-gobject_introspection/i_enum_info_test.rb

@@ -1,17 +1,16 @@
 require 'introspection_test_helper'
 
 describe GObjectIntrospection::IEnumInfo do
-  describe "#find_method" do
+  describe '#find_method' do
     before do
       gir = GObjectIntrospection::IRepository.default
       gir.require 'Regress', nil
       @info = gir.find_by_name 'Regress', 'TestEnum'
     end
 
-    it "finds a method by name" do
-      result = @info.find_method("param")
-      result.name.must_equal "param"
+    it 'finds a method by name' do
+      result = @info.find_method('param')
+      result.name.must_equal 'param'
     end
   end
 end
-

data/test/ffi-gobject_introspection/i_function_info_test.rb

@@ -2,5 +2,3 @@ require 'introspection_test_helper'
 
 describe GObjectIntrospection::IFunctionInfo do
 end
-
-

data/test/ffi-gobject_introspection/i_object_info_test.rb

@@ -3,14 +3,14 @@ require 'introspection_test_helper'
 describe GObjectIntrospection::IObjectInfo do
   let(:object_info) { get_introspection_data('GObject', 'Object') }
 
-  describe "#find_vfunc" do
-    it "finds a vfunc by name" do
-      object_info.find_vfunc("finalize").wont_be_nil
+  describe '#find_vfunc' do
+    it 'finds a vfunc by name' do
+      object_info.find_vfunc('finalize').wont_be_nil
     end
   end
 
-  describe "#type_name" do
-    it "returns the correct name" do
+  describe '#type_name' do
+    it 'returns the correct name' do
       object_info.type_name.must_equal 'GObject'
     end
   end