gir_ffi-gtk 0.14.1 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8bd9e77a426417bff917414f6d484ec54248a58159a0160f7a5f8dad983a4bef
-  data.tar.gz: 4f3f05f2d9da9adb3dd5283c6c5e6abede7c170b9e8e77c57e555c820c7ac09d
+  metadata.gz: 8d45b72cccc0ec948d74f745d823939e5ac7e48ae69d68ff5c97ddf43b39ec01
+  data.tar.gz: a5249e2bfc4c7473f7bd52c52f8de200f5fa126a07fb53e2b95a0294ef5dacaf
 SHA512:
-  metadata.gz: 83176abd6470da76a04a1a702d17bb51a9809e4510eb63dc35eaf626c585563b699e04a77e8398cf0edfdc6e470c92c491367a124cc1a7a60f3e69e9b1588d1a
-  data.tar.gz: 973b776ac24f27de88e9550e5388b8bef089e402e5f875c914cf6d6e3bb9e751fe4fe09bc9daa793a4303c062ca16ed64ae79317c5192cd6bf319548ff96ea0c
+  metadata.gz: 74415a42a27ea38dd77dedcbfeb2e429f8c41cd702d9ddcfeb7763c0722a2d40d6c997c0887f2279e86ef98ca298ee899bdc113e795eb4aea0c408148b47b3ef
+  data.tar.gz: b24ee409eaca856b8c3662fad01b85cecf95cc74add4c9b50dc8dbebebceda61cb74c83407df3e8570891fc7405e5fec92d9d131de1bd379f5b3c310e1acd6e5

data/Changelog.md

@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file. See the
 Git log for all changes.
 
+## 0.15.0 / 2019-10-19
+
+* Fix override for `Gtk::Menu#popup`
+* Depend on GirFFI 0.15.0
+* Target Ruby 2.4+
+
 ## 0.14.1 / 2018-12-19
 
 * Override `Gtk::Widget#get_events`, `Gtk::Widget#set_events` and

data/Rakefile

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

data/lib/gir_ffi-gtk/gtk2/menu.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+Gtk.load_class :Menu
+module Gtk
+  # Add non-introspected functions to Gtk::Lib
+  module Lib
+    attach_function(:gtk_menu_popup,
+                    [:pointer, :pointer, :pointer,
+                     :pointer, :pointer,
+                     :uint, :uint32 ],
+                    :void)
+  end
+
+  # Overrides for GtkMenu
+  class Menu
+    def popup(parent_menu_shell, parent_menu_item, button, activate_time, &func)
+      _v1 = Gtk::Widget.from(parent_menu_shell)
+      _v2 = Gtk::Widget.from(parent_menu_item)
+      _v3 = Gtk::MenuPositionFunc.from(func)
+      _v4 = GirFFI::ArgHelper.store(_v3)
+      _v5 = button
+      _v6 = activate_time
+      Gtk::Lib.gtk_menu_popup self, _v1, _v2, _v3, _v4, _v5, _v6
+    end
+  end
+end
+

data/lib/gir_ffi-gtk2.rb

@@ -13,7 +13,6 @@ require 'gir_ffi-gtk/dialog'
 require 'gir_ffi-gtk/file_chooser_dialog'
 require 'gir_ffi-gtk/image'
 require 'gir_ffi-gtk/list_store'
-require 'gir_ffi-gtk/menu'
 require 'gir_ffi-gtk/message_dialog'
 require 'gir_ffi-gtk/tree_path'
 require 'gir_ffi-gtk/tree_store'
@@ -21,6 +20,7 @@ require 'gir_ffi-gtk/tree_view_column'
 require 'gir_ffi-gtk/widget'
 
 require 'gir_ffi-gtk/gtk2/list_store'
+require 'gir_ffi-gtk/gtk2/menu'
 require 'gir_ffi-gtk/gtk2/radio_action'
 require 'gir_ffi-gtk/gtk2/radio_button'
 require 'gir_ffi-gtk/gtk2/target_entry'

data/lib/gir_ffi-gtk3.rb

@@ -13,7 +13,6 @@ require 'gir_ffi-gtk/dialog'
 require 'gir_ffi-gtk/file_chooser_dialog'
 require 'gir_ffi-gtk/image'
 require 'gir_ffi-gtk/list_store'
