gir_ffi 0.8.6 → 0.9.0

data/test/integration/generated_gio_test.rb

@@ -101,7 +101,7 @@ describe 'The generated Gio module' do
     let(:simple_action) { Gio::SimpleAction.new('test', 'd') }
 
     it 'can read the property "state-type" with #get_property' do
-      simple_action.get_property('state-type').get_value.must_be_nil
+      simple_action.get_property('state-type').must_be_nil
     end
 
     it 'can read the property "state-type" with #state_type' do

data/test/integration/generated_gobject_test.rb

@@ -89,7 +89,7 @@ describe GObject do
       let(:binding) { source.bind_property 'double', target, 'double', :default }
 
       it 'can read the property "target-property" with #get_property' do
-        binding.get_property('target-property').get_value.must_equal 'double'
+        binding.get_property('target-property').must_equal 'double'
       end
 
       it 'can read the property "target-property" with #target_property' do

data/test/integration/generated_gtop_test.rb

@@ -4,7 +4,11 @@ require 'gir_ffi_test_helper'
 # contains types with bad names, like 'glibtop_cpu'.
 describe 'The generated GTop module' do
   before do
-    GirFFI.setup :GTop
+    begin
+      GirFFI.setup :GTop
+    rescue
+      skip 'No GIR data for GTop available'
+    end
   end
 
   describe 'Glibtop' do

data/test/integration/generated_regress_test.rb

@@ -5,9 +5,6 @@ GirFFI.setup :Regress
 
 if IntrospectionTestExtensions.get_introspection_data 'Regress', 'TestInheritDrawable'
   class ConcreteDrawable < Regress::TestInheritDrawable
-    def initialize
-      super(self.class.gtype, [])
-    end
   end
 
   GirFFI.define_type ConcreteDrawable
@@ -1149,7 +1146,7 @@ describe Regress do
 
     it 'creates an instance using #new_callback' do
       a = 1
-      o = Regress::TestObj.new_callback proc { a = 2 }, nil, nil
+      o = Regress::TestObj.new_callback { a = 2 }
       assert_instance_of Regress::TestObj, o
       a.must_equal 2
 
@@ -1177,7 +1174,7 @@ describe Regress do
 
     it 'has a working function #static_method_callback' do
       a = 1
-      Regress::TestObj.static_method_callback proc { a = 2 }
+      Regress::TestObj.static_method_callback { a = 2 }
       assert_equal 2, a
     end
 
@@ -1257,7 +1254,7 @@ describe Regress do
 
     it 'has a working method #instance_method_callback' do
       a = 1
-      instance.instance_method_callback proc { a = 2 }
+      instance.instance_method_callback { a = 2 }
       assert_equal 2, a
     end
 
@@ -1344,7 +1341,7 @@ describe Regress do
 
     describe "its 'bare' property" do
       it 'can be retrieved with #get_property' do
-        instance.get_property('bare').get_value.must_be_nil
+        instance.get_property('bare').must_be_nil
       end
 
       it 'can be retrieved with #bare' do
@@ -1354,7 +1351,7 @@ describe Regress do
       it 'can be set with #set_property' do
         obj = Regress::TestObj.new_from_file('bar')
         instance.set_property 'bare', obj
-        instance.get_property('bare').get_value.must_equal obj
+        instance.get_property('bare').must_equal obj
       end
 
       it 'can be set with #bare=' do
@@ -1362,13 +1359,13 @@ describe Regress do
         instance.bare = obj
 
         instance.bare.must_equal obj
-        instance.get_property('bare').get_value.must_equal obj
+        instance.get_property('bare').must_equal obj
       end
     end
 
     describe "its 'boxed' property" do
       it 'can be retrieved with #get_property' do
-        instance.get_property('boxed').get_value.must_be_nil
+        instance.get_property('boxed').must_be_nil
       end
 
       it 'can be retrieved with #boxed' do
@@ -1378,20 +1375,20 @@ describe Regress do
       it 'can be set with #set_property' do
         tb = Regress::TestBoxed.new_alternative_constructor1 75
         instance.set_property 'boxed', tb
-        instance.get_property('boxed').get_value.some_int8.must_equal 75
+        instance.get_property('boxed').some_int8.must_equal 75
       end
 
       it 'can be set with #boxed=' do
         tb = Regress::TestBoxed.new_alternative_constructor1 75
         instance.boxed = tb
         instance.boxed.some_int8.must_equal tb.some_int8
