gir_ffi 0.10.1 → 0.10.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fa45cf6ed9c1af0159b7faeea5573b925d0fbff3
-  data.tar.gz: c016996c65de12f29c5133955b211d8ae0346f9d
+  metadata.gz: 87a8f4c01010d8c1d510e080f58ebc0cc601b163
+  data.tar.gz: 25eae9388e40ac27eb7724ca335d21c5a6dd0b80
 SHA512:
-  metadata.gz: 21a3c042d42c4c441908818ba387905d8a397245adbdd112980d4fba07166954b997219327781b3ab461d3fb93c9abd47e9f3e5aee2b3264c23208bab3aec2b6
-  data.tar.gz: 412062c0492c572e3aa2d9fb2beda46665c43fdf5263c77b96afc2b9c6c66f4ecf6d7ac7bda7ae722ea93e929d04f995b69bb0521b10b34d239ceed2de89c4fd
+  metadata.gz: 7c045bfc9d552fc6fec83cfe4aa222f123c3df3bd0327b0768f247ff3257d31debf9da3704523d95c6601c3a09afddb6d743d23ef8f4f74af2242d5bd78915e2
+  data.tar.gz: 16e9ebda8c005d7b9363f76d4a8a9c79e5fc26ab07298f27f087c688fd955db771b762bd0c9e6e9ec2b92653573fbdb52d29e395a630aee81814cb09ac0b97a7

data/Changelog.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 0.10.2 / 2016-04-29
+
+* Update ffi-bit_masks dependency and remove monkey-patch
+* Support gobject-introspection version 1.48
+
 ## 0.10.1 / 2016-03-28
 
 * Restore JRuby compatibility.

data/Gemfile

@@ -4,7 +4,7 @@ source 'https://rubygems.org'
 # The gem's dependencies are specified in gir_ffi.gemspec
 gemspec
 
-gem 'rubocop', '~> 0.38.0', type: :development
+gem 'rubocop', '~> 0.39.0', type: :development
 
 if ENV['CI']
   if ENV['TRAVIS_RUBY_VERSION'] == '2.2'

data/lib/ffi-gobject/closure.rb

@@ -7,6 +7,7 @@ module GObject
   # To create Closure objects wrapping Ruby code, use {RubyClosure}.
   class Closure
     setup_method :new_simple
+    setup_instance_method :invoke
 
     # @override
     #
@@ -16,6 +17,25 @@ module GObject
       Lib.g_closure_set_marshal self, callback
     end
 
+    # @override
+    #
+    # This override of invoke ensures the return value location can be passed
+    # in as the first argument, which is needed to ensure the GValue is
+    # initialized with the proper type.
+    #
+    # @param [GObject::Value] return_value The GValue to store the return
+    #   value, or nil if no return value is expected.
+    # @param [Array] param_values the closure parameters, or nil if no
+    #   parameters are needed.
+    # @param invocation_hint
+    def invoke(return_value, param_values, invocation_hint = nil)
+      rval = GObject::Value.from(return_value)
+      n_params = param_values.nil? ? 0 : param_values.length
+      params = GirFFI::SizedArray.from(GObject::Value, -1, param_values)
+      GObject::Lib.g_closure_invoke self, rval, n_params, params, invocation_hint
+      rval.get_value
+    end
+
     def store_pointer(ptr)
       super
       # NOTE: Call C functions directly to avoid extra argument conversion

data/lib/gir_ffi-base/gobject/lib.rb

@@ -1,13 +1,6 @@
 # frozen_string_literal: true
 require 'ffi/bit_masks'
 
-# NOTE: Monkey-patch BitMask to work on JRuby.
-FFI::BitMasks::BitMask.class_eval do
-  def reference_required?
-    false
-  end
-end
-
 module GObject
   # Module for attaching functions from the gobject library
   module Lib

data/lib/gir_ffi/builders/user_defined_builder.rb

@@ -70,14 +70,16 @@ module GirFFI
       end
 
       def class_init_proc
-        proc do |object_class_ptr, _data|
+        proc do |type_class_or_ptr, _data|
+          object_class_ptr = type_class_or_ptr.to_ptr
           setup_properties object_class_ptr
           setup_vfuncs object_class_ptr
         end
       end
 
       def interface_init_proc(interface)
-        proc do |interface_ptr, _data|
+        proc do |interface_or_ptr, _data|
+          interface_ptr = interface_or_ptr.to_ptr
           setup_interface_vfuncs interface, interface_ptr
         end
       end

data/lib/gir_ffi/version.rb

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

data/test/ffi-glib/ruby_closure_test.rb

@@ -59,7 +59,7 @@ describe GObject::RubyClosure do
       a = 0
       c = GObject::RubyClosure.new { a = 2 }
       c2 = GObject::Closure.wrap(c.to_ptr)
-      c2.invoke nil, nil, nil
+      c2.invoke nil, []
       assert_equal 2, a
     end
   end

data/test/gir_ffi/builders/function_builder_test.rb

@@ -488,16 +488,16 @@ describe GirFFI::Builders::FunctionBuilder do
     end
 
     describe 'for functions where some allow-none cannot be honored' do
-      let(:function_info) { get_method_introspection_data 'GObject', 'Closure', 'invoke' }
+      let(:function_info) { get_introspection_data 'GIMarshallingTests', 'array_in_utf8_two_in_out_of_order' }
       it 'builds correct definition with default parameter value on the later arguments' do
         code.must_equal <<-CODE.reset_indentation
-          def invoke(return_value, param_values, invocation_hint = nil)
-            _v1 = GObject::Value.from(return_value)
-            n_param_values = param_values.nil? ? 0 : param_values.length
-            _v2 = n_param_values
-            _v3 = invocation_hint
-            _v4 = GirFFI::SizedArray.from(GObject::Value, -1, param_values)
-            GObject::Lib.g_closure_invoke self, _v1, _v2, _v4, _v3
+          def self.array_in_utf8_two_in_out_of_order(a, ints, b = nil)
+            length = ints.nil? ? 0 : ints.length
+            _v1 = length
+            _v2 = GirFFI::InPointer.from_utf8(a)
+            _v3 = GirFFI::InPointer.from_utf8(b)
+            _v4 = GirFFI::SizedArray.from(:gint32, -1, ints)
+            GIMarshallingTests::Lib.gi_marshalling_tests_array_in_utf8_two_in_out_of_order _v1, _v2, _v4, _v3
           end
         CODE
       end

data/test/integration/generated_gimarshallingtests_test.rb

@@ -1841,8 +1841,9 @@ describe GIMarshallingTests do
   it 'has a working function #gclosure_return' do
     cl = GIMarshallingTests.gclosure_return
     gv = GObject::Value.wrap_ruby_value 0
-    cl.invoke gv, nil, nil
+    result = cl.invoke gv, nil
     assert_equal 42, gv.get_value
+    result.must_equal 42
   end
 
   it 'has a working function #genum_in' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gir_ffi
 version: !ruby/object:Gem::Version
-  version: 0.10.1
+  version: 0.10.2
 platform: ruby
 authors:
 - Matijs van Zuijlen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-28 00:00:00.000000000 Z
+date: 2016-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.1.1
 - !ruby/object:Gem::Dependency
   name: indentation
   requirement: !ruby/object:Gem::Requirement