gir_ffi 0.11.0 → 0.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 40ea5b819bf924354aa3422d6d50f16b273c2da6
-  data.tar.gz: 6da1f53d118bca0abccf87a2e4540bc6dc0f879f
+  metadata.gz: 4383f1ecbc304b28e9b0b85b0bc54f85444e744d
+  data.tar.gz: aa02867a66c86cf5dd47535d7743e7259361d3c3
 SHA512:
-  metadata.gz: c2bc2ce1e2c881277554af8fe4e4b937518761f218b920442f56c0974caf67721751b2aee983acb02737e029fde356c5bbe71106bab0c73bf42311bd10021987
-  data.tar.gz: 0fe6972ea1da4b0dddd910efb36aeae78940bd4a3de5812b4e1dbe64fde8bd74795739e639f7bc17620121f37fe63a1e10a04559bf0d567d4c7aa13a1c440525
+  metadata.gz: 0e26daaa79d44f2485a9c0d58a3699e30c33dd5ec8615833aeceeaad06f8d1f112a7a4b18e2bd64469becc50be0574df533c219d4745d8a2cd8f23fef7fa49db
+  data.tar.gz: 6639c70f15f213e08e0e366f3c852b5c85d63ca80c78763a099fa68e60cd8ba87114b63f2c3a8c8419d07961b548d73b14b896e15416c3af96e2b831411a5671

data/Changelog.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 0.11.1 / 2017-01-07
+
+* Fix build on JRuby
+* Allow clearing properties that take a GObject value
+* Handle GLists requiring an Interface type
+
 ## 0.11.0 / 2016-10-16
 
 * Internal test and code improvements. Some internal APIs have been removed or

data/Gemfile

@@ -4,18 +4,11 @@ source 'https://rubygems.org'
 # The gem's dependencies are specified in gir_ffi.gemspec
 gemspec
 
-gem 'rubocop', '~> 0.43.0', group: :development
-
-gem 'mutant', git: 'https://github.com/mbj/mutant.git',
-              branch: 'feature/minitest-integration',
-              platform: :mri_23,
-              group: :development
-
 if ENV['CI']
   if ENV['TRAVIS_RUBY_VERSION'] == '2.2'
     gem 'coveralls', group: :development
   end
 else
-  gem 'simplecov', '~> 0.12.0', group: :development, platform: :mri
-  gem 'pry', '~> 0.10.0', group: :development
+  gem 'pry', '~> 0.10.4', group: :local_development
+  gem 'simplecov', '~> 0.12.0', group: :local_development, platform: :mri
 end

data/README.md

@@ -53,8 +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.0 and 9.1, and on
-Rubinius 3.
+GirFFI is tested on CRuby 2.1, 2.2 and 2.3, JRuby 9.1, and on Rubinius 3.
 
 You will also need gobject-introspection installed with some
 introspection data.
@@ -70,10 +69,9 @@ On Debian and Ubuntu, installing `libgirepository1.0-1` and `gir1.2-glib-2.0`
 should be enough to use GirFFI in your application.
 
 To run the tests, you should additionally install `libgirepository1.0-dev`,
-`libcairo2-dev`, `gobject-introspection`, `gir1.2-gtop-2.0`, `gir1.2-pango-1.0`,
-`gir1.2-secret-1` and `gir1.2-gstreamer-1.0`. This should be enough to get
-`rake test` working.
-
+`libcairo2-dev`, `gobject-introspection`, `gir1.2-gtop-2.0`, `gir1.2-gtk-3.0`,
+`gir1.2-pango-1.0`, `gir1.2-secret-1` and `gir1.2-gstreamer-1.0`. This should
+be enough to get `rake test` working.
 
 GirFFI has not been tested on Mac OS X or Microsoft Windows. YMMV.
 

data/lib/ffi-glib/main_loop.rb

@@ -39,10 +39,7 @@ module GLib
     setup_instance_method :run
 
     def run_with_thread_enabler
-      case RUBY_ENGINE
-      when 'jruby'
-      when 'rbx'
-      else # 'ruby' most likely
+      if RUBY_ENGINE == 'ruby'
         ThreadEnabler.instance.setup_idle_handler
       end
       RUNNING_LOOPS << self

data/lib/ffi-gobject/value.rb

@@ -149,11 +149,9 @@ module GObject
       raise "Can't handle #{val.class}"
     end
 
-    def set_none(_)
-    end
+    def set_none(_); end
 
-    def get_none
-    end
+    def get_none; end
 
     def set_instance_enhanced(val)
       check_type_compatibility val if val

data/lib/gir_ffi/builders/argument_builder.rb

@@ -206,7 +206,7 @@ module GirFFI
 
       def pre_convertor_argument
         if ownership_transfer == :everything && specialized_type_tag == :object
-          "#{name}.ref"
+          "#{name} && #{name}.ref"
         else
           name
         end

data/lib/gir_ffi/builders/null_argument_builder.rb

@@ -2,8 +2,7 @@
 module GirFFI
   # Argument builder that does nothing. Implements the Null Object pattern.
   class NullArgumentBuilder
-    def initialize(*)
-    end
+    def initialize(*); end
 
     def pre_conversion
       []

data/lib/gir_ffi/builders/null_return_value_builder.rb

@@ -3,8 +3,7 @@ module GirFFI
   module Builders
     # Implements a blank return value matching ReturnValueBuilder's interface.
     class NullReturnValueBuilder
-      def initialize
-      end
+      def initialize; end
 
       def array_length_idx
         -1

