gir_ffi 0.11.3 → 0.11.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d1e39bcc0f9f9fcac282b4b73a70afcf38f07696
-  data.tar.gz: 8f62a51f4fc6ce78aca5e2d88fd756aca059561d
+  metadata.gz: a183b776462b97665e2e4422ee403c77189232f0
+  data.tar.gz: 0e803082509b39db6946310f232b5b7dd5ccdee6
 SHA512:
-  metadata.gz: bb3dc4825b39325387310a3509772f72fa4df20907ba7aca1ebfba0f98f3b5390bbe345a9abbaf2ee1d6b1c7e58e468d1d8c94966d794e9840f8075543e74144
-  data.tar.gz: 7fbb7f35d22e0b552c5538c984a567f06ad67f98f90963f49c351603ed1652ac9206c7d47c60229737202942115155ce802c0ba5b1628900bfa9a11b92f6eed6
+  metadata.gz: 233f733b08504cbc8282d2f2a0fc68caf65e3e648dcc9b0c912c816f83574c38c1e287a1c561db4a11195980243f62024a6a0588376a6f7b0311afa12481b350
+  data.tar.gz: a4d1c9f718083cbe4932385aa60196ac3bbe870403de227d1cd43914908afb836c42191f3e63ee66021c6da43e07cb432ed6f8d3e241ff95d70b05b818e08fec

data/Changelog.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.11.4 / 2017-09-19
+
+* Support glib 2.54 and gobject-introspection 1.54
+
 ## 0.11.3 / 2017-05-05
 
 * Allow conversion to native Boolean from any Ruby value

data/Gemfile

@@ -11,5 +11,5 @@ if ENV['CI']
   end
 else
   gem 'pry', '~> 0.10.4', group: :local_development
-  gem 'simplecov', '~> 0.14.0', group: :local_development, platform: :mri
+  gem 'simplecov', '~> 0.15.0', group: :local_development, platform: :mri
 end

data/README.md

@@ -53,7 +53,7 @@ examples can be found in `gir_ffi-gtk` and `gir_ffi-gst`.
 
 ## Requirements
 
-GirFFI is tested on CRuby 2.1, 2.2 and 2.3, JRuby 9.1, and on Rubinius 3.
+GirFFI is tested on CRuby 2.1, 2.2, 2.3 and 2.4, JRuby 9.1, and on Rubinius 3.
 
 You will also need gobject-introspection installed with some
 introspection data.

data/lib/ffi-gobject/object.rb

@@ -8,17 +8,34 @@ module GObject
   # Overrides for GObject, GObject's generic base class.
   class Object
     setup_method 'new'
-
-    def initialize_with_automatic_gtype(properties = {})
-      gparameters = properties.map do |name, value|
-        name = name.to_s
-        property_param_spec(name)
-        GObject::Parameter.new.tap do |gparam|
-          gparam.name = name
-          gparam.value = value
+    if !GLib.check_version(2, 54, 0)
+      setup_method 'newv'
+
+      def initialize_with_automatic_gtype(properties = {})
+        names = []
+        values = []
+        properties.each do |name, value|
+          name = name.to_s
+          gvalue = gvalue_for_property(name)
+          gvalue.set_value value
+
+          names << name
+          values << gvalue
+        end
+        initialize_without_automatic_gtype(self.class.gtype, names, values)
+      end
+    else
+      def initialize_with_automatic_gtype(properties = {})
+        gparameters = properties.map do |name, value|
+          name = name.to_s
+          property_param_spec(name)
+          GObject::Parameter.new.tap do |gparam|
+            gparam.name = name
+            gparam.value = value
+          end
         end
+        initialize_without_automatic_gtype(self.class.gtype, gparameters)
       end
-      initialize_without_automatic_gtype(self.class.gtype, gparameters)
     end
 
     alias_method :initialize_without_automatic_gtype, :initialize

data/lib/gir_ffi/builders/enum_builder.rb

@@ -41,11 +41,11 @@ module GirFFI
       end
 
       def setup_inspect
-        klass.instance_eval <<-EOS
+        klass.instance_eval <<-RUBY
           def self.inspect
             "#{@namespace}::#{@classname}"
           end
-        EOS
+        RUBY
       end
 
       def already_set_up

data/lib/gir_ffi/builders/object_builder.rb

@@ -132,17 +132,17 @@ module GirFFI
         return if info.find_method 'new'
 
         if info.abstract?
-          klass.class_eval <<-END
+          klass.class_eval <<-RUBY
             def initialize(*)
               raise NoMethodError
             end
-          END
+          RUBY
         else
-          klass.class_eval <<-END
+          klass.class_eval <<-RUBY
             def initialize(properties = {})
               base_initialize(properties)
             end
-          END
+          RUBY
         end
       end
 

data/lib/gir_ffi/callback_base.rb

@@ -58,7 +58,7 @@ module GirFFI
       new do |*args|
         begin
           call_with_argument_mapping(prc, *args)
