qtext 0.6.8 → 0.6.9

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: dfe64329c4fb2c401403072b0eae2ad28a336c77
+  data.tar.gz: a1bf928c812c6694b2968fe59525825c1bf4a90c
+SHA512:
+  metadata.gz: 3c453b9747d5dcc88d4e7f47042ac0a370d08f47d19fb7c635f31e464ab578195a74c474ab6121fff2963cc239e425ce90a083e653e87c8a45c6318854ce3f7d
+  data.tar.gz: 55acf85c952e78c40aba1c8cb6b9efc0a0916391fde0dfa96d97ffd6e03dc15f490e60f86cf8b10288462205e543fd7e165658ff643e01b53157028bf17d8d70

data/History.txt

@@ -1,3 +1,7 @@
+== 0.6.9
+* fix error in ActionBuilder.included
+* tests broken
+
 == 0.6.8
 * Remove Hoe dependency
 * Update gather dependency
@@ -21,7 +25,7 @@
 == 0.6.0
 * add Qt::Widget.signal class method which adds some signal emitting and
   handling methods.
-* remove Qt::Widget.construct and construct_exec because they're already part 
+* remove Qt::Widget.construct and construct_exec because they're already part
   of Qt::Widget.new
 * Documentation
 * Some testing

data/README.txt

@@ -4,7 +4,7 @@ http://rubyforge.org/projects/qtext
 
 == DESCRIPTION:
 
-Some extensions to qt4-qtruby to make it more rubyish.
+Some extensions to qtruby to make it more rubyish.
 
 == FEATURES
 - ActionBuilder module to simplify creating Action objects for inclusion into menus.
@@ -18,13 +18,14 @@ Some extensions to qt4-qtruby to make it more rubyish.
 
 == SYNOPSIS:
 
-require 'qtext' 
+require 'qtext'
 
 == REQUIREMENTS:
 
 - qtruby4
 - Shoulda if you want to run tests
-- ActiveSupport. Only needed in Header for humanize.
+- something that supplies String#humanize (activesupport or sequel)
+
 == INSTALL:
 
 sudo gem install qtext

data/Rakefile

@@ -5,7 +5,6 @@ rescue LoadError
 end
 
 task :default => 'test:run'
-task 'gem:release' => 'test:run'
 
 ensure_in_path 'lib'
 require 'qtext/version.rb'

data/lib/qtext/action_builder.rb

@@ -71,11 +71,11 @@ If this method is not defined, it will be created in the including class as an e
 module ActionBuilder
   # raise a RuntimeError if the including class/module does not define add_action
   def self.included( including_module )
-    shortlist = including_module.instance_methods.grep /action/i
+    shortlist = including_module.instance_methods.grep(/action/i).map{|meth_name| meth_name.to_sym}
     # add_action is actually an method_missing lookup for addAction, so
     # search for both.
-    unless shortlist.any? {|x| %w{add_action addAction}.include?( x )}
-      raise NotImplementedError( "#{including_module.class.name} must have an add_action method" )
+    unless shortlist.any? {|x| %i{add_action addAction}.include?( x )}
+      raise NotImplementedError, "#{including_module.name} must have an add_action method"
     end
   end
   

data/lib/qtext/version.rb

@@ -2,7 +2,7 @@ module QtExt #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 6
-    TINY  = 8
+    TINY  = 9
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/test/test_key_event.rb