-        instance.get_property('boxed').get_value.some_int8.must_equal tb.some_int8
+        instance.get_property('boxed').some_int8.must_equal tb.some_int8
       end
     end
 
     describe "its 'double' property" do
       it 'can be retrieved with #get_property' do
-        instance.get_property('double').get_value.must_equal 0.0
+        instance.get_property('double').must_equal 0.0
       end
 
       it 'can be retrieved with #double' do
@@ -1400,19 +1397,19 @@ describe Regress do
 
       it 'can be set with #set_property' do
         instance.set_property 'double', 3.14
-        instance.get_property('double').get_value.must_equal 3.14
+        instance.get_property('double').must_equal 3.14
       end
 
       it 'can be set with #double=' do
         instance.double = 3.14
         instance.double.must_equal 3.14
-        instance.get_property('double').get_value.must_equal 3.14
+        instance.get_property('double').must_equal 3.14
       end
     end
 
     describe "its 'float' property" do
       it 'can be retrieved with #get_property' do
-        instance.get_property('float').get_value.must_equal 0.0
+        instance.get_property('float').must_equal 0.0
       end
 
       it 'can be retrieved with #float' do
@@ -1421,13 +1418,13 @@ describe Regress do
 
       it 'can be set with #set_property' do
         instance.set_property 'float', 3.14
-        instance.get_property('float').get_value.must_be_close_to 3.14
+        instance.get_property('float').must_be_close_to 3.14
       end
 
       it 'can be set with #float=' do
         instance.float = 3.14
         instance.float.must_be_close_to 3.14
-        instance.get_property('float').get_value.must_be_close_to 3.14
+        instance.get_property('float').must_be_close_to 3.14
       end
     end
 
@@ -1437,7 +1434,7 @@ describe Regress do
       end
 
       it 'can be retrieved with #get_property' do
-        instance.get_property('gtype').get_value.must_equal 0
+        instance.get_property('gtype').must_equal 0
       end
 
       it 'can be retrieved with #gtype' do
@@ -1446,19 +1443,19 @@ describe Regress do
 
       it 'can be set with #set_property' do
         instance.set_property 'gtype', GObject::TYPE_INT64
-        instance.get_property('gtype').get_value.must_equal GObject::TYPE_INT64
+        instance.get_property('gtype').must_equal GObject::TYPE_INT64
       end
 
       it 'can be set with #gtype=' do
         instance.gtype = GObject::TYPE_STRING
         instance.gtype.must_equal GObject::TYPE_STRING
-        instance.get_property('gtype').get_value.must_equal GObject::TYPE_STRING
+        instance.get_property('gtype').must_equal GObject::TYPE_STRING
       end
     end
 
     describe "its 'hash-table' property" do
       it 'can be retrieved with #get_property' do
-        instance.get_property('hash-table').get_value.must_be_nil
+        instance.get_property('hash-table').must_be_nil
       end
 
       it 'can be retrieved with #hash_table' do
@@ -1480,7 +1477,7 @@ describe Regress do
 
     describe "its 'hash-table-old' property" do
       it 'can be retrieved with #get_property' do
-        instance.get_property('hash-table-old').get_value.must_be_nil
+        instance.get_property('hash-table-old').must_be_nil
       end
 
       it 'can be retrieved with #hash_table_old' do
@@ -1502,7 +1499,7 @@ describe Regress do
 
     describe "its 'int' property" do
       it 'can be retrieved with #get_property' do
-        assert_equal 0, instance.get_property('int').get_value
+        assert_equal 0, instance.get_property('int')
       end
 
       it 'can be retrieved with #int' do
@@ -1511,12 +1508,12 @@ describe Regress do
 
       it 'can be set with #set_property' do
         instance.set_property 'int', 42
-        assert_equal 42, instance.get_property('int').get_value
+        assert_equal 42, instance.get_property('int')
       end
 
       it 'can be set with #int=' do
         instance.int = 41
-        assert_equal 41, instance.get_property('int').get_value
+        assert_equal 41, instance.get_property('int')
         assert_equal 41, instance.int
       end
     end
@@ -1591,7 +1588,7 @@ describe Regress do
     end
     describe "its 'string' property" do
       it 'can be retrieved with #get_property' do
-        assert_nil instance.get_property('string').get_value
+        assert_nil instance.get_property('string')
       end
 
       it 'can be retrieved with #string' do
