gir_ffi-gtk 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 742b828f6ed4e8f3422442b2b6e9cca410d18fc2
-  data.tar.gz: a6f03e605b7cdbb8bf20886647c9735c4cdab169
+  metadata.gz: 9db12a11ec0be6f650fa77d62a76e2f987b2e99a
+  data.tar.gz: d3a2f90bb11881d3b4f0fe12beda7e1791e2ad55
 SHA512:
-  metadata.gz: 2ab32afa737ee8935ec70b2e4102a37f569aa27cf84d8e6173c90d8cdc48a9070d8e00054c3b88c8c5ef19e55980cf7bf6af41efd0e35d258385b0e8f4269bd0
-  data.tar.gz: 14c8e71fc367b194e65da0d56948485272dbc24698a73b1dbfafcf28fb1799d9f3bfc50be5b41c2f061d8294ddcb0d62d3625ec9c02a9d3404e480890355db0f
+  metadata.gz: 215691511a0bb591c5342ad9842d637b29f06f1112e4b29ead2033833bc64ed430e19de97c7283a0fbbe9558d55a4d4d84308d7c4d4056c525c93ef0b8a3d6de
+  data.tar.gz: 0e695e5a0d1a17f29d58d97a1ed4a7a4258d4f5243014f848bc029467d0bc525f26a0ee43766f752bd80f8431e91e5014d2e4ee1b78e1aec44c76e4213bfa574

data/Changelog.md

@@ -1,8 +1,20 @@
-## Change Log
+# Change Log
+
 All notable changes to this project will be documented in this file. See the
 Git log for all changes.
 
-### 0.7.2 / 2014-09-22
+## 0.8.1 / 2015-12-02
+
+* Add override for Gtk::RadioAction#set_group
+* Add Gtk::Application example (thanks, cedlemo)
+* Add and update WebKit examples
+
+## 0.8.0 / 2015-09-20
+
+* Update dependency on GirFFI
+* Update constructor overrides to match GirFFI's new constructor structure
+
+## 0.7.2 / 2014-09-22
 
 * Require at least Ruby 1.9.3
 * Add overrides for Gtk::TreePath
@@ -11,31 +23,31 @@ Git log for all changes.
 * Update dependencies
 * Update examples
 
-### 0.7.1 / 2014-03-25
+## 0.7.1 / 2014-03-25
 
 * Fix Gtk::Builder#connect_signals_full by updating dependency on GirFFI
 * Only override Gtk::Menu#popup if needed
 * Test both Gtk+ 2 and 3
 * Provide constructors for Gtk::RadioButton if needed
 
-### 0.7.0 / 2014-01-11
+## 0.7.0 / 2014-01-11
 
 * Update dependency on GirFFI
 
-### 0.6.0 / 2013-06-09
+## 0.6.0 / 2013-06-09
 
 * Update dependency on GirFFI
 
-### 0.5.0 / 2013-01-19
+## 0.5.0 / 2013-01-19
 
 * Update dependency on GirFFI
 
-### 0.4.1 / 2012-09-22
+## 0.4.1 / 2012-09-22
 
 * New TreeView example (thanks, Kasper Johansen)
 * Implement Gtk::Menu#popup
 * Update dependency on GirFFI so interfaces can wrap pointers
 
-### 0.4.0 / 2012-08-24
+## 0.4.0 / 2012-08-24
 
 * Initial release

data/examples/04_webkit.rb

@@ -1,16 +1,18 @@
 #!/usr/bin/env ruby
 #
-# Based on http://www.idle-hacking.com/2010/02/webkit-ruby-and-gtk/
+# Based on https://web.archive.org/web/20110228141616/http://www.idle-hacking.com/2010/02/webkit-ruby-and-gtk/
+#
+
 require 'gir_ffi-gtk3'
 
-GirFFI.setup :WebKit, '3.0'
+GirFFI.setup :WebKit2, '4.0'
 
 Gtk.init
 
 win = Gtk::Window.new :toplevel
-wv = WebKit::WebView.new
+wv = WebKit2::WebView.new
 win.add(wv)
 win.show_all
-wv.open('http://www.google.com/')
-win.signal_connect("destroy") { Gtk.main_quit }
+wv.load_uri('http://www.google.com/')
+win.signal_connect('destroy') { Gtk.main_quit }
 Gtk.main

data/examples/07_simple_gtk_application.rb

@@ -0,0 +1,30 @@
+#!/usr/bin/env ruby
+
+require 'gir_ffi-gtk3'
+
+myapp = Gtk::Application.new('org.gtk.example', :handles_command_line)
+
+myapp.signal_connect 'command-line' do |app, _command_line|
+  app.activate
+  0
+end
+
+myapp.signal_connect 'activate' do |app|
+  win = Gtk::ApplicationWindow.new(app)
+  win.set_title('Gtk Application example')
+  win.set_default_size(200, 200)
+
+  button_box = Gtk::ButtonBox.new(:horizontal)
+  win.add(button_box)
+
+  button = Gtk::Button.new_with_label('Hello world')
+  button.signal_connect 'clicked' do
+    puts 'Hello World'
+    app.quit
+  end
+
+  button_box.add(button)
+  win.show_all
+end
+
+exit(myapp.run([$PROGRAM_NAME] + ARGV))