data/lib/gir_ffi/builders/user_defined_builder.rb

@@ -174,7 +174,7 @@ module GirFFI
 
         alignment = superclass::Struct.alignment
         fields_spec = properties.flat_map do |param_info|
-          field_name = param_info.accessor_name
+          field_name = param_info.accessor_name.to_sym
           ffi_type = param_info.ffi_type
           type_size = FFI.type_size(ffi_type)
           spec = [field_name, ffi_type, offset]

data/lib/gir_ffi/in_pointer.rb

@@ -37,10 +37,10 @@ module GirFFI
         from_utf8 val
       when :gint32, :guint32, :gint8, :GType
         FFI::Pointer.new val
-      when Class, :void
-        val.to_ptr
-      when Module
+      when GirFFI::EnumLikeBase
         FFI::Pointer.new type[val]
+      when Module, :void
+        val.to_ptr
       else
         raise NotImplementedError, type
       end

data/lib/gir_ffi/version.rb

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

data/tasks/test.rake

@@ -189,22 +189,6 @@ namespace :test do
   Cucumber::Rake::Task.new(:features) do |t|
     t.cucumber_opts = 'features --format pretty'
   end
-
-  desc 'Run mutant'
-
-  task mutant: :lib do
-    command = <<-EOS
-      RUBY_THREAD_VM_STACK_SIZE=64000 \
-      bundle exec mutant \
-        --include lib \
-        --include test \
-        --use minitest \
-        --since master \
-        --jobs 4 \
-        "GirFFI*" "GObject*" "GObjectIntrospection*" "GLib*"
-    EOS
-    system command
-  end
 end
 
 file "test/lib/Makefile" => "test/lib/configure" do

data/test/base_test_helper.rb

@@ -61,41 +61,3 @@ module BaseTestExtensions
 end
 
 Minitest::Test.send :include, BaseTestExtensions
-
-# Provide methods needed for integration with mutant
-module ForMutant
-  # Mark the current test class as covering the given expression.
-  def cover(expression)
-    @expression = expression
-  end
-
-  # Return the currently set covering expression.
-  def covering
-    defined?(@expression) && @expression
-  end
-
-  # Return the cover expression, but raise an exception if it is not defined.
-  # This is the method used by mutant to fetch the coverage information.
-  def cover_expression
-    raise "Cover expression for #{self} is not specified" unless @expression
-    @expression
-  end
-end
-
-Minitest::Test.send :extend, ForMutant
-
-def cover_expression_for(cls)
-  full_stack = cls.describe_stack.dup << cls
-  full_stack.reverse_each do |level|
-    return level.covering if level.covering
-    return level.desc.to_s if level.desc.is_a? Module
-  end
-  full_stack.first.desc.to_s
-end
-
-# Override describe to automatically set cover information
-def describe(desc, *additional_desc, &block)
-  super.tap do |cls|
-    cls.cover cover_expression_for(cls) unless cls.covering
-  end
-end

data/test/ffi-gobject/gobject_test.rb

@@ -14,33 +14,33 @@ describe GObject do
   end
 
   it 'has constants for the fundamental GTypes' do
-    assert_equal GObject.type_from_name('invalid'), GObject::TYPE_INVALID
-    assert_equal nil, GObject.type_name(GObject::TYPE_INVALID)
+    GObject::TYPE_INVALID.must_equal GObject.type_from_name('invalid')
+    GObject.type_name(GObject::TYPE_INVALID).must_be_nil
 
