ffi-tk 2010.08.23 → 2018.02.20

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../helper'
 
 describe Tk::Tile::PanedWindow do
@@ -10,4 +11,3 @@ describe Tk::Tile::PanedWindow do
   it 'needs more specs' do
   end
 end
-

data/spec/ffi-tk/tile/progressbar.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../helper'
 
 describe Tk::Tile::Progressbar do
@@ -75,4 +76,3 @@ describe Tk::Tile::Progressbar do
     pbar.orient.should == :vertical
   end
 end
-

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../helper'
 
 describe Tk::Tile::RadioButton do
@@ -10,4 +11,3 @@ describe Tk::Tile::RadioButton do
   it 'needs more specs' do
   end
 end
-

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../helper'
 
 describe Tk::Tile::Scale do
@@ -10,4 +11,3 @@ describe Tk::Tile::Scale do
   it 'needs more specs' do
   end
 end
-

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

@@ -1,20 +1,6 @@
+# frozen_string_literal: true
 require_relative '../../helper'
 
-describe Tk::Tile::Scrollbar do
-  it 'initializes' do
-    instance = Tk::Tile::Scrollbar.new
-    instance.class.should == Tk::Tile::Scrollbar
-    instance.tk_parent.should == Tk.root
-  end
-
-  it 'sets orientation' do
-    s = Tk::Tile::YScrollbar.new
-    s.orient.should == :vertical
-    s.orient :horizontal
-    s.orient.should == :horizontal
-  end
-end
-
 describe Tk::Tile::YScrollbar do
   it 'initializes' do
     instance = Tk::Tile::YScrollbar.new
@@ -40,4 +26,3 @@ describe Tk::Tile::XScrollbar do
     s.cget(:orient).should == :horizontal
   end
 end
-

data/spec/ffi-tk/tile/separator.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../helper'
 
 describe Tk::Tile::Separator do
@@ -16,7 +17,6 @@ describe Tk::Tile::Separator do
 
   it 'sets identify' do
     s = Tk::Tile::Separator.new
-    s.identify(0,0).should == true 
+    s.identify(0, 0).should == true
   end
 end
-

data/spec/ffi-tk/tile/sizegrip.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../helper'
 
 describe Tk::Tile::Sizegrip do
@@ -10,4 +11,3 @@ describe Tk::Tile::Sizegrip do
   it 'needs more specs' do
   end
 end
-

data/spec/ffi-tk/tile/style.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../helper'
 
 Tk.init
@@ -5,106 +6,107 @@ Tk.init
 describe Tk::Tile::Style do
   Style = Tk::Tile::Style
 
-  it '#theme_names  returns a list of all known themes' do
+  it '#theme_names returns a list of all known themes' do
     names = Style.theme_names
 
-    names.should.kind_of? Array
+    names.should.is_a? Array
     names.should.not.be.empty?
-    names.all?{|i| i.kind_of?(String) }
-    names.should == ["clam", "alt", "default", "classic"]
+    names.all? { |i| i.is_a?(String) }
+    names.all? { |i| %w(aqua clam alt default classic).include? i }
+    # tk-aqua: "aqua", "clam", ...
   end
 
-  it '#theme_use  sets the current theme' do
+  it '#theme_use sets the current theme' do
     Style.theme_use('default').should == 'default'
     Style.theme_use('unkown-theme-').should.be.nil?
   end
 
-  it '#element_names  returns the list of elements defined in the current theme' do
+  it '#element_names returns the list of elements defined in the current theme' do
     names = Style.element_names
 
-    names.should.kind_of? Array
+    names.should.is_a? Array
     names.should.not.be.empty?
-    names.all?{|i| i.kind_of?(String) }
-    %w{label focus image text textarea}.each {|i| names.should.include? i }
+    names.all? { |i| i.is_a?(String) }
+    %w(label focus image text textarea).each { |i| names.should.include? i }
   end
 
-  it '#element_options  returns the list of elements options' do
+  it '#element_options returns the list of elements options' do
     name = 'text'
-    options = %w{-text -font -foreground -underline -width -anchor -justify -wraplength -embossed}
+    options = %w(-text -font -foreground -underline -width -anchor -justify -wraplength -embossed)
 
-    Style.element_options(name).should.kind_of? Array
+    Style.element_options(name).should.is_a? Array
     Style.element_options(name).should.not.be.empty?
     Style.element_options(name).should == options
 