-require 'gir_ffi-gtk/menu'
 require 'gir_ffi-gtk/message_dialog'
 require 'gir_ffi-gtk/tree_path'
 require 'gir_ffi-gtk/tree_store'

data/test/callback_exceptions_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 
 class CallbackTestException < RuntimeError; end
@@ -14,7 +16,7 @@ describe 'An exception in a callback' do
 
     describe 'when the signal is emitted synchronously' do
       it 'raises an error' do
-        -> { GObject.signal_emit object, 'destroy' }.must_raise CallbackTestException
+        _(-> { GObject.signal_emit object, 'destroy' }).must_raise CallbackTestException
       end
     end
 
@@ -26,9 +28,7 @@ describe 'An exception in a callback' do
         end
         # Guard against runaway loop
         @guard = GLib.timeout_add(GLib::PRIORITY_DEFAULT, 1000) { Gtk.main_quit }
-        proc do
-          Gtk.main
-        end.must_raise CallbackTestException
+        _(-> { Gtk.main }).must_raise CallbackTestException
       end
 
       after do
@@ -45,9 +45,7 @@ describe 'An exception in a callback' do
         end
         # Guard against runaway loop
         @guard = GLib.timeout_add(GLib::PRIORITY_DEFAULT, 1000) { Gtk.main_quit }
-        proc do
-          Gtk.main
-        end.must_raise CallbackTestException
+        _(-> { Gtk.main }).must_raise CallbackTestException
       end
 
       after do

data/test/gir_ffi-gtk/action_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 
 describe Gtk::Action do
@@ -6,12 +8,12 @@ describe Gtk::Action do
   describe '#create_icon' do
     it 'works when called with a symbol' do
       result = action.create_icon :dialog
-      result.must_be_instance_of Gtk::Image
+      _(result).must_be_instance_of Gtk::Image
     end
 
     it 'works when called with an integer' do
       result = action.create_icon 4
-      result.must_be_instance_of Gtk::Image
+      _(result).must_be_instance_of Gtk::Image
     end
   end
 end

data/test/gir_ffi-gtk/base_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 
 describe Gtk do
@@ -41,7 +43,7 @@ describe Gtk do
 
       slow_thread.join
 
-      a.last.must_equal 'After run'
+      _(a.last).must_equal 'After run'
     end
   end
 end

data/test/gir_ffi-gtk/builder_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 
 describe Gtk::Builder do
@@ -31,7 +33,7 @@ describe Gtk::Builder do
         nil
       end
 
-      name.must_equal 'on_button_clicked'
+      _(name).must_equal 'on_button_clicked'
     end
 
     it 'connects the signal to the proc returned by the block' do
@@ -41,7 +43,7 @@ describe Gtk::Builder do
       end
       button = builder.get_object('foo')
       GObject.signal_emit button, 'clicked'
-      name.must_equal 'on_button_clicked'
+      _(name).must_equal 'on_button_clicked'
     end
 
     describe 'with a signal with after flag' do
@@ -63,7 +65,7 @@ describe Gtk::Builder do
         end
         button = builder.get_object('foo')
         GObject.signal_emit button, 'clicked'
-        name.must_equal 'handler_after'
+        _(name).must_equal 'handler_after'
       end
     end
   end

data/test/gir_ffi-gtk/button_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 
 describe Gtk::Button do
@@ -8,12 +10,12 @@ describe Gtk::Button do
 
     it 'works when called with a symbol' do
       result = Gtk::Button.new_from_icon_name('hi', :dialog)
-      result.must_be_instance_of Gtk::Button
+      _(result).must_be_instance_of Gtk::Button
     end
 
     it 'works when called with an integer' do
       result = Gtk::Button.new_from_icon_name('hi', 4)
-      result.must_be_instance_of Gtk::Button
+      _(result).must_be_instance_of Gtk::Button
     end
   end
 end

data/test/gir_ffi-gtk/container_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 
 describe Gtk::Container do
@@ -10,11 +12,11 @@ describe Gtk::Container do
     end
 
     it 'adds the widget to the container' do
-      container.get_children.to_a.must_equal [widget]
+      _(container.get_children.to_a).must_equal [widget]
     end
 
     it 'sets the child properties for the widget' do