-    assert_equal 'void', GObject.type_name(GObject::TYPE_NONE)
-    assert_equal 'GInterface', GObject.type_name(GObject::TYPE_INTERFACE)
-    assert_equal 'gchar', GObject.type_name(GObject::TYPE_CHAR)
-    assert_equal 'guchar', GObject.type_name(GObject::TYPE_UCHAR)
-    assert_equal 'gboolean', GObject.type_name(GObject::TYPE_BOOLEAN)
-    assert_equal 'gint', GObject.type_name(GObject::TYPE_INT)
-    assert_equal 'guint', GObject.type_name(GObject::TYPE_UINT)
-    assert_equal 'glong', GObject.type_name(GObject::TYPE_LONG)
-    assert_equal 'gulong', GObject.type_name(GObject::TYPE_ULONG)
-    assert_equal 'gint64', GObject.type_name(GObject::TYPE_INT64)
-    assert_equal 'guint64', GObject.type_name(GObject::TYPE_UINT64)
-    assert_equal 'GEnum', GObject.type_name(GObject::TYPE_ENUM)
-    assert_equal 'GFlags', GObject.type_name(GObject::TYPE_FLAGS)
-    assert_equal 'gfloat', GObject.type_name(GObject::TYPE_FLOAT)
-    assert_equal 'gdouble', GObject.type_name(GObject::TYPE_DOUBLE)
-    assert_equal 'gchararray', GObject.type_name(GObject::TYPE_STRING)
-    assert_equal 'gpointer', GObject.type_name(GObject::TYPE_POINTER)
-    assert_equal 'GBoxed', GObject.type_name(GObject::TYPE_BOXED)
-    assert_equal 'GParam', GObject.type_name(GObject::TYPE_PARAM)
-    assert_equal 'GObject', GObject.type_name(GObject::TYPE_OBJECT)
-    assert_equal 'GType', GObject.type_name(GObject::TYPE_GTYPE)
-    assert_equal 'GVariant', GObject.type_name(GObject::TYPE_VARIANT)
-    assert_equal 'GStrv', GObject.type_name(GObject::TYPE_STRV)
-    assert_equal 'GHashTable', GObject.type_name(GObject::TYPE_HASH_TABLE)
+    GObject.type_name(GObject::TYPE_NONE).must_equal       'void'
+    GObject.type_name(GObject::TYPE_INTERFACE).must_equal  'GInterface'
+    GObject.type_name(GObject::TYPE_CHAR).must_equal       'gchar'
+    GObject.type_name(GObject::TYPE_UCHAR).must_equal      'guchar'
+    GObject.type_name(GObject::TYPE_BOOLEAN).must_equal    'gboolean'
+    GObject.type_name(GObject::TYPE_INT).must_equal        'gint'
+    GObject.type_name(GObject::TYPE_UINT).must_equal       'guint'
+    GObject.type_name(GObject::TYPE_LONG).must_equal       'glong'
+    GObject.type_name(GObject::TYPE_ULONG).must_equal      'gulong'
+    GObject.type_name(GObject::TYPE_INT64).must_equal      'gint64'
+    GObject.type_name(GObject::TYPE_UINT64).must_equal     'guint64'
+    GObject.type_name(GObject::TYPE_ENUM).must_equal       'GEnum'
+    GObject.type_name(GObject::TYPE_FLAGS).must_equal      'GFlags'
+    GObject.type_name(GObject::TYPE_FLOAT).must_equal      'gfloat'
+    GObject.type_name(GObject::TYPE_DOUBLE).must_equal     'gdouble'
+    GObject.type_name(GObject::TYPE_STRING).must_equal     'gchararray'
+    GObject.type_name(GObject::TYPE_POINTER).must_equal    'gpointer'
+    GObject.type_name(GObject::TYPE_BOXED).must_equal      'GBoxed'
+    GObject.type_name(GObject::TYPE_PARAM).must_equal      'GParam'
+    GObject.type_name(GObject::TYPE_OBJECT).must_equal     'GObject'
+    GObject.type_name(GObject::TYPE_GTYPE).must_equal      'GType'
+    GObject.type_name(GObject::TYPE_VARIANT).must_equal    'GVariant'
+    GObject.type_name(GObject::TYPE_STRV).must_equal       'GStrv'
+    GObject.type_name(GObject::TYPE_HASH_TABLE).must_equal 'GHashTable'
   end
 
   describe '::object_class_from_instance' do

data/test/ffi-gobject/value_test.rb

@@ -41,35 +41,37 @@ describe GObject::Value do
     it 'wraps a boolean false' do
       gv = GObject::Value.wrap_ruby_value false
       assert_instance_of GObject::Value, gv
-      assert_equal false, gv.get_boolean
+      gv.get_boolean.must_equal false
     end
 
     it 'wraps a boolean true' do
       gv = GObject::Value.wrap_ruby_value true
       assert_instance_of GObject::Value, gv
-      assert_equal true, gv.get_boolean
+      gv.get_boolean.must_equal true
     end
 
     it 'wraps an Integer' do
       gv = GObject::Value.wrap_ruby_value 42
-      assert_equal 42, gv.get_int
+      gv.get_int.must_equal 42
     end
 
     it 'wraps a String' do
       gv = GObject::Value.wrap_ruby_value 'Some Random String'
-      assert_equal 'Some Random String', gv.get_string
+      gv.get_string.must_equal 'Some Random String'
     end
 
     it 'wraps nil' do
       gv = GObject::Value.wrap_ruby_value nil
       assert_instance_of GObject::Value, gv
-      assert_equal nil, gv.get_value
+      gv.get_value.must_be_nil
     end
 
     it 'wraps object values' do
       value = GObject::Object.new({})
       gv = GObject::Value.wrap_ruby_value value
+      value.ref_count.must_equal 2
       gv.get_value.must_equal value
+      value.ref_count.must_equal 3
     end
   end
 
@@ -177,13 +179,13 @@ describe GObject::Value do
     it 'unwraps a boolean false' do
       gv = GObject::Value.wrap_ruby_value false
       result = gv.get_value
-      assert_equal false, result
+      result.must_equal false
     end
 
     it 'unwraps a boolean true' do
       gv = GObject::Value.wrap_ruby_value true
       result = gv.get_value
-      assert_equal true, result
+      result.must_equal true
     end
 
     it 'unwraps a signed char' do
@@ -321,7 +323,7 @@ describe GObject::Value do
     it 'creates a null GValue from a Ruby nil' do
       gv = GObject::Value.from nil
       gv.current_gtype.must_equal GObject::TYPE_INVALID
-      gv.get_value.must_equal nil
+      gv.get_value.must_be_nil
     end
   end
 

data/test/gir_ffi/boxed_base_test.rb

@@ -17,8 +17,9 @@ describe GirFFI::BoxedBase do
     it 'returns a copy with owned false' do
       original = GIMarshallingTests::BoxedStruct.new
       copy = GIMarshallingTests::BoxedStruct.copy_from(original)
-      copy.to_ptr.wont_equal original.to_ptr
-      copy.to_ptr.wont_be :autorelease?
+      ptr = copy.to_ptr
+      ptr.wont_be :==, original.to_ptr
+      ptr.wont_be :autorelease? if ptr.respond_to? :autorelease?
       copy.struct.wont_be :owned?
     end
   end
@@ -27,8 +28,9 @@ describe GirFFI::BoxedBase do
     it 'wraps and owns the supplied pointer' do
       original = GIMarshallingTests::BoxedStruct.new
       copy = GIMarshallingTests::BoxedStruct.wrap_own(original.to_ptr)