-    Style.element_options('unkown-element').should == nil
+    Style.element_options('unkown-element').should.nil?
   end
 
-  it '#lookup  returns the value specified for -option in style style' do
+  it '#lookup returns the value specified for -option in style style' do
     Style.lookup('label', 'font').should == 'TkDefaultFont'
-    Style.lookup('label', 'foreground').should == 'black'
-    Style.lookup('label', :foreground).should == 'black'
+    %w(black #000000).should.include? Style.lookup('label', 'foreground')
+    %w(black #000000).should.include? Style.lookup('label', :foreground)
   end
 
-  it '#configure  sets the default value of the specified option(s) in style' do
+  it '#configure sets the default value of the specified option(s) in style' do
     # configure one element option
-    Style.configure('label', foreground: 'gray' ).should == true
+    Style.configure('label', foreground: 'gray').should == true
     Style.lookup('label', 'foreground').should == 'gray'
 
     # configure a hash of element options
-    Style.configure('label', {foreground: 'gray', background: 'blue'} ).should == true
+    Style.configure('label', foreground: 'gray', background: 'blue').should == true
     Style.lookup('label', 'foreground').should == 'gray'
     Style.lookup('label', 'background').should == 'blue'
 
     Style.configure('label', foreground: 'black').should == true
 
     # configure other element..
-    Style.configure('Button.label', foreground: :red ).should == true
+    Style.configure('Button.label', foreground: :red).should == true
     Style.lookup('Button.label', 'foreground').should == 'red'
 
-    Style.configure('Button.label', foreground: :blue ).should == true
+    Style.configure('Button.label', foreground: :blue).should == true
     Style.lookup('Button.label', 'foreground').should == 'blue'
 
     # element origin is still black
     Style.lookup('label', 'foreground').should == 'black'
   end
 
-  it '#map  sets dynamic values of the specified option(s) in style' do
-    Style.map('label', :background=>[:active, '#694418']).should == true
-    Style.map(:foreground=>[:disabled, '#B2B2B2', :active, '#FFE7CB']).should == true
+  it '#map sets dynamic values of the specified option(s) in style' do
+    Style.map('label', background: [:active, '#694418']).should == true
+    Style.map(foreground: [:disabled, '#B2B2B2', :active, '#FFE7CB']).should == true
   end
 
-  it '#layout  defines the widget layout for style' do
+  it '#layout defines the widget layout for style' do
     Style.layout('TButton', [
-      'Button.button', {:children=>[
-        'Button.focus', {:children=>[
-          'Button.padding', {:children=>[
-            'Button.label', {:expand=>true, :sticky=>''}
-          ]}
-        ]}
-      ]}
-    ]).should == true
+                   'Button.button', { children: [
+                     'Button.focus', { children: [
+                       'Button.padding', { children: [
+                         'Button.label', { expand: true, sticky: '' }
+                       ] }
+                     ] }
+                   ] }
+                 ]).should == true
 
     module Tk::Tile::TScrollbar; end
     style_name = Tk::Tile.style('Vertical', Tk::Tile::TScrollbar)
     style_name.should == 'Vertical.TScrollbar'
 
     Style.layout(style_name, [
-     'Checkbutton.background', # this is not needed in tile 0.5 or later
-     'Checkbutton.border', {:children=>[
-       'Checkbutton.padding', {:children=>[
-         'Checkbutton.indicator', {:side=>:left},
-         'Checkbutton.focus', {:side=>:left, :children=>[
-           'Checkbutton.label'
-         ]}
-       ]}
-     ]}
-    ]).should == true
+                   'Checkbutton.background', # this is not needed in tile 0.5 or later
+                   'Checkbutton.border', { children: [
+                     'Checkbutton.padding', { children: [
+                       'Checkbutton.indicator', { side: :left },
+                       'Checkbutton.focus', { side: :left, children: [
+                         'Checkbutton.label'
+                       ] }
+                     ] }
+                   ] }
+                 ]).should == true
   end
 
-
-  it '#element_create  creates a new element in the current theme' do
-    Style.element_create('someElement','label').should == nil
-    Style.element_names.should.not.include? "someElement"
+  it '#element_create creates a new element in the current theme' do
+    Style.element_create('someElement', 'label').should.nil?
+    Style.element_names.should.not.include? 'someElement'
+    Tk::Image.names.size.should == 4
 
     assets = {}
     assets['button-n'] = Tk::Image.create('photo').to_s
