gir_ffi-gtk 0.14.0 → 0.14.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 281f8a6888138d1e0202fb5db8c0ea53360554105b53d6406341178b0ed78b3f
-  data.tar.gz: 962bcd69122c211806c3080b338ab8149db749b4f2e05308054e8a427f5f3f1c
+  metadata.gz: 8bd9e77a426417bff917414f6d484ec54248a58159a0160f7a5f8dad983a4bef
+  data.tar.gz: 4f3f05f2d9da9adb3dd5283c6c5e6abede7c170b9e8e77c57e555c820c7ac09d
 SHA512:
-  metadata.gz: c22e681ac28ad88e51a77a6abe88537222d9efa0fe559fc5d697810adcfbc3d47aa090e8451f6fd6a93324ace8857805700211913e36da1ff46397ecae34816b
-  data.tar.gz: 196ec071a952298f9a9d71769325beb0fbbf696feff3425ffc5057bb6061323495fc8873ab8af905f9b97dffef70a915d4d2e0bfc9453b3f85b1794e4b8e7c95
+  metadata.gz: 83176abd6470da76a04a1a702d17bb51a9809e4510eb63dc35eaf626c585563b699e04a77e8398cf0edfdc6e470c92c491367a124cc1a7a60f3e69e9b1588d1a
+  data.tar.gz: 973b776ac24f27de88e9550e5388b8bef089e402e5f875c914cf6d6e3bb9e751fe4fe09bc9daa793a4303c062ca16ed64ae79317c5192cd6bf319548ff96ea0c

data/Changelog.md

@@ -3,6 +3,13 @@
 All notable changes to this project will be documented in this file. See the
 Git log for all changes.
 
+## 0.14.1 / 2018-12-19
+
+* Override `Gtk::Widget#get_events`, `Gtk::Widget#set_events` and
+  `Gtk::Widget#add_events` methods to take and return `EventMask` values
+  instead of bare `int`s.
+* Fix license in gemspec; it's LGPL 2.1 or later
+
 ## 0.14.0 / 2018-09-27
 
 * Depend on GirFFI 0.14.0

data/lib/gir_ffi-gtk/widget.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module GirFFIGtk
+  # Overrides for GtkWidget methods
+  module WidgetOverrides
+    def add_events(events)
+      super Gdk::EventMask.to_int events
+    end
+
+    def get_events
+      Gdk::EventMask.from_native super
+    end
+
+    def set_events(events)
+      super Gdk::EventMask.to_int events
+    end
+  end
+end
+
+Gtk.load_class :Widget
+
+Gtk::Widget.setup_instance_method! :add_events
+Gtk::Widget.setup_instance_method! :get_events
+Gtk::Widget.setup_instance_method! :set_events
+Gtk::Widget.prepend GirFFIGtk::WidgetOverrides

data/lib/gir_ffi-gtk2.rb

@@ -18,6 +18,7 @@ require 'gir_ffi-gtk/message_dialog'
 require 'gir_ffi-gtk/tree_path'
 require 'gir_ffi-gtk/tree_store'
 require 'gir_ffi-gtk/tree_view_column'
+require 'gir_ffi-gtk/widget'
 
 require 'gir_ffi-gtk/gtk2/list_store'
 require 'gir_ffi-gtk/gtk2/radio_action'

data/lib/gir_ffi-gtk3.rb

@@ -18,6 +18,7 @@ require 'gir_ffi-gtk/message_dialog'
 require 'gir_ffi-gtk/tree_path'
 require 'gir_ffi-gtk/tree_store'
 require 'gir_ffi-gtk/tree_view_column'
+require 'gir_ffi-gtk/widget'
 
 require 'gir_ffi-gtk/gtk3/button'
 require 'gir_ffi-gtk/gtk3/target_entry'

data/test/gir_ffi-gtk/widget_test.rb

@@ -0,0 +1,103 @@
+require 'test_helper'
+
+describe Gtk::Widget do
+  describe '#add_events' do
+    let(:widget) { Gtk::EventBox.new }
+    let(:expected_native) do
+      Gdk::EventMask.to_int(focus_change_mask: true,
+                            button_press_mask: true)
+    end
+
+    before do
+      ev_int = Gdk::EventMask.to_int :focus_change_mask
+      widget.set_events ev_int
+    end
+
+    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
+    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
+    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
+    end
+  end
+
+  describe '#get_events' do
+    let(:widget) { Gtk::EventBox.new }
+
+    it 'returns a bitmap hash' do
+      widget.set_events focus_change_mask: true
+      ev = widget.get_events
+      ev.must_equal focus_change_mask: true
+    end
+  end
+
+  describe '#set_events' do
+    let(:widget) { Gtk::EventBox.new }
+    let(:expected_native) { Gdk::EventMask.to_int(focus_change_mask: true) }
+
+    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
+    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
+    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
+    end
+  end
+
+  describe '#events' do
+    let(:widget) { Gtk::EventBox.new }
+
+    it 'returns a bitmap hash' do
+      widget.set_events focus_change_mask: true
+      ev = widget.events
+      ev.must_equal focus_change_mask: true
+    end
+  end
+
+  describe '#events=' do
+    let(:widget) { Gtk::EventBox.new }
+    let(:expected_native) { Gdk::EventMask.to_int(focus_change_mask: true) }
+
+    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
+    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
+    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
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gir_ffi-gtk
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.14.1
 platform: ruby
 authors:
 - Matijs van Zuijlen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-27 00:00:00.000000000 Z
+date: 2018-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gir_ffi
@@ -107,6 +107,7 @@ files:
 - lib/gir_ffi-gtk/tree_path.rb
 - lib/gir_ffi-gtk/tree_store.rb
 - lib/gir_ffi-gtk/tree_view_column.rb
+- lib/gir_ffi-gtk/widget.rb
 - lib/gir_ffi-gtk2.rb
 - lib/gir_ffi-gtk3.rb
 - tasks/test.rake
@@ -129,10 +130,11 @@ files:
 - test/gir_ffi-gtk/tree_path_test.rb
 - test/gir_ffi-gtk/tree_store_test.rb
 - test/gir_ffi-gtk/tree_view_column_test.rb
+- test/gir_ffi-gtk/widget_test.rb
 - test/test_helper.rb
 homepage: http://www.github.com/mvz/gir_ffi-gtk
 licenses:
-- LGPL-2.1
+- LGPL-2.1+
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -174,4 +176,5 @@ test_files:
 - test/gir_ffi-gtk/tree_path_test.rb
 - test/gir_ffi-gtk/tree_store_test.rb
 - test/gir_ffi-gtk/tree_view_column_test.rb
+- test/gir_ffi-gtk/widget_test.rb
 - test/test_helper.rb