-      copy.to_ptr.must_equal original.to_ptr
-      copy.to_ptr.wont_be :autorelease?
+      ptr = copy.to_ptr
+      ptr.must_equal original.to_ptr
+      ptr.wont_be :autorelease? if ptr.respond_to? :autorelease?
       copy.struct.must_be :owned?
     end
   end

data/test/gir_ffi/builders/function_builder_test.rb

@@ -275,7 +275,7 @@ describe GirFFI::Builders::FunctionBuilder do
           code.must_equal <<-CODE.reset_indentation
           def self.full_inout(object)
             _v1 = FFI::MemoryPointer.new :pointer
-            _v1.put_pointer 0, GIMarshallingTests::Object.from(object.ref)
+            _v1.put_pointer 0, GIMarshallingTests::Object.from(object && object.ref)
             GIMarshallingTests::Lib.gi_marshalling_tests_object_full_inout _v1
             _v2 = GIMarshallingTests::Object.wrap(_v1.get_pointer(0))
             return _v2

data/test/gir_ffi/builders/user_defined_builder_test.rb

@@ -23,7 +23,7 @@ describe GirFFI::Builders::UserDefinedBuilder do
           it.install_property GObject.param_spec_int('foo-bar', 'foo bar',
                                                      'The Foo Bar Property',
                                                      10, 20, 15,
-                                                     readwrite: true)
+                                                     readable: true, writable: true)
         end
       end
 
@@ -74,15 +74,15 @@ describe GirFFI::Builders::UserDefinedBuilder do
           it.install_property GObject.param_spec_string('string-prop', 'string property',
                                                         'The String Property',
                                                         'this is the default value',
-                                                        readwrite: true)
+                                                        readable: true, writable: true)
           it.install_property GObject.param_spec_int('int-prop', 'integer property',
                                                      'The Integer Property',
                                                      10, 20, 15,
-                                                     readwrite: true)
+                                                     readable: true, writable: true)
           it.install_property GObject.param_spec_long('long-prop', 'long property',
                                                       'The Long Property',
                                                       10.0, 50.0, 42.0,
-                                                      readwrite: true)
+                                                      readable: true, writable: true)
         end
       end
 
@@ -120,7 +120,7 @@ describe GirFFI::Builders::UserDefinedBuilder do
           it.install_property GObject.param_spec_boxed('boxed-prop', 'boxed property',
                                                        'The Boxed Property',
                                                        boxed_gtype,
-                                                       readwrite: true)
+                                                       readable: true, writable: true)
         end
       end
 
@@ -151,7 +151,7 @@ describe GirFFI::Builders::UserDefinedBuilder do
           it.install_property GObject.param_spec_object('object-prop', 'object property',
                                                         'The Object Property',
                                                         object_gtype,
-                                                        readwrite: true)
+                                                        readable: true, writable: true)
         end
       end
 
@@ -173,6 +173,27 @@ describe GirFFI::Builders::UserDefinedBuilder do
         obj.object_prop = object
         obj.object_prop.int.must_equal 423
       end
+
+      it 'allows clearing the property throught the setter method' do
+        obj = klass.new
+        obj.object_prop = nil
+        obj.object_prop.must_be_nil
+      end
+
+      it 'handles reference counting correctly when using the accessor' do
+        obj = klass.new
+        object = GIMarshallingTests::Object.new 42
+        obj.object_prop = object
+        object.ref_count.must_equal 2
+      end
+
+      it 'handles reference counting correctly when using the set_property method' do
+        obj = klass.new
+        object = GIMarshallingTests::Object.new 42
+        object.ref_count.must_equal 1
+        obj.set_property('object_prop', object)
+        object.ref_count.must_equal 4 # Due to extra Value#set_value + Value#get_value
+      end
     end
 
     describe 'with a boolean property' do
@@ -182,7 +203,7 @@ describe GirFFI::Builders::UserDefinedBuilder do
           it.install_property GObject.param_spec_boolean('the-prop', 'the property',
                                                          'The Property',
                                                          true,
-                                                         readwrite: true)
+                                                         readable: true, writable: true)
         end
       end
 
@@ -200,7 +221,7 @@ describe GirFFI::Builders::UserDefinedBuilder do
           it.install_property GObject.param_spec_char('the-prop', 'the property',
                                                       'The Property',
                                                       -20, 100, 15,
-                                                      readwrite: true)
+                                                      readable: true, writable: true)
         end
       end
 
@@ -218,7 +239,7 @@ describe GirFFI::Builders::UserDefinedBuilder do
           it.install_property GObject.param_spec_uchar('the-prop', 'the property',
                                                        'The Property',
                                                        10, 100, 15,
-                                                       readwrite: true)
+                                                       readable: true, writable: true)
         end
       end
 
@@ -236,7 +257,7 @@ describe GirFFI::Builders::UserDefinedBuilder do
           it.install_property GObject.param_spec_uint('the-prop', 'the property',
                                                       'The Property',
                                                       10, 100, 15,
-                                                      readwrite: true)
+                                                      readable: true, writable: true)
         end
       end
 
@@ -254,7 +275,7 @@ describe GirFFI::Builders::UserDefinedBuilder do
           it.install_property GObject.param_spec_ulong('the-prop', 'the property',
                                                        'The Property',
                                                        10, 100, 15,
-                                                       readwrite: true)
+                                                       readable: true, writable: true)
         end
       end
 