@@ -1,29 +1,29 @@
-require File.dirname(__FILE__) + '/test_helper.rb'
-
-require 'sequel/core'
-require 'sequel/extensions/inflector'
-
-module Sequel; end
-
-class TestKeyEvent < Test::Unit::TestCase
-
-  #~ Qt::NoModifier	0x00000000	No modifier key is pressed.
-  #~ Qt::ShiftModifier	0x02000000	A Shift key on the keyboard is pressed.
-  #~ Qt::ControlModifier	0x04000000	A Ctrl key on the keyboard is pressed.
-  #~ Qt::AltModifier	0x08000000	An Alt key on the keyboard is pressed.
-  #~ Qt::MetaModifier	0x10000000	A Meta key on the keyboard is pressed.
-  #~ Qt::KeypadModifier	0x20000000	A keypad button is pressed.
-  #~ Qt::GroupSwitchModifier
-  def setup
-    @key_event = Qt::KeyEvent.new( Qt::Event::KeyPress, Qt::Key_Down, Qt::NoModifier )
-  end
-  
-  def test_camelize
-    assert "somstring".respond_to?( :camelize ), "String has no camelize method"
-  end
-  
-  should 'have the key? methods' do
-    assert @key_event.key? 'down'
-    assert @key_event.down?, "Key is not Qt::Key_Down"
-  end
-end
+require_relative 'test_helper.rb'
+
+require 'sequel/core'
+require 'sequel/extensions/inflector'
+
+module Sequel; end
+
+class TestKeyEvent < Test::Unit::TestCase
+
+  #~ Qt::NoModifier	0x00000000	No modifier key is pressed.
+  #~ Qt::ShiftModifier	0x02000000	A Shift key on the keyboard is pressed.
+  #~ Qt::ControlModifier	0x04000000	A Ctrl key on the keyboard is pressed.
+  #~ Qt::AltModifier	0x08000000	An Alt key on the keyboard is pressed.
+  #~ Qt::MetaModifier	0x10000000	A Meta key on the keyboard is pressed.
+  #~ Qt::KeypadModifier	0x20000000	A keypad button is pressed.
+  #~ Qt::GroupSwitchModifier
+  def setup
+    @key_event = Qt::KeyEvent.new( Qt::Event::KeyPress, Qt::Key_Down, Qt::NoModifier )
+  end
+
+  def test_camelize
+    assert "somstring".respond_to?( :camelize ), "String has no camelize method"
+  end
+
+  should 'have the key? methods' do
+    assert @key_event.key? 'down'
+    assert @key_event.down?, "Key is not Qt::Key_Down"
+  end
+end

data/test/test_model_index_extensions.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/test_helper'
+require_relative 'test_helper.rb'
 
 class TestModelIndex < Test::Unit::TestCase
   def setup
@@ -10,24 +10,24 @@ class TestModelIndex < Test::Unit::TestCase
     end
     @zero_index = @model.create_index(0,0)
   end
-  
+
   def teardown
   end
-  
+
   should "be valid" do
     assert @zero_index.valid?
   end
-  
+
   should_eventually "be invalid" do
     mi = @model.create_index( @model.row_count+1, @model.column_count+1 )
     assert !mi.valid?
   end
-  
+
   should 'be an invalid copy of an invalid index' do
     choppy = Qt::ModelIndex.invalid.choppy
     assert !choppy.valid?
   end
-  
+
   should "be a valid exact copy" do
     choppy = @zero_index.choppy
     assert choppy.valid?
@@ -36,11 +36,11 @@ class TestModelIndex < Test::Unit::TestCase
   should 'be an invalid copy' do
     choppy = @zero_index.choppy( :row => @model.row_count )
     assert !choppy.valid?, "choppy: #{choppy.inspect}"
-    
+
     choppy = @zero_index.choppy( :column => @model.column_count )
     assert !choppy.valid?
   end
-  
+
   should 'be a copy with a changed row and column, from hash' do
     choppy = @zero_index.choppy( :row => 1, :column => 2)
     assert_equal 1, choppy.row, choppy.inspect
@@ -57,23 +57,23 @@ class TestModelIndex < Test::Unit::TestCase
     assert_equal 1, choppy.row
     assert_equal 2, choppy.column
   end
-  
+
   should 'be a copy with changed row and column, from parameters' do
     choppy = @zero_index.choppy(3,0)
     assert choppy.valid?
     assert_equal 3, choppy.row
     assert_equal 0, choppy.column
   end
-  
+
   should 'raise an exception because parameters are wrong' do
     assert_raise TypeError do
       @zero_index.choppy( 3 )
     end
   end
-  
+
   should 'be a copy with decremented row and column, from block' do
     two_index = @model.create_index(2,2)
-    
+
     choppy = two_index.choppy do |i|
       i.row -= 1
       i.column -= 2

data/test/test_object_table.rb

