shoes-core 4.0.0.pre6 → 4.0.0.pre7

data/lib/shoes/core/version.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 class Shoes
   module Core
-    VERSION = "4.0.0.pre6"
+    VERSION = "4.0.0.pre7"
   end
 end

data/lib/shoes/dimensions.rb

@@ -191,7 +191,7 @@ class Shoes
   module DimensionsDelegations
     extend Forwardable
 
-    UNDELEGATED_METHODS = [:to_s]
+    UNDELEGATED_METHODS = [:to_s].freeze
     CANDIDATE_METHODS = Dimensions.public_instance_methods(false) - UNDELEGATED_METHODS
 
     WRITER_METHODS    = CANDIDATE_METHODS.select { |meth| meth.to_s.end_with?("=") }
@@ -205,7 +205,7 @@ class Shoes
       key = meth.to_s.sub("=", "").to_sym
       define_method(meth) do |value|
         @style[key] = value if @style
-        self.dimensions.send(meth, value)
+        dimensions.send(meth, value)
       end
     end
 
@@ -219,5 +219,9 @@ class Shoes
     extend Forwardable
 
     def_delegators :dsl, *DimensionsDelegations::CANDIDATE_METHODS
+
+    def redraw_target
+      @dsl
+    end
   end
 end

data/lib/shoes/dsl.rb

@@ -74,12 +74,14 @@ require 'shoes/text_block_dimensions'
 
 require 'shoes/color'
 
+require 'shoes/common/attachable'
 require 'shoes/common/background_element'
 require 'shoes/common/changeable'
 require 'shoes/common/clickable'
 require 'shoes/common/fill'
 require 'shoes/common/hover'
 require 'shoes/common/initialization'
+require 'shoes/common/link_finder'
 require 'shoes/common/positioning'
 require 'shoes/common/remove'
 require 'shoes/common/rotate'
@@ -87,6 +89,7 @@ require 'shoes/common/state'
 require 'shoes/common/stroke'
 require 'shoes/common/style'
 require 'shoes/common/style_normalizer'
+require 'shoes/common/translate'
 require 'shoes/common/visibility'
 
 require 'shoes/common/ui_element'
@@ -100,6 +103,7 @@ require 'shoes/input_box'
 # please keep this list tidy and alphabetically sorted
 require 'shoes/animation'
 require 'shoes/arc'
+require 'shoes/arrow'
 require 'shoes/background'
 require 'shoes/border'
 require 'shoes/button'
@@ -128,6 +132,7 @@ require 'shoes/star'
 require 'shoes/sound'
 require 'shoes/text_block'
 require 'shoes/timer'
+require 'shoes/window'
 
 class Shoes
   # Methods for creating and manipulating Shoes elements
@@ -303,6 +308,17 @@ class Shoes
       Shoes::Sound.new @__app__, soundfile, opts, &blk
     end
 
+    # Creates an arrow centered at (left, top)
+    #
+    # @param [Integer] left the x-coordinate of the element center
+    # @param [Integer] top the y-coordinate of the element center
+    # @param [Integer] width width of the arrow
+    # @param [Hash] opts Arrow style options
+    # @option opts [Integer] rotate (false)
+    def arrow(left, top, width, styles = {}, &blk)
+      create Shoes::Arrow, left, top, width, styles, blk
+    end
+
     # Creates an arc at (left, top)
     #
     # @param [Integer] left the x-coordinate of the top-left corner
@@ -351,7 +367,7 @@ class Shoes
     #   @option styles [Integer] height (0) the height
     #   @option styles [Integer] top (0) the y-coordinate of the top-left corner
     #   @option styles [Boolean] center (false) is (left, top) the center of the oval
-    OVAL_ALLOWED_ARG_SIZES = [0, 3, 4]
+    OVAL_ALLOWED_ARG_SIZES = [0, 3, 4].freeze
     def oval(*opts, &blk)
       oval_style = pop_style(opts)
       oval_style = style_normalizer.normalize(oval_style)
@@ -364,7 +380,7 @@ Wrong number of arguments. Must be one of:
   - oval(left, top, width, height, [opts])
   - oval(styles)
 EOS