-        rescue => e
+        rescue StandardError => e
           GLib::MainLoop.handle_exception e
         end
       end

data/lib/gir_ffi/ffi_ext/pointer.rb

@@ -29,12 +29,13 @@ end
 FFI::Pointer.prepend GirFFI::FFIExt::Pointer
 
 FFI::Pointer.class_eval do
-  case FFI.type_size(:size_t)
-  when 4
-    alias_method :get_size_t, :get_uint32
-  when 8
-    alias_method :get_size_t, :get_uint64
-  end
+  size_t_getter = case FFI.type_size(:size_t)
+                  when 4
+                    :get_uint32
+                  when 8
+                    :get_uint64
+                  end
 
+  alias_method :get_size_t, size_t_getter
   alias_method :get_gtype, :get_size_t
 end

data/lib/gir_ffi/user_defined_object_info.rb

@@ -25,9 +25,7 @@ module GirFFI
     end
 
     def install_vfunc_implementation(name, implementation = nil)
-      unless implementation
-        implementation = ->(obj, *args) { obj.public_send name, *args }
-      end
+      implementation ||= ->(obj, *args) { obj.public_send name, *args }
       @vfunc_implementations << VFuncImplementation.new(name, implementation)
     end
 

data/lib/gir_ffi/version.rb

@@ -2,5 +2,5 @@
 
 # Current GirFFI version
 module GirFFI
-  VERSION = '0.11.3'.freeze
+  VERSION = '0.11.4'.freeze
 end

data/test/integration/generated_gimarshallingtests_test.rb

@@ -1,4 +1,3 @@
-# coding: utf-8
 # frozen_string_literal: true
 
 require 'gir_ffi_test_helper'

data/test/integration/generated_gtk_source_test.rb

@@ -7,7 +7,7 @@ describe 'The generated GtkSource module' do
   before do
     begin
       GirFFI.setup :GtkSource
-    rescue
+    rescue RuntimeError
       skip 'GtkSource GIR not available'
     end
   end

data/test/integration/generated_gtop_test.rb

@@ -8,7 +8,7 @@ describe 'The generated GTop module' do
   before do
     begin
       GirFFI.setup :GTop
-    rescue
+    rescue RuntimeError
       skip 'No GIR data for GTop available'
     end
   end

data/test/integration/generated_pango_ft2_test.rb

@@ -1,4 +1,3 @@
-# coding: utf-8
 # frozen_string_literal: true
 
 require 'gir_ffi_test_helper'

data/test/integration/generated_pango_test.rb

@@ -1,4 +1,3 @@
-# coding: utf-8
 # frozen_string_literal: true
 
 require 'gir_ffi_test_helper'

data/test/integration/generated_regress_test.rb

@@ -1,4 +1,3 @@
-# coding: utf-8
 # frozen_string_literal: true
 
 require 'gir_ffi_test_helper'
@@ -2827,7 +2826,15 @@ describe Regress do
   end
 
   it 'has a working function #annotation_transfer_floating' do
-    Regress.annotation_transfer_floating.must_be_nil
+    Regress.setup_method :annotation_transfer_floating
+    method = Regress.method :annotation_transfer_floating
+    # NOTE: The arity of this method was changed in GObjectIntrospection 1.53.2
+    if method.arity == 1
+      object = GObject::Object.new
+      Regress.annotation_transfer_floating(object).must_be_nil
+    else
+      Regress.annotation_transfer_floating.must_be_nil
+    end
   end
 
   it 'has a working function #annotation_versioned' do

data/test/integration/generated_secret_test.rb

@@ -7,7 +7,7 @@ describe 'The generated Secret module' do
     it 'has a working constructor' do
       begin
         GirFFI.setup :Secret
-      rescue
+      rescue RuntimeError
         skip 'No GIR data for Secret available'
       end
       instance = Secret::Schema.new('foo', :none, 'bar' => :string)

data/test/integration/generated_warnlib_test.rb

@@ -6,7 +6,7 @@ describe 'The generated WarnLib module' do
   before do
     begin
       GirFFI.setup :WarnLib
-    rescue
+    rescue RuntimeError
       skip 'WarnLib GIR not available'
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gir_ffi
 version: !ruby/object:Gem::Version
-  version: 0.11.3
+  version: 0.11.4
 platform: ruby
 authors:
 - Matijs van Zuijlen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-05 00:00:00.000000000 Z
+date: 2017-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.5.0
+        version: '3.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.5.0
+        version: '3.5'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -431,7 +431,7 @@ files:
 - test/minitest/stats_plugin.rb
 homepage: http://www.github.com/mvz/ruby-gir-ffi
 licenses:
-- LGPL-2.1
+- LGPL-2.1+
 metadata: {}
 post_install_message: 
 rdoc_options:
@@ -451,7 +451,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: FFI-based GObject binding using the GObject Introspection Repository