@@ -1,85 +1,86 @@
-require File.dirname(__FILE__) + '/test_helper.rb'
-require 'qtext/object_table_model.rb'
-require 'Qt4'
-
-class TestObjectTableModel < Test::Unit::TestCase
-  Thing = Struct.new( :name, :value, :location, :price, :ignored ) do
-    include TreeViewable
-  end
-
-  def setup
-    @data = [
-      Thing.new( "Screwdriver", 'high', 'toolbox', 10.96, 'not' ),
-      Thing.new( "Thermometer", '15 degrees', 'bathroom', 0.01, 'here' ),
-      Thing.new( "Bed", 'large', 'bedroom' ),
-      Thing.new( "Approximation", 'useful', 'maths', 'none', 'all' )
-    ]
-    @data[3].children = @data
-    @model = ObjectTableModel.new( :data => @data, :headers => [ :name, :value, :location, Header.new( :attribute => :price, :alignment => Qt::AlignRight ) ] )
-    @main_window = Qt::MainWindow.new
-    #~ @view = Qt::TableView.new( @main_window ) { |tv| tv.model = @model }
-    @view = Qt::TreeView.new( @main_window ) { |tv| tv.model = @model }
-    @main_window.central_widget = @view
-  end
-  
-  should 'have children for data[3]' do
-    assert_equal 4, @data[3].children.size
-  end
-  
-  should 'have a 4 x 4 size' do
-    assert_equal 4, @model.rowCount
-    assert_equal 4, @model.row_count
-    assert_equal 4, @model.columnCount
-    assert_equal 4, @model.column_count
-  end
-  
-  should 'have 0x0 size for children models at a given index' do
-    index = @model.create_index(1,1)
-    assert_equal 0, @model.row_count( index )
-    assert_equal 0, @model.column_count( index )
-  end
-
-  should 'return correct data' do
-    @data.each_with_index do |item,i|
-      Thing.members.each_with_index do |member,j|
-        next if j >= 4
-        model_index = @model.create_index(i,j)
-        assert_equal item[member], @model.data( model_index ).value
-      end
-    end
-  end
-  
-  should 'return nil for invalid index' do
-    assert_equal Qt::Variant.invalid, @model.data( Qt::ModelIndex.invalid )
-  end
-  
-  should 'have price aligned right' do
-    assert_equal Qt::AlignLeft.to_i, @model.data( @model.create_index(0,0), Qt::TextAlignmentRole ).to_i & Qt::AlignLeft.to_i
-    assert_equal Qt::AlignLeft.to_i, @model.data( @model.create_index(0,1), Qt::TextAlignmentRole ).to_i & Qt::AlignLeft.to_i
-    assert_equal Qt::AlignRight.to_i, @model.data( @model.create_index(0,3), Qt::TextAlignmentRole ).to_i & Qt::AlignRight.to_i
-  end
-  
-  should 'have a nil parent' do
-    assert_nil @model.parent
-  end
-  
-  should 'have parent == @model' do
-    model = ObjectTableModel.new( :parent => @model, :data => @data, :headers => [ :name, :value, :location, Header.new( :attribute => :price, :alignment => Qt::AlignRight ) ] )
-    assert_equal @model, model.parent
-  end
-  
-  context 'tree view' do
-    should 'have children' do
-      model_index = @model.create_index(3,0)
-      assert_equal 4, @model.row_count( model_index )
-    end
-  end
-
-  def dont_test_show_window
-    @main_window.window_title = 'Test ObjectTableModel'
-    @main_window.move( 150, 0 )
-    @main_window.show
-    #~ $app.exec
-  end
-  
-end
+require_relative 'test_helper.rb'
+
+require 'qtext/object_table_model.rb'
+require 'Qt4'
+
+class TestObjectTableModel < Test::Unit::TestCase
+  Thing = Struct.new( :name, :value, :location, :price, :ignored ) do
+    include TreeViewable
+  end
+
+  def setup
+    @data = [
+      Thing.new( "Screwdriver", 'high', 'toolbox', 10.96, 'not' ),
+      Thing.new( "Thermometer", '15 degrees', 'bathroom', 0.01, 'here' ),
+      Thing.new( "Bed", 'large', 'bedroom' ),
+      Thing.new( "Approximation", 'useful', 'maths', 'none', 'all' )
+    ]
+    @data[3].children = @data
+    @model = ObjectTableModel.new( :data => @data, :headers => [ :name, :value, :location, Header.new( :attribute => :price, :alignment => Qt::AlignRight ) ] )
+    @main_window = Qt::MainWindow.new
+    #~ @view = Qt::TableView.new( @main_window ) { |tv| tv.model = @model }
+    @view = Qt::TreeView.new( @main_window ) { |tv| tv.model = @model }
+    @main_window.central_widget = @view
+  end
+
+  should 'have children for data[3]' do
+    assert_equal 4, @data[3].children.size
+  end
+
+  should 'have a 4 x 4 size' do
+    assert_equal 4, @model.rowCount
+    assert_equal 4, @model.row_count
+    assert_equal 4, @model.columnCount
+    assert_equal 4, @model.column_count
+  end
+
+  should 'have 0x0 size for children models at a given index' do
+    index = @model.create_index(1,1)
+    assert_equal 0, @model.row_count( index )
+    assert_equal 0, @model.column_count( index )
+  end
+
+  should 'return correct data' do
+    @data.each_with_index do |item,i|
+      Thing.members.each_with_index do |member,j|
+        next if j >= 4
+        model_index = @model.create_index(i,j)
+        assert_equal item[member], @model.data( model_index ).value
+      end
+    end
+  end
+
+  should 'return nil for invalid index' do
+    assert_equal Qt::Variant.invalid, @model.data( Qt::ModelIndex.invalid )
+  end
+
+  should 'have price aligned right' do
+    assert_equal Qt::AlignLeft.to_i, @model.data( @model.create_index(0,0), Qt::TextAlignmentRole ).to_i & Qt::AlignLeft.to_i
+    assert_equal Qt::AlignLeft.to_i, @model.data( @model.create_index(0,1), Qt::TextAlignmentRole ).to_i & Qt::AlignLeft.to_i
+    assert_equal Qt::AlignRight.to_i, @model.data( @model.create_index(0,3), Qt::TextAlignmentRole ).to_i & Qt::AlignRight.to_i
+  end
+
+  should 'have a nil parent' do
+    assert_nil @model.parent
+  end
+
+  should 'have parent == @model' do
+    model = ObjectTableModel.new( :parent => @model, :data => @data, :headers => [ :name, :value, :location, Header.new( :attribute => :price, :alignment => Qt::AlignRight ) ] )
+    assert_equal @model, model.parent
+  end
+
+  context 'tree view' do
+    should 'have children' do
+      model_index = @model.create_index(3,0)
+      assert_equal 4, @model.row_count( model_index )
+    end
+  end
+
+  def dont_test_show_window
+    @main_window.window_title = 'Test ObjectTableModel'
+    @main_window.move( 150, 0 )
+    @main_window.show
+    #~ $app.exec
+  end
+
+end

