ffi-tk 2010.08.23 → 2018.02.20

data/spec/ffi-tk/widget/checkbutton.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../helper'
 
 describe Tk::CheckButton do
@@ -21,7 +22,7 @@ describe Tk::CheckButton do
   it 'assigns a command block on initialize' do
     toggled = false
     value = Tk::Variable.new('checkbutton_value')
-    cb = Tk::CheckButton.new(variable: value){ toggled = !toggled }
+    cb = Tk::CheckButton.new(variable: value) { toggled = !toggled }
     cb.pack
     cb.focus
 
@@ -30,15 +31,15 @@ describe Tk::CheckButton do
     Tk::Wait.visibility(cb)
 
     Tk::Event.generate(cb, '<1>')
-    Tk.interp.do_events_until{ toggled }
+    Tk.interp.do_events_until { toggled }
     toggled.should == true
 
     Tk::Event.generate(cb, '<1>')
-    Tk.interp.do_events_until{ !toggled }
+    Tk.interp.do_events_until { !toggled }
     toggled.should == false
 
     Tk::Event.generate(cb, '<1>')
-    Tk.interp.do_events_until{ toggled }
+    Tk.interp.do_events_until { toggled }
     toggled.should == true
   end
-end
+end

data/spec/ffi-tk/widget/entry.rb

@@ -1,155 +1,164 @@
+# frozen_string_literal: true
 require_relative '../../helper'
 
 describe Tk::Entry do
-  @entry = Tk::Entry.new
-
-  it "returns the entry's string" do
-    @entry.get.should == ''
+  entry = Tk::Entry.new
+
+  cget_options = {
+    background: ['systemWindowBody', '#ffffff', '#282828'],
+    bd: [2, 1],
+    bg: ['systemWindowBody', '#ffffff', '#282828'],
+    borderwidth: [2, 1],
+    cursor: ['xterm'],
+    disabledbackground: ['systemWindowBody', '#d9d9d9'],
+    disabledforeground: ['#a3a3a3'],
+    exportselection: [true],
+    fg: ['Black', '#000000', '#ebdbb2'],
+    font: ['TkTextFont'],
+    foreground: ['Black', '#000000', '#ebdbb2'],
+    highlightbackground: ['systemWindowBody', '#d9d9d9'],
+    highlightcolor: ['Black', '#000000'],
+    highlightthickness: [3, 1],
+    insertbackground: ['Black', '#000000'],
+    insertborderwidth: [0],
+    insertofftime: [300],
+    insertontime: [600],
+    insertwidth: [1, 2],
+    invalidcommand: [nil],
+    invcmd: [nil],
+    justify: [:left],
+    readonlybackground: ['systemWindowBody', '#d9d9d9'],
+    relief: [:sunken],
+    selectbackground: ['systemHighlight', '#c3c3c3'],
+    selectborderwidth: [1, 0],
+    selectforeground: [nil, '#000000'],
+    show: [nil],
+    state: [['normal']],
+    takefocus: [false],
+    textvariable: [nil],
+    validate: [:none],
+    validatecommand: [nil],
+    vcmd: [nil],
+    width: [20],
+    xscrollcommand: [nil]
+  }
+
+  describe 'getting options via cget' do
+    cget_options.each do |key, values|
+      it "returns a member of #{values.inspect} for -#{key}" do
+        values.should.include entry.cget(key)
+      end
+    end
   end
 
-  it 'inserts text at index' do
-    @entry.insert(:end, 'Hello, World!')
-    @entry.get.should == 'Hello, World!'
+  it 'configures a single option' do
+    entry.configure(validate: :focus)
+    entry.cget(:validate).should == :focus
+    entry.configure(validate: :none)
+    entry.cget(:validate).should == :none
   end
 
-  it 'returns a list of four numbers describing the bounding box of the character given by index' do
-    index_bbox = @entry.bbox(0)
-    index_bbox.should.be.kind_of? Array
-    index_bbox.size.should == 4
-  end
+  it 'configures more options at once' do
+    entry.configure(justify: :right, validate: :focus)
+    entry.cget(:validate).should == :focus
+    entry.cget(:justify).should == :right
 
