gir_ffi 0.3.2 → 0.4.0

data/History.txt

@@ -1,3 +1,7 @@
+== 0.4.0 / 2012-08-24
+
+* Move Gtk+ bindings to their own gem (gir_ffi-gtk).
+
 == 0.3.2 / 2012-08-24
 
 * Correctly set FFI return type when callbacks that return GObjects have

data/README.rdoc

@@ -13,10 +13,10 @@ Ruby bindings for GNOME using the GObject Introspection Repository.
 == Features/Notes
 
 * Create bindings to any GObject-based library.
-* Supports both Gtk+ 2 and Gtk+ 3.
 * Bindings generated at runtime.
 * Provides overridden bindings for selected methods.
-* Require 'ffi-gtk2' or 'ffi-gtk3' to load overrides for Gtk2 or Gtk3.
+* Install 'gir_ffi-gtk' and require 'gir_ffi-gtk2' or 'gir_ffi-gtk3' to
+  load overrides for Gtk2 or Gtk3.
 
 == Install
 
@@ -24,8 +24,6 @@ Ruby bindings for GNOME using the GObject Introspection Repository.
 
 == Synopsis
 
-Basic usage:
-
   require 'gir_ffi'
 
   GirFFI.setup :TheNamespace
@@ -35,26 +33,6 @@ Basic usage:
   obj = TheNamespace::SomeClass.new
   obj.some_method with, some, args
 
-Gtk2:
-
-  require 'ffi-gtk2'
-  Gtk.init
-  win = Gtk::Window.new :toplevel
-  win.show
-  GObject.signal_connect(win, "destroy") { Gtk.main_quit }
-  Gtk.main
-
-Gtk3:
-
-  require 'ffi-gtk3'
-  Gtk.init
-  win = Gtk::Window.new :toplevel
-  win.show
-  GObject.signal_connect(win, "destroy") { Gtk.main_quit }
-  Gtk.main
-
-See the `examples/` directory for more, well, examples.
-
 == Requirements
 
 * Ruby-FFI of course
@@ -66,9 +44,9 @@ available under the name ending in plain `.so`. If GirFFI complains that it
 cannot find the library, try installing development packages for those
 libraries.
 
-On Debian and Ubuntu, the following set of packages should be enough to get
-`rake test` working: `libgirepository1.0-dev` (at least version 0.10),
-`gir1.2-gtk-2.0` and `libgtk2.0-dev`.
+On Debian and Ubuntu, installing `libgirepository1.0-dev` and
+`gobject-introspection` (at least version 0.10) should be enough to get `rake
+test` working.
 
 == Hacking and contributing
 

data/lib/gir_ffi/version.rb

@@ -1,4 +1,4 @@
 module GirFFI
-  VERSION = "0.3.2"
+  VERSION = "0.4.0"
 end
 

data/test/test_helper.rb

@@ -4,7 +4,7 @@ if RUBY_PLATFORM == 'java'
   require 'rubygems'
 end
 
-if RUBY_VERSION >= "1.9" and ENV["SIMPLECOV"]
+if RUBY_VERSION >= "1.9"
   require 'simplecov'
   SimpleCov.start
 end

data/test/type_builder_test.rb

@@ -1,7 +1,5 @@
 require File.expand_path('gir_ffi_test_helper.rb', File.dirname(__FILE__))
 
-require 'ffi-gtk3'
-
 class TypeBuilderTest < MiniTest::Spec
   context "The Builder::Type class" do
     context 'the find_signal method' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gir_ffi
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -102,10 +102,8 @@ extra_rdoc_files:
 - README.rdoc
 - TODO.rdoc
 files:
-- lib/ffi-gtk2.rb
 - lib/ffi-gobject_introspection.rb
 - lib/gir_ffi.rb
-- lib/ffi-gtk/base.rb
 - lib/gir_ffi/lib_c.rb
 - lib/gir_ffi/builder/function.rb
 - lib/gir_ffi/builder/type/constant.rb
@@ -195,7 +193,6 @@ files:
 - lib/ffi-gobject_introspection/i_registered_type_info.rb
 - lib/ffi-gobject_introspection/g_error.rb
 - lib/ffi-gobject.rb
-- lib/ffi-gtk3.rb
 - test/test_helper.rb
 - test/unit/user_defined_registered_type_info_test.rb
 - test/unit/unintrospectable_type_builder_test.rb
@@ -230,13 +227,11 @@ files:
 - test/lib/autogen.sh
 - test/builder_test.rb
 - test/gir_ffi_test_helper.rb
