gir_ffi-gtk 0.7.1 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 88100a2341f51b96e708b1b0d47dd6367872266f
-  data.tar.gz: d21407d8a6d371b868a3a13f50da70499586a4e5
+  metadata.gz: af9c23060c5f36407a7862b2abaa874a07534b1e
+  data.tar.gz: 7b650fc017065988a9a11f03c5e3233d8a189a8d
 SHA512:
-  metadata.gz: 237673941e21d3c8397b3767af681d25ff741bfdc360b59d6c912d895ac1821217387fbb6c35efa315c3719e260f288c3307fdba37caf3ff4a6d2355507ab333
-  data.tar.gz: b7481e2b68b30b28285e4a4afc2025ecae63ba6dd081990553c2b36fe08e8e1452e77102e1a96797d61c6311bbe20bbbf5ef7e09e6f2dbbf6cc0f2cda80cbe77
+  metadata.gz: 24c701020e7fffe55ea56105566844f25de1b3a7eb7881410810c1bd2b9c5bbe04a76c1d168bcb9b7af1c00a494c0c5591ffcfee0dad91788b64923b531dd190
+  data.tar.gz: 0977c1c3087cc292c50af481c783347dc86b3f8e49273c2cf123d70550f179a2f88ea00262c04e24a70d35171ad7007e25195c225d5448d7c45b6c11fd32019e

data/Changelog.md

@@ -1,3 +1,16 @@
+## 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
+
+* Require at least Ruby 1.9.3
+* Add overrides for Gtk::TreePath
+* Add overrides for Gtk::MessageDialog.new
+* Make other Ruby threads run during Gtk.main loop
+* Update dependencies
+* Update examples
+
 ### 0.7.1 / 2014-03-25
 
 * Fix Gtk::Builder#connect_signals_full by updating dependency on GirFFI
@@ -25,4 +38,4 @@
 
 ### 0.4.0 / 2012-08-24
 
-* Inital release
+* Initial release

data/README.md

@@ -24,6 +24,22 @@ Gtk3:
 
 See the `examples/` directory for more examples.
 
+## Requirements
+
+First, make sure the `ffi` gem is properly installed. See its documentation for
+the necessary requirements.
+
+GirFFI-Gtk itself depends on the GirFFI gem, and the gobject-introspection and
+gtk+ libaries.
+
+For debian-like systems, try the following for Gtk+ 3:
+
+    apt-get install libgirepository1.0-dev gobject-introspection gir1.2-gtk-3.0
+
+and for Gtk+ 2:
+
+    apt-get install libgirepository1.0-dev gobject-introspection gir1.2-gtk-2.0
+
 ## Install
 
     gem install gir_ffi-gtk

data/examples/01_empty_window.rb

@@ -1,12 +1,12 @@
+#!/usr/bin/env ruby
 #
 # Based on the empty window Gtk+ tutorial example at
 # http://library.gnome.org/devel/gtk-tutorial/2.90/c39.html
 #
-$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', 'lib')
 require 'gir_ffi-gtk3'
 
 Gtk.init
 win = Gtk::Window.new :toplevel
 win.show
-GObject.signal_connect(win, "destroy") { Gtk.main_quit }
+win.signal_connect("destroy") { Gtk.main_quit }
 Gtk.main

data/examples/02_hello_world.rb

@@ -1,24 +1,23 @@
+#!/usr/bin/env ruby
 #
 # Based on the 'Hello world' Gtk+ tutorial example at
 # http://library.gnome.org/devel/gtk-tutorial/2.90/c39.html#SEC-HELLOWORLD
 #
-$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', 'lib')
 require 'gir_ffi-gtk3'
 
 Gtk.init
 
 win = Gtk::Window.new(:toplevel)
-GObject.signal_connect win, "delete-event" do
+win.signal_connect "delete-event" do
   puts "delete event occured"
   true
 end
 
-GObject.signal_connect(win, "destroy") { Gtk.main_quit }
-# FIXME: #border_width= should work
-win.set_border_width 10
+win.signal_connect("destroy") { Gtk.main_quit }
+win.border_width = 10
 
 but = Gtk::Button.new_with_label("Hello World")
-GObject.signal_connect(but, "clicked") { win.destroy }
+but.signal_connect("clicked") { win.destroy }
 
 win.add but
 

data/examples/03_upgraded_hello_world.rb

@@ -1,8 +1,8 @@
+#!/usr/bin/env ruby
 #
 # Based on the 'Upgraded Hello world' Gtk+ tutorial example at
 # http://library.gnome.org/devel/gtk-tutorial/2.90/x344.html
 #