-      container.child_get_property(widget, 'left-attach').must_equal 1
+      _(container.child_get_property(widget, 'left-attach')).must_equal 1
     end
   end
 
@@ -22,12 +24,12 @@ describe Gtk::Container do
     it 'fetches the given child property' do
       container.add widget
       container.child_set_property(widget, 'left-attach', 1)
-      container.child_get_property(widget, 'left-attach').must_equal 1
+      _(container.child_get_property(widget, 'left-attach')).must_equal 1
     end
 
     it 'raises an ArgumentError for unknown properties' do
       container.add widget
-      proc { container.child_get_property(widget, 'foobar') }.must_raise ArgumentError
+      _(proc { container.child_get_property(widget, 'foobar') }).must_raise ArgumentError
     end
   end
 end

data/test/gir_ffi-gtk/dialog_test.rb

@@ -1,13 +1,15 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 
 describe Gtk::Dialog do
   describe '.new_with_buttons' do
     it 'creates a Gtk::Dialog with the right title and buttons' do
       dialog = Gtk::Dialog.new_with_buttons 'Foo', nil, :modal, [['Bar', :yes]]
-      dialog.title.must_equal 'Foo'
+      _(dialog.title).must_equal 'Foo'
       button = dialog.action_area.children.first
-      button.label.must_equal 'Bar'
-      dialog.response_for_widget(button).must_equal Gtk::ResponseType.to_int(:yes)
+      _(button.label).must_equal 'Bar'
+      _(dialog.response_for_widget(button)).must_equal Gtk::ResponseType.to_int(:yes)
     end
   end
 end

data/test/gir_ffi-gtk/file_chooser_dialog_test.rb

@@ -1,18 +1,20 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 
 describe Gtk::FileChooserDialog do
   describe '.new' do
     it 'creates a Gtk::FileChooserDialog with the right attributes' do
       dialog = Gtk::FileChooserDialog.new 'Foo', nil, :save, [['Bar', :yes]]
-      dialog.title.must_equal 'Foo'
-      dialog.action.must_equal :save
+      _(dialog.title).must_equal 'Foo'
+      _(dialog.action).must_equal :save
       button = if Gtk::MAJOR_VERSION == 3 && Gtk::MINOR_VERSION >= 12
                  dialog.header_bar.children.to_a.last
                else
                  dialog.action_area.children.to_a.last
                end
-      button.label.must_equal 'Bar'
-      dialog.response_for_widget(button).must_equal Gtk::ResponseType.to_int(:yes)
+      _(button.label).must_equal 'Bar'
+      _(dialog.response_for_widget(button)).must_equal Gtk::ResponseType.to_int(:yes)
     end
   end
 end

data/test/gir_ffi-gtk/generated_gtk_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 
 # Tests generated methods and functions in the Gtk namespace.
@@ -39,9 +41,9 @@ describe 'In the generated Gtk module' do
         assert_instance_of Gtk::Button, o
         assert_equal 'clicked', sn
         assert_equal 'on_button_clicked', hn
-        co.must_be_nil
+        _(co).must_be_nil
         assert_equal 0, f
-        ud.wont_be_nil
+        _(ud).wont_be_nil
       end
     end
   end

data/test/gir_ffi-gtk/image_test.rb

@@ -1,15 +1,17 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 
 describe Gtk::Image do
   describe '.new_from_icon_name' do
     it 'works when called with a symbol' do
       result = Gtk::Image.new_from_icon_name('hi', :dialog)
-      result.must_be_instance_of Gtk::Image
+      _(result).must_be_instance_of Gtk::Image
     end
 
     it 'works when called with an integer' do
       result = Gtk::Image.new_from_icon_name('hi', 4)
-      result.must_be_instance_of Gtk::Image
+      _(result).must_be_instance_of Gtk::Image
     end
   end
 
@@ -17,12 +19,12 @@ describe Gtk::Image do
     let(:gicon) { Gio::ThemedIcon.new('hi') }
     it 'works when called with a symbol' do
       result = Gtk::Image.new_from_gicon(gicon, :dialog)
-      result.must_be_instance_of Gtk::Image
+      _(result).must_be_instance_of Gtk::Image
     end
 
     it 'works when called with an integer' do
       result = Gtk::Image.new_from_gicon(gicon, 4)
