gir_ffi 0.10.0.pre1 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 35f0c0d049d4d368c306162a75fbc3e2f5d15f7a
-  data.tar.gz: 2bc5789912987309b031c94477290b4988e26f4d
+  metadata.gz: 464fd086b86382dddea95e18946be4af246c36b4
+  data.tar.gz: c9c13a75efe36d9a513c7ff8d9327b1aab20e8cb
 SHA512:
-  metadata.gz: cfe43dd9795cc18eb70b096306a7bb7413d581b7df91fbcbe0339788a379f73c4357b5d997db6064fd907563ae23f8943df3cf2b16153de10e3d7f0761f51427
-  data.tar.gz: 667648adf9dc0ccfb8371af90fce175c4d28d3c450f2500a7b7715a05c07431d878a508ff4362a77307697554cabccb9f9051462ac840e9b8c8b91c57c633fe1
+  metadata.gz: d3324bd949d9d9915d1656641d9ab19831aa884adfbd36df8690749450405f9b75721bac8104c8ec4c75baf2ceb079219338abd61b2c43bab5d731382190394f
+  data.tar.gz: dffc23519a16b729b03372502594cb959733bd9c94305814829579cf99821e2d301173fd7cda51b82d0472136c33f78b0569f684f91701a20f34a37f7c85f298

data/Changelog.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.10.0 / 2016-03-23
+
+* Ensure ownership of created RubyClosure objects
+
 ## 0.10.0.pre1 / 2016-03-22
 
 * Rework generated method code to use less indirection.

data/lib/ffi-gobject/closure.rb

@@ -15,5 +15,12 @@ module GObject
       callback = GObject::ClosureMarshal.from marshal
       Lib.g_closure_set_marshal self, callback
     end
+
+    def store_pointer(ptr)
+      super
+      # NOTE: Call C functions directly to avoid extra argument conversion
+      Lib.g_closure_ref ptr
+      Lib.g_closure_sink ptr
+    end
   end
 end

data/lib/ffi-gobject.rb

@@ -99,6 +99,9 @@ module GObject
     attach_function :g_signal_connect_data,
                     [:pointer, :string, Callback, :pointer, ClosureNotify, ConnectFlags],
                     :ulong
+
+    attach_function :g_closure_ref, [:pointer], :pointer
+    attach_function :g_closure_sink, [:pointer], :pointer
     attach_function :g_closure_set_marshal,
                     [:pointer, ClosureMarshal], :void
 

data/lib/gir_ffi/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 # Current GirFFI version
 module GirFFI
-  VERSION = '0.10.0.pre1'.freeze
+  VERSION = '0.10.0'.freeze
 end

data/test/ffi-glib/ruby_closure_test.rb

@@ -2,26 +2,35 @@
 require 'gir_ffi_test_helper'
 
 describe GObject::RubyClosure do
-  it 'has a constructor with a mandatory block argument' do
-    assert_raises ArgumentError do
-      GObject::RubyClosure.new
+  describe '.new' do
+    it 'takes a mandatory block argument' do
+      assert_raises ArgumentError do
+        GObject::RubyClosure.new
+      end
+    end
+
+    it 'returns a kind of Closure' do
+      c = GObject::RubyClosure.new {}
+      assert_kind_of GObject::Closure, c
     end
-  end
 
-  it 'is a kind of Closure' do
-    c = GObject::RubyClosure.new {}
-    assert_kind_of GObject::Closure, c
+    it 'updates the ref_count of the created object' do
+      c = GObject::RubyClosure.new {}
+      c.ref_count.must_equal 1
+    end
   end
 
-  it 'is able to retrieve its block from its struct' do
-    a = 0
-    c = GObject::RubyClosure.new { a = 2 }
-    c2 = GObject::RubyClosure.wrap(c.to_ptr)
-    c2.invoke_block
-    assert_equal 2, a
+  describe '.wrap' do
+    it 'returns a fully functional object that can invoke the original block' do
+      a = 0
+      c = GObject::RubyClosure.new { a = 2 }
+      c2 = GObject::RubyClosure.wrap(c.to_ptr)
+      c2.invoke_block
+      assert_equal 2, a
+    end
   end
 
-  describe 'its #marshaller singleton method' do
+  describe '.marshaller' do
     it "invokes its closure argument's block" do
       a = 0
       c = GObject::RubyClosure.new { a = 2 }
@@ -45,11 +54,13 @@ describe GObject::RubyClosure do
     end
   end
 
-  it 'has GObject::Closure#invoke call its block' do
-    a = 0
-    c = GObject::RubyClosure.new { a = 2 }
-    c2 = GObject::Closure.wrap(c.to_ptr)
-    c2.invoke nil, nil, nil
-    assert_equal 2, a
+  describe '#invoke' do
+    it 'invokes the ruby block' do
+      a = 0
+      c = GObject::RubyClosure.new { a = 2 }
+      c2 = GObject::Closure.wrap(c.to_ptr)
+      c2.invoke nil, nil, nil
+      assert_equal 2, a
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gir_ffi
 version: !ruby/object:Gem::Version
-  version: 0.10.0.pre1
+  version: 0.10.0
 platform: ruby
 authors:
 - Matijs van Zuijlen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-22 00:00:00.000000000 Z
+date: 2016-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -449,9 +449,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.5.1