@@ -272,7 +293,7 @@ describe GirFFI::Builders::UserDefinedBuilder do
           it.install_property GObject.param_spec_int64('the-prop', 'the property',
                                                        'The Property',
                                                        10, 100, 15,
-                                                       readwrite: true)
+                                                       readable: true, writable: true)
         end
       end
 
@@ -290,7 +311,7 @@ describe GirFFI::Builders::UserDefinedBuilder do
           it.install_property GObject.param_spec_uint64('the-prop', 'the property',
                                                         'The Property',
                                                         10, 100, 15,
-                                                        readwrite: true)
+                                                        readable: true, writable: true)
         end
       end
 
@@ -308,7 +329,7 @@ describe GirFFI::Builders::UserDefinedBuilder do
           it.install_property GObject.param_spec_float('the-prop', 'the property',
                                                        'The Property',
                                                        10.0, 100.0, 15.0,
-                                                       readwrite: true)
+                                                       readable: true, writable: true)
         end
       end
 
@@ -326,7 +347,7 @@ describe GirFFI::Builders::UserDefinedBuilder do
           it.install_property GObject.param_spec_double('the-prop', 'the property',
                                                         'The Property',
                                                         10.0, 100.0, 15.0,
-                                                        readwrite: true)
+                                                        readable: true, writable: true)
         end
       end
 
@@ -344,7 +365,7 @@ describe GirFFI::Builders::UserDefinedBuilder do
           prop = GObject.param_spec_enum('the-prop', 'the property',
                                          'The Property',
                                          GIMarshallingTests::GEnum.gtype, 0,
-                                         readwrite: true)
+                                         readable: true, writable: true)
           it.install_property prop
         end
       end
@@ -363,7 +384,7 @@ describe GirFFI::Builders::UserDefinedBuilder do
           prop = GObject.param_spec_flags('the-prop', 'the property',
                                           'The Property',
                                           GIMarshallingTests::Flags.gtype, 0,
-                                          readwrite: true)
+                                          readable: true, writable: true)
           it.install_property prop
         end
       end
@@ -388,7 +409,7 @@ describe GirFFI::Builders::UserDefinedBuilder do
           it.install_property GObject.param_spec_int('int-prop', 'integer property',
                                                      'Integer Property',
                                                      10, 20, 15,
-                                                     readwrite: true)
+                                                     readable: true, writable: true)
         end
       end
 

data/test/gir_ffi/class_base_test.rb

@@ -93,8 +93,7 @@ describe GirFFI::ClassBase do
           'correct-result'
         end
 
-        def initialize
-        end
+        def initialize; end
       end
       klass.const_set :GIR_FFI_BUILDER, builder
 
@@ -105,8 +104,7 @@ describe GirFFI::ClassBase do
     it 'raises a sensible error if the method is not found' do
       expect(builder = Object.new).to receive(:setup_method).with('foo').and_return nil
       klass = Class.new GirFFI::ClassBase do
-        def initialize
-        end
+        def initialize; end
       end
       klass.const_set :GIR_FFI_BUILDER, builder
 
@@ -124,11 +122,9 @@ describe GirFFI::ClassBase do
 
       expect(sub_builder = Object.new).to receive(:setup_instance_method).with('foo').and_return nil
       sub_klass = Class.new klass do
-        def foo
-        end
+        def foo; end
 
-        def initialize
-        end
+        def initialize; end
       end
       sub_klass.const_set :GIR_FFI_BUILDER, sub_builder
 
@@ -144,8 +140,7 @@ describe GirFFI::ClassBase do
           'correct-result'
         end
 
-        def initialize
-        end
+        def initialize; end
       end
       klass.const_set :GIR_FFI_BUILDER, builder
 
@@ -158,8 +153,7 @@ describe GirFFI::ClassBase do
     it 'raises a sensible error if the method is not found' do
       expect(builder = Object.new).to receive(:setup_instance_method).with('foo').and_return nil
       klass = Class.new GirFFI::ClassBase do
-        def initialize
-        end
+        def initialize; end
       end
       klass.const_set :GIR_FFI_BUILDER, builder
 

data/test/gir_ffi/in_pointer_test.rb

@@ -33,7 +33,7 @@ describe GirFFI::InPointer do
       struct[:foo] = 42
       struct[:bar] = 24
       ptr = GirFFI::InPointer.from_array e, [struct]
-      ptr.wont_equal struct.to_ptr
+      ptr.wont_be :==, struct.to_ptr
       new_struct = e::Struct.new ptr
       new_struct[:foo].must_equal 42
       new_struct[:bar].must_equal 24
@@ -147,10 +147,8 @@ describe GirFFI::InPointer do
 
     it 'handles enum types' do
       e = Module.new do
+        extend GirFFI::EnumBase
         self::Enum = FFI::Enum.new [:foo, :bar, :baz], :qux
-        def self.[](val)
-          self::Enum[val]
-        end
       end
       ptr = GirFFI::InPointer.from e, :bar
       ptr.address.must_equal 1
@@ -166,7 +164,7 @@ describe GirFFI::InPointer do
       end
 
       it 'returns nil when passed nil' do
-        GirFFI::InPointer.from(:void, nil).must_equal nil
+        GirFFI::InPointer.from(:void, nil).must_be_nil
       end
     end
 

data/test/gir_ffi/sized_array_test.rb

@@ -103,7 +103,7 @@ describe GirFFI::SizedArray do
 
         struct_copy = arr.first
         struct_copy.long_.must_equal struct.long_
-        struct_copy.to_ptr.wont_equal struct.to_ptr
+        struct_copy.to_ptr.wont_be :==, struct.to_ptr
         struct_copy.struct.wont_be :owned?
       end
 