-      fail ArgumentError, message unless OVAL_ALLOWED_ARG_SIZES.include? opts.size
+      raise ArgumentError, message unless OVAL_ALLOWED_ARG_SIZES.include? opts.size
       create Shoes::Oval, left, top, width, height, oval_style, blk
     end
 
@@ -390,7 +406,7 @@ EOS
     #   @option styles [Integer] height (0) the height
     #   @option styles [Integer] top (0) the y-coordinate of the top-left corner
     #   @option styles [Boolean] center (false) is (left, top) the center of the rectangle?
-    RECT_ALLOWED_ARG_SIZES = [0, 3, 4, 5]
+    RECT_ALLOWED_ARG_SIZES = [0, 3, 4, 5].freeze
     def rect(*args, &blk)
       opts = style_normalizer.normalize pop_style(args)
 
@@ -404,7 +420,7 @@ Wrong number of arguments. Must be one of:
   - rect(left, top, width, height, curve, [opts])
   - rect(styles)
 EOS
-      fail ArgumentError, message unless RECT_ALLOWED_ARG_SIZES.include? args.size
+      raise ArgumentError, message unless RECT_ALLOWED_ARG_SIZES.include? args.size
       create Shoes::Rect, left, top, width, height, style.merge(opts), blk
     end
 
@@ -449,7 +465,7 @@ Wrong number of arguments. Must be one of:
   - star(left, top, points, outer, [styles])
   - star(left, top, points, outer, inner, [styles])
 EOS
-        fail ArgumentError, message
+        raise ArgumentError, message
       end
 
       create Shoes::Star, left, top, points, outer, inner, styles, blk
@@ -469,7 +485,7 @@ EOS
     #   Creates a shape at (0, 0)
     #   @option styles [Integer] left (0) the x-coordinate of the top-left corner
     #   @option styles [Integer] top (0) the y-coordinate of the top-left corner
-    SHAPE_ALLOWED_ARG_SIZES = [0, 2]
+    SHAPE_ALLOWED_ARG_SIZES = [0, 2].freeze
     def shape(*args, &blk)
       opts = style_normalizer.normalize pop_style(args)
       opts[:left], opts[:top] = args if args.length == 2
@@ -480,13 +496,13 @@ Wrong number of arguments. Must be one of:
   - shape(left, top, [opts])
   - shape(styles)
 EOS
-      fail ArgumentError, message unless SHAPE_ALLOWED_ARG_SIZES.include? args.length
+      raise ArgumentError, message unless SHAPE_ALLOWED_ARG_SIZES.include? args.length
       create Shoes::Shape, style.merge(opts), blk
     end
 
     # Define app-level setter methods
-    PATTERN_APP_STYLES = [:fill, :stroke]
-    OTHER_APP_STYLES = [:cap, :rotate, :strokewidth, :transform, :translate]
+    PATTERN_APP_STYLES = [:fill, :stroke].freeze
+    OTHER_APP_STYLES = [:cap, :rotate, :strokewidth, :transform].freeze
 
     PATTERN_APP_STYLES.each do |style|
       define_method style do |val|
@@ -500,6 +516,10 @@ EOS
       end
     end
 
+    def translate(left, top)
+      @__app__.style[:translate] = [left, top]
+    end
+
     def nostroke
       @__app__.style[:stroke] = nil
     end
@@ -524,7 +544,7 @@ EOS
       sub: { rise: -10, size_modifier: 0.8 },
       sup: { rise: 10, size_modifier: 0.8 },
       strong: { weight: true },
-    }
+    }.freeze
 
     TEXT_STYLES.keys.each do |method|
       define_method method do |*texts|
@@ -623,10 +643,10 @@ EOS
     end
 
     def video(*_args)
-      fail Shoes::NotImplementedError,
-           'Sorry video support has been cut from shoes 4!' \
-           ' Check out github issue #113 for any changes/updates or if you' \
-           ' want to help :)'
+      raise Shoes::NotImplementedError,
+            'Sorry video support has been cut from shoes 4!' \
+            ' Check out github issue #113 for any changes/updates or if you' \
+            ' want to help :)'
     end
   end
 end

data/lib/shoes/font.rb

@@ -2,7 +2,7 @@ class Shoes
   FONT_DIR = DIR + "/fonts/"
 
   module Font
