gir_ffi 0.11.4 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: a183b776462b97665e2e4422ee403c77189232f0
-  data.tar.gz: 0e803082509b39db6946310f232b5b7dd5ccdee6
+SHA256:
+  metadata.gz: 878b55819cccfb1e47cee4e9e7c32f82f10fe6047a354f769099248a7f25ca50
+  data.tar.gz: 7324795f3e9ef0427638b6b2cb3ed67a6a2a60daa9d56483173ec11a2198f3a7
 SHA512:
-  metadata.gz: 233f733b08504cbc8282d2f2a0fc68caf65e3e648dcc9b0c912c816f83574c38c1e287a1c561db4a11195980243f62024a6a0588376a6f7b0311afa12481b350
-  data.tar.gz: a4d1c9f718083cbe4932385aa60196ac3bbe870403de227d1cd43914908afb836c42191f3e63ee66021c6da43e07cb432ed6f8d3e241ff95d70b05b818e08fec
+  metadata.gz: e28e7c3a60c4957747a808edde2deb2b649b49e832206a32dd5ef655edcbe629081fd89b2cc442811f47e18fefbb0e24d825ef76b9b56b555f3f31afdd2a57ae
+  data.tar.gz: aef306323a901033df3e1359318f52f44943a77100a03c20bbbc8e35b99389eb0fe3462ec01fd90c1c671c82a5b26136ed45876aeee7b482d05e329100ec8474

data/Changelog.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 0.12.0 / 2018-03-024
+
+* Drop support for GLib::IConv, which is no longer introspectable in glib 2.56.
+* Drop support for Ruby 2.1 and 2.2
+* Add support for Ruby 2.5
+
 ## 0.11.4 / 2017-09-19
 
 * Support glib 2.54 and gobject-introspection 1.54

data/Gemfile

@@ -6,10 +6,5 @@ source 'https://rubygems.org'
 gemspec
 
 if ENV['CI']
-  if ENV['TRAVIS_RUBY_VERSION'] == '2.2'
-    gem 'coveralls', group: :development
-  end
-else
-  gem 'pry', '~> 0.10.4', group: :local_development
-  gem 'simplecov', '~> 0.15.0', group: :local_development, platform: :mri
+  gem 'coveralls', group: :development if ENV['TRAVIS_RUBY_VERSION'] == '2.4'
 end

data/README.md

