gir_ffi-gtk 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c56a62fd551103e8221e6e65ad13068d6a0af97d
-  data.tar.gz: e9bff015d8ca92dea4fa765a2e19eb16db54ca19
+  metadata.gz: 88100a2341f51b96e708b1b0d47dd6367872266f
+  data.tar.gz: d21407d8a6d371b868a3a13f50da70499586a4e5
 SHA512:
-  metadata.gz: 91789d145d177a1b418222bed46268d6793d5ff3df7bec731ad685bf724ff03d89f7eeec6659637e9ecc19288c1fa39b5c048b243cd3de7b8df70576bf38c218
-  data.tar.gz: 30d92df92c4d0d616885c86b626d6f57cd7d01dbc343a4b54242d718ef3b3e08c812f94371f2fec932da136bf1bc990309a8da17a52977a32bea51f1ab71ceb0
+  metadata.gz: 237673941e21d3c8397b3767af681d25ff741bfdc360b59d6c912d895ac1821217387fbb6c35efa315c3719e260f288c3307fdba37caf3ff4a6d2355507ab333
+  data.tar.gz: b7481e2b68b30b28285e4a4afc2025ecae63ba6dd081990553c2b36fe08e8e1452e77102e1a96797d61c6311bbe20bbbf5ef7e09e6f2dbbf6cc0f2cda80cbe77

data/Changelog.md

@@ -1,4 +1,11 @@
-### 0.6.0 / 2013-01-11
+### 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
 
 * Update dependency on GirFFI
 

data/Rakefile

@@ -1,3 +1,5 @@
-load 'tasks/setup.rb'
+require 'rake/clean'
+
+load 'tasks/test.rake'
 
 task :default => 'test'

data/lib/gir_ffi-gtk/base.rb

@@ -1,5 +1,3 @@
-require 'gir_ffi-gtk/menu'
-
 module Gtk
   setup_method "init"
 
@@ -8,12 +6,9 @@ module Gtk
     remaining.shift
     ARGV.replace remaining
   end
+
   class << self
     alias init_without_auto_argv init
     alias init init_with_auto_argv
   end
 end
-
-Gtk.class_eval do
-end
-

data/lib/gir_ffi-gtk/menu.rb

@@ -3,11 +3,13 @@ module Gtk
 
   # Overrides for GtkMenu
   class Menu
-    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,
-                       button, activate_time)
+    unless method_defined? :popup
+      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,
+                         button, activate_time)
+      end
     end
   end
 end

data/lib/gir_ffi-gtk/radio_button.rb

@@ -0,0 +1,26 @@
+module Gtk
+  load_class :RadioButton
+
+  module Lib
+    attach_function :gtk_radio_button_new, [:pointer], :pointer
+    attach_function :gtk_radio_button_new_from_widget, [:pointer], :pointer
+  end
+
+  # 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
+    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
+    end
+  end
+end
+

data/lib/gir_ffi-gtk2.rb

@@ -3,3 +3,5 @@ require 'gir_ffi'
 GirFFI.setup :Gtk, '2.0'
 
 require 'gir_ffi-gtk/base'
+require 'gir_ffi-gtk/menu'
+require 'gir_ffi-gtk/radio_button'

data/lib/gir_ffi-gtk3.rb

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

data/tasks/test.rake

@@ -1,12 +1,18 @@
 require 'rake/testtask'
 
 namespace :test do
-  Rake::TestTask.new(:run) do |t|
+  Rake::TestTask.new(:gtk3) do |t|
     t.libs = ['lib']
     t.test_files = FileList['test/**/*_test.rb']
-    t.ruby_opts += ["-w"]
+    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"]
   end
 end
 
 desc 'Run unit tests'
-task :test => ['test:run']
+task :test => ['test:gtk3', 'test:gtk2']

data/test/gir_ffi-gtk/base_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../test_helper.rb', File.dirname(__FILE__))
+require 'test_helper'
 
 describe Gtk do
   describe "::init" do

data/test/gir_ffi-gtk/generated_gtk_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../test_helper.rb', File.dirname(__FILE__))
+require 'test_helper'
 
 Gtk.init
 
@@ -57,33 +57,4 @@ describe "In the generated Gtk module" do
       assert_equal 2, ref_count(@w)
     end
   end
-
-  describe "Gtk::RadioButton" do
-    describe ".new" do
-      it "works when called with nil" do
-        assert_nothing_raised {
-          Gtk::RadioButton.new nil
-        }
-      end
-    end
-
-    describe "#get_group" do
-      it "returns a GLib::SList object" do
-        btn = Gtk::RadioButton.new nil
-        grp = btn.get_group
-        assert_instance_of GLib::SList, grp
-      end
-    end
-
-    describe ".new" do
-      it "works 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