@@ -112,19 +114,17 @@ describe Tk::Tile::Style do
     assets['button-h'] = Tk::Image.create('photo').to_s
 
     Style.element_create('Button.button', :image,
-                             [ assets['button-n'],
-                               :pressed, assets['button-p'],
-                               :active,  assets['button-h'],
-                             ], :border=>3, :sticky=>:ew)
+                         [assets['button-n'],
+                          :pressed, assets['button-p'],
+                          :active,  assets['button-h']], border: 3, sticky: :ew)
 
-    Tk::Image.delete *assets.each_value
-    Tk::Image.names.size.should == 0
+    Tk::Image.delete(*assets.each_value)
+    Tk::Image.names.size.should == 4
   end
 
-  it '#theme_settings  configure in the context of a theme' do
-
+  it '#theme_settings configure in the context of a theme' do
     res = Style.theme_settings 'alt' do
-      Style.configure('label', foreground: :green ).should == true
+      Style.configure('label', foreground: :green).should == true
       Style.lookup('label', 'foreground').should == 'green'
     end
     res.should == 'alt'
@@ -133,9 +133,9 @@ describe Tk::Tile::Style do
     Style.lookup('label', 'foreground').should == 'black'
   end
 
-  it '#theme_create  creates a new theme' do
+  it '#theme_create creates a new theme' do
     # Creates a new theme. It is an error if themeName already exists.
-    lambda { Style.theme_create('default') }.should.raise ArgumentError
+    -> { Style.theme_create('default') }.should.raise ArgumentError
 
     #
     Style.theme_create('spec-theme').should == true
@@ -147,15 +147,13 @@ describe Tk::Tile::Style do
 
     # If -settings is present, script is evaluated in the context of the new theme
     res = Style.theme_create('spec-theme-block', parent: 'default') do
-      Style.configure('.', :background=>'#FCB64F',
-                              :troughcolor=>'#F8C278', :borderwidth=>1)
-      Style.configure(:font=>Tk::Tile::Font::Default, :borderwidth=>1)
+      Style.configure('.', background: '#FCB64F',
+                           troughcolor: '#F8C278', borderwidth: 1)
+      Style.configure(font: Tk::Tile::Font::Default, borderwidth: 1)
 
-      Style.map('.', :background=>[:active, '#694418'])
-      Style.map(:foreground=>[:disabled, '#B2B2B2', :active, '#FFE7CB'])
+      Style.map('.', background: [:active, '#694418'])
+      Style.map(foreground: [:disabled, '#B2B2B2', :active, '#FFE7CB'])
     end
     res.should == true
-
   end
-
 end

data/spec/ffi-tk/tile/treeview.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../helper'
 
 describe Tk::Tile::Treeview do
@@ -13,16 +14,16 @@ describe Tk::Tile::Treeview do
     list.cget(:takefocus).should == false
     list.cget(:columns).should == []
     list.cget(:displaycolumns).should == ['#all']
-    list.cget(:show).should == ['tree', 'headings']
+    list.cget(:show).should == %w(tree headings)
     list.cget(:selectmode).should == :extended
     list.cget(:height).should == 10
     list.cget(:padding).should == []
-    list.cget(:xscrollcommand).should == nil
-    list.cget(:yscrollcommand).should == nil
+    list.cget(:xscrollcommand).should.nil?
+    list.cget(:yscrollcommand).should.nil?
     list.cget(:takefocus).should == false
-    list.cget(:cursor).should == nil
+    list.cget(:cursor).should.nil?
     list.cget(:style).should == []
-    list.cget(:class).should == nil
+    list.cget(:class).should.nil?
   end
 
   it 'returns the widget state' do
@@ -31,9 +32,9 @@ describe Tk::Tile::Treeview do
 
   it 'executes a block if the state matches the spec' do
     value = nil
-    list.instate('active'){ value = :active }
+    list.instate('active') { value = :active }
     value.should == :active
-    list.instate('!active'){ value = :inactive }
+    list.instate('!active') { value = :inactive }
     value.should == :active
   end
 
@@ -53,7 +54,7 @@ describe Tk::Tile::Treeview do
       image: '',
       values: '',
       open: 0,
-      tags: '',
+      tags: ''
     }
   end
 