@@ -124,7 +124,7 @@ describe GirFFI::SizedArray do
       it 'return an unowned copy of its argument' do
         arr = GirFFI::SizedArray.from :gint32, 3, [3, 2, 1]
         arr2 = GirFFI::SizedArray.copy_from :gint32, 3, arr
-        arr.to_ptr.wont_equal arr2.to_ptr
+        arr.to_ptr.wont_be :==, arr2.to_ptr
         arr2.to_a.must_equal [3, 2, 1]
         arr2.to_ptr.wont_be :autorelease?
       end
@@ -139,7 +139,7 @@ describe GirFFI::SizedArray do
       arr = GirFFI::SizedArray.from :gint32, 3, [3, 2, 1]
       arr2 = GirFFI::SizedArray.copy_from :gint32, 3, arr.to_ptr
       assert_instance_of GirFFI::SizedArray, arr2
-      arr2.to_ptr.wont_equal arr.to_ptr
+      arr2.to_ptr.wont_be :==, arr.to_ptr
       arr2.to_ptr.wont_be :autorelease?
       arr2.to_a.must_equal [3, 2, 1]
     end
@@ -185,7 +185,8 @@ describe GirFFI::SizedArray do
     it 'returns just a pointer' do
       sized = GirFFI::SizedArray.from :int32, 3, [1, 2, 3]
       ptr = sized.to_ptr
-      GirFFI::SizedArray.get_value_from_pointer(ptr, 0).must_equal ptr
+      result = GirFFI::SizedArray.get_value_from_pointer(ptr, 0)
+      result.must_be :==, ptr
     end
 
     it 'offsets correctly' do

data/test/gir_ffi/struct_like_base_test.rb

@@ -8,7 +8,7 @@ describe GirFFI::StructLikeBase do
     it 'returns a wrapped owned copy of structs' do
       original = GIMarshallingTests::SimpleStruct.new
       copy = GIMarshallingTests::SimpleStruct.wrap_copy(original.to_ptr)
-      copy.to_ptr.wont_equal original.to_ptr
+      copy.to_ptr.wont_be :==, original.to_ptr
       copy.to_ptr.wont_be :autorelease?
       copy.struct.must_be :owned?
     end
@@ -16,7 +16,7 @@ describe GirFFI::StructLikeBase do
     it 'returns a wrapped owned copy of unions' do
       original = GIMarshallingTests::Union.new
       copy = GIMarshallingTests::Union.wrap_copy(original.to_ptr)
-      copy.to_ptr.wont_equal original.to_ptr
+      copy.to_ptr.wont_be :==, original.to_ptr
       copy.to_ptr.wont_be :autorelease?
       copy.struct.must_be :owned?
     end
@@ -24,8 +24,9 @@ describe GirFFI::StructLikeBase do
     it 'returns a wrapped owned copy of boxed types' do
       original = GIMarshallingTests::BoxedStruct.new
       copy = GIMarshallingTests::BoxedStruct.wrap_copy(original.to_ptr)
-      copy.to_ptr.wont_equal original.to_ptr
-      copy.to_ptr.wont_be :autorelease?
+      ptr = copy.to_ptr
+      ptr.wont_be :==, original.to_ptr
+      ptr.wont_be :autorelease? if ptr.respond_to? :autorelease
       copy.struct.must_be :owned?
     end
 
@@ -40,7 +41,7 @@ describe GirFFI::StructLikeBase do
       original.long_ = 42
       copy = GIMarshallingTests::Union.copy_from(original)
       copy.long_.must_equal 42
-      copy.to_ptr.wont_equal original.to_ptr
+      copy.to_ptr.wont_be :==, original.to_ptr
       copy.to_ptr.wont_be :autorelease?
       copy.struct.wont_be :owned?
     end
@@ -48,7 +49,7 @@ describe GirFFI::StructLikeBase do
     it 'returns an unowned copy of structs' do
       original = GIMarshallingTests::SimpleStruct.new
       copy = GIMarshallingTests::SimpleStruct.copy_from(original)
-      copy.to_ptr.wont_equal original.to_ptr
+      copy.to_ptr.wont_be :==, original.to_ptr
       copy.to_ptr.wont_be :autorelease?
       copy.struct.wont_be :owned?
     end
@@ -122,7 +123,8 @@ describe GirFFI::StructLikeBase do
     it 'returns just a pointer' do
       object = klass.new
       ptr = object.to_ptr
-      klass.get_value_from_pointer(ptr, 0).must_equal ptr
+      result = klass.get_value_from_pointer(ptr, 0)
+      result.must_be :==, ptr
     end
 
     it 'uses offset correctly' do

data/test/gir_ffi/user_defined_object_info_test.rb

@@ -85,7 +85,7 @@ describe GirFFI::UserDefinedObjectInfo do
     let(:info) { GirFFI::UserDefinedObjectInfo.new klass }
 
     it 'finds no methods' do
-      info.find_method('foo').must_equal nil
+      info.find_method('foo').must_be_nil
     end
   end
 
@@ -94,7 +94,7 @@ describe GirFFI::UserDefinedObjectInfo do
     let(:info) { GirFFI::UserDefinedObjectInfo.new klass }
 
     it 'finds no signals' do
-      info.find_signal('foo').must_equal nil
+      info.find_signal('foo').must_be_nil
     end
   end
 

data/test/integration/callback_exceptions_test.rb