data/test/gir_ffi-gtk/menu_test.rb

@@ -1,16 +1,18 @@
-require File.expand_path('../test_helper.rb', File.dirname(__FILE__))
+require 'test_helper'
 
 describe Gtk::Menu do
-  describe "#popup" do
-    it "delegates to popup_for_device" do
-      mnu = Gtk::Menu.new
-      mock(mnu).popup_for_device(nil,
-                                  'parent_menu_shell', 'parent_menu_item',
-                                  'func', 'data',
-                                  nil,
-                                  'button', 'activate_time')
-      mnu.popup('parent_menu_shell', 'parent_menu_item', 'func', 'data',
-                'button', 'activate_time')
+  unless GObjectIntrospection::IRepository.default.find_by_name('Gtk', 'Menu').find_method('popup')
+    describe "#popup" do
+      it "delegates to popup_for_device" do
+        mnu = Gtk::Menu.new
+        mock(mnu).popup_for_device(nil,
+                                   'parent_menu_shell', 'parent_menu_item',
+                                   'func', 'data',
+                                   nil,
+                                   'button', 'activate_time')
+        mnu.popup('parent_menu_shell', 'parent_menu_item', 'func', 'data',
+                  'button', 'activate_time')
+      end
     end
   end
 end

data/test/gir_ffi-gtk/radio_button_test.rb

@@ -0,0 +1,37 @@
+require 'test_helper'
+
+describe Gtk::RadioButton do
+  describe ".new_from_widget" do
+    it "works when called with nil" do
+      result = Gtk::RadioButton.new_from_widget(nil)
+      result.must_be_instance_of Gtk::RadioButton
+    end
+
+    it "works when called with another radio button" do
+      btn = Gtk::RadioButton.new_from_widget nil
+      result = Gtk::RadioButton.new_from_widget btn
+      result.must_be_instance_of Gtk::RadioButton
+    end
+  end
+
+  describe "#get_group" do
+    it "returns a GLib::SList object" do
+      btn = Gtk::RadioButton.new_from_widget nil
+      grp = btn.get_group
+      assert_instance_of GLib::SList, grp
+    end
+  end
+
+  describe ".new" do
+    it "works when called with nil" do
+      result = Gtk::RadioButton.new nil
+      result.must_be_instance_of Gtk::RadioButton
+    end
+
+    it "works when called with the result of #get_group" do
+      btn = Gtk::RadioButton.new_from_widget nil
+      result = Gtk::RadioButton.new btn.get_group
+      result.must_be_instance_of Gtk::RadioButton
+    end
+  end
+end

data/test/test_helper.rb

@@ -2,9 +2,12 @@ if RUBY_PLATFORM == 'java'
   require 'rubygems'
 end
 
-if RUBY_VERSION >= "1.9" and ENV["SIMPLECOV"]
+begin
   require 'simplecov'
-  SimpleCov.start
+  SimpleCov.start do
+    add_filter "/test/"
+  end
+rescue LoadError
 end
 
 require 'minitest/autorun'
@@ -12,13 +15,11 @@ require 'rr'
 
 Thread.abort_on_exception = true
 
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-
-require 'gir_ffi-gtk3'
+unless Object.const_defined? :Gtk
+  require 'gir_ffi-gtk3'
+end
 
 class Minitest::Test
-  include RR::Adapters::TestUnit
-
   def assert_nothing_raised
     yield
     assert true

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gir_ffi-gtk
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Matijs van Zuijlen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-11 00:00:00.000000000 Z
+date: 2014-03-25 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.7.0
+        version: 0.7.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.7.3
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -76,12 +76,13 @@ files:
 - lib/gir_ffi-gtk2.rb
 - lib/gir_ffi-gtk/menu.rb
 - lib/gir_ffi-gtk/base.rb
+- lib/gir_ffi-gtk/radio_button.rb
 - lib/gir_ffi-gtk3.rb
 - test/test_helper.rb
 - test/gir_ffi-gtk/base_test.rb
 - test/gir_ffi-gtk/menu_test.rb
 - test/gir_ffi-gtk/generated_gtk_test.rb
-- tasks/setup.rb
+- test/gir_ffi-gtk/radio_button_test.rb
 - tasks/test.rake
 - examples/04_webkit.rb
 - examples/01_empty_window.rb
@@ -121,5 +122,6 @@ 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/radio_button_test.rb
 - test/test_helper.rb
 has_rdoc: 

data/tasks/setup.rb

@@ -1,6 +0,0 @@
-require 'rake/clean'
-
-# Load the other rake files in the tasks folder
-tasks_dir = File.expand_path(File.dirname(__FILE__))
-rakefiles = Dir.glob(File.join(tasks_dir, '*.rake')).sort
-import(*rakefiles)