-      result.must_be_instance_of Gtk::Image
+      _(result).must_be_instance_of Gtk::Image
     end
   end
 
@@ -32,12 +34,12 @@ describe Gtk::Image do
 
     it 'works when called with a symbol' do
       image.set_from_gicon(gicon, :dialog)
-      image.get_gicon.must_equal [gicon, 6]
+      _(image.get_gicon).must_equal [gicon, 6]
     end
 
     it 'works when called with an integer' do
       image.set_from_gicon(gicon, 4)
-      image.get_gicon.must_equal [gicon, 4]
+      _(image.get_gicon).must_equal [gicon, 4]
     end
   end
 end

data/test/gir_ffi-gtk/list_store_test.rb

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 
 describe Gtk::ListStore do
   describe '.new' do
     it 'takes an array of column types' do
       store = Gtk::ListStore.new([GObject::TYPE_STRING, GObject::TYPE_INT])
-      store.must_be_instance_of Gtk::ListStore
+      _(store).must_be_instance_of Gtk::ListStore
     end
   end
 
@@ -12,8 +14,8 @@ describe Gtk::ListStore do
     it 'inserts a row with the given values' do
       store = Gtk::ListStore.new([GObject::TYPE_STRING, GObject::TYPE_INT])
       row = store.insert_with_values(0, [0, 1], ['foo', 42])
-      store.get_value(row, 0).must_equal 'foo'
-      store.get_value(row, 1).must_equal 42
+      _(store.get_value(row, 0)).must_equal 'foo'
+      _(store.get_value(row, 1)).must_equal 42
     end
   end
 
@@ -22,8 +24,8 @@ describe Gtk::ListStore do
       store = Gtk::ListStore.new([GObject::TYPE_STRING, GObject::TYPE_INT])
       row = store.insert_with_values(0, [0, 1], ['foo', 42])
       store.set(row, [1, 0], [3, 'bar'])
-      store.get_value(row, 0).must_equal 'bar'
-      store.get_value(row, 1).must_equal 3
+      _(store.get_value(row, 0)).must_equal 'bar'
+      _(store.get_value(row, 1)).must_equal 3
     end
   end
 
@@ -32,7 +34,7 @@ describe Gtk::ListStore do
       store = Gtk::ListStore.new([GObject::TYPE_STRING, GObject::TYPE_INT])
       row = store.insert_with_values(0, [0, 1], ['foo', 42])
       store.set_value(row, 0, nil)
-      store.get_value(row, 0).must_be_nil
+      _(store.get_value(row, 0)).must_be_nil
     end
   end
 end

data/test/gir_ffi-gtk/menu_test.rb

@@ -1,20 +1,12 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 
 describe Gtk::Menu do
   describe '#popup' do
-    it 'delegates to popup_for_device' do
-      default_method = GObjectIntrospection::IRepository.default.
-        find_by_name('Gtk', 'Menu').
-        find_method('popup')
-      skip 'No overrided needed for Gtk::Menu#popup' if default_method
+    it 'can be called with 4 arguments' do
       mnu = Gtk::Menu.new
-      mock(mnu).popup_for_device(nil,
-                                 'parent_menu_shell', 'parent_menu_item',
-                                 'func', 'data',
-                                 nil,
-                                 'button', 'activate_time')
-      mnu.popup('parent_menu_shell', 'parent_menu_item', 'func', 'data',
-                'button', 'activate_time')
+      mnu.popup(nil, nil, 1, 32)
     end
   end
 end

data/test/gir_ffi-gtk/message_dialog_test.rb

@@ -1,15 +1,17 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 
 describe Gtk::MessageDialog do
   describe '.new' do
     it 'creates a Gtk::MessageDialog with the right text' do
       dialog = Gtk::MessageDialog.new nil, :modal, :info, :close, 'Foo'
-      dialog.text.must_equal 'Foo'
+      _(dialog.text).must_equal 'Foo'
     end
 
     it 'handles all % characters in the message as literals' do
       dialog = Gtk::MessageDialog.new nil, :modal, :info, :close, 'Foo %'
-      dialog.text.must_equal 'Foo %'
+      _(dialog.text).must_equal 'Foo %'
     end
   end
 end

data/test/gir_ffi-gtk/radio_action_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 
 describe Gtk::RadioAction do