@@ -6,8 +6,6 @@ GirFFI.setup :Regress
 class CallbackTestException < RuntimeError; end
 
 describe 'An exception in a callback' do
-  cover 'GLib::MainLoop'
-
   describe 'for signals' do
     let(:object) { Regress::TestSubObj.new }
 

data/test/integration/derived_classes_test.rb

@@ -5,8 +5,6 @@ GirFFI.setup :Regress
 
 # Tests deriving Ruby classes from GObject classes.
 describe 'For derived classes' do
-  cover 'GirFFI'
-
   describe 'setting up methods when first called' do
     before do
       save_module :GIMarshallingTests

data/test/integration/generated_everything_test.rb

@@ -394,7 +394,7 @@ describe Everything do
     skip unless get_introspection_data 'Everything', 'passthrough_one_gpointer'
     ptr = FFI::MemoryPointer.new(:int)
     result = Everything.passthrough_one_gpointer(ptr)
-    result.must_equal ptr
+    result.must_be :==, ptr
   end
 
   it 'has a working function #passthrough_one_gshort' do

data/test/integration/generated_gimarshallingtests_test.rb

@@ -843,11 +843,11 @@ describe GIMarshallingTests do
       end
 
       it 'can be retrieved with #get_property' do
-        instance.get_property('some-boxed-glist').must_equal nil
+        instance.get_property('some-boxed-glist').must_be_nil
       end
 
       it 'can be retrieved with #some_boxed_glist' do
-        instance.some_boxed_glist.must_equal nil
+        instance.some_boxed_glist.must_be_nil
       end
 
       it 'can be set with #set_property_extended' do
@@ -870,11 +870,11 @@ describe GIMarshallingTests do
       end
 
       it 'can be retrieved with #get_property' do
-        instance.get_property('some-boxed-struct').must_equal nil
+        instance.get_property('some-boxed-struct').must_be_nil
       end
 
       it 'can be retrieved with #some_boxed_struct' do
-        instance.some_boxed_struct.must_equal nil
+        instance.some_boxed_struct.must_be_nil
       end
 
       it 'can be set with #set_property' do
@@ -1536,49 +1536,49 @@ describe GIMarshallingTests do
 
   it 'has a working function #boolean_inout_false_true' do
     res = GIMarshallingTests.boolean_inout_false_true false
-    assert_equal true, res
+    res.must_equal true
   end
 
   it 'has a working function #boolean_inout_true_false' do
     res = GIMarshallingTests.boolean_inout_true_false true
-    assert_equal false, res
+    res.must_equal false
   end
 
   it 'has a working function #boolean_out_false' do
     res = GIMarshallingTests.boolean_out_false
-    assert_equal false, res
+    res.must_equal false
   end
 
   it 'has a working function #boolean_out_true' do
     res = GIMarshallingTests.boolean_out_true
-    assert_equal true, res
+    res.must_equal true
   end
 
   it 'has a working function #boolean_return_false' do
     res = GIMarshallingTests.boolean_return_false
-    assert_equal false, res
+    res.must_equal false
   end
 
   it 'has a working function #boolean_return_true' do
     res = GIMarshallingTests.boolean_return_true
-    assert_equal true, res
+    res.must_equal true
   end
 
   it 'has a working function #boxed_struct_inout' do
     bx = GIMarshallingTests::BoxedStruct.new
     bx.long_ = 42
     res = GIMarshallingTests.boxed_struct_inout bx
-    assert_equal 0, res.long_
+    res.long_.must_equal 0
   end
 
   it 'has a working function #boxed_struct_out' do
     res = GIMarshallingTests.boxed_struct_out
-    assert_equal 42, res.long_
+    res.long_.must_equal 42
   end
 
   it 'has a working function #boxed_struct_returnv' do
     res = GIMarshallingTests.boxed_struct_returnv
-    assert_equal 42, res.long_
+    res.long_.must_equal 42
     res.g_strv.must_be :==, %w(0 1 2)
   end
 
@@ -1656,12 +1656,12 @@ describe GIMarshallingTests do
 
   it 'has a working function #double_out' do
     ret = GIMarshallingTests.double_out
-    assert_equal Float::MAX, ret
+    ret.must_equal Float::MAX
   end
 
   it 'has a working function #double_return' do
     ret = GIMarshallingTests.double_return
-    assert_equal Float::MAX, ret
+    ret.must_equal Float::MAX
   end
 
   it 'has a working function #enum_in' do
@@ -1671,22 +1671,22 @@ describe GIMarshallingTests do
 
   it 'has a working function #enum_inout' do
     e = GIMarshallingTests.enum_inout :value3
-    assert_equal :value1, e
+    e.must_equal :value1
   end
 
   it 'has a working function #enum_out' do
     e = GIMarshallingTests.enum_out
-    assert_equal :value3, e
+    e.must_equal :value3
   end
 
   it 'has a working function #enum_returnv' do
     e = GIMarshallingTests.enum_returnv
-    assert_equal :value3, e
+    e.must_equal :value3
   end
 
   it 'has a working function #filename_list_return' do
     fl = GIMarshallingTests.filename_list_return
-    assert_equal nil, fl
+    fl.must_be_nil
   end
 
   it 'has a working function #flags_in' do
@@ -1843,7 +1843,7 @@ describe GIMarshallingTests do
     cl = GIMarshallingTests.gclosure_return
     gv = GObject::Value.wrap_ruby_value 0
     result = cl.invoke gv, []
-    assert_equal 42, gv.get_value
+    gv.get_value.must_equal 42
     result.must_equal 42
   end
 