-  it 'Returns the current value of the configuration option given' do
-    @entry.cget(:background         ).should == "#ffffff"
-    @entry.cget(:bd                 ).should == 1
-    @entry.cget(:bg                 ).should == "#ffffff"
-    @entry.cget(:borderwidth        ).should == 1
-    @entry.cget(:cursor             ).should == "xterm"
-    @entry.cget(:disabledbackground ).should == "#d9d9d9"
-    @entry.cget(:disabledforeground ).should == "#a3a3a3"
-    @entry.cget(:exportselection    ).should == true
-    @entry.cget(:fg                 ).should == "#000000"
-    @entry.cget(:font               ).should == "TkTextFont"
-    @entry.cget(:foreground         ).should == "#000000"
-    @entry.cget(:highlightbackground).should == "#d9d9d9"
-    @entry.cget(:highlightcolor     ).should == "#000000"
-    @entry.cget(:highlightthickness ).should == 1
-    @entry.cget(:insertbackground   ).should == "#000000"
-    @entry.cget(:insertborderwidth  ).should == 0
-    @entry.cget(:insertofftime      ).should == 300
-    @entry.cget(:insertontime       ).should == 600
-    @entry.cget(:insertwidth        ).should == 2
-    @entry.cget(:invalidcommand     ).should == nil
-    @entry.cget(:invcmd             ).should == nil
-    @entry.cget(:justify            ).should == :left
-    @entry.cget(:readonlybackground ).should == "#d9d9d9"
-    @entry.cget(:relief             ).should == :sunken
-    @entry.cget(:selectbackground   ).should == "#c3c3c3"
-    @entry.cget(:selectborderwidth  ).should == 0
-    @entry.cget(:selectforeground   ).should == "#000000"
-    @entry.cget(:show               ).should == nil
-    @entry.cget(:state              ).should == ['normal']
-    @entry.cget(:takefocus          ).should == false
-    @entry.cget(:textvariable       ).should == nil
-    @entry.cget(:validate           ).should == :none
-    @entry.cget(:validatecommand    ).should == nil
-    @entry.cget(:vcmd               ).should == nil
-    @entry.cget(:width              ).should == 20
-    @entry.cget(:xscrollcommand     ).should == nil
+    entry.configure(justify: :left, validate: :none)
+    entry.cget(:validate).should == :none
+    entry.cget(:justify).should == :left
   end
 
-  it 'configures a single option' do
-    @entry.configure(validate: :focus)
-    @entry.cget(:validate).should == :focus
-    @entry.configure(validate: :none)
-    @entry.cget(:validate).should == :none
+  it "returns the entry's string" do
+    entry.get.should == ''
   end
 
-  it 'configures more options at once' do
-    @entry.configure(justify: :right, validate: :focus)
-    @entry.cget(:validate).should == :focus
-    @entry.cget(:justify).should == :right
+  it 'inserts text at index' do
+    entry.insert(:end, 'Hello, World!')
+    entry.get.should == 'Hello, World!'
+  end
 
-    @entry.configure(justify: :left, validate: :none)
-    @entry.cget(:validate).should == :none
-    @entry.cget(:justify).should == :left
+  it 'returns a list of four numbers describing the bounding box of the character given by index' do
+    index_bbox = entry.bbox(0)
+    index_bbox.should.be.is_a? Array
+    index_bbox.size.should == 4
   end
 
-  it "deletes character at index" do
-    @entry.delete(5)
-    @entry.get.should == "Hello World!"
+  it 'deletes character at index' do
+    entry.delete(5)
+    entry.get.should == 'Hello World!'
   end
 
-  it "deletes character between indices" do
-    @entry.delete(5, 11)
-    @entry.get.should == "Hello!"
+  it 'deletes character between indices' do
+    entry.delete(5, 11)
+    entry.get.should == 'Hello!'
   end
 
-  it "Puts the insertion cursor just before the character given by index" do
-    @entry.icursor(5)
-    @entry.insert(:insert, ", World")
-    @entry.get.should == "Hello, World!"
+  it 'Puts the insertion cursor just before the character given by index' do
+    entry.icursor(5)
+    entry.insert(:insert, ', World')
+    entry.get.should == 'Hello, World!'
   end
 