data/test/test_widget.rb

@@ -1,104 +1,104 @@
-require File.dirname(__FILE__) + '/test_helper.rb'
-
-class Thok < Qt::Widget
-  signal :whatever
-end
-
-class TestWidget < Test::Unit::TestCase
-
-  def setup
-    @thok = Thok.new
-  end
-  
-  should 'have a whatever_signal method' do
-    assert_equal 1, @thok.methods.grep( /^whatever_signal$/ ).size
-    assert_raise ArgumentError do
-      @thok.whatever_signal( 'hello' )
-    end
-    
-    assert_nothing_raised do
-      @thok.whatever_signal( 'hello'.to_variant )
-    end
-  end
-  
-  should 'have a whatever emitter' do
-    assert_equal 1, @thok.methods.grep( /^whatever$/ ).size
-    assert_nothing_raised { @thok.whatever }
-    assert_nothing_raised { @thok.whatever 1 }
-    assert_nothing_raised { @thok.whatever 1,2,3 }
-    assert_nothing_raised { @thok.whatever [4,5,6] }
-  end
-  
-  should 'have an on_whatever handler' do
-    assert_equal 1, @thok.methods.grep( /^on_whatever$/ ).size
-  end
-  
-  context 'on_whatever handler' do
-    should 'handle nil args' do
-      @thok.on_whatever do |arg|
-        assert_nil arg
-      end
-      @thok.whatever
-      @thok.whatever( nil )
-    end
-    
-    should 'handle single args' do
-      @thok.on_whatever do |arg|
-        assert_not_nil arg
-        assert_not_equal Array, arg.class
-      end
-      @thok.whatever 1
-      @thok.whatever 'hello'
-    end
-    
-    should_eventually 'handle objects' do
-      NVP = Struct.new :name, :value
-      nvp = NVP.new
-      nvp.name = 'how'
-      nvp.value = 'that'
-      @thok.on_whatever do |arg|
-        assert_not_nil arg
-        assert_equal NVP, arg.class
-      end
-      @thok.whatever nvp
-    end
-    
-    should 'handle arg lists' do
-      @thok.on_whatever do |arg1,arg2|
-        assert_not_nil arg1
-        assert_not_nil arg2
-        assert_not_equal Array, arg1.class
-        assert_not_equal Array, arg2.class
-      end
-      @thok.whatever 1,2
-      @thok.whatever 'hello','there'
-    end
-    
-    should 'handle a single array' do
-      @thok.on_whatever do |ary|
-        assert_not_nil ary
-        assert_equal Array, ary.class
-        assert_equal 3, ary.size
-        assert_equal [4,5,6], ary
-      end
-      @thok.whatever [4,5,6]
-    end
-    
-    should_eventually 'handle multiple arrays' do
-      @thok.on_whatever do |ary1,ary2|
-        assert_not_nil ary1
-        assert_not_nil ary2
-        assert_equal Array, ary1.class
-        assert_equal Array, ary2.class
-        assert_equal 3, ary1.size
-        assert_equal 3, ary2.size
-        # fails here because ary1 is an array of variants
-        puts "ary1: #{ary1.inspect}"
-        assert_equal [4,5,6], ary1
-        assert_equal [7,8,9], ary2
-      end
-      @thok.whatever( [4,5,6], [7,8,9] )
-    end
-  end
-  
-end
+require_relative 'test_helper.rb'
+
+class Thok < Qt::Widget
+  signal :whatever
+end
+
+class TestWidget < Test::Unit::TestCase
+
+  def setup
+    @thok = Thok.new
+  end
+
+  should 'have a whatever_signal method' do
+    assert_equal 1, @thok.methods.grep( /^whatever_signal$/ ).size
+    assert_raise ArgumentError do
+      @thok.whatever_signal( 'hello' )
+    end
+
+    assert_nothing_raised do
+      @thok.whatever_signal( 'hello'.to_variant )
+    end
+  end
+
+  should 'have a whatever emitter' do
+    assert_equal 1, @thok.methods.grep( /^whatever$/ ).size
+    assert_nothing_raised { @thok.whatever }
+    assert_nothing_raised { @thok.whatever 1 }
+    assert_nothing_raised { @thok.whatever 1,2,3 }
+    assert_nothing_raised { @thok.whatever [4,5,6] }
+  end
+
+  should 'have an on_whatever handler' do
+    assert_equal 1, @thok.methods.grep( /^on_whatever$/ ).size
+  end
+
+  context 'on_whatever handler' do
+    should 'handle nil args' do
+      @thok.on_whatever do |arg|
+        assert_nil arg
+      end
+      @thok.whatever
+      @thok.whatever( nil )
+    end
+
+    should 'handle single args' do
+      @thok.on_whatever do |arg|
+        assert_not_nil arg
+        assert_not_equal Array, arg.class
+      end
+      @thok.whatever 1
+      @thok.whatever 'hello'
+    end
+
+    should_eventually 'handle objects' do
+      NVP = Struct.new :name, :value
+      nvp = NVP.new
+      nvp.name = 'how'
+      nvp.value = 'that'
+      @thok.on_whatever do |arg|
+        assert_not_nil arg
+        assert_equal NVP, arg.class
+      end
+      @thok.whatever nvp
+    end
+
+    should 'handle arg lists' do
+      @thok.on_whatever do |arg1,arg2|
+        assert_not_nil arg1
+        assert_not_nil arg2
+        assert_not_equal Array, arg1.class
+        assert_not_equal Array, arg2.class
+      end
+      @thok.whatever 1,2
+      @thok.whatever 'hello','there'
+    end
+
+    should 'handle a single array' do
+      @thok.on_whatever do |ary|
+        assert_not_nil ary
+        assert_equal Array, ary.class
+        assert_equal 3, ary.size
+        assert_equal [4,5,6], ary
+      end
+      @thok.whatever [4,5,6]
+    end
+
+    should_eventually 'handle multiple arrays' do
+      @thok.on_whatever do |ary1,ary2|
+        assert_not_nil ary1
+        assert_not_nil ary2
+        assert_equal Array, ary1.class
+        assert_equal Array, ary2.class
+        assert_equal 3, ary1.size
+        assert_equal 3, ary2.size
+        # fails here because ary1 is an array of variants
+        puts "ary1: #{ary1.inspect}"
+        assert_equal [4,5,6], ary1
+        assert_equal [7,8,9], ary2
+      end
+      @thok.whatever( [4,5,6], [7,8,9] )
+    end
+  end
+
+end