@@ -63,7 +64,7 @@ describe Tk::Tile::Treeview do
       minwidth: 20,
       stretch: true,
       anchor: 'w',
-      id: '',
+      id: ''
     }
   end
 
@@ -76,7 +77,7 @@ describe Tk::Tile::Treeview do
   end
 
   it 'gets parent of item' do
-    @item0.parent.id.should == ''
+    @item0.parent.should.nil?
   end
 
   it 'detaches the item' do

data/spec/ffi-tk/variable.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../helper'
 
 Tk.init
@@ -5,11 +6,11 @@ Tk.init
 describe Tk::Variable do
   it 'creates a Variable' do
     @var = Tk::Variable.new('somevar')
-    @var.name.should == "somevar"
+    @var.name.should == 'somevar'
   end
 
   it 'cannot get a value from it yet' do
-    lambda{ @var.get }.should.raise(NameError)
+    -> { @var.get }.should.raise(NameError)
   end
 
   it 'sets the value and retrieves it' do
@@ -19,6 +20,6 @@ describe Tk::Variable do
 
   it 'unsets the variable' do
     @var.unset
-    lambda{ @var.get }.should.raise(NameError)
+    -> { @var.get }.should.raise(NameError)
   end
-end
+end

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../helper'
 
 describe Tk::Button do
@@ -5,10 +6,10 @@ describe Tk::Button do
     ran = false
     Tk.callbacks.size.should == 0
 
-    button = Tk::Button.new{
+    button = Tk::Button.new do
       ran = true
       button.destroy
-    }
+    end
     button.invoke
 
     Tk.callbacks.size.should == 0

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../helper'
 
 describe Tk::Canvas do
@@ -12,18 +13,18 @@ describe Tk::Canvas do
     @text.id.should == 1
     @text.canvas.should == @canvas
 
-    @text.activefill.should == nil
-    @text.activestipple.should == nil
-    @text.anchor.should == "center"
-    @text.disabledfill.should == nil
-    @text.disabledstipple.should == nil
-    @text.fill.should == "black"
-    @text.font.should == "TkDefaultFont"
+    @text.activefill.should.nil?
+    @text.activestipple.should.nil?
+    @text.anchor.should == 'center'
+    @text.disabledfill.should.nil?
+    @text.disabledstipple.should.nil?
+    @text.fill.should == 'black'
+    @text.font.should == 'TkDefaultFont'
     @text.justify.should == :left
-    @text.state.should == nil
-    @text.stipple.should == nil
+    @text.state.should.nil?
+    @text.stipple.should.nil?
     @text.tags.should == []
-    @text.text.should == "Hello, World!"
+    @text.text.should == 'Hello, World!'
     @text.underline.should == -1
     @text.width.should == 0
   end
@@ -37,23 +38,23 @@ describe Tk::Canvas do
     @rect.activedash.should == 0
     @rect.disableddash.should == 0
     @rect.dashoffset.should == 0
-    @rect.fill.should == nil
-    @rect.activefill.should == nil
-    @rect.disabledfill.should == nil
+    @rect.fill.should.nil?
+    @rect.activefill.should.nil?
+    @rect.disabledfill.should.nil?
     @rect.offset.should == '0,0'
     @rect.outline.should == 'black'
-    @rect.activeoutline.should == nil
-    @rect.disabledoutline.should == nil
+    @rect.activeoutline.should.nil?
+    @rect.disabledoutline.should.nil?
     @rect.outlineoffset.should == 0
-    @rect.outlinestipple.should == nil
-    @rect.activeoutlinestipple.should == nil
-    @rect.disabledoutlinestipple.should == nil
-    @rect.stipple.should == nil
-    @rect.activestipple.should == nil
-    @rect.disabledstipple.should == nil
-    @rect.state.should == nil
+    @rect.outlinestipple.should.nil?
+    @rect.activeoutlinestipple.should.nil?
+    @rect.disabledoutlinestipple.should.nil?
+    @rect.stipple.should.nil?
+    @rect.activestipple.should.nil?
+    @rect.disabledstipple.should.nil?
+    @rect.state.should.nil?
     @rect.tags.should == []
-    @rect.width.should == 0
+    @rect.width.should == 1
     @rect.activewidth.should == 0
     @rect.disabledwidth.should == 0
   end
