gir_ffi-gtk 0.8.1 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9db12a11ec0be6f650fa77d62a76e2f987b2e99a
-  data.tar.gz: d3a2f90bb11881d3b4f0fe12beda7e1791e2ad55
+  metadata.gz: 44dcee9edb2115e16f8d3db797a6c84bca61e6b6
+  data.tar.gz: b5f54fc463e5a501e5d603815114348248a734fa
 SHA512:
-  metadata.gz: 215691511a0bb591c5342ad9842d637b29f06f1112e4b29ead2033833bc64ed430e19de97c7283a0fbbe9558d55a4d4d84308d7c4d4056c525c93ef0b8a3d6de
-  data.tar.gz: 0e695e5a0d1a17f29d58d97a1ed4a7a4258d4f5243014f848bc029467d0bc525f26a0ee43766f752bd80f8431e91e5014d2e4ee1b78e1aec44c76e4213bfa574
+  metadata.gz: cc76784425a3bdaf0f83b37e1f8915a86fa900f907d5bd20222d6bacf3450c3cad55269f946d649742c6e798116fc61b1f6770060acc4aba5bec650a97c5aa8d
+  data.tar.gz: 3007b00f4ecc6492ab2198480c2a76e49844b9901da87a90d4d1ae2c8bfb33ed4f41f689fa4f1a7fe8310c698d04584a98095954d74a28bb74acd08050b54186

data/Changelog.md

@@ -3,6 +3,21 @@
 All notable changes to this project will be documented in this file. See the
 Git log for all changes.
 
+## 0.9.0 / 2016-01-21
+
+* Propagate exceptions from callbacks during event loops
+* Add new overrides:
+  * for Gtk::Container
+  * for Gtk::TreeViewColumn
+  * for Gtk::TreeStore
+  * for Gtk::ListStore
+  * for Gtk::TargetEntry.new
+  * for GtkBuilder#connect_signals
+* Depend on GirFFI 0.9.0
+* Use GirFFI's new way of handling callback parameters and user data and
+  destroy notifier handling
+
+
 ## 0.8.1 / 2015-12-02
 
 * Add override for Gtk::RadioAction#set_group

data/README.md

@@ -46,7 +46,7 @@ and for Gtk+ 2:
 
 ## License
 