-  it "Returns the numerical index corresponding to index" do
-    @entry.index(:insert).should == 12
+  it 'Returns the numerical index corresponding to index' do
+    entry.index(:insert).should == 12
   end
 
-  it "Insert the string just before the character indicated by index" do
-    @entry.insert(0, 'OHAI ')
-    @entry.get.should == 'OHAI Hello, World!'
+  it 'Insert the string just before the character indicated by index' do
+    entry.insert(0, 'OHAI ')
+    entry.get.should == 'OHAI Hello, World!'
   end
 
   it 'uses the scan commands' do
-    lambda{
-      @entry.scan_mark(0)
-      @entry.scan_dragto(10)
-    }.should.not.raise
+    lambda do
+      entry.scan_mark(0)
+      entry.scan_dragto(10)
+    end.should.not.raise
   end
 
   it 'Returns whether a selection is present' do
-    @entry.selection_present.should == false
+    entry.selection_present.should == false
   end
 
   it 'adjusts the selection' do
-    @entry.selection_adjust(0)
-    @entry.index('sel.first').should == 0
-    @entry.selection_adjust(5)
-    @entry.index('sel.last').should == 5
+    entry.selection_adjust(0)
+    entry.index('sel.first').should == 0
+    entry.selection_adjust(5)
+    entry.index('sel.last').should == 5
   end
 
   it 'Clears the selection' do
-    @entry.selection_present.should == true
-    @entry.selection_clear
-    @entry.selection_present.should == false
+    entry.selection_present.should == true
+    entry.selection_clear
+    entry.selection_present.should == false
   end
 
   it 'Selects the characters at start ending with the one just before end' do
-    @entry.selection_range(1, 4)
-    @entry.index('sel.first').should == 1
-    @entry.index('sel.last').should == 4
+    entry.selection_range(1, 4)
+    entry.index('sel.first').should == 1
+    entry.index('sel.last').should == 4
   end
 
   it 'Adjusts selection with the from and to commands' do
-    @entry.selection_from(2)
-    @entry.selection_to(5)
-    @entry.index('sel.first').should == 2
-    @entry.index('sel.last').should == 5
+    entry.selection_from(2)
+    entry.selection_to(5)
+    entry.index('sel.first').should == 2
+    entry.index('sel.last').should == 5
   end
 
   it 'validates the entry without validation command' do
-    @entry.validate.should == true
+    entry.validate.should == true
   end
 
   it 'validates the entry with validation command' do
-    @entry.configure validatecommand: lambda{|*args| true }
-    @entry.validate.should == true
+    entry.configure validatecommand: ->(*_args) { true }
+    entry.validate.should == true
 
-    @entry.configure validatecommand: lambda{|*args| false }
-    @entry.validate.should == false
+    entry.configure validatecommand: ->(*_args) { false }
+    entry.validate.should == false
   end
 end
 
 # puts
-# @entry.configure.map{|c| c.first[1..-1] }.each{|k,v|
-#   puts "@entry.cget(%-20p).should == %p" % [k.to_sym, @entry.cget(k)]
-# }
+# entry.configure.map{|c| c.first[1..-1] }.each{|k,v|
+#   puts "entry.cget(%-20p).should == %p" % [k.to_sym, entry.cget(k)]
+# }

data/spec/ffi-tk/widget/frame.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../helper'
 
 describe Tk::Frame do
@@ -5,4 +6,4 @@ describe Tk::Frame do
     @frame = Tk::Frame.new
     @frame.winfo_exists.should == true
   end
-end
+end

data/spec/ffi-tk/widget/label.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../helper'
 
 describe Tk::Label do
@@ -9,7 +10,7 @@ describe Tk::Label do
 
   it 'needs more specs' do
     label = Tk::Label.new
-    label.value.should == nil
+    label.value.should.nil?
     label.value = 'Hello, World!'
     label.value.should == 'Hello, World!'
   end

data/spec/ffi-tk/widget/labelframe.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../helper'
 
 describe Tk::LabelFrame do

data/spec/ffi-tk/widget/listbox.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../helper'
 
 describe Tk::Listbox do
@@ -9,10 +10,10 @@ describe Tk::Listbox do
 
   it 'Make sure we get contents of the list' do
     list = Tk::Listbox.new