@@ -5,7 +7,7 @@ describe Gtk::RadioAction do
     it 'returns a GLib::SList object' do
       action = Gtk::RadioAction.new 'name', 'label', 'tooltip', nil, 1
       grp = action.get_group
-      grp.must_be_instance_of GLib::SList
+      _(grp).must_be_instance_of GLib::SList
     end
   end
 

data/test/gir_ffi-gtk/radio_button_test.rb

@@ -1,16 +1,18 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 
 describe Gtk::RadioButton do
   describe '.new_from_widget' do
     it 'works when called with nil' do
       result = Gtk::RadioButton.new_from_widget(nil)
-      result.must_be_instance_of Gtk::RadioButton
+      _(result).must_be_instance_of Gtk::RadioButton
     end
 
     it 'works when called with another radio button' do
       btn = Gtk::RadioButton.new_from_widget nil
       result = Gtk::RadioButton.new_from_widget btn
-      result.must_be_instance_of Gtk::RadioButton
+      _(result).must_be_instance_of Gtk::RadioButton
     end
   end
 
@@ -25,13 +27,13 @@ describe Gtk::RadioButton do
   describe '.new' do
     it 'works when called with nil' do
       result = Gtk::RadioButton.new nil
-      result.must_be_instance_of Gtk::RadioButton
+      _(result).must_be_instance_of Gtk::RadioButton
     end
 
     it 'works when called with the result of #get_group' do
       btn = Gtk::RadioButton.new_from_widget nil
       result = Gtk::RadioButton.new btn.get_group
-      result.must_be_instance_of Gtk::RadioButton
+      _(result).must_be_instance_of Gtk::RadioButton
     end
   end
 end

data/test/gir_ffi-gtk/target_entry_test.rb

@@ -1,19 +1,21 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 
 describe Gtk::TargetEntry do
   describe '.new' do
     it 'takes and uses three arguments' do
       entry = Gtk::TargetEntry.new('foo', 3, 42)
-      entry.target.must_equal 'foo'
-      entry.flags.must_equal 3
-      entry.info.must_equal 42
+      _(entry.target).must_equal 'foo'
+      _(entry.flags).must_equal 3
+      _(entry.info).must_equal 42
     end
 
     it 'allows symbol values for the second argument' do
       entry = Gtk::TargetEntry.new('foo', :same_app, 42)
-      entry.target.must_equal 'foo'
-      entry.flags.must_equal 1
-      entry.info.must_equal 42
+      _(entry.target).must_equal 'foo'
+      _(entry.flags).must_equal 1
+      _(entry.info).must_equal 42
     end
   end
 end

data/test/gir_ffi-gtk/tree_path_test.rb

@@ -1,17 +1,19 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 
 describe Gtk::TreePath do
   describe '#get_indices' do
     it "returns an enumerable of the TreePath's indices" do
       tree_path = Gtk::TreePath.new_from_string '1:2:3'
-      tree_path.get_indices.to_a.must_equal [1, 2, 3]
+      _(tree_path.get_indices.to_a).must_equal [1, 2, 3]
     end
   end
 
   describe '.new_from_indices' do
     it 'creates a Gtk::TreePath with the right indices' do
       tree_path = Gtk::TreePath.new_from_indices [1, 2, 3]
-      tree_path.get_indices.to_a.must_equal [1, 2, 3]
+      _(tree_path.get_indices.to_a).must_equal [1, 2, 3]
     end
   end
 end

data/test/gir_ffi-gtk/tree_store_test.rb

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 
 describe Gtk::TreeStore do
   describe '.new' do
     it 'takes an array of column types' do
       store = Gtk::TreeStore.new([GObject::TYPE_STRING, GObject::TYPE_INT])
-      store.must_be_instance_of Gtk::TreeStore
+      _(store).must_be_instance_of Gtk::TreeStore
     end
   end
 
@@ -12,8 +14,8 @@ describe Gtk::TreeStore do
     it 'inserts a row with the given values' do
       store = Gtk::TreeStore.new([GObject::TYPE_STRING, GObject::TYPE_INT])
       row = store.insert_with_values(nil, 0, [0, 1], ['foo', 42])
-      store.get_value(row, 0).must_equal 'foo'
-      store.get_value(row, 1).must_equal 42
+      _(store.get_value(row, 0)).must_equal 'foo'
+      _(store.get_value(row, 1)).must_equal 42
     end
   end
 