@@ -9,10 +9,10 @@ Ruby bindings for GNOME using the GObject Introspection Repository.
 ## Status
 
 [![Gem Version](https://badge.fury.io/rb/gir_ffi.svg)](http://badge.fury.io/rb/gir_ffi)
-[![Dependency Status](https://gemnasium.com/mvz/gir_ffi.svg)](https://gemnasium.com/mvz/gir_ffi)
+[![Depfu](https://badges.depfu.com/badges/d5a8e9bffd2462a7ab4921d2f7e6fc48/overview.svg)](https://depfu.com/github/mvz/gir_ffi)
 [![Build Status](https://travis-ci.org/mvz/gir_ffi.svg?branch=master)](https://travis-ci.org/mvz/gir_ffi)
 [![Code Climate](https://codeclimate.com/github/mvz/gir_ffi/badges/gpa.svg)](https://codeclimate.com/github/mvz/gir_ffi)
-[![Coverage Status](https://coveralls.io/repos/mvz/gir_ffi/badge.svg?branch=master&service=github)](https://coveralls.io/github/mvz/gir_ffi?branch=master)
+[![Coverage Status](https://coveralls.io/repos/github/mvz/gir_ffi/badge.svg?branch=master)](https://coveralls.io/github/mvz/gir_ffi?branch=master)
 [![Documentation Status](https://inch-ci.org/github/mvz/gir_ffi.svg?branch=master)](https://inch-ci.org/github/mvz/gir_ffi/branch/master)
 
 ## Features
@@ -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, 2.3 and 2.4, JRuby 9.1, and on Rubinius 3.
+GirFFI is supported on CRuby 2.3, 2.4 and 2.5, and JRuby 9.1.
 
 You will also need gobject-introspection installed with some
 introspection data.

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rake/clean'
 require 'bundler/gem_tasks'
 

data/lib/ffi-glib.rb

@@ -14,7 +14,6 @@ require 'ffi-glib/bytes'
 require 'ffi-glib/destroy_notify'
 require 'ffi-glib/error'
 require 'ffi-glib/hash_table'
-require 'ffi-glib/iconv'
 require 'ffi-glib/list'
 require 'ffi-glib/main_loop'
 require 'ffi-glib/ptr_array'

data/lib/ffi-glib/array_methods.rb

@@ -5,7 +5,7 @@ module GLib
   module ArrayMethods
     # Re-implementation of the g_array_index and g_ptr_array_index macros
     def index(idx)
-      if idx >= length || idx < 0
+      unless (0...length).cover? idx
         raise IndexError, "Index #{idx} outside of bounds 0..#{length - 1}"
       end
       ptr = GirFFI::InOutPointer.new element_type, data_ptr + idx * element_size

data/lib/ffi-glib/container_class_methods.rb

@@ -18,7 +18,7 @@ module GLib
             end
 
       super(ptr).tap do |container|
-        container.reset_typespec typespec if container
+        container&.reset_typespec typespec
       end
     end
 

data/lib/ffi-glib/main_loop.rb

@@ -40,9 +40,7 @@ module GLib
     setup_instance_method :run
 
     def run_with_thread_enabler
-      if RUBY_ENGINE == 'ruby'
-        ThreadEnabler.instance.setup_idle_handler
-      end
+      ThreadEnabler.instance.setup_idle_handler if RUBY_ENGINE == 'ruby'
       RUNNING_LOOPS << self
       result = run_without_thread_enabler
       ex = EXCEPTIONS.shift

data/lib/ffi-gobject/ruby_closure.rb

@@ -36,7 +36,7 @@ module GObject
 
       result = rclosure.invoke_block(*args)
 
-      return_value.set_value(result) if return_value
+      return_value&.set_value(result)
     end
 
     # @api private

data/lib/ffi-gobject/value.rb

@@ -22,9 +22,7 @@ module GObject
       proc do
         if struct.owned?
           ptr = struct.to_ptr
-          unless struct[:g_type] == TYPE_INVALID
-            Lib.g_value_unset ptr
-          end
+          Lib.g_value_unset ptr unless struct[:g_type] == TYPE_INVALID
           GObject.boxed_free gtype, ptr
         end
       end
@@ -141,9 +139,7 @@ module GObject
     }.freeze
 
     def init_for_ruby_value(val)
-      if val.class.respond_to? :gtype
-        return init val.class.gtype
-      end
+      return init val.class.gtype if val.class.respond_to? :gtype
       CLASS_TO_GTYPE_MAP.each do |klass, type|
         return init type if val.is_a? klass
       end

data/lib/ffi-gobject_introspection/i_base_info.rb

@@ -40,7 +40,7 @@ module GObjectIntrospection
       method = method.to_s
       single ||= method.to_s[0..-2]
       count = method.sub(/^(get_)?/, '\\1n_')
-      class_eval <<-CODE
+      class_eval <<-CODE, __FILE__, __LINE__ + 1
         def #{method}
           (0..(#{count} - 1)).map do |i|
             #{single} i
@@ -70,7 +70,7 @@ module GObjectIntrospection
       single = method.sub(/^find_/, '')
       counter ||= "n_#{single}s"
       fetcher ||= single
-      class_eval <<-CODE
+      class_eval <<-CODE, __FILE__, __LINE__ + 1
         def #{method}(name)
           name = name.to_s
           #{counter}.times do |i|

data/lib/gir_ffi/arg_helper.rb

@@ -17,9 +17,7 @@ module GirFFI
     end
 
     def self.check_fixed_array_size(size, arr, name)
-      unless arr.size.equal? size
-        raise ArgumentError, "#{name} should have size #{size}"
-      end
+      raise ArgumentError, "#{name} should have size #{size}" unless arr.size.equal? size
     end
 
     # NOTE: Only used in List, SList and HashTable classes.

data/lib/gir_ffi/builders/argument_builder.rb

@@ -84,9 +84,7 @@ module GirFFI
       end
 
       def output_value
-        if caller_allocated_object? && gvalue?
-          return "#{call_argument_name}.get_value"
-        end
+        return "#{call_argument_name}.get_value" if caller_allocated_object? && gvalue?
         base = pointer_to_value_method_call call_argument_name, type_spec
         if needs_out_conversion?
           outgoing_convertor(base).conversion
@@ -127,7 +125,7 @@ module GirFFI
       end
 
       def length_argument_name
-        length_arg && length_arg.post_converted_name
+        length_arg&.post_converted_name
       end
 
       def needs_size_check?
@@ -188,7 +186,7 @@ module GirFFI
           @arginfo.caller_allocates?
       end
 
-      DESTROY_NOTIFIER = 'GLib::DestroyNotify.default'.freeze
+      DESTROY_NOTIFIER = 'GLib::DestroyNotify.default'
 
       def ingoing_convertor
         if skipped_in?

data/lib/gir_ffi/builders/callback_argument_builder.rb

@@ -170,7 +170,7 @@ module GirFFI
       end
 
       def length_argument_name
-        length_arg && length_arg.pre_converted_name
+        length_arg&.pre_converted_name
       end
     end
   end

data/lib/gir_ffi/builders/enum_builder.rb

@@ -41,7 +41,7 @@ module GirFFI
       end
 
       def setup_inspect
-        klass.instance_eval <<-RUBY
+        klass.instance_eval <<-RUBY, __FILE__, __LINE__ + 1
           def self.inspect
             "#{@namespace}::#{@classname}"
           end

data/lib/gir_ffi/builders/initializer_return_value_builder.rb

@@ -9,9 +9,7 @@ module GirFFI
       def post_conversion
         result = []
         result << "store_pointer(#{capture_variable_name})"
-        if specialized_type_tag == :struct
-          result << '@struct.owned = true'
-        end
+        result << '@struct.owned = true' if specialized_type_tag == :struct
         result
       end
     end

data/lib/gir_ffi/builders/object_builder.rb

@@ -121,24 +121,24 @@ module GirFFI
 
       def define_vfunc_invoker(vfunc_name, invoker_name)
         return if vfunc_name == invoker_name
-        klass.class_eval "
+        klass.class_eval <<-DEF, __FILE__, __LINE__ + 1
           def #{vfunc_name} *args, &block
             #{invoker_name}(*args, &block)
           end
-        "
+        DEF
       end
 
       def provide_initializer
         return if info.find_method 'new'
 
         if info.abstract?
-          klass.class_eval <<-RUBY
+          klass.class_eval <<-RUBY, __FILE__, __LINE__ + 1
             def initialize(*)
               raise NoMethodError
             end
           RUBY
         else
-          klass.class_eval <<-RUBY
+          klass.class_eval <<-RUBY, __FILE__, __LINE__ + 1
             def initialize(properties = {})
               base_initialize(properties)
             end

data/lib/gir_ffi/builders/return_value_builder.rb

@@ -39,7 +39,7 @@ module GirFFI
       end
 
       def length_argument_name
-        length_arg && length_arg.post_converted_name
+        length_arg&.post_converted_name
       end
     end
   end

data/lib/gir_ffi/builders/struct_builder.rb

@@ -23,9 +23,7 @@ module GirFFI
           return type.tag_or_class if type.tag == :interface
         end
 
-        if GObject.type_fundamental(info.gtype) == GObject::TYPE_BOXED
-          return BoxedBase
-        end
+        return BoxedBase if GObject.type_fundamental(info.gtype) == GObject::TYPE_BOXED
 
         StructBase
       end

data/lib/gir_ffi/builders/unintrospectable_builder.rb

@@ -27,7 +27,7 @@ module GirFFI
         info = super
         return info if info
         signal_id = GObject.signal_lookup signal_name, target_gtype
-        return UnintrospectableSignalInfo.new(signal_id) if signal_id > 0
+        return UnintrospectableSignalInfo.new(signal_id) unless signal_id.zero?
       end
     end
   end

data/lib/gir_ffi/class_base.rb

@@ -19,9 +19,7 @@ module GirFFI
     def setup_and_call(method, arguments, &block)
       method_name = self.class.try_in_ancestors(:setup_instance_method, method.to_s)
 
-      unless method_name
-        raise NoMethodError, "undefined method `#{method}' for #{self}"
-      end
+      raise NoMethodError, "undefined method `#{method}' for #{self}" unless method_name
 
       send method_name, *arguments, &block
     end
@@ -35,9 +33,7 @@ module GirFFI
     def self.setup_and_call(method, arguments, &block)
       method_name = try_in_ancestors(:setup_method, method.to_s)
 
-      unless method_name
-        raise NoMethodError, "undefined method `#{method}' for #{self}"
-      end
+      raise NoMethodError, "undefined method `#{method}' for #{self}" unless method_name
 
       send method_name, *arguments, &block
     end

data/lib/gir_ffi/enum_like_base.rb

@@ -31,9 +31,7 @@ module GirFFI
     def setup_and_call(method, arguments, &block)
       result = setup_method method.to_s
 
-      unless result
-        raise "Unable to set up method #{method} in #{self}"
-      end
+      raise "Unable to set up method #{method} in #{self}" unless result
 
       send method, *arguments, &block
     end

data/lib/gir_ffi/info_ext/i_registered_type_info.rb

@@ -16,7 +16,7 @@ module GirFFI
 
       def find_instance_method(method)
         info = find_method method
-        return info if info && info.method?
+        return info if info&.method?
       end
 
       def find_method(_method)

data/lib/gir_ffi/info_ext/i_type_info.rb

@@ -194,7 +194,7 @@ module GirFFI
         end
       end
 
-      GOBJECT_VALUE_NAME = 'GObject::Value'.freeze
+      GOBJECT_VALUE_NAME = 'GObject::Value'
 
       def gvalue?
         argument_class_name == GOBJECT_VALUE_NAME

data/lib/gir_ffi/info_ext/i_vfunc_info.rb

@@ -16,7 +16,7 @@ module GirFFI
       end
 
       def invoker_name
-        invoker && invoker.name
+        invoker&.name
       end
 
       def has_invoker?

data/lib/gir_ffi/interface_base.rb

@@ -9,9 +9,7 @@ module GirFFI
 
     def setup_and_call(method, arguments, &block)
       method_name = setup_method method.to_s
-      unless method_name
-        raise NoMethodError, "undefined method `#{method}' for #{self}"
-      end
+      raise NoMethodError, "undefined method `#{method}' for #{self}" unless method_name
       send method_name, *arguments, &block
     end
 

data/lib/gir_ffi/object_base.rb

@@ -38,7 +38,7 @@ module GirFFI
     end
 
     def self.copy_from(val)
-      val.ref if val
+      val&.ref
     end
 
     #

data/lib/gir_ffi/struct_like_base.rb

@@ -38,34 +38,37 @@ module GirFFI
 
       # Create an unowned copy of the struct represented by val
       def copy_from(val)
+        return unless val
         disown copy from(val)
       end
 
       # Wrap an owned copy of the struct represented by val
       def wrap_copy(val)
+        return unless val
         own copy(val)
       end
 
       # Wrap value and take ownership of it
       def wrap_own(val)
+        return unless val
+        return if val.null?
         own wrap(val)
       end
 
       private
 
       def own(val)
-        val.struct.owned = true if val
+        val.struct.owned = true
         val
       end
 
       def disown(val)
-        val.struct.owned = nil if val
+        val.struct.owned = nil
         val
       end
 
       # Create a copy of the struct represented by val
       def copy(val)
-        return unless val
         new.tap do |copy|
           copy_value_to_pointer(val, copy.to_ptr)
         end

data/lib/gir_ffi/unintrospectable_boxed_info.rb

@@ -20,7 +20,7 @@ module GirFFI
       GObject.type_name g_type
     end
 
-    DEFAULT_BOXED_NAMESPACE = 'GLib'.freeze
+    DEFAULT_BOXED_NAMESPACE = 'GLib'
 
     def namespace
       DEFAULT_BOXED_NAMESPACE

data/lib/gir_ffi/version.rb

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