-    list.insert 0, "first line"
-    list.get(0).should == "first line"
-    list.insert 1, "second line"
-    list.get(1).should == "second line"
+    list.insert 0, 'first line'
+    list.get(0).should == 'first line'
+    list.insert 1, 'second line'
+    list.get(1).should == 'second line'
     list.get(0, 1).should == ['first line', 'second line']
     list.value.should == ['first line', 'second line']
   end

data/spec/ffi-tk/widget/menu.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../helper'
 
 describe Tk::Menu do
@@ -7,6 +8,6 @@ describe Tk::Menu do
     instance.tk_parent.should == Tk.root
   end
 
-  #it 'needs more specs' do
-  #end
+  # it 'needs more specs' do
+  # end
 end

data/spec/ffi-tk/widget/menubutton.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../helper'
 
 describe Tk::MenuButton do

data/spec/ffi-tk/widget/message.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../helper'
 
 describe Tk::Message do

data/spec/ffi-tk/widget/panedwindow.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../helper'
 
 describe Tk::PanedWindow do

data/spec/ffi-tk/widget/radiobutton.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../helper'
 
 describe Tk::RadioButton do

data/spec/ffi-tk/widget/root.rb

@@ -1,9 +1,10 @@
+# frozen_string_literal: true
 require_relative '../../helper'
 
 describe Tk::Root do
   it 'initializes' do
     instance = Tk::Root.new
     instance.class.should == Tk::Root
-    instance.tk_parent.should == nil
+    instance.tk_parent.should.nil?
   end
 end

data/spec/ffi-tk/widget/scale.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../helper'
 
 describe Tk::Scale do

data/spec/ffi-tk/widget/scrollbar.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../helper'
 
 describe Tk::Scrollbar do

data/spec/ffi-tk/widget/spinbox.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../helper'
 
 describe Tk::Spinbox do

data/spec/ffi-tk/widget/text.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../helper'
 
 describe Tk::Text do
@@ -13,50 +14,58 @@ describe Tk::Text do
     text.get('1.0', 'end').should == "Hello, World!\n"
   end
 
-  it 'gets all possible options with cget' do
-    text.cget(:autoseparators          ).should == true
-    text.cget(:background              ).should == "#ffffff"
-    text.cget(:bd                      ).should == 1
-    text.cget(:bg                      ).should == "#ffffff"
-    text.cget(:blockcursor             ).should == false
-    text.cget(:borderwidth             ).should == 1
-    text.cget(:cursor                  ).should == "xterm"
-    text.cget(:endline                 ).should == 0
-    text.cget(:exportselection         ).should == true
-    text.cget(:fg                      ).should == "#000000"
-    text.cget(:font                    ).should == "TkFixedFont"
-    text.cget(:foreground              ).should == "#000000"
-    text.cget(:height                  ).should == 24
-    text.cget(:highlightbackground     ).should == "#d9d9d9"
-    text.cget(:highlightcolor          ).should == "#000000"
-    text.cget(:highlightthickness      ).should == 1
-    text.cget(:inactiveselectbackground).should == "#c3c3c3"
-    text.cget(:insertbackground        ).should == "#000000"
-    text.cget(:insertborderwidth       ).should == 0
-    text.cget(:insertofftime           ).should == 300
-    text.cget(:insertontime            ).should == 600
-    text.cget(:insertwidth             ).should == 2
-    text.cget(:maxundo                 ).should == 0
-    text.cget(:padx                    ).should == 1
-    text.cget(:pady                    ).should == 1
-    text.cget(:relief                  ).should == :sunken
-    text.cget(:selectbackground        ).should == "#c3c3c3"
-    text.cget(:selectborderwidth       ).should == 0
-    text.cget(:selectforeground        ).should == "#000000"
-    text.cget(:setgrid                 ).should == false
-    text.cget(:spacing1                ).should == 0
-    text.cget(:spacing2                ).should == 0
-    text.cget(:spacing3                ).should == 0
-    text.cget(:startline               ).should == 0
-    text.cget(:state                   ).should == ['normal']
-    text.cget(:tabs                    ).should == nil
-    text.cget(:tabstyle                ).should == :tabular
-    text.cget(:takefocus               ).should == false
-    text.cget(:undo                    ).should == false
-    text.cget(:width                   ).should == 80
-    text.cget(:wrap                    ).should == :char
-    text.cget(:xscrollcommand          ).should == nil
-    text.cget(:yscrollcommand          ).should == nil
+  cget_options = {
+    autoseparators: [true],
+    background: %w(systemWindowBody #282828),
+    bd: [0, 1],
+    bg: %w(systemWindowBody #ffffff #282828),
+    blockcursor: [false],
+    borderwidth: [0, 1],
+    cursor: ['xterm'],
+    endline: ['', 0],
+    exportselection: [true],
+    fg: %w(Black #000000 #ebdbb2),
+    font: %w(TkFixedFont),
+    foreground: %w(Black #000000 #ebdbb2),
+    height: [24],
+    highlightbackground: %w(systemWindowBody #d9d9d9),
+    highlightcolor: %w(Black #000000),
+    highlightthickness: [3, 1],
+    inactiveselectbackground: %w(systemHighlightSecondary #c3c3c3),
+    insertbackground: %w(Black #000000),
+    insertborderwidth: [0],
+    insertofftime: [300],
+    insertontime: [600],
+    insertwidth: [1, 2],
+    maxundo: [0],
+    padx: [1],
+    pady: [1],
+    relief: [:flat, :sunken],
+    selectbackground: %w(systemHighlight #c3c3c3),
+    selectborderwidth: [1, 0],
+    selectforeground: [nil, '#000000'],
+    setgrid: [false],
+    spacing1: [0],
+    spacing2: [0],
+    spacing3: [0],
+    startline: [0, ''],
+    state: [['normal']],
+    tabs: [nil],
+    tabstyle: [:tabular],
+    takefocus: [false],
+    undo: [false, true],
+    width: [80],
+    wrap: [:char],
+    xscrollcommand: [nil],
+    yscrollcommand: [nil]
+  }
+
+  describe 'getting options via cget' do
+    cget_options.each do |key, values|
+      it "returns a member of #{values.inspect} for -#{key}" do
+        values.should.include text.cget(key)
+      end
+    end
   end
 
   it 'configures a single option' do
@@ -111,7 +120,7 @@ describe Tk::Text do
   end
 
   it 'counts ypixels' do
-    text.count(1.0, :end, :ypixels).should == 195
+    text.count(1.0, :end, :ypixels).should == 182
   end
 
   should 'not be in debug mode' do
@@ -131,7 +140,7 @@ describe Tk::Text do
   it 'gives line info' do
     info = text.dlineinfo(1.0)
     info.size.should == 5
-    info.all?{|i| i.kind_of?(Fixnum) }
+    info.all? { |i| i.is_a?(Integer) }
   end
 
   it 'inserts string with taglist' do
@@ -189,12 +198,12 @@ describe Tk::Text do
     text.peer_names.should == []
   end
 
-   it 'searches for {}' do
-     text.insert :end, '{ now some text in here}'
-     text.search(/\{/, '1.0', 'end', :all).should == ['1.10']
-     text.search(/\}/, '1.0', 'end', :all).should == ['1.33']
-     text.search(/[{}]/, '1.0', 'end', :all).should == ['1.10', '1.33']
-   end
+  it 'searches for {}' do
+    text.insert :end, '{ now some text in here}'
+    text.search(/\{/, '1.0', 'end', :all).should == ['1.10']
+    text.search(/\}/, '1.0', 'end', :all).should == ['1.33']
+    text.search(/[{}]/, '1.0', 'end', :all).should == ['1.10', '1.33']
+  end
 
   text.delete '1.0', 'end'
   text.insert(:end, <<-TEXT)
@@ -222,8 +231,8 @@ Voluptates dicta labore impedit deserunt quod. Vero sint rerum at asperiores eos
 
   describe 'Text#search' do
     it 'searches by exact match' do
-      text.search("et", '1.0', :end).should == ['1.13']
-      text.search("labore", '1.0', :end).should == ['20.17']
+      text.search('et', '1.0', :end).should == ['1.13']
+      text.search('labore', '1.0', :end).should == ['20.17']
     end
 
     it 'searches by regular expression' do