@@ -67,23 +68,23 @@ describe Tk::Canvas do
     @arc.activedash.should == 0
     @arc.disableddash.should == 0
     @arc.dashoffset.should == 0
-    @arc.fill.should == nil
-    @arc.activefill.should == nil
-    @arc.disabledfill.should == nil
+    @arc.fill.should.nil?
+    @arc.activefill.should.nil?
+    @arc.disabledfill.should.nil?
     @arc.offset.should == '0,0'
     @arc.outline.should == 'black'
-    @arc.activeoutline.should == nil
-    @arc.disabledoutline.should == nil
+    @arc.activeoutline.should.nil?
+    @arc.disabledoutline.should.nil?
     @arc.outlineoffset.should == 0.0
-    @arc.outlinestipple.should == nil
-    @arc.activeoutlinestipple.should == nil
-    @arc.disabledoutlinestipple.should == nil
-    @arc.stipple.should == nil
-    @arc.activestipple.should == nil
-    @arc.disabledstipple.should == nil
-    @arc.state.should == nil
+    @arc.outlinestipple.should.nil?
+    @arc.activeoutlinestipple.should.nil?
+    @arc.disabledoutlinestipple.should.nil?
+    @arc.stipple.should.nil?
+    @arc.activestipple.should.nil?
+    @arc.disabledstipple.should.nil?
+    @arc.state.should.nil?
     @arc.tags.should == []
-    @arc.width.should == 0
+    @arc.width.should == 1
     @arc.activewidth.should == 0
     @arc.disabledwidth.should == 0
     @arc.extent.should == 90.0
@@ -101,21 +102,21 @@ describe Tk::Canvas do
     @poly.disableddash.should == 0
     @poly.dashoffset.should == 0
     @poly.fill.should == 'black'
-    @poly.activefill.should == nil
-    @poly.disabledfill.should == nil
+    @poly.activefill.should.nil?
+    @poly.disabledfill.should.nil?
     @poly.offset.should == '0,0'
-    @poly.outline.should == nil
-    @poly.activeoutline.should == nil
-    @poly.disabledoutline.should == nil
-    @poly.outlinestipple.should == nil
-    @poly.activeoutlinestipple.should == nil
-    @poly.disabledoutlinestipple.should == nil
-    @poly.stipple.should == nil
-    @poly.activestipple.should == nil
-    @poly.disabledstipple.should == nil
-    @poly.state.should == nil
+    @poly.outline.should.nil?
+    @poly.activeoutline.should.nil?
+    @poly.disabledoutline.should.nil?
+    @poly.outlinestipple.should.nil?
+    @poly.activeoutlinestipple.should.nil?
+    @poly.disabledoutlinestipple.should.nil?
+    @poly.stipple.should.nil?
+    @poly.activestipple.should.nil?
+    @poly.disabledstipple.should.nil?
+    @poly.state.should.nil?
     @poly.tags.should == []
-    @poly.width.should == 0
+    @poly.width.should == 1
     @poly.activewidth.should == 0
     @poly.disabledwidth.should == 0
     @poly.joinstyle.should == :round
@@ -133,18 +134,18 @@ describe Tk::Canvas do
     @line.disableddash.should == 0
     @line.dashoffset.should == 0
     @line.fill.should == 'black'
-    @line.activefill.should == nil
-    @line.disabledfill.should == nil
-    @line.stipple.should == nil
-    @line.activestipple.should == nil
-    @line.disabledstipple.should == nil
-    @line.state.should == nil
+    @line.activefill.should.nil?
+    @line.disabledfill.should.nil?
+    @line.stipple.should.nil?
+    @line.activestipple.should.nil?
+    @line.disabledstipple.should.nil?
+    @line.state.should.nil?
     @line.tags.should == []
-    @line.width.should == 0
+    @line.width.should == 1
     @line.activewidth.should == 0
     @line.disabledwidth.should == 0
     @line.arrow.should == :none
-    @line.arrowshape.should == ["8", "10", "3"]
+    @line.arrowshape.should == %w(8 10 3)
     @line.capstyle.should == :butt
     @line.joinstyle.should == :round
     @line.smooth.should == false
@@ -157,7 +158,7 @@ describe Tk::Canvas do
     @win.id.should == 6
     @win.canvas.should == @canvas
 
-    @win.state.should == nil
+    @win.state.should.nil?
     @win.tags.should == []
     @win.anchor.should == 'center'
     @win.height.should == 0