@@ -22,8 +24,8 @@ describe Gtk::TreeStore do
       store = Gtk::TreeStore.new([GObject::TYPE_STRING, GObject::TYPE_INT])
       row = store.insert_with_values(nil, 0, [0, 1], ['foo', 42])
       store.set(row, [1, 0], [3, 'bar'])
-      store.get_value(row, 0).must_equal 'bar'
-      store.get_value(row, 1).must_equal 3
+      _(store.get_value(row, 0)).must_equal 'bar'
+      _(store.get_value(row, 1)).must_equal 3
     end
   end
 
@@ -32,7 +34,7 @@ describe Gtk::TreeStore do
       store = Gtk::TreeStore.new([GObject::TYPE_STRING, GObject::TYPE_INT])
       row = store.insert_with_values(nil, 0, [0, 1], ['foo', 42])
       store.set_value(row, 0, nil)
-      store.get_value(row, 0).must_be_nil
+      _(store.get_value(row, 0)).must_be_nil
     end
   end
 end

data/test/gir_ffi-gtk/tree_view_column_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 
 describe Gtk::TreeViewColumn do
@@ -11,23 +13,23 @@ describe Gtk::TreeViewColumn do
     let(:list_store) { Gtk::ListStore.new([GObject::TYPE_INT, GObject::TYPE_STRING]) }
 
     it "sets the column's title" do
-      column.title.must_equal 'foo-title'
+      _(column.title).must_equal 'foo-title'
     end
 
     it 'packs the renderer into the column' do
-      column.get_cells.to_a.must_equal [renderer]
+      _(column.get_cells.to_a).must_equal [renderer]
     end
 
     it 'adds the attribute mapping for the renderer' do
       row = list_store.append
       list_store.set_value(row, 1, 'foo-value')
       column.cell_set_cell_data(list_store, row, false, false)
-      renderer.text.must_equal 'foo-value'
+      _(renderer.text).must_equal 'foo-value'
     end
 
     it 'allows not specifying any attributes' do
       col = Gtk::TreeViewColumn.new_with_attributes('foo-title', renderer)
-      col.must_be_instance_of Gtk::TreeViewColumn
+      _(col).must_be_instance_of Gtk::TreeViewColumn
     end
   end
 
@@ -45,7 +47,7 @@ describe Gtk::TreeViewColumn do
       row = list_store.append
       list_store.set_value(row, 1, 'foo-value')
       column.cell_set_cell_data(list_store, row, false, false)
-      renderer.text.must_equal 'foo-value'
+      _(renderer.text).must_equal 'foo-value'
     end
   end
 end

data/test/gir_ffi-gtk/widget_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 
 describe Gtk::Widget do
@@ -16,20 +18,20 @@ describe Gtk::Widget do
     it 'works when called with a bitmask hash' do
       widget.add_events button_press_mask: true
       ev = widget.get_events
-      Gdk::EventMask.to_int(ev).must_equal expected_native
+      _(Gdk::EventMask.to_int(ev)).must_equal expected_native
     end
 
     it 'works when called with a symbol' do
       widget.add_events :button_press_mask
       ev = widget.get_events
-      Gdk::EventMask.to_int(ev).must_equal expected_native
+      _(Gdk::EventMask.to_int(ev)).must_equal expected_native
     end
 
     it 'works when called with an int' do
       ev_int = Gdk::EventMask.to_int :button_press_mask
       widget.add_events ev_int
       ev = widget.get_events
-      Gdk::EventMask.to_int(ev).must_equal expected_native
+      _(Gdk::EventMask.to_int(ev)).must_equal expected_native
     end
   end
 
@@ -39,7 +41,7 @@ describe Gtk::Widget do
     it 'returns a bitmap hash' do
       widget.set_events focus_change_mask: true
       ev = widget.get_events
-      ev.must_equal focus_change_mask: true
+      _(ev).must_equal focus_change_mask: true
     end
   end
 
@@ -50,20 +52,20 @@ describe Gtk::Widget do
     it 'works when called with a bitmask hash' do
       widget.set_events focus_change_mask: true
       ev = widget.get_events