-$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', 'lib')
 require 'gir_ffi-gtk3'
 
 callback = lambda { |widget, data|
@@ -14,24 +14,23 @@ Gtk.init
 win = Gtk::Window.new(:toplevel)
 win.title= "Hello Buttons!"
 
-GObject.signal_connect win, "delete-event" do
+win.signal_connect "delete-event" do
   Gtk.main_quit
   false
 end
 
-# FIXME: #border_width= should work
-win.set_border_width 10
+win.border_width = 10
 
 box = Gtk::HBox.new(false, 0)
 win.add box
 
 button = Gtk::Button.new_with_label("Button 1")
-GObject.signal_connect button, "clicked", "button 1", &callback
+button.signal_connect "clicked", "button 1", &callback
 box.pack_start button, true, true, 0
 button.show
 
 button = Gtk::Button.new_with_label("Button 2")
-GObject.signal_connect button, "clicked", "button 2", &callback
+button.signal_connect "clicked", "button 2", &callback
 box.pack_start button, true, true, 0
 button.show
 
@@ -39,4 +38,3 @@ box.show
 win.show
 
 Gtk.main
-

data/examples/04_webkit.rb

@@ -1,5 +1,6 @@
+#!/usr/bin/env ruby
+#
 # Based on http://www.idle-hacking.com/2010/02/webkit-ruby-and-gtk/
-$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', 'lib')
 require 'gir_ffi-gtk3'
 
 GirFFI.setup :WebKit, '3.0'
@@ -11,5 +12,5 @@ wv = WebKit::WebView.new
 win.add(wv)
 win.show_all
 wv.open('http://www.google.com/')
-GObject.signal_connect(win, "destroy") { Gtk.main_quit }
+win.signal_connect("destroy") { Gtk.main_quit }
 Gtk.main

data/examples/05_notification.rb

@@ -1,7 +1,6 @@
+#!/usr/bin/env ruby
 #
 # Simple notification example.
-#
-$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', 'lib')
 require 'gir_ffi-gtk3'
 
 GirFFI.setup :Notify
@@ -22,7 +21,7 @@ nf.add_action "test", "Test", Proc.new { |obj, action, user_data|
 
 # In this case, we want the program to end once the notification is gone,
 # but not before.
-GObject.signal_connect(nf, "closed") {
+nf.signal_connect("closed") {
   puts "Notification closed."
   Gtk.main_quit
 }

data/examples/06_treeview.rb

@@ -1,3 +1,5 @@
+#!/usr/bin/env ruby
+#
 $LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', 'lib')
 require 'gir_ffi-gtk3'
 
@@ -7,7 +9,7 @@ Gtk.init
 #Add window.
 win = Gtk::Window.new(:toplevel)
 win.resize(640, 480)
-GObject.signal_connect(win, "destroy"){ Gtk.main_quit }
+win.signal_connect("destroy") { Gtk.main_quit }
 
 
 #Add treeview.
@@ -46,4 +48,4 @@ tv.show
 
 win.show
 
-Gtk.main
+Gtk.main

data/lib/gir_ffi-gtk/base.rb

@@ -1,14 +1,53 @@
-module Gtk
-  setup_method "init"
+module GirFFIGtk
+  # Override init to automatically use ARGV as its argument.
+  module AutoArgv
+    def self.included base
+      base.extend ClassMethods
+      class << base
+        alias_method :init_without_auto_argv, :init
+        alias_method :init, :init_with_auto_argv
+      end
+    end
 
-  def self.init_with_auto_argv
-    remaining = init_without_auto_argv([$0, *ARGV]).to_a
-    remaining.shift
-    ARGV.replace remaining
+    module ClassMethods
+      def init_with_auto_argv
+        remaining = init_without_auto_argv([$PROGRAM_NAME, *ARGV]).to_a
+        remaining.shift
+        ARGV.replace remaining
+      end
+    end
   end
 
-  class << self
-    alias init_without_auto_argv init
-    alias init init_with_auto_argv
+  # Override main to start an idle thread to allow Ruby threads to run during
+  # the main loop.
+  module ThreadEnabler
+    def self.included base
+      base.extend ClassMethods
+      class << base
+        alias_method :main_without_thread_enabler, :main
+        alias_method :main, :main_with_thread_enabler
+      end
+    end
+
+    module ClassMethods
+      def main_with_thread_enabler
+        case RUBY_ENGINE
+        when 'jruby'
+        when 'rbx'
+        else # 'ruby' most likely
+          GLib::MainLoop::ThreadEnabler.instance.setup_idle_handler
+        end
+        main_without_thread_enabler
+      end
+    end
   end
 end
+
+# Overrides for Gtk module functions
+module Gtk
+  setup_method "init"
+  setup_method "main"
+
+  include GirFFIGtk::AutoArgv
+  include GirFFIGtk::ThreadEnabler
+end

data/lib/gir_ffi-gtk/menu.rb

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

@@ -0,0 +1,22 @@
+Gtk.load_class :MessageDialog
+
+module Gtk
+  # Add non-introspected function to Gtk::Lib
+  module Lib
+    attach_function :gtk_message_dialog_new, [:pointer,
+                                              Gtk::DialogFlags,
+                                              Gtk::MessageType,
+                                              Gtk::ButtonsType,
+                                              :string,
+                                              :varargs], :pointer
+  end
+
+  class MessageDialog
+    def self.new parent, flags, type, buttons, message
+      ptr = Gtk::Lib.gtk_message_dialog_new(parent, flags, type, buttons,
+                                            '%s',
+                                            :string, message)
+      constructor_wrap ptr
+    end
+  end
+end

data/lib/gir_ffi-gtk/radio_button.rb

@@ -1,6 +1,6 @@
+Gtk.load_class :RadioButton
 module Gtk
-  load_class :RadioButton
-
+  # Add non-introspected functions to Gtk::Lib
   module Lib
     attach_function :gtk_radio_button_new, [:pointer], :pointer
     attach_function :gtk_radio_button_new_from_widget, [:pointer], :pointer
@@ -8,19 +8,16 @@ module Gtk
 
   # Overrides for GtkRadioButton
   class RadioButton
-    def self.new(group)
-      _v1 = GLib::SList.from(Gtk::RadioButton, group)
-      _v2 = Gtk::Lib.gtk_radio_button_new(_v1)
-      _v3 = self.constructor_wrap(_v2)
-      return _v3
+    def self.new group
+      v1 = GLib::SList.from(Gtk::RadioButton, group)
+      v2 = Gtk::Lib.gtk_radio_button_new(v1)
+      constructor_wrap(v2)
     end
 
-    def self.new_from_widget(radio_group_member)
-      _v1 = Gtk::RadioButton.from(radio_group_member)
-      _v2 = Gtk::Lib.gtk_radio_button_new_from_widget(_v1)
-      _v3 = self.constructor_wrap(_v2)
-      return _v3
+    def self.new_from_widget radio_group_member
+      v1 = Gtk::RadioButton.from(radio_group_member)
+      v2 = Gtk::Lib.gtk_radio_button_new_from_widget(v1)
+      constructor_wrap(v2)
     end
   end
 end
-

data/lib/gir_ffi-gtk/tree_path.rb

@@ -0,0 +1,31 @@
+Gtk.load_class :TreePath
+module Gtk
+  # Add non-introspected function to Gtk::Lib
+  module Lib
+    if Gtk::MAJOR_VERSION == 2 || Gtk::MINOR_VERSION < 12
+      attach_function :gtk_tree_path_new_from_indices, [:varargs], :pointer
+    end
+  end
+
+  # Overrides for GtkTreePath
+  class TreePath
+    if Gtk::MAJOR_VERSION == 2 || Gtk::MINOR_VERSION < 12
+      def self.new_from_indices indices
+        args = indices.flat_map { |index| [:int, index] }
+        ptr = Gtk::Lib.gtk_tree_path_new_from_indices(*args, :int, -1)
+        constructor_wrap ptr
+      end
+    end
+
+    if Gtk::MAJOR_VERSION == 2
+      setup_instance_method 'get_indices'
+      remove_method :get_indices
+
+      def get_indices
+        depth = get_depth
+        ptr = Gtk::Lib.gtk_tree_path_get_indices self
+        GirFFI::SizedArray.wrap(:gint32, depth, ptr)
+      end
+    end
+  end
+end

data/lib/gir_ffi-gtk2.rb

@@ -4,4 +4,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_button'
+require 'gir_ffi-gtk/tree_path'

data/lib/gir_ffi-gtk3.rb

@@ -4,3 +4,5 @@ GirFFI.setup :Gtk, '3.0'
 
 require 'gir_ffi-gtk/base'
 require 'gir_ffi-gtk/menu'
+require 'gir_ffi-gtk/message_dialog'
+require 'gir_ffi-gtk/tree_path'

data/test/gir_ffi-gtk/base_test.rb

@@ -3,32 +3,47 @@ require 'test_helper'
 describe Gtk do
   describe "::init" do
     before do
-      save_module :Gtk
-      ::Object.const_set :Gtk, Module.new
-      Gtk.class_eval do
+      module DummyGtk
         def self.init arr
           ["baz", "qux", "zonk"]
         end
-      end
-      mock(Gtk).setup_method("init") { }
 
-      load 'gir_ffi-gtk/base.rb'
+        include GirFFIGtk::AutoArgv
+      end
     end
 
     it "does not take any arguments" do
-      assert_raises(ArgumentError) { Gtk.init 1, ["foo"] }
-      assert_raises(ArgumentError) { Gtk.init ["foo"] }
-      assert_nothing_raised { Gtk.init }
+      assert_raises(ArgumentError) { DummyGtk.init 1, ["foo"] }
+      assert_raises(ArgumentError) { DummyGtk.init ["foo"] }
+      assert_nothing_raised { DummyGtk.init }
     end
 
     it "replaces ARGV with the tail of the result of the original init function" do
       ARGV.replace ["foo", "bar"]
-      Gtk.init
+      DummyGtk.init
       assert_equal ["qux", "zonk"], ARGV.to_a
     end
+  end
+
+  describe "::main" do
+    it "allows other threads to run" do
+      a = []
+      GLib.timeout_add(GLib::PRIORITY_DEFAULT, 100,
+                       proc { Gtk.main_quit },
+                       nil, nil)
+
+      slow_thread = Thread.new do
+        sleep 0.005
+        a << "During run"
+      end
+
+      a << "Before run"
+      Gtk.main
+      a << "After run"
+
+      slow_thread.join
 
-    after do
-      restore_module :Gtk
+      a.last.must_equal "After run"
     end
   end
 end

data/test/gir_ffi-gtk/message_dialog_test.rb

@@ -0,0 +1,16 @@
+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'
+    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 %'
+    end
+  end
+end
+

data/test/gir_ffi-gtk/tree_path_test.rb

@@ -0,0 +1,17 @@
+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]
+    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]
+    end
+  end
+end

data/test/test_helper.rb

@@ -28,24 +28,4 @@ class Minitest::Test
   def ref_count object
     GObject::Object::Struct.new(object.to_ptr)[:ref_count]
   end
-
-  SAVED_MODULES = {}
-
-  def save_module name
-    if Object.const_defined? name
-      puts "Saving #{name} over existing" if SAVED_MODULES.has_key? name
-      SAVED_MODULES[name] = Object.const_get name
-      Object.send(:remove_const, name)
-    end
-  end
-
-  def restore_module name
-    if Object.const_defined? name
-      Object.send(:remove_const, name)
-    end
-    if SAVED_MODULES.has_key? name
-      Object.const_set name, SAVED_MODULES[name]
-      SAVED_MODULES.delete name
-    end
-  end
 end

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: gir_ffi-gtk
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors:
 - Matijs van Zuijlen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-25 00:00:00.000000000 Z
+date: 2014-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gir_ffi
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.3
+        version: 0.7.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.3
+        version: 0.7.6
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
 - !ruby/object:Gem::Dependency
   name: rr
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.2
+        version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.2
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.1'
 description: Bindings for Gtk+ 2 and 3, generated by GirFFI, with overrides.
@@ -73,27 +73,31 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/gir_ffi-gtk2.rb
-- lib/gir_ffi-gtk/menu.rb
+- COPYING.LIB
+- Changelog.md
+- README.md
+- Rakefile
+- examples/01_empty_window.rb
+- examples/02_hello_world.rb
+- examples/03_upgraded_hello_world.rb
+- examples/04_webkit.rb
+- examples/05_notification.rb
+- examples/06_treeview.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_button.rb
+- lib/gir_ffi-gtk/tree_path.rb
+- lib/gir_ffi-gtk2.rb
 - lib/gir_ffi-gtk3.rb
-- test/test_helper.rb
+- tasks/test.rake
 - test/gir_ffi-gtk/base_test.rb
-- test/gir_ffi-gtk/menu_test.rb
 - 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_button_test.rb
-- tasks/test.rake
-- examples/04_webkit.rb
-- examples/01_empty_window.rb
-- examples/03_upgraded_hello_world.rb
-- examples/02_hello_world.rb
-- examples/06_treeview.rb
-- examples/05_notification.rb
-- Changelog.md
-- README.md
-- Rakefile
-- COPYING.LIB
+- test/gir_ffi-gtk/tree_path_test.rb
+- test/test_helper.rb
 homepage: http://www.github.com/mvz/gir_ffi-gtk
 licenses:
 - LGPL-2.1
@@ -104,17 +108,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.4.1
 signing_key: 
 specification_version: 4
 summary: GirFFI-based Ruby bindings for Gtk+ 2 and 3
@@ -122,6 +126,8 @@ test_files:
 - test/gir_ffi-gtk/base_test.rb
 - 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_button_test.rb
+- test/gir_ffi-gtk/tree_path_test.rb
 - test/test_helper.rb
 has_rdoc: