ffi-tk 2010.08.23 → 2018.02.20

data/lib/ffi-tk/widget/canvas/arc.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Tk
   class Canvas
     # Items of type arc appear on the display as arc-shaped regions.
@@ -15,4 +16,4 @@ module Tk
       )
     end
   end
-end
+end

data/lib/ffi-tk/widget/canvas/bitmap.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Tk
   class Canvas
     # Items of type bitmap appear on the display as images with two colors,
@@ -10,4 +11,4 @@ module Tk
       )
     end
   end
-end
+end

data/lib/ffi-tk/widget/canvas/image.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Tk
   class Canvas
     # Items of type image are used to display images on a canvas.
@@ -7,4 +8,4 @@ module Tk
       )
     end
   end
-end
+end

data/lib/ffi-tk/widget/canvas/item.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Tk
   class Canvas
     class Item < Struct.new(:canvas, :id)
@@ -52,9 +53,8 @@ module Tk
         text:                   :string,
         underline:              :integer,
         width:                  :integer,
-        width:                  :integer,
         window:                 :pathname
-      }
+      }.freeze
 
       def self.create(canvas, type, id)
         klass = Canvas.const_get(type.to_s.capitalize)
@@ -79,7 +79,7 @@ end
       end
 
       def inspect
-        "#<%s %d>" % [self.class.name, id]
+        '#<%s %d>' % [self.class.name, id]
       end
 
       def cget(option)
@@ -167,4 +167,4 @@ end
       end
     end
   end
-end
+end

data/lib/ffi-tk/widget/canvas/line.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Tk
   class Canvas
     # Items of type line appear on the display as one or more connected line
@@ -13,4 +14,4 @@ module Tk
       )
     end
   end
-end
+end

data/lib/ffi-tk/widget/canvas/oval.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Tk
   class Canvas
     # Items of type oval appear as circular or oval regions on the display.
@@ -12,4 +13,4 @@ module Tk
       )
     end
   end
-end
+end

data/lib/ffi-tk/widget/canvas/polygon.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Tk
   class Canvas
     # Items of type polygon appear as polygonal or curved filled regions on the
@@ -13,4 +14,4 @@ module Tk
       )
     end
   end
-end
+end

data/lib/ffi-tk/widget/canvas/rectangle.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Tk
   class Canvas
     # Items of type rectangle appear as rectangular regions on the display.
@@ -12,4 +13,4 @@ module Tk
       )
     end
   end
-end
+end

data/lib/ffi-tk/widget/canvas/text.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Tk
   class Canvas
     # A text item displays a string of characters on the screen in one or more
@@ -12,4 +13,4 @@ module Tk
       )
     end
   end
-end
+end

data/lib/ffi-tk/widget/canvas/window.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Tk
   class Canvas
     # Items of type window cause a particular window to be displayed at a given
@@ -8,4 +9,4 @@ module Tk
       )
     end
   end
-end
+end

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

@@ -1,9 +1,12 @@
+# frozen_string_literal: true
 module Tk
   # Create and manipulate checkbutton widgets
   class CheckButton < Button
     include Cget, Configure
 
-    def self.tk_command; 'checkbutton'; end
+    def self.tk_command
+      'checkbutton'
+    end
 
     def initialize(parent = Tk.root, options = None)
       if block_given?

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Tk
   # An entry is a widget that displays a one-line text string and allows that
   # string to be edited using widget methods described below, which are
@@ -21,7 +22,9 @@ module Tk
   class Entry < Widget
     include Cget, Configure
 
-    def self.tk_command; 'entry'; end
+    def self.tk_command
+      'entry'
+    end
 
     def value
       get

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Tk
   # Create and manipulate frame widgets
   # A frame is a simple widget.
@@ -7,6 +8,8 @@ module Tk
   class Frame < Widget
     include Cget, Configure
 
-    def self.tk_command; 'frame'; end
+    def self.tk_command
+      'frame'
+    end
   end
 end

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Tk
   # A label is a widget that displays a textual string, bitmap or image.
   #
@@ -13,7 +14,9 @@ module Tk
   class Label < Widget
     include Cget, Configure
 
-    def self.tk_command; 'label'; end
+    def self.tk_command
+      'label'
+    end
 
     def value=(string)
       configure(text: string)

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

@@ -1,7 +1,10 @@
+# frozen_string_literal: true
 module Tk
   class LabelFrame < Frame
     include Cget, Configure
 
-    def self.tk_command; 'labelframe'; end
+    def self.tk_command
+      'labelframe'
+    end
   end
 end

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

@@ -1,8 +1,11 @@
+# frozen_string_literal: true
 module Tk
   class Listbox < Widget
     include Cget, Configure, Scrollable
 
-    def self.tk_command; 'listbox'; end
+    def self.tk_command
+      'listbox'
+    end
 
     def clear
       delete 0, :end
@@ -14,7 +17,7 @@ module Tk
 
     def value=(enumerable)
       clear
-      enumerable.each{|element| insert(:end, element) }
+      enumerable.each { |element| insert(:end, element) }
     end
 
     # Sets the active element to the one indicated by index.

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

@@ -1,8 +1,11 @@
+# frozen_string_literal: true
 module Tk
   class Menu < Widget
     include Cget, Configure
 
-    def self.tk_command; 'menu'; end
+    def self.tk_command
+      'menu'
+    end
 
     # Change the state of the entry indicated by index to active and redisplay
     # it using its active colors.

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

@@ -1,7 +1,10 @@
+# frozen_string_literal: true
 module Tk
   class MenuButton < Button
     include Cget, Configure
 
-    def self.tk_command; 'menubutton'; end
+    def self.tk_command
+      'menubutton'
+    end
   end
 end

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Tk
   # Create and manipulate message widgets
   #
@@ -31,6 +32,8 @@ module Tk
   class Message < Widget
     include Cget, Configure
 
-    def self.tk_command; 'message'; end
+    def self.tk_command
+      'message'
+    end
   end
 end

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

@@ -1,15 +1,18 @@
+# frozen_string_literal: true
 module Tk
   class PanedWindow < Widget
     include Cget, Configure
 
-    def self.tk_command; 'panedwindow'; end
+    def self.tk_command
+      'panedwindow'
+    end
 
     # Add one or more windows to the panedwindow, each in a separate pane.
     # The arguments consist of the names of one or more windows followed by
     # pairs of arguments that specify how to manage the windows.
     # Option may have any of the values accepted by the configure subcommand.
     def add(window, *arguments)
-      options, windows = arguments.partition{|arg| arg.respond_to?(:to_tcl_options) }
+      options, windows = arguments.partition { |arg| arg.respond_to?(:to_tcl_options) }
 
       if option = options.first
         execute(:add, window, *windows, option.to_tcl_options)

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

@@ -1,8 +1,11 @@
+# frozen_string_literal: true
 module Tk
   class RadioButton < Button
     include Cget, Configure
 
-    def self.tk_command; 'radiobutton'; end
+    def self.tk_command
+      'radiobutton'
+    end
 
     # Deselects the radiobutton and sets the associated variable to an empty
     # string. If this radiobutton was not currently selected, the command has

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Tk
   class Root < Toplevel
     def initialize

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

@@ -1,8 +1,11 @@
+# frozen_string_literal: true
 module Tk
   class Scale < Widget
     include Cget, Configure
 
-    def self.tk_command; 'scale'; end
+    def self.tk_command
+      'scale'
+    end
 
     # Returns a list whose elements are the x and y coordinates of the point
     # along the centerline of the trough that corresponds to value.

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

@@ -1,8 +1,11 @@
+# frozen_string_literal: true
 module Tk
   class Scrollbar < Widget
     include Cget, Configure
 
-    def self.tk_command; 'scrollbar'; end
+    def self.tk_command
+      'scrollbar'
+    end
 
     # Marks the element indicated by element as active, which causes it to be
     # displayed as specified by the activeBackground and activeRelief options.

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

@@ -1,8 +1,11 @@
+# frozen_string_literal: true
 module Tk
   class Spinbox < Widget
     include Cget, Configure
 
-    def self.tk_command; 'spinbox'; end
+    def self.tk_command
+      'spinbox'
+    end
 
     # Returns a list of four numbers describing the bounding box of the
     # character given by index.

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

@@ -1,8 +1,11 @@
+# frozen_string_literal: true
 module Tk
   class Text < Widget
     include Cget, Configure, Scrollable
 
-    def self.tk_command; 'text'; end
+    def self.tk_command
+      'text'
+    end
 
     autoload :Peer, 'ffi-tk/widget/text/peer'
 
@@ -111,7 +114,7 @@ module Tk
     # :xpixels, :ypixels` is perfectly valid and will return a list of two
     # elements.
     def count(index1, index2, *options)
-      args = options.map{|option| option.to_tcl_option }
+      args = options.map(&:to_tcl_option)
       execute('count', *args, index1, index2)
     end
 
@@ -200,7 +203,10 @@ module Tk
       invocation = []
       indices = [given_index]
 
-      while arg = arguments.shift
+      loop do
+        arg = arguments.shift
+        break unless arg
+
         if arg.respond_to?(:to_tcl_option)
           case tcl_option = arg.to_tcl_option
           when '-command'
@@ -363,7 +369,7 @@ module Tk
     # markName is set to the given value.
     def mark_gravity(name, direction = None)
       if direction == None
-        execute('mark', 'gravity', name).to_sym?
+        execute('mark', 'gravity', name)&.to_sym
       else
         execute_only('mark', 'gravity', name, direction)
       end
@@ -389,7 +395,7 @@ module Tk
     # after end with respect to the pathName mark next operation.
     # nil is returned if there are no marks after index.
     def mark_next(index)
-      execute('mark', 'next', index).to_sym?
+      execute('mark', 'next', index)&.to_sym
     end
 
     # Returns the name of the mark at or before index.
@@ -404,7 +410,7 @@ module Tk
     # mark information returned by the pathName dump operation.
     # nil is returned if there are no marks before index.
     def mark_previous(index)
-      execute('mark', 'previous', index).to_sym?
+      execute('mark', 'previous', index)&.to_sym
     end
 
     # Sets the mark named markName to a position just before the character at
@@ -592,7 +598,7 @@ module Tk
       switches << :regexp if pattern.class < CoreExtensions::Regexp
       to = :end if None == to
 
-      switches.map!{|switch| switch.to_s.to_tcl_option }
+      switches.map! { |switch| switch.to_s.to_tcl_option }
       switches.uniq!
 
       if switches.include?('-all') && switches.delete('-count')
@@ -607,20 +613,20 @@ module Tk
 
       if count
         SEARCH_MUTEX.synchronize do
-          list = execute(:search, *switches, sep, pattern, from, to).to_a
+          list = [*execute(:search, *switches, sep, pattern, from, to)]
           return list if list.empty?
           count_value = Tk.execute('set', count)
           [*list, count_value]
         end
       elsif count_all
         SEARCH_MUTEX.synchronize do
-          list = execute(:search, *switches, sep, pattern, from, to).to_a
+          list = [*execute(:search, *switches, sep, pattern, from, to)]
           return list if list.empty?
           count_list = Tk.execute('set', count_all)
           list.zip(count_list)
         end
       else
-        execute(:search, *switches, sep, pattern, from, to).to_a
+        [*execute(:search, *switches, sep, pattern, from, to)]
       end
     end
 
@@ -695,12 +701,10 @@ module Tk
     # The tag bindings will be invoked first, followed by bindings for the
     # window as a whole.
     def tag_bind(tag_name, sequence = None, &script)
-      unless script
-        if None == sequence
-          return Tk.execute(:tag, :bind, tag_name)
-        else
-          return Tk.execute(:tag, :bind, tag_name, sequence)
-        end
+      if !script && None == sequence
+        return Tk.execute(:tag, :bind, tag_name)
+      elsif !script
+        return Tk.execute(:tag, :bind, tag_name, sequence)
       end
 
       # create name for command