@@ -1600,13 +1597,13 @@ describe Regress do
 
       it 'can be set with #set_property' do
         instance.set_property 'string', 'foobar'
-        assert_equal 'foobar', instance.get_property('string').get_value
+        assert_equal 'foobar', instance.get_property('string')
       end
 
       it 'can be set with #string=' do
         instance.string = 'foobar'
         assert_equal 'foobar', instance.string
-        assert_equal 'foobar', instance.get_property('string').get_value
+        assert_equal 'foobar', instance.get_property('string')
       end
     end
 
@@ -1698,7 +1695,7 @@ describe Regress do
       result = GObject.signal_emit instance, 'sig-with-int64-prop', 0x7fff_ffff_ffff_ffff
 
       a.must_equal 0x7fff_ffff_ffff_ffff
-      result.get_value.must_equal 0x7fff_ffff_ffff_ffff
+      result.must_equal 0x7fff_ffff_ffff_ffff
     end
 
     it "handles the 'sig-with-intarray-ret' signal" do
@@ -1715,8 +1712,7 @@ describe Regress do
 
       a.must_equal 3
 
-      # TODO: Use signal info to convert return value
-      GLib::Array.wrap(:gint32, result.get_value_plain).to_a.must_equal [3, 2, 1]
+      result.to_a.must_equal [3, 2, 1]
     end
 
     it "handles the 'sig-with-obj' signal" do
@@ -1756,7 +1752,7 @@ describe Regress do
       result = GObject.signal_emit instance, 'sig-with-uint64-prop', 0xffff_ffff_ffff_ffff
 
       a.must_equal 0xffff_ffff_ffff_ffff
-      result.get_value.must_equal 0xffff_ffff_ffff_ffff
+      result.must_equal 0xffff_ffff_ffff_ffff
     end
 
     it "handles the 'test' signal" do
@@ -2276,7 +2272,7 @@ describe Regress do
 
     describe "its 'testbool' property" do
       it 'can be retrieved with #get_property' do
-        instance.get_property('testbool').get_value.must_equal true
+        instance.get_property('testbool').must_equal true
       end
 
       it 'can be retrieved with #testbool' do
@@ -2286,23 +2282,23 @@ describe Regress do
       it 'can be set with #set_property' do
         instance.set_property 'testbool', true
         instance.get_testbool.must_equal true
-        instance.get_property('testbool').get_value.must_equal true
+        instance.get_property('testbool').must_equal true
 
         instance.set_property 'testbool', false
         instance.get_testbool.must_equal false
-        instance.get_property('testbool').get_value.must_equal false
+        instance.get_property('testbool').must_equal false
       end
 
       it 'can be set with #testbool=' do
         instance.testbool = true
         instance.testbool.must_equal true
         instance.get_testbool.must_equal true
-        instance.get_property('testbool').get_value.must_equal true
+        instance.get_property('testbool').must_equal true
 
         instance.testbool = false
         instance.testbool.must_equal false
         instance.get_testbool.must_equal false
-        instance.get_property('testbool').get_value.must_equal false
+        instance.get_property('testbool').must_equal false
       end
     end
   end
@@ -2438,7 +2434,7 @@ describe Regress do
 
   it 'has a working function #global_get_flags_out' do
     result = Regress.global_get_flags_out
-    result.must_equal Regress::TestFlags[:flag1] | Regress::TestFlags[:flag3]
+    result.must_equal(flag1: true, flag3: true)
   end
 
   it 'has a working function #has_parameter_named_attrs' do
@@ -2470,14 +2466,12 @@ describe Regress do
     b = nil
     c = 95
 
-    callback = proc do |one, two|
+    result = Regress.test_array_callback do |one, two|
       a = one
       b = two
       c
     end
 
-    result = Regress.test_array_callback callback
-
     result.must_equal 2 * c
     a.to_a.must_equal [-1, 0, 1, 2]
     b.to_a.must_equal %w(one two three)
@@ -2539,11 +2533,11 @@ describe Regress do
 
   it 'has a working function #test_array_inout_callback' do
     skip unless get_introspection_data 'Regress', 'test_array_inout_callback'
-    Regress.test_array_inout_callback proc { |ints|
+    Regress.test_array_inout_callback do |ints|
       arr = ints.to_a
       arr.shift
       arr
-    }
+    end
     pass
   end
 
@@ -2580,10 +2574,10 @@ describe Regress do
     main_loop = GLib::MainLoop.new nil, false
 
     a = 1
