gir_ffi 0.9.3 → 0.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 32348b4646865dc62bc64b2138a2e2103a6e1260
-  data.tar.gz: d62d4d20fd485c6c67e245850e76838b2efd1065
+  metadata.gz: 45d1fd64a20d066116552af625c33d0173bd6c47
+  data.tar.gz: 404f1c8c32d94fff866f0e3499a62f4b9727ebc8
 SHA512:
-  metadata.gz: 75e7375073038d8189f15cc7b1c30209beedde82144f6eb50fbb794be81b3be2689de49f5b3db9322a875c81bfdda22f8a4260cadb4f59e9b0c957e19bb16582
-  data.tar.gz: a932d8198cc5fbed0418e658fda7b4031ae3373642228139c6b1645557e8e4192d706b6fe0f5c21ac5e65d29558a1b1e35a7032b2eec033f479d7d508d558806
+  metadata.gz: 99533353d82d5700a0ecf734c4829157a51923b00b7bd40201dd760a8d6800865e6d00778182826565ac1ccf2bde68736d33cbb70116542ecf7d72e24a7d383e
+  data.tar.gz: d9ddd4fe6a2017148a447d4ac8a9573905cd76cd73dabc7248f60fd75417f530751cf731286f5600e8c70baf89b97db73ff9847ef77505cf669f8231a63b8e75

data/Changelog.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 0.9.4 / 2016-02-22
+
+* Pass nil user data as null pointer, and store a missing callback as nil. This
+  avoids passing a null callback and a non-null user data value, which causes
+  problems with vte_terminal_spawn_sync() and perhaps other functions.
+
 ## 0.9.3 / 2016-02-20
 
 * Make allow-none arguments optional in Ruby

data/lib/gir_ffi/builders/closure_to_pointer_convertor.rb

@@ -10,7 +10,7 @@ module GirFFI
       end
 
       def conversion
-        "GirFFI::InPointer.from_closure_data(#{callback_argument_name}.object_id)"
+        "GirFFI::InPointer.from_closure_data(#{callback_argument_name})"
       end
 
       private

data/lib/gir_ffi/callback_base.rb

@@ -38,8 +38,8 @@ module GirFFI
       CALLBACKS[prc.object_id] = prc
     end
 
-    def self.drop_callback(key)
-      CALLBACKS.delete key
+    def self.drop_callback(prc)
+      CALLBACKS.delete prc.object_id
     end
 
     # Create Callback from a Proc. Makes sure arguments are properly wrapped,

data/lib/gir_ffi/object_store.rb

@@ -8,6 +8,7 @@ module GirFFI
     end
 
     def store(obj)
+      return FFI::Pointer::NULL if obj.nil?
       # FIXME: Don't use object_id!
       key = obj.object_id
       @store[key] = obj

data/lib/gir_ffi/version.rb

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

data/tasks/test.rake

@@ -201,3 +201,4 @@ file "test/lib/configure" => ["test/lib/autogen.sh", "test/lib/configure.ac"] do
 end
 
 task test: 'test:all'
+task test: 'test:features'

data/test/ffi-glib/destroy_notify_test.rb

@@ -6,7 +6,7 @@ describe GLib::DestroyNotify do
     it 'removes the passed-in key from the callback store' do
       dummy_proc = 'some-callback'
       GirFFI::CallbackBase.store_callback dummy_proc
-      user_data = GirFFI::InPointer.from_closure_data dummy_proc.object_id
+      user_data = GirFFI::InPointer.from_closure_data dummy_proc
       GLib::DestroyNotify.default.call user_data
       GirFFI::CallbackBase::CALLBACKS[dummy_proc.object_id].must_be_nil
     end

data/test/gir_ffi/builders/argument_builder_test.rb

@@ -68,7 +68,7 @@ describe GirFFI::Builders::ArgumentBuilder do
         end
 
         it 'has the correct value for #pre_conversion' do
-          builder.pre_conversion.must_equal ['_v1 = GirFFI::InPointer.from_closure_data(foo.object_id)']
+          builder.pre_conversion.must_equal ['_v1 = GirFFI::InPointer.from_closure_data(foo)']
         end
 
         it 'has the correct value for #post_conversion' do

data/test/gir_ffi/builders/function_builder_test.rb

@@ -42,7 +42,7 @@ describe GirFFI::Builders::FunctionBuilder do
         code.must_equal <<-CODE.reset_indentation
           def self.test_callback_destroy_notify(&callback)
             _v1 = Regress::TestCallbackUserData.from(callback)
-            _v2 = GirFFI::InPointer.from_closure_data(_v1.object_id)
+            _v2 = GirFFI::InPointer.from_closure_data(_v1)
             _v3 = GLib::DestroyNotify.default
             _v4 = Regress::Lib.regress_test_callback_destroy_notify _v1, _v2, _v3
             return _v4

data/test/gir_ffi/callback_base_test.rb

@@ -14,7 +14,7 @@ describe GirFFI::CallbackBase do
     it 'removes the corresponding proc from CALLBACKS' do
       dummy_proc = 'some-callback'
       GirFFI::CallbackBase.store_callback dummy_proc