-- test/ffi-gtk/gtk_test.rb
 - test/integration/derived_classes_test.rb
 - test/integration/generated_regress_test.rb
 - test/integration/method_lookup_test.rb
 - test/integration/generated_gimarshallingtests_test.rb
 - test/integration/generated_gio_test.rb
-- test/integration/generated_gtk_test.rb
 - test/integration/pretty_print_test.rb
 - test/integration/generated_pango_test.rb
 - test/integration/generated_gobject_test.rb
@@ -270,12 +265,7 @@ files:
 - examples/leak_test.rb
 - examples/demo_ffi_safe_inherited_layout.rb
 - examples/demo_ffi_inherited_layout.rb
-- examples/04_webkit.rb
-- examples/01_empty_window.rb
-- examples/03_upgraded_hello_world.rb
 - examples/print_class.rb
-- examples/02_hello_world.rb
-- examples/05_notification.rb
 - README.rdoc
 - DESIGN.rdoc
 - TODO.rdoc
@@ -330,14 +320,12 @@ test_files:
 - test/ffi-gobject_introspection/i_object_info_test.rb
 - test/ffi-gobject_introspection/i_repository_test.rb
 - test/ffi-gobject_introspection/lib_test.rb
-- test/ffi-gtk/gtk_test.rb
 - test/gir_ffi_test_helper.rb
 - test/girffi_test.rb
 - test/integration/derived_classes_test.rb
 - test/integration/generated_gimarshallingtests_test.rb
 - test/integration/generated_gio_test.rb
 - test/integration/generated_gobject_test.rb
-- test/integration/generated_gtk_test.rb
 - test/integration/generated_pango_test.rb
 - test/integration/generated_regress_test.rb
 - test/integration/method_lookup_test.rb

data/examples/01_empty_window.rb

@@ -1,12 +0,0 @@
-#
-# 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 'ffi-gtk3'
-
-Gtk.init
-win = Gtk::Window.new :toplevel
-win.show
-GObject.signal_connect(win, "destroy") { Gtk.main_quit }
-Gtk.main

data/examples/02_hello_world.rb

@@ -1,28 +0,0 @@
-#
-# 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 'ffi-gtk3'
-
-Gtk.init
-
-win = Gtk::Window.new(:toplevel)
-GObject.signal_connect win, "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
-
-but = Gtk::Button.new_with_label("Hello World")
-GObject.signal_connect(but, "clicked") { win.destroy }
-
-win.add but
-
-but.show
-win.show
-
-Gtk.main

data/examples/03_upgraded_hello_world.rb

@@ -1,42 +0,0 @@
-#
-# 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 'ffi-gtk3'
-
-callback = lambda { |widget, data|
-  puts "Hello again - #{data} was pressed"
-}
-
-Gtk.init
-
-win = Gtk::Window.new(:toplevel)
-win.title= "Hello Buttons!"
-
-GObject.signal_connect win, "delete-event" do
-  Gtk.main_quit
-  false
-end
-
-# FIXME: #border_width= should work
-win.set_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
-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
-box.pack_start button, true, true, 0
-button.show
-
-box.show
-win.show
-
-Gtk.main
-

data/examples/04_webkit.rb

@@ -1,15 +0,0 @@
-# Based on http://www.idle-hacking.com/2010/02/webkit-ruby-and-gtk/
-$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', 'lib')
-require 'ffi-gtk3'
-
-GirFFI.setup :WebKit, '3.0'
-
-Gtk.init
-
-win = Gtk::Window.new :toplevel
-wv = WebKit::WebView.new
-win.add(wv)
-win.show_all
-wv.open('http://www.google.com/')
-GObject.signal_connect(win, "destroy") { Gtk.main_quit }
-Gtk.main

data/examples/05_notification.rb

@@ -1,34 +0,0 @@
-#
-# Simple notification example.
-#
-$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', 'lib')
-require 'ffi-gtk3'
-
-GirFFI.setup :Notify
-
-# Both Gtk and Notify need to be init'ed.
-Gtk.init
-Notify.init "notification test"
-
-# Basic set up of the notification.
-nf = Notify::Notification.new "Hello!", "Hi there.", "gtk-dialog-info"
-nf.timeout = 3000
-nf.urgency = :critical
-
-# Show a button 'Test' in the notification, with a callback function.
-nf.add_action "test", "Test", Proc.new { |obj, action, user_data|
-  puts "Action #{action} clicked."
-}, nil, nil
-
-# In this case, we want the program to end once the notification is gone,
-# but not before.
-GObject.signal_connect(nf, "closed") {
-  puts "Notification closed."
-  Gtk.main_quit
-}
-
-# Show the notification.
-nf.show
-
-# Start a main loop to wait for the notification to be closed.
-Gtk.main