-    FONT_TYPES = "{ttf,ttc,otf,fnt,fon,bdf,pcf,snf,mmm,pfb,pfm}"
+    FONT_TYPES = "{ttf,ttc,otf,fnt,fon,bdf,pcf,snf,mmm,pfb,pfm}".freeze
     @loaded_fonts = {}
 
     class << self

data/lib/shoes/gradient.rb

@@ -4,7 +4,8 @@ class Shoes
     include Comparable
 
     def initialize(color1, color2, alpha = Shoes::Color::OPAQUE)
-      @color1, @color2 = color1, color2
+      @color1 = color1
+      @color2 = color2
       @alpha = alpha
     end
 

data/lib/shoes/image.rb

@@ -9,7 +9,7 @@ class Shoes
 
     style_with :art_styles, :common_styles, :dimensions, :file_path
 
-    STYLES = { fill: Shoes::COLORS[:black] }
+    STYLES = { fill: Shoes::COLORS[:black] }.freeze
 
     def before_initialize(styles, file_path_or_data)
       styles[:file_path] = normalized_source(file_path_or_data)
@@ -42,7 +42,7 @@ class Shoes
 
     def absolute_file_path(path)
       path = File.join(Dir.pwd, path) unless Pathname(path).absolute?
-      fail FileNotFoundError, "#{path} not found." unless File.exist?(path)
+      raise FileNotFoundError, "#{path} not found." unless File.exist?(path)
       path
     end
   end

data/lib/shoes/input_box.rb

@@ -38,12 +38,12 @@ class Shoes
 
   class EditBox < InputBox
     style_with :change, :common_styles, :dimensions, :text, :state
-    STYLES = { width: 200, height: 108, text: '' }
+    STYLES = { width: 200, height: 108, text: '' }.freeze
   end
 
   class EditLine < InputBox
     style_with :change, :common_styles, :dimensions, :text, :secret, :state
-    STYLES = { width:  200, height: 28, text: '' }
+    STYLES = { width: 200, height: 28, text: '' }.freeze
 
     def secret?
       secret

data/lib/shoes/internal_app.rb

@@ -14,12 +14,12 @@ class Shoes
     extend Forwardable
 
     DEFAULT_OPTIONS = {
-                        width:     600,
-                        height:    500,
-                        title:     "Shoes 4",
-                        resizable: true,
-                        border:    true
-                      }.freeze
+      width:     600,
+      height:    500,
+      title:     "Shoes 4",
+      resizable: true,
+      border:    true
+    }.freeze
 
     def initialize(app, opts, &blk)
       @app = app
@@ -41,7 +41,7 @@ class Shoes
     end
 
     def ensure_backend_loaded
-      if !defined?(Shoes.configuration.backend::App)
+      unless defined?(Shoes.configuration.backend::App)
         backend_const = Shoes.load_backend(Shoes.configuration.backend_name)
         backend_const.initialize_backend
       end
@@ -100,7 +100,7 @@ class Shoes
 
     def_delegators :gui, *delegated_to_gui
 
-    alias_method :start_as_fullscreen?, :start_as_fullscreen
+    alias start_as_fullscreen? start_as_fullscreen
 
     # Necessary for click/mouse positioning checks
     def hidden?

data/lib/shoes/line.rb

@@ -3,15 +3,16 @@ require 'matrix'
 class Shoes
   class Line
     include Common::UIElement
-    include Common::Stroke
-    include Common::Style
     include Common::Clickable
     include Common::Hover
+    include Common::Stroke
+    include Common::Style
+    include Common::Translate
 
     attr_reader :point_a, :point_b
 
     style_with :angle, :art_styles, :dimensions, :x2, :y2
-    STYLES = { angle: 0, fill: Shoes::COLORS[:black] }
+    STYLES = { angle: 0, fill: Shoes::COLORS[:black] }.freeze
 
     def create_dimensions(point_a, point_b)
       @point_a = point_a
@@ -37,7 +38,7 @@ class Shoes
 
       if left_c_dot_left_right.between?(0, left_right_dot_left_right)
         left_c_dot_left_c = left_c.inner_product(left_c)