@@ -1854,17 +1854,17 @@ describe GIMarshallingTests do
 
   it 'has a working function #genum_inout' do
     res = GIMarshallingTests.genum_inout :value3
-    assert_equal :value1, res
+    res.must_equal :value1
   end
 
   it 'has a working function #genum_out' do
     res = GIMarshallingTests.genum_out
-    assert_equal :value3, res
+    res.must_equal :value3
   end
 
   it 'has a working function #genum_returnv' do
     res = GIMarshallingTests.genum_returnv
-    assert_equal :value3, res
+    res.must_equal :value3
   end
 
   it 'has a working function #gerror' do
@@ -2261,10 +2261,10 @@ describe GIMarshallingTests do
 
   it 'has a working function #gvalue_inout' do
     res = GIMarshallingTests.gvalue_inout GObject::Value.wrap_ruby_value(42)
-    assert_equal '42', res
+    res.must_equal '42'
 
     res = GIMarshallingTests.gvalue_inout 42
-    assert_equal '42', res
+    res.must_equal '42'
   end
 
   it 'has a working function #gvalue_int64_in' do
@@ -2284,7 +2284,7 @@ describe GIMarshallingTests do
 
   it 'has a working function #gvalue_out' do
     res = GIMarshallingTests.gvalue_out
-    assert_equal 42, res
+    res.must_equal 42
   end
 
   it 'has a working function #gvalue_out_caller_allocates' do

data/test/integration/generated_gio_test.rb

@@ -5,8 +5,6 @@ GirFFI.setup :Gio
 
 # Tests generated methods and functions in the Gio namespace.
 describe 'The generated Gio module' do
-  cover 'Gio'
-
   describe 'File#new_for_path, a method returning an interface,' do
     it 'returns an object of a more specific class' do
       file = Gio::File.new_for_path('/')

data/test/integration/generated_glib_test.rb

@@ -3,8 +3,6 @@ require 'gir_ffi_test_helper'
 
 # Tests generated classes, methods and functions in the GLib namespace.
 describe 'The generated GLib module' do
-  cover 'GLib'
-
   it 'can auto-generate the GLib::IConv class' do
     klass = GLib::IConv
 

data/test/integration/generated_gst_test.rb

@@ -6,8 +6,6 @@ Gst.init []
 
 # Tests behavior of objects in the generated Gio namespace.
 describe 'the generated Gst module' do
-  cover 'Gst'
-
   describe 'Gst::FakeSink' do
     let(:instance) { Gst::ElementFactory.make('fakesink', 'sink') }
 

data/test/integration/generated_gtk_source_test.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+require 'gir_ffi_test_helper'
+
+# Tests behavior of objects in the generated GtkSource namespace.
+describe 'The generated GtkSource module' do
+  before do
+    begin
+      GirFFI.setup :GtkSource
+    rescue
+      skip 'GtkSource GIR not available'
+    end
+  end
+
+  describe 'GtkSource::CompletionContext' do
+    let(:instance) { GtkSource::CompletionContext.new }
+
+    it 'allows adding proposals' do
+      proposals = [
+        GtkSource::CompletionItem.new('Proposal 1', 'Proposal 1', nil, 'blah 1'),
+        GtkSource::CompletionItem.new('Proposal 2', 'Proposal 2', nil, 'blah 2'),
+        GtkSource::CompletionItem.new('Proposal 3', 'Proposal 3', nil, 'blah 3')
+      ]
+      instance.add_proposals nil, proposals, true
+    end
+  end
+end

data/test/integration/generated_gtop_test.rb

@@ -4,8 +4,6 @@ require 'gir_ffi_test_helper'
 # Tests generated methods and functions in the GTop namespace. This namespace
 # contains types with bad names, like 'glibtop_cpu'.
 describe 'The generated GTop module' do
-  cover 'GTop'
-
   before do
     begin
       GirFFI.setup :GTop

data/test/integration/generated_secret_test.rb

@@ -2,8 +2,6 @@
 require 'gir_ffi_test_helper'
 
 describe 'The generated Secret module' do
-  cover 'Secret'
-
   describe 'Secret::Schema' do
     it 'has a working constructor' do
       begin

data/test/integration/generated_warnlib_test.rb

@@ -2,8 +2,6 @@
 require 'gir_ffi_test_helper'
 
 describe 'The generated WarnLib module' do
-  cover 'WarnLib'
-
   before do
     begin
       GirFFI.setup :WarnLib

data/test/integration/method_lookup_test.rb

@@ -3,8 +3,6 @@ require 'gir_ffi_test_helper'
 
 # Tests how methods are looked up and generated on first use.
 describe 'Looking up methods' do
-  cover 'GirFFI'
-
   before do
     save_module :Regress
     GirFFI.setup :Regress

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gir_ffi
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.11.1
 platform: ruby
 authors:
 - Matijs van Zuijlen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-16 00:00:00.000000000 Z
+date: 2017-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.1'
+        version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.1'
+        version: '12.0'
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
@@ -108,6 +108,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.14.1
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.46.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.46.0
 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
@@ -415,6 +429,7 @@ files:
 - test/integration/generated_glib_test.rb
 - test/integration/generated_gobject_test.rb
 - test/integration/generated_gst_test.rb
+- test/integration/generated_gtk_source_test.rb
 - test/integration/generated_gtop_test.rb
 - test/integration/generated_pango_ft2_test.rb
 - test/integration/generated_pango_test.rb
@@ -451,7 +466,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: FFI-based GObject binding using the GObject Introspection Repository