-      Gdk::EventMask.to_int(ev).must_equal expected_native
+      _(Gdk::EventMask.to_int(ev)).must_equal expected_native
     end
 
     it 'works when called with a symbol' do
       widget.set_events :focus_change_mask
       ev = widget.get_events
-      Gdk::EventMask.to_int(ev).must_equal expected_native
+      _(Gdk::EventMask.to_int(ev)).must_equal expected_native
     end
 
     it 'works when called with an int' do
       ev_int = Gdk::EventMask.to_int :focus_change_mask
       widget.set_events ev_int
       ev = widget.get_events
-      Gdk::EventMask.to_int(ev).must_equal expected_native
+      _(Gdk::EventMask.to_int(ev)).must_equal expected_native
     end
   end
 
@@ -73,7 +75,7 @@ describe Gtk::Widget do
     it 'returns a bitmap hash' do
       widget.set_events focus_change_mask: true
       ev = widget.events
-      ev.must_equal focus_change_mask: true
+      _(ev).must_equal focus_change_mask: true
     end
   end
 
@@ -84,20 +86,20 @@ describe Gtk::Widget do
     it 'works when called with a bitmask hash' do
       widget.events = { focus_change_mask: true }
       ev = widget.get_events
-      Gdk::EventMask.to_int(ev).must_equal expected_native
+      _(Gdk::EventMask.to_int(ev)).must_equal expected_native
     end
 
     it 'works when called with a symbol' do
       widget.events = :focus_change_mask
       ev = widget.get_events
-      Gdk::EventMask.to_int(ev).must_equal expected_native
+      _(Gdk::EventMask.to_int(ev)).must_equal expected_native
     end
 
     it 'works when called with an int' do
       ev_int = Gdk::EventMask.to_int :focus_change_mask
       widget.events = ev_int
       ev = widget.get_events
-      Gdk::EventMask.to_int(ev).must_equal expected_native
+      _(Gdk::EventMask.to_int(ev)).must_equal expected_native
     end
   end
 end

data/test/test_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rubygems' if RUBY_PLATFORM == 'java'
 
 begin

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gir_ffi-gtk
 version: !ruby/object:Gem::Version
-  version: 0.14.1
+  version: 0.15.0
 platform: ruby
 authors:
 - Matijs van Zuijlen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-19 00:00:00.000000000 Z
+date: 2019-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gir_ffi
@@ -16,42 +16,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.0
+        version: 0.15.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.0
+        version: 0.15.0
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.12'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rr
   requirement: !ruby/object:Gem::Requirement
@@ -94,6 +94,7 @@ files:
 - lib/gir_ffi-gtk/dialog.rb
 - lib/gir_ffi-gtk/file_chooser_dialog.rb
 - lib/gir_ffi-gtk/gtk2/list_store.rb
+- lib/gir_ffi-gtk/gtk2/menu.rb
 - lib/gir_ffi-gtk/gtk2/radio_action.rb
 - lib/gir_ffi-gtk/gtk2/radio_button.rb
 - lib/gir_ffi-gtk/gtk2/target_entry.rb
@@ -102,7 +103,6 @@ files:
 - lib/gir_ffi-gtk/gtk3/target_entry.rb
 - lib/gir_ffi-gtk/image.rb
 - lib/gir_ffi-gtk/list_store.rb
-- lib/gir_ffi-gtk/menu.rb
 - lib/gir_ffi-gtk/message_dialog.rb
 - lib/gir_ffi-gtk/tree_path.rb
 - lib/gir_ffi-gtk/tree_store.rb
@@ -144,15 +144,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.2.0
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: GirFFI-based Ruby bindings for Gtk+ 2 and 3

data/lib/gir_ffi-gtk/menu.rb

@@ -1,19 +0,0 @@
-# frozen_string_literal: true
-
-Gtk.load_class :Menu
-module Gtk
-  # Overrides for GtkMenu
-  class Menu
-    unless method_defined? :popup
-      # Smells of :reek:LongParameterList: due to the defined GtkMenu interface.
-      # rubocop:disable Metrics/ParameterLists
-      def popup(parent_menu_shell, parent_menu_item, func, data, button, activate_time)
-        popup_for_device(nil,
-                         parent_menu_shell, parent_menu_item, func, data,
-                         nil,
-                         button, activate_time)
-      end
-      # rubocop:enable Metrics/ParameterLists
-    end
-  end
-end