-    Regress.test_async_ready_callback proc {
+    Regress.test_async_ready_callback do
       main_loop.quit
       a = 2
-    }
+    end
 
     main_loop.run
 
@@ -2647,57 +2641,55 @@ describe Regress do
   end
 
   it 'has a working function #test_callback' do
-    result = Regress.test_callback proc { 5 }
+    result = Regress.test_callback { 5 }
     assert_equal 5, result
   end
 
   it 'has a working function #test_callback_async' do
     a = 1
-    Regress.test_callback_async(proc { |b| a = 2; b },
-                                44)
-    r = Regress.test_callback_thaw_async
-    assert_equal 44, r
-    assert_equal 2, a
+    stored_id = nil
+    Regress.test_callback_async { |user_data| stored_id = user_data; a = 2 }
+    result = Regress.test_callback_thaw_async
+    a.must_equal 2
+    stored_id.wont_be_nil
+    result.must_equal 2
+    # TODO: See when we can clean up the stored callback for async callbacks.
+    GirFFI::CallbackBase::CALLBACKS[stored_id].wont_be_nil
   end
 
   it 'has a working function #test_callback_destroy_notify' do
     a = 1
-    r1 = Regress.test_callback_destroy_notify(proc { |b| a = 2; b },
-                                              42,
-                                              proc { a = 3 })
-    assert_equal 2, a
-    assert_equal 42, r1
+    stored_id = nil
+    r1 = Regress.test_callback_destroy_notify { |user_data| stored_id = user_data; a = 2 }
+    a.must_equal 2
+    GirFFI::CallbackBase::CALLBACKS[stored_id].wont_be_nil
+
+    a = 3
     r2 = Regress.test_callback_thaw_notifications
-    assert_equal 3, a
-    assert_equal 42, r2
+    a.must_equal 2
+    r1.must_equal r2
+    GirFFI::CallbackBase::CALLBACKS[stored_id].must_be_nil
   end
 
   it 'has a working function #test_callback_destroy_notify_no_user_data' do
     skip unless get_introspection_data 'Regress', 'test_callback_destroy_notify_no_user_data'
 
     callback_times_called = 0
-    notify_times_called = 0
     b = :not_nil
 
-    callback = proc do|user_data|
+    result = Regress.test_callback_destroy_notify_no_user_data do |user_data|
       callback_times_called += 1
       b = user_data
       callback_times_called * 5
     end
 
-    notify = proc { notify_times_called += 1 }
-
-    result = Regress.test_callback_destroy_notify_no_user_data callback, notify
-
     callback_times_called.must_equal 1
-    notify_times_called.must_equal 0
     result.must_equal 5
     b.must_be_nil
 
     result = Regress.test_callback_thaw_notifications
 
     callback_times_called.must_equal 2
-    notify_times_called.must_equal 1
     result.must_equal 10
     b.must_be_nil
   end
@@ -2705,44 +2697,35 @@ describe Regress do
   it 'has a working function #test_callback_return_full' do
     skip unless get_introspection_data 'Regress', 'test_callback_return_full'
     obj = Regress::TestObj.constructor
-    Regress.test_callback_return_full proc { obj }
+    Regress.test_callback_return_full { obj }
     ref_count(obj).must_equal 1
   end
 
   it 'has a working function #test_callback_thaw_async' do
     invoked = []
-    Regress.test_callback_async proc { invoked << 1; 1 }, nil
-    Regress.test_callback_async proc { invoked << 2; 2 }, nil
-    Regress.test_callback_async proc { invoked << 3; 3 }, nil
+    Regress.test_callback_async { invoked << 1; 1 }
+    Regress.test_callback_async { invoked << 2; 2 }
+    Regress.test_callback_async { invoked << 3; 3 }
     result = Regress.test_callback_thaw_async
     invoked.must_equal [3, 2, 1]
     result.must_equal 1
   end
 
   it 'has a working function #test_callback_thaw_notifications' do
-    invoked = false
-    Regress.test_callback_destroy_notify proc { 42 }, nil, nil
-    Regress.test_callback_destroy_notify proc { 24 }, nil, proc { invoked = true }
+    Regress.test_callback_destroy_notify { 42 }
+    Regress.test_callback_destroy_notify { 24 }
     result = Regress.test_callback_thaw_notifications
     result.must_equal 66
-    invoked.must_equal true
   end
 
   it 'has a working function #test_callback_user_data' do