data/lib/ffi-gtk/base.rb

@@ -1,17 +0,0 @@
-module Gtk
-  _setup_method "init"
-
-  def self.init_with_auto_argv
-    my_args = init_without_auto_argv [$0, *ARGV]
-    my_args.shift
-    ARGV.replace my_args
-  end
-  class << self
-    alias init_without_auto_argv init
-    alias init init_with_auto_argv
-  end
-end
-
-Gtk.class_eval do
-end
-

data/lib/ffi-gtk2.rb

@@ -1,5 +0,0 @@
-require 'gir_ffi'
-
-GirFFI.setup :Gtk, '2.0'
-
-require 'ffi-gtk/base'

data/lib/ffi-gtk3.rb

@@ -1,5 +0,0 @@
-require 'gir_ffi'
-
-GirFFI.setup :Gtk, '3.0'
-
-require 'ffi-gtk/base'

data/test/ffi-gtk/gtk_test.rb

@@ -1,36 +0,0 @@
-require File.expand_path('../gir_ffi_test_helper.rb', File.dirname(__FILE__))
-
-require 'ffi-gtk3'
-
-describe Gtk do
-  describe "::init" do
-    before do
-      save_module :Gtk
-      ::Object.const_set :Gtk, Module.new
-      Gtk.class_eval do
-        def self.init arr
-          ["baz", "qux", "zonk"]
-        end
-      end
-      stub(Gtk)._setup_method { }
-
-      load 'ffi-gtk/base.rb'
-    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 }
-    end
-
-    it "replaces ARGV with the tail of the result of the original init function" do
-      ARGV.replace ["foo", "bar"]
-      Gtk.init
-      assert_equal ["qux", "zonk"], ARGV.to_a
-    end
-
-    after do
-      restore_module :Gtk
-    end
-  end
-end

data/test/integration/generated_gtk_test.rb

@@ -1,94 +0,0 @@
-require File.expand_path('../gir_ffi_test_helper.rb', File.dirname(__FILE__))
-
-# Since the tests will call Gtk+ functions, Gtk+ must be initialized.
-require 'ffi-gtk3'
-Gtk.init
-
-# Tests generated methods and functions in the Gtk namespace.
-class GeneratedGtkTest < MiniTest::Spec
-  context "In the generated Gtk module" do
-    context "a Gtk::Builder instance" do
-      setup do
-	@builder = Gtk::Builder.new
-	@spec = '
-	<interface>
-	<object class="GtkButton" id="foo">
-	<signal handler="on_button_clicked" name="clicked"/>
-	</object>
-	</interface>
-	'
-      end
-
-      should "load spec" do
-	assert_nothing_raised { @builder.add_from_string @spec, @spec.length }
-      end
-
-      context "its #get_object method" do
-	should "return objects of the proper class" do
-	  @builder.add_from_string @spec, @spec.length
-	  o = @builder.get_object "foo"
-	  assert_instance_of Gtk::Button, o
-	end
-      end
-
-      context "its #connect_signals_full method" do
-	setup do
-	  @builder.add_from_string @spec, @spec.length
-	end
-	should "pass arguments correctly" do
-	  aa = nil
-	  @builder.connect_signals_full Proc.new {|*args| aa = args}, nil
-	  b, o, sn, hn, co, f, ud = aa
-	  assert_instance_of Gtk::Builder, b
-	  assert_equal b.to_ptr, @builder.to_ptr
-	  assert_instance_of Gtk::Button, o
-	  assert_equal "clicked", sn
-	  assert_equal "on_button_clicked", hn
-	  assert_equal nil, co
-	  assert_equal 0, f
-	  assert_equal nil, ud
-	end
-      end
-    end
-
-    context "a Gtk::Window instance" do
-      setup do
-        @w = Gtk::Window.new :toplevel
-      end
-
-      should "start with a refcount of 2 (one for us, one for GTK+)" do
-        assert_equal 2, ref_count(@w)
-      end
-    end
-
-    context "Gtk::RadioButton" do
-      context ".new" do
-        should "work when called with nil" do
-          assert_nothing_raised {
-            Gtk::RadioButton.new nil
-          }
-        end
-      end
-
-      context "#get_group" do
-        should "return a GLib::SList object" do
-          btn = Gtk::RadioButton.new nil
-          grp = btn.get_group
-          assert_instance_of GLib::SList, grp
-        end
-      end
-
-      context ".new" do
-        should "work when called with the result of #get_group" do
-          assert_nothing_raised {
-            btn = Gtk::RadioButton.new nil
-            grp = btn.get_group
-            Gtk::RadioButton.new grp
-          }
-        end
-      end
-
-    end
-  end
-end
-