-        left_right_dot_left_right * left_c_dot_left_c <= boldness ** 2 * left_right_dot_left_right + left_c_dot_left_right ** 2
+        left_right_dot_left_right * left_c_dot_left_c <= boldness**2 * left_right_dot_left_right + left_c_dot_left_right**2
       else
         false
       end
@@ -64,8 +65,8 @@ class Shoes
       set_point_b(:y, val)
     end
 
-    alias_method :x2=, :right=
-    alias_method :y2=, :bottom=
+    alias x2= right=
+    alias y2= bottom=
 
     def move(x, y, x2 = nil, y2 = nil)
       @point_a.x = x

data/lib/shoes/link.rb

@@ -7,7 +7,7 @@ class Shoes
 
     attr_reader :app, :gui, :blk
     style_with :common_styles, :text_block_styles
-    STYLES = { underline: true, stroke: ::Shoes::COLORS[:blue], fill: nil }
+    STYLES = { underline: true, stroke: ::Shoes::COLORS[:blue], fill: nil }.freeze
 
     def initialize(my_app, texts, styles = {}, blk = nil)
       @app = my_app
@@ -18,11 +18,6 @@ class Shoes
       super texts, @style
     end
 
-    # Force hovering evaluation up in parent where we have actual dimensions
-    def eval_in_parent?
-      true
-    end
-
     # Doesn't use Common::Clickable because of URL flavor option clicks
     def setup_click(blk)
       if blk.nil?
@@ -62,6 +57,10 @@ class Shoes
       text_block_guard && @text_block.visible?
     end
 
+    def links
+      [self]
+    end
+
     private
 
     def text_block_guard

data/lib/shoes/list_box.rb

@@ -31,7 +31,7 @@ class Shoes
     include Common::State
 
     style_with :change, :choose, :common_styles, :dimensions, :items, :state, :text
-    STYLES = { width: 200, height: 20, items: [""] }
+    STYLES = { width: 200, height: 20, items: [""] }.freeze
 
     def handle_block(blk)
       change(&blk) if blk
@@ -64,6 +64,6 @@ class Shoes
       end
     end
 
-    alias_method :choose=, :choose
+    alias choose= choose
   end
 end

data/lib/shoes/logger.rb

@@ -47,7 +47,8 @@ class Shoes
               Shoes::LOG.clear
             end
           end
-          @log, @hash = stack, nil
+          @log = stack
+          @hash = nil
           update
 
           every(0.2) do

data/lib/shoes/mock.rb

@@ -6,6 +6,7 @@ require 'shoes/mock/packager'
 require 'shoes/mock/animation'
 require 'shoes/mock/app'
 require 'shoes/mock/arc'
+require 'shoes/mock/arrow'
 require 'shoes/mock/background'
 require 'shoes/mock/border'
 require 'shoes/mock/button'

data/lib/shoes/mock/arrow.rb

@@ -0,0 +1,15 @@
+class Shoes
+  module Mock
+    class Arrow
+      include Shoes::Mock::CommonMethods
+      include Shoes::Mock::Clickable
+
+      def initialize(dsl, app, _opts = {})
+        @dsl = dsl
+        @app = app
+      end
+
+      attr_reader :dsl, :app
+    end
+  end
+end

data/lib/shoes/mock/rect.rb

@@ -5,7 +5,8 @@ class Shoes
       include Shoes::Mock::Clickable
 
       def initialize(dsl, app, _opts = {})
-        @dsl, @app = dsl, app
+        @dsl = dsl
+        @app = app
       end
 
       attr_reader :dsl, :app

data/lib/shoes/mock/slot.rb

@@ -5,7 +5,11 @@ class Shoes
       include Shoes::Mock::Clickable
 
       def initialize(dsl, parent)
-        @dsl, @parent = dsl, parent
+        @dsl = dsl
+        @parent = parent
+      end
+
+      def remove
       end
 
       attr_reader :dsl

data/lib/shoes/mock/star.rb

@@ -5,7 +5,8 @@ class Shoes
       include Shoes::Mock::Clickable
 
       def initialize(dsl, app)
-        @dsl, @app = dsl, app
+        @dsl = dsl
+        @app = app
       end
 
       attr_reader :dsl, :app