-    a = 'old-value'
-    result = Regress.test_callback_user_data proc { |u| a = u; 5 }, 'new-value'
-    a.must_equal 'new-value'
+    stored_id = nil
+    result = Regress.test_callback_user_data { |u| stored_id = u; 5 }
+    # TODO: Ensure that the key stored_id is no longer in the callback store
+    stored_id.wont_be_nil
     result.must_equal 5
   end
 
-  describe 'the #test_callback_user_data function' do
-    it 'handles boolean user_data' do
-      a = false
-      Regress.test_callback_user_data proc { |u| a = u; 5 }, true
-      assert_equal true, a
-    end
-  end
-
   it 'has a working function #test_closure' do
     c = GObject::RubyClosure.new { 5235 }
     r = Regress.test_closure c
@@ -2774,8 +2757,7 @@ describe Regress do
   end
 
   it 'has a working function #test_date_in_gvalue' do
-    r = Regress.test_date_in_gvalue
-    date = r.get_value
+    date = Regress.test_date_in_gvalue
     skip unless date.respond_to? :get_year
     assert_equal [1984, :december, 5],
                  [date.get_year, date.get_month, date.get_day]
@@ -2830,7 +2812,7 @@ describe Regress do
 
   it 'has a working function #test_gerror_callback' do
     result = nil
-    Regress.test_gerror_callback proc { |err| result = err.message }
+    Regress.test_gerror_callback { |err| result = err.message }
     result.must_equal 'regression test error'
   end
 
@@ -3059,7 +3041,7 @@ describe Regress do
 
   it 'has a working function #test_hash_table_callback' do
     value = nil
-    Regress.test_hash_table_callback({ 'foo' => 42 }, proc { |hash| value = hash })
+    Regress.test_hash_table_callback('foo' => 42) { |hash| value = hash }
     value.to_hash.must_equal('foo' => 42)
   end
 
@@ -3109,10 +3091,10 @@ describe Regress do
 
   it 'has a working function #test_multi_callback' do
     a = 1
-    result = Regress.test_multi_callback proc {
+    result = Regress.test_multi_callback do
       a += 1
       23
-    }
+    end
     assert_equal 2 * 23, result
     assert_equal 3, a
   end
@@ -3133,13 +3115,13 @@ describe Regress do
 
   it 'has a working function #test_null_gerror_callback' do
     value = nil
-    Regress.test_owned_gerror_callback proc { |err| value = err }
+    Regress.test_owned_gerror_callback { |err| value = err }
     value.message.must_equal 'regression test owned error'
   end
 
   it 'has a working function #test_owned_gerror_callback' do
     value = nil
-    Regress.test_owned_gerror_callback proc { |err| value = err }
+    Regress.test_owned_gerror_callback { |err| value = err }
     value.message.must_equal 'regression test owned error'
   end
 
@@ -3155,7 +3137,7 @@ describe Regress do
 
   it 'has a working function #test_simple_callback' do
     a = 0
-    Regress.test_simple_callback proc { a = 1 }
+    Regress.test_simple_callback { a = 1 }
     assert_equal 1, a
   end
 
@@ -3179,8 +3161,8 @@ describe Regress do
   end
 
   it 'has a working function #test_strv_in_gvalue' do
-    gv = Regress.test_strv_in_gvalue
-    gv.get_value.must_be :==, %w(one two three)
+    arr = Regress.test_strv_in_gvalue
+    arr.must_be :==, %w(one two three)
   end
 
   it 'has a working function #test_strv_out' do
@@ -3225,11 +3207,10 @@ describe Regress do
 
   it 'has a working function #test_torture_signature_2' do
     a = 1
-    y, z, q = Regress.test_torture_signature_2 244,
-                                               proc { |u| a = u }, 2, proc { a = 3 },
-                                               'foofoo', 31
+    y, z, q = Regress.test_torture_signature_2 244, 'foofoo', 31 do |u|
+      a = u
+    end
     assert_equal [244, 2 * 244, 6 + 31], [y, z, q]
-    assert_equal 3, a
   end
 
   it 'has a working function #test_uint' do
@@ -3322,7 +3303,7 @@ describe Regress do
 
   it 'has a working function #test_value_return' do
     result = Regress.test_value_return 3423
-    assert_equal 3423, result.get_int
+    result.must_equal 3423
   end
 
   it 'has a working function #test_versioning' do