data/examples/08_webkit_headless.rb

@@ -0,0 +1,21 @@
+require 'gir_ffi-gtk3'
+
+GirFFI.setup :WebKit, '3.0'
+
+Gtk.init
+
+win = Gtk::OffscreenWindow.new
+web_view = WebKit::WebView.new
+win.add(web_view)
+
+web_view.signal_connect "load-finished" do
+  pixbuf = win.get_pixbuf
+  pixbuf.savev("google.png", "png", nil, nil)
+  puts web_view.get_title
+  Gtk.main_quit
+end
+
+web_view.load_uri('http://www.google.com/')
+win.show_all
+
+Gtk.main

data/examples/09_webkit2_headless.rb

@@ -0,0 +1,24 @@
+require 'gir_ffi-gtk3'
+
+GirFFI.setup :WebKit2, '4.0'
+
+Gtk.init
+
+win = Gtk::OffscreenWindow.new
+web_view = WebKit2::WebView.new
+win.add(web_view)
+
+web_view.signal_connect "load-changed" do |_, event, _|
+  case event
+  when :finished
+    pixbuf = win.get_pixbuf
+    pixbuf.savev("google.png", "png", nil, nil)
+    puts web_view.get_title
+    Gtk.main_quit
+  end
+end
+
+web_view.load_uri('http://www.google.com/')
+win.show_all
+
+Gtk.main

data/lib/gir_ffi-gtk/base.rb

@@ -1,7 +1,7 @@
 module GirFFIGtk
   # Override init to automatically use ARGV as its argument.
   module AutoArgv
-    def self.included base
+    def self.included(base)
       base.extend ClassMethods
       class << base
         alias_method :init_without_auto_argv, :init
@@ -22,7 +22,7 @@ module GirFFIGtk
   # Override main to start an idle thread to allow Ruby threads to run during
   # the main loop.
   module ThreadEnabler
-    def self.included base
+    def self.included(base)
       base.extend ClassMethods
       class << base
         alias_method :main_without_thread_enabler, :main
@@ -47,8 +47,8 @@ end
 
 # Overrides for Gtk module functions
 module Gtk
-  setup_method "init"
-  setup_method "main"
+  setup_method 'init'
+  setup_method 'main'
 
   include GirFFIGtk::AutoArgv
   include GirFFIGtk::ThreadEnabler

data/lib/gir_ffi-gtk/menu.rb

@@ -3,7 +3,9 @@ module Gtk
   # Overrides for GtkMenu
   class Menu
     unless method_defined? :popup
-      def popup parent_menu_shell, parent_menu_item, func, data, button, activate_time
+      # 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,

data/lib/gir_ffi-gtk/message_dialog.rb

@@ -13,13 +13,13 @@ module Gtk
 
   # Overrides for GtkMessageDialog
   class MessageDialog
-    def self.new *args
+    def self.new(*args)
       obj = allocate
       obj.send :initialize, *args
       obj
     end
 
-    def initialize parent, flags, type, buttons, message
+    def initialize(parent, flags, type, buttons, message)
       ptr = Gtk::Lib.gtk_message_dialog_new(parent, flags, type, buttons,
                                             '%s',
                                             :string, message)

data/lib/gir_ffi-gtk/radio_action.rb

@@ -0,0 +1,14 @@
+Gtk.load_class :RadioAction
+module Gtk
+  # Add non-introspected functions to Gtk::Lib
+  module Lib
+    attach_function :gtk_radio_action_set_group, [:pointer, :pointer], :void
+  end
+
+  # Overrides for GtkRadioAction
+  class RadioAction
+    def set_group(group)
+      Gtk::Lib.gtk_radio_action_set_group self, group
+    end
+  end
+end

data/lib/gir_ffi-gtk/radio_button.rb

@@ -8,28 +8,28 @@ module Gtk
 
   # Overrides for GtkRadioButton
   class RadioButton
-    def self.new *args
+    def self.new(*args)
       obj = allocate
       obj.send :initialize, *args
       obj
     end
 
-    def self.new_from_widget *args
+    def self.new_from_widget(*args)
       obj = allocate
       obj.send :initialize_from_widget, *args
       obj
     end
 
-    def initialize group
-      v1 = GLib::SList.from(Gtk::RadioButton, group)
-      v2 = Gtk::Lib.gtk_radio_button_new(v1)
-      store_pointer(v2)
+    def initialize(group)
+      list = GLib::SList.from(Gtk::RadioButton, group)
+      ptr = Gtk::Lib.gtk_radio_button_new(list)
+      store_pointer(ptr)
     end
 