-      GirFFI::CallbackBase.drop_callback dummy_proc.object_id
+      GirFFI::CallbackBase.drop_callback dummy_proc
       GirFFI::CallbackBase::CALLBACKS[dummy_proc.object_id].must_be_nil
     end
   end

data/test/gir_ffi/in_pointer_test.rb

@@ -184,8 +184,8 @@ describe GirFFI::InPointer do
 
   describe '.from_closure_data' do
     describe 'when called with nil' do
-      it 'returns a pointer pointing to nil.object_id' do
-        GirFFI::InPointer.from_closure_data(nil).address.must_equal nil.object_id
+      it 'returns a null pointer' do
+        GirFFI::InPointer.from_closure_data(nil).must_be :null?
       end
     end
 

data/test/gir_ffi/object_store_test.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+require 'gir_ffi_test_helper'
+
+describe GirFFI::ObjectStore do
+  let(:store) { GirFFI::ObjectStore.new }
+
+  describe '#store' do
+    it 'returns a non-null pointer when storing objects' do
+      obj = Object.new
+      ptr = store.store obj
+      ptr.wont_be :null?
+    end
+
+    it 'returns a null pointer when storing nil' do
+      ptr = store.store nil
+      ptr.must_be :null?
+    end
+  end
+
+  describe '#fetch' do
+    it 'returns the stored object when passed the key pointer' do
+      obj = Object.new
+      ptr = store.store obj
+      result = store.fetch ptr
+      result.must_equal obj
+    end
+
+    it 'returns the nil object when passed a null pointer' do
+      ptr = FFI::Pointer.new(0)
+      result = store.fetch ptr
+      result.must_be_nil
+    end
+
+    it 'returns the pointer itself when passed an unknown pointer' do
+      ptr = FFI::Pointer.new(42)
+      result = store.fetch ptr
+      result.must_equal ptr
+    end
+  end
+end

data/test/integration/generated_regress_test.rb

@@ -2648,22 +2648,23 @@ describe Regress do
 
   it 'has a working function #test_callback_async' do
     a = 1
-    stored_id = nil
-    Regress.test_callback_async { |user_data| stored_id = user_data; a = 2 }
+    stored_proc = nil
+    Regress.test_callback_async { |user_data| stored_proc = user_data; a = 2 }
     result = Regress.test_callback_thaw_async
     a.must_equal 2
-    stored_id.wont_be_nil
+    stored_proc.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
+    GirFFI::CallbackBase::CALLBACKS[stored_proc.object_id].must_equal stored_proc
   end
 
   it 'has a working function #test_callback_destroy_notify' do
     a = 1
-    stored_id = nil
-    r1 = Regress.test_callback_destroy_notify { |user_data| stored_id = user_data; a = 2 }
+    stored_proc = nil
+    r1 = Regress.test_callback_destroy_notify { |user_data| stored_proc = user_data; a = 2 }
     a.must_equal 2
-    GirFFI::CallbackBase::CALLBACKS[stored_id].wont_be_nil
+    stored_id = stored_proc.object_id
+    GirFFI::CallbackBase::CALLBACKS[stored_id].must_equal stored_proc
 
     a = 3
     r2 = Regress.test_callback_thaw_notifications

metadata

@@ -1,127 +1,127 @@
 --- !ruby/object:Gem::Specification
 name: gir_ffi
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 0.9.4
 platform: ruby
 authors:
 - Matijs van Zuijlen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-20 00:00:00.000000000 Z
+date: 2016-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  type: :runtime
   name: ffi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.8'
+  type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.8'
-  prerelease: false
 - !ruby/object:Gem::Dependency
-  type: :runtime
   name: ffi-bit_masks
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.0
+  type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.0
-  prerelease: false
 - !ruby/object:Gem::Dependency
-  type: :runtime
   name: indentation
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.1
+  type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.1
-  prerelease: false
 - !ruby/object:Gem::Dependency
-  type: :development
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.5'
+  type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.5'
-  prerelease: false
 - !ruby/object:Gem::Dependency
-  type: :development
   name: minitest-rspec_mocks
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.3.0
+  type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.3.0
-  prerelease: false
 - !ruby/object:Gem::Dependency
-  type: :development
   name: rspec-mocks
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.4.1
+  type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.4.1
-  prerelease: false
 - !ruby/object:Gem::Dependency
-  type: :development
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.1'
+  type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.1'
-  prerelease: false
 - !ruby/object:Gem::Dependency
-  type: :development
   name: aruba
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.12.0
+  type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.12.0
-  prerelease: false
 description: |2
       GirFFI creates bindings for GObject-based libraries at runtime based on introspection
       data provided by the GObject Introspection Repository (GIR) system. Bindings are created
@@ -391,6 +391,7 @@ files:
 - test/gir_ffi/interface_base_test.rb
 - test/gir_ffi/method_stubber_test.rb
 - test/gir_ffi/object_base_test.rb
+- test/gir_ffi/object_store_test.rb
 - test/gir_ffi/sized_array_test.rb
 - test/gir_ffi/type_map_test.rb
 - test/gir_ffi/unintrospectable_type_info_test.rb