-Copyright © 2012–2015 [Matijs van Zuijlen](http://www.matijs.net)
+Copyright © 2012–2016 [Matijs van Zuijlen](http://www.matijs.net)
 
 GirFFI-Gtk is free software, distributed under the terms of the GNU Lesser
 General Public License, version 2.1 or later. See the file COPYING.LIB for

data/lib/gir_ffi-gtk/base.rb

@@ -20,26 +20,37 @@ module GirFFIGtk
   end
 
   # Override main to start an idle thread to allow Ruby threads to run during
-  # the main loop.
-  module ThreadEnabler
+  # the main loop, and to handle exceptions
+  module MainLoopOverride
+    class DummyLoop
+      def quit
+        Gtk.main_quit
+      end
+    end
+
     def self.included(base)
       base.extend ClassMethods
       class << base
-        alias_method :main_without_thread_enabler, :main
-        alias_method :main, :main_with_thread_enabler
+        alias_method :main_without_override, :main
+        alias_method :main, :main_with_override
       end
     end
 
-    # Implementation of class methods for ThreadEnabler
+    # Implementation of class methods for MainLoopOverride
     module ClassMethods
-      def main_with_thread_enabler
+      def main_with_override
         case RUBY_ENGINE
         when 'jruby'
         when 'rbx'
         else # 'ruby' most likely
           GLib::MainLoop::ThreadEnabler.instance.setup_idle_handler
         end
-        main_without_thread_enabler
+        GLib::MainLoop::RUNNING_LOOPS << DummyLoop.new
+        result = main_without_override
+        ex = GLib::MainLoop::EXCEPTIONS.shift
+        GLib::MainLoop::RUNNING_LOOPS.pop
+        raise ex if ex
+        result
       end
     end
   end
@@ -51,5 +62,5 @@ module Gtk
   setup_method 'main'
 
   include GirFFIGtk::AutoArgv
-  include GirFFIGtk::ThreadEnabler
+  include GirFFIGtk::MainLoopOverride
 end

data/lib/gir_ffi-gtk/builder.rb

@@ -0,0 +1,32 @@
+Gtk.load_class :Builder
+module Gtk
+  # Overrides for GtkBuilder
+  class Builder
+    setup_instance_method :add_from_string
+
+    def add_from_string_with_auto_length(buffer)
+      add_from_string_without_auto_length buffer, buffer.length
+    end
+
+    alias_method :add_from_string_without_auto_length, :add_from_string
+    alias_method :add_from_string, :add_from_string_with_auto_length
+
+    setup_instance_method :connect_signals_full
+    remove_method :connect_signals
+
+    AFTER_FLAG = GObject::ConnectFlags[:after]
+
+    def connect_signals
+      connect_signals_full do |_builder, object, signal_name, handler_name, _connect_object, flags, _user_data|
+        handler = yield handler_name
+        return unless handler
+
+        if flags & AFTER_FLAG == AFTER_FLAG
+          object.signal_connect_after signal_name, &handler
+        else
+          object.signal_connect signal_name, &handler
+        end
+      end
+    end
+  end
+end

data/lib/gir_ffi-gtk/container.rb

@@ -0,0 +1,30 @@
+Gtk.load_class :Container
+module Gtk
+  # Overrides for GtkContainer
+  class Container
+    def add_with_properties(widget, properties)
+      add widget
+      properties.each do |property_name, value|
+        child_set_property widget, property_name.to_s, value
+      end
+    end
+
+    setup_instance_method :child_get_property
+
+    def child_get_property_with_override(widget, property_name)
+      param_spec = object_class.find_child_property property_name
+      unless param_spec
+        raise ArgumentError,
+          "child property named '#{property_name}' not found in #{self.class}"
+      end
+      gtype = param_spec.value_type
+      gvalue = GObject::Value.for_gtype gtype
+
+      child_get_property_without_override widget, property_name, gvalue
+      gvalue.get_value
+    end
+
+    alias_method :child_get_property_without_override, :child_get_property
+    alias_method :child_get_property, :child_get_property_with_override
+  end
+end

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

@@ -0,0 +1,14 @@
+Gtk.load_class :ListStore
+module Gtk
+  # Overrides for GtkListStore
+  class ListStore
+    setup_method :newv
+    setup_instance_method :set_valuesv
+
+    alias_method :old_initialize, :initialize
+    alias_method :initialize, :initializev
+    remove_method :old_initialize
+
+    alias_method :set, :set_valuesv
+  end
+end

data/lib/gir_ffi-gtk/{radio_button.rb → gtk2/radio_button.rb}

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

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

@@ -0,0 +1,12 @@
+Gtk.load_class :TargetEntry
+module Gtk
+  # Overrides for GtkTargetEntry
+  class TargetEntry
+    def initialize(target, flags, info)
+      super()
+      self.target = target
+      self.flags = Gtk::TargetFlags.to_native flags, nil
+      self.info = info
+    end
+  end
+end

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

@@ -0,0 +1,16 @@
+Gtk.load_class :TreeStore
+module Gtk
+  # Overrides for GtkTreeStore
+  class TreeStore
+    setup_method :newv
+    setup_instance_method :set_valuesv
+    setup_instance_method :insert_with_valuesv
+
+    alias_method :old_initialize, :initialize
+    alias_method :initialize, :initializev
+    remove_method :old_initialize
+
+    alias_method :insert_with_values, :insert_with_valuesv
+    alias_method :set, :set_valuesv
+  end
+end

data/lib/gir_ffi-gtk/gtk3/target_entry.rb

@@ -0,0 +1,15 @@
+Gtk.load_class :TargetEntry
+module Gtk
+  # Overrides for GtkTargetEntry
+  class TargetEntry
+    setup_method :new
+
+    def initialize_with_flags_conversion(target, flags, info)
+      native_flags = Gtk::TargetFlags.to_native flags, nil
+      initialize_without_flags_conversion target, native_flags, info
+    end
+
+    alias_method :initialize_without_flags_conversion, :initialize
+    alias_method :initialize, :initialize_with_flags_conversion
+  end
+end

data/lib/gir_ffi-gtk/list_store.rb

@@ -0,0 +1,21 @@
+Gtk.load_class :ListStore
+module Gtk
+  # Overrides for GtkListStore
+  class ListStore
+    setup_instance_method :insert_with_valuesv
+
+    alias_method :insert_with_values, :insert_with_valuesv
+
+    setup_instance_method :set_value
+
+    def set_value_with_value_conversion(iter, column, value)
+      if value.nil?
+        value = GObject::Value.for_gtype get_column_type(column)
+      end
+      set_value_without_value_conversion iter, column, value
+    end
+
+    alias_method :set_value_without_value_conversion, :set_value
+    alias_method :set_value, :set_value_with_value_conversion
+  end
+end

data/lib/gir_ffi-gtk/message_dialog.rb

@@ -13,11 +13,7 @@ module Gtk
 
   # Overrides for GtkMessageDialog
   class MessageDialog
-    def self.new(*args)
-      obj = allocate
-      obj.send :initialize, *args
-      obj
-    end
+    alias_method :old_initialize, :initialize
 
     def initialize(parent, flags, type, buttons, message)
       ptr = Gtk::Lib.gtk_message_dialog_new(parent, flags, type, buttons,
@@ -25,5 +21,7 @@ module Gtk
                                             :string, message)
       store_pointer(ptr)
     end
+
+    remove_method :old_initialize
   end
 end

data/lib/gir_ffi-gtk/tree_store.rb

@@ -0,0 +1,15 @@
+Gtk.load_class :TreeStore
+module Gtk
+  # Overrides for GtkTreeStore
+  class TreeStore
+    def set_value_with_value_conversion(iter, column, value)
+      if value.nil?
+        value = GObject::Value.for_gtype get_column_type(column)
+      end
+      set_value_without_value_conversion iter, column, value
+    end
+
+    alias_method :set_value_without_value_conversion, :set_value
+    alias_method :set_value, :set_value_with_value_conversion
+  end
+end

data/lib/gir_ffi-gtk/tree_view_column.rb

@@ -0,0 +1,26 @@
+Gtk.load_class :TreeViewColumn
+module Gtk
+  # Overrides for Gtk::TreeViewColumn
+  class TreeViewColumn
+    def self.new_with_attributes(*args)
+      obj = allocate
+      obj.send :initialize_with_attributes, *args
+      obj
+    end
+
+    def set_attributes(renderer, attributes)
+      attributes.each do |attribute, column|
+        add_attribute renderer, attribute.to_s, column
+      end
+    end
+
+    private
+
+    def initialize_with_attributes(title, renderer, attributes = {})
+      initialize
+      set_title title
+      pack_start(renderer, false)
+      set_attributes(renderer, attributes)
+    end
+  end
+end

data/lib/gir_ffi-gtk2.rb

@@ -3,8 +3,17 @@ require 'gir_ffi'
 GirFFI.setup :Gtk, '2.0'
 
 require 'gir_ffi-gtk/base'
+require 'gir_ffi-gtk/builder'
+require 'gir_ffi-gtk/container'
+require 'gir_ffi-gtk/list_store'
 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'
+require 'gir_ffi-gtk/tree_store'
+require 'gir_ffi-gtk/tree_view_column'
+
+require 'gir_ffi-gtk/gtk2/list_store'
+require 'gir_ffi-gtk/gtk2/radio_action'
+require 'gir_ffi-gtk/gtk2/radio_button'
+require 'gir_ffi-gtk/gtk2/target_entry'
+require 'gir_ffi-gtk/gtk2/tree_store'

data/lib/gir_ffi-gtk3.rb

@@ -3,6 +3,13 @@ require 'gir_ffi'
 GirFFI.setup :Gtk, '3.0'
 
 require 'gir_ffi-gtk/base'
+require 'gir_ffi-gtk/builder'
+require 'gir_ffi-gtk/container'
+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'
+require 'gir_ffi-gtk/tree_view_column'
+
+require 'gir_ffi-gtk/gtk3/target_entry'

data/tasks/test.rake

@@ -10,7 +10,13 @@ namespace :test do
   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 += ['-w', '-Itest']
+  end
+
+  task gtk2: :set_gtk_version_2
+
+  task :set_gtk_version_2 do
+    ENV['GTK_VERSION'] = '2'
   end
 end
 

data/test/callback_exceptions_test.rb

@@ -0,0 +1,59 @@
+require 'test_helper'
+
+class CallbackTestException < RuntimeError; end
+
+describe "An exception in a callback" do
+  describe "for signals" do
+    let(:object) { Gtk::Window.new :toplevel }
+
+    before do
+      object.signal_connect "destroy" do
+        raise CallbackTestException, "Boom"
+      end
+    end
+
+    describe "when the signal is emitted synchronously" do
+      it "raises an error" do
+        lambda { GObject.signal_emit object, "destroy" }.must_raise CallbackTestException
+      end
+    end
+
+    describe "when the signal is emitted during an event loop" do
+      it "causes loop run to be terminated with an exception" do
+        GLib.timeout_add GLib::PRIORITY_DEFAULT, 1 do
+          GObject.signal_emit object, "destroy"
+          false
+        end
+        # Guard against runaway loop
+        @guard = GLib.timeout_add(GLib::PRIORITY_DEFAULT, 1000) { Gtk.main_quit }
+        proc do
+          Gtk.main
+        end.must_raise CallbackTestException
+      end
+
+      after do
+        GLib.source_remove @guard
+      end
+    end
+  end
+
+  describe "for other callbacks" do
+    describe "when the callback occurs during an event loop" do
+      it "causes loop run to be terminated with an exception" do
+        GLib.timeout_add GLib::PRIORITY_DEFAULT, 1 do
+          raise CallbackTestException, "Boom"
+        end
+        # Guard against runaway loop
+        @guard = GLib.timeout_add(GLib::PRIORITY_DEFAULT, 1000) { Gtk.main_quit }
+        proc do
+          Gtk.main
+        end.must_raise CallbackTestException
+      end
+
+      after do
+        GLib.source_remove @guard
+      end
+    end
+  end
+end
+

data/test/gir_ffi-gtk/base_test.rb

@@ -28,9 +28,7 @@ describe Gtk do
   describe "::main" do
     it "allows other threads to run" do
       a = []
-      GLib.timeout_add(GLib::PRIORITY_DEFAULT, 150,
-                       proc { Gtk.main_quit },
-                       nil, nil)
+      GLib.timeout_add(GLib::PRIORITY_DEFAULT, 150) { Gtk.main_quit }
 
       slow_thread = Thread.new do
         sleep 0.005

data/test/gir_ffi-gtk/builder_test.rb

@@ -0,0 +1,70 @@
+require 'test_helper'
+
+describe Gtk::Builder do
+  let(:builder) { Gtk::Builder.new }
+  let(:spec) do
+    <<-EOS
+      <interface>
+      <object class="GtkButton" id="foo">
+      <signal handler="on_button_clicked" name="clicked"/>
+      </object>
+      </interface>
+    EOS
+  end
+
+  describe "#add_from_string" do
+    it 'takes one string as argument' do
+      builder.add_from_string spec
+      pass
+    end
+  end
+
+  describe "#connect_signals" do
+    before do
+      builder.add_from_string spec
+    end
+
+    it 'passes the handler name to the block' do
+      name = nil
+      builder.connect_signals do |handler_name|
+        name = handler_name
+        nil
+      end
+
+      name.must_equal 'on_button_clicked'
+    end
+
+    it 'connects the signal to the proc returned by the block' do
+      name = nil
+      builder.connect_signals do |handler_name|
+        proc { name = handler_name }
+      end
+      button = builder.get_object('foo')
+      GObject.signal_emit button, 'clicked'
+      name.must_equal 'on_button_clicked'
+    end
+
+    describe 'with a signal with after flag' do
+      let(:spec) do
+        <<-EOS
+          <interface>
+          <object class="GtkButton" id="foo">
+          <signal handler="handler_after" name="clicked" after="true"/>
+          <signal handler="handler_before" name="clicked"/>
+          </object>
+          </interface>
+        EOS
+      end
+
+      it 'connects the handlers in the right order' do
+        name = nil
+        builder.connect_signals do |handler_name|
+          proc { name = handler_name }
+        end
+        button = builder.get_object('foo')
+        GObject.signal_emit button, 'clicked'
+        name.must_equal 'handler_after'
+      end
+    end
+  end
+end

data/test/gir_ffi-gtk/container_test.rb

@@ -0,0 +1,33 @@
+require 'test_helper'
+
+describe Gtk::Container do
+  let(:container) { Gtk::Table.new 1, 1, true }
+  let(:widget) { Gtk::Label.new 'foo' }
+
+  describe '#add_with_properties' do
+    before do
+      container.add_with_properties widget, :'left-attach' => 1
+    end
+
+    it 'adds the widget to the container' do
+      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
+    end
+  end
+
+  describe '#child_get_property' 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
+    end
+
+    it 'raises an ArgumentError for unknown properties' do
+      container.add widget
+      proc { container.child_get_property(widget, 'foobar') }.must_raise ArgumentError
+    end
+  end
+end

data/test/gir_ffi-gtk/generated_gtk_test.rb

@@ -17,12 +17,12 @@ describe "In the generated Gtk module" do
     end
 
     it "loads the interface spec" do
-      assert_nothing_raised { @builder.add_from_string @spec, @spec.length }
+      assert_nothing_raised { @builder.add_from_string @spec }
     end
 
     describe "its #get_object method" do
       it "returns objects of the proper class" do
-        @builder.add_from_string @spec, @spec.length
+        @builder.add_from_string @spec
         o = @builder.get_object "foo"
         assert_instance_of Gtk::Button, o
       end
@@ -30,11 +30,11 @@ describe "In the generated Gtk module" do
 
     describe "its #connect_signals_full method" do
       before do
-        @builder.add_from_string @spec, @spec.length
+        @builder.add_from_string @spec
       end
       it "passes arguments correctly" do
         aa = nil
-        @builder.connect_signals_full Proc.new {|*args| aa = args}, nil
+        @builder.connect_signals_full {|*args| aa = args}
         b, o, sn, hn, co, f, ud = aa
         assert_instance_of Gtk::Builder, b
         assert_equal b.to_ptr, @builder.to_ptr
@@ -43,7 +43,7 @@ describe "In the generated Gtk module" do
         assert_equal "on_button_clicked", hn
         assert_equal nil, co
         assert_equal 0, f
-        assert_equal nil, ud
+        ud.wont_be_nil
       end
     end
   end

data/test/gir_ffi-gtk/list_store_test.rb

@@ -0,0 +1,38 @@
+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
+    end
+  end
+
+  describe '#insert_with_values' 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
+    end
+  end
+
+  describe '#set' do
+    it 'updates 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.set(row, [1, 0], [3, 'bar'])
+      store.get_value(row, 0).must_equal 'bar'
+      store.get_value(row, 1).must_equal 3
+    end
+  end
+
+  describe '#set_value' do
+    it 'allows setting a value to nil' 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_equal nil
+    end
+  end
+end

data/test/gir_ffi-gtk/target_entry_test.rb

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

data/test/gir_ffi-gtk/tree_store_test.rb

@@ -0,0 +1,38 @@
+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
+    end
+  end
+
+  describe '#insert_with_values' 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
+    end
+  end
+
+  describe '#set' do
+    it 'updates 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.set(row, [1, 0], [3, 'bar'])
+      store.get_value(row, 0).must_equal 'bar'
+      store.get_value(row, 1).must_equal 3
+    end
+  end
+
+  describe '#set_value' do
+    it 'allows setting a value to nil' 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_equal nil
+    end
+  end
+end

data/test/gir_ffi-gtk/tree_view_column_test.rb

@@ -0,0 +1,49 @@
+require 'test_helper'
+
+describe Gtk::TreeViewColumn do
+  describe '.new_with_attributes' do
+    let(:renderer) { Gtk::CellRendererText.new }
+    let(:column) { Gtk::TreeViewColumn.new_with_attributes('foo-title',
+                                                           renderer,
+                                                           text: 1) }
+    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'
+    end
+
+    it 'packs the renderer into the column' do
+      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'
+    end
+
+    it 'allows not specifying any attributes' do
+      col = Gtk::TreeViewColumn.new_with_attributes('foo-title', renderer)
+      col.must_be_instance_of Gtk::TreeViewColumn
+    end
+  end
+
+  describe '#set_attributes' do
+    let(:renderer) { Gtk::CellRendererText.new }
+    let(:column) { Gtk::TreeViewColumn.new }
+    let(:list_store) { Gtk::ListStore.new([GObject::TYPE_INT, GObject::TYPE_STRING]) }
+
+    before do
+      column.pack_start(renderer, false)
+      column.set_attributes(renderer, text: 1)
+    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'
+    end
+  end
+end

data/test/test_helper.rb

@@ -15,7 +15,9 @@ require 'rr'
 
 Thread.abort_on_exception = true
 
-unless Object.const_defined? :Gtk
+if ENV['GTK_VERSION'] == '2'
+  require 'gir_ffi-gtk2'
+else
   require 'gir_ffi-gtk3'
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gir_ffi-gtk
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.9.0
 platform: ruby
 authors:
 - Matijs van Zuijlen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-02 00:00:00.000000000 Z
+date: 2016-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gir_ffi
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -87,21 +87,37 @@ files:
 - examples/08_webkit_headless.rb
 - examples/09_webkit2_headless.rb
 - lib/gir_ffi-gtk/base.rb
+- lib/gir_ffi-gtk/builder.rb
+- lib/gir_ffi-gtk/container.rb
+- lib/gir_ffi-gtk/gtk2/list_store.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
+- lib/gir_ffi-gtk/gtk2/tree_store.rb
+- lib/gir_ffi-gtk/gtk3/target_entry.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/radio_action.rb
-- lib/gir_ffi-gtk/radio_button.rb
 - 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-gtk2.rb
 - lib/gir_ffi-gtk3.rb
 - tasks/test.rake
+- test/callback_exceptions_test.rb
 - test/gir_ffi-gtk/base_test.rb
+- test/gir_ffi-gtk/builder_test.rb
+- test/gir_ffi-gtk/container_test.rb
 - test/gir_ffi-gtk/generated_gtk_test.rb
+- test/gir_ffi-gtk/list_store_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/target_entry_test.rb
 - 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/test_helper.rb
 homepage: http://www.github.com/mvz/gir_ffi-gtk
 licenses:
@@ -115,7 +131,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -128,11 +144,18 @@ signing_key:
 specification_version: 4
 summary: GirFFI-based Ruby bindings for Gtk+ 2 and 3
 test_files:
+- test/callback_exceptions_test.rb
 - test/gir_ffi-gtk/base_test.rb
+- test/gir_ffi-gtk/builder_test.rb
+- test/gir_ffi-gtk/container_test.rb
 - test/gir_ffi-gtk/generated_gtk_test.rb
+- test/gir_ffi-gtk/list_store_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/target_entry_test.rb
 - 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/test_helper.rb