-    def initialize_from_widget radio_group_member
-      v1 = Gtk::RadioButton.from(radio_group_member)
-      v2 = Gtk::Lib.gtk_radio_button_new_from_widget(v1)
-      store_pointer(v2)
+    def initialize_from_widget(radio_group_member)
+      widget = Gtk::RadioButton.from(radio_group_member)
+      ptr = Gtk::Lib.gtk_radio_button_new_from_widget(widget)
+      store_pointer(ptr)
     end
   end
 end

data/lib/gir_ffi-gtk/tree_path.rb

@@ -10,13 +10,13 @@ module Gtk
   # Overrides for GtkTreePath
   class TreePath
     if Gtk::MAJOR_VERSION == 2 || Gtk::MAJOR_VERSION == 3 && Gtk::MINOR_VERSION < 12
-      def self.new_from_indices *args
+      def self.new_from_indices(*args)
         obj = allocate
         obj.send :initialize_from_indices, *args
         obj
       end
 
-      def initialize_from_indices indices
+      def initialize_from_indices(indices)
         args = indices.flat_map { |index| [:int, index] }
         ptr = Gtk::Lib.gtk_tree_path_new_from_indices(*args, :int, -1)
         store_pointer ptr

data/lib/gir_ffi-gtk2.rb

@@ -5,5 +5,6 @@ GirFFI.setup :Gtk, '2.0'
 require 'gir_ffi-gtk/base'
 require 'gir_ffi-gtk/menu'
 require 'gir_ffi-gtk/message_dialog'
+require 'gir_ffi-gtk/radio_action'
 require 'gir_ffi-gtk/radio_button'
 require 'gir_ffi-gtk/tree_path'

data/tasks/test.rake

@@ -4,15 +4,15 @@ namespace :test do
   Rake::TestTask.new(:gtk3) do |t|
     t.libs = ['lib']
     t.test_files = FileList['test/**/*_test.rb']
-    t.ruby_opts += ["-w", "-Itest"]
+    t.ruby_opts += ['-w', '-Itest']
   end
 
   Rake::TestTask.new(:gtk2) do |t|
     t.libs = ['lib']
     t.test_files = FileList['test/**/*_test.rb']
-    t.ruby_opts += ["-rgir_ffi-gtk2",  "-w", "-Itest"]
+    t.ruby_opts += ['-rgir_ffi-gtk2', '-w', '-Itest']
   end
 end
 
 desc 'Run unit tests'
-task :test => ['test:gtk3', 'test:gtk2']
+task test: ['test:gtk3', 'test:gtk2']

data/test/gir_ffi-gtk/radio_action_test.rb

@@ -0,0 +1,27 @@
+require 'test_helper'
+
+describe Gtk::RadioAction do
+  describe "#get_group" 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
+    end
+  end
+
+  describe "#set_group" do
+    let(:action) { Gtk::RadioAction.new 'name', 'label', 'tooltip', nil, 1 }
+
+    it "accepts nil" do
+      action.set_group nil
+      pass
+    end
+
+    it "accepts a GLib::SList object" do
+      grp = action.get_group
+      other_action = Gtk::RadioAction.new 'other-name', 'other-label', 'other-tooltip', nil, 2
+      other_action.set_group grp
+      pass
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gir_ffi-gtk
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Matijs van Zuijlen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-20 00:00:00.000000000 Z
+date: 2015-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gir_ffi
@@ -83,9 +83,13 @@ files:
 - examples/04_webkit.rb
 - examples/05_notification.rb
 - examples/06_treeview.rb
+- examples/07_simple_gtk_application.rb
+- examples/08_webkit_headless.rb
+- examples/09_webkit2_headless.rb
 - lib/gir_ffi-gtk/base.rb
 - lib/gir_ffi-gtk/menu.rb
 - lib/gir_ffi-gtk/message_dialog.rb
+- lib/gir_ffi-gtk/radio_action.rb
 - lib/gir_ffi-gtk/radio_button.rb
 - lib/gir_ffi-gtk/tree_path.rb
 - lib/gir_ffi-gtk2.rb
@@ -95,6 +99,7 @@ files:
 - test/gir_ffi-gtk/generated_gtk_test.rb
 - test/gir_ffi-gtk/menu_test.rb
 - test/gir_ffi-gtk/message_dialog_test.rb
+- test/gir_ffi-gtk/radio_action_test.rb
 - test/gir_ffi-gtk/radio_button_test.rb
 - test/gir_ffi-gtk/tree_path_test.rb
 - test/test_helper.rb
@@ -127,6 +132,7 @@ test_files:
 - test/gir_ffi-gtk/generated_gtk_test.rb
 - test/gir_ffi-gtk/menu_test.rb
 - test/gir_ffi-gtk/message_dialog_test.rb
+- test/gir_ffi-gtk/radio_action_test.rb
 - test/gir_ffi-gtk/radio_button_test.rb
 - test/gir_ffi-gtk/tree_path_test.rb
 - test/test_helper.rb