shoes-core 4.0.0.pre6 → 4.0.0.pre7

data/lib/shoes/oval.rb

@@ -1,14 +1,15 @@
 class Shoes
   class Oval
     include Common::UIElement
+    include Common::Clickable
     include Common::Fill
+    include Common::Hover
     include Common::Stroke
     include Common::Style
-    include Common::Clickable
-    include Common::Hover
+    include Common::Translate
 
     style_with :art_styles, :center, :common_styles, :dimensions, :radius
-    STYLES = { fill: Shoes::COLORS[:black] }
+    STYLES = { fill: Shoes::COLORS[:black] }.freeze
 
     def create_dimensions(left, top, width, height)
       left   ||= @style[:left]
@@ -20,7 +21,7 @@ class Shoes
     end
 
     def needs_rotate?
-      rotate != 0
+      rotate && rotate.nonzero?
     end
   end
 end

data/lib/shoes/point.rb

@@ -3,7 +3,8 @@ class Shoes
     include Common::Inspect
 
     def initialize(x, y)
-      @x, @y = x, y
+      @x = x
+      @y = y
       @dimensions = 2
     end
 

data/lib/shoes/progress.rb

@@ -4,7 +4,7 @@ class Shoes
     include Common::Style
 
     style_with :common_styles, :dimensions, :fraction
-    STYLES = { fraction: 0.0 }
+    STYLES = { fraction: 0.0 }.freeze
 
     def after_initialize(*_)
       @gui.fraction = @style[:fraction]

data/lib/shoes/rect.rb

@@ -6,9 +6,10 @@ class Shoes
     include Common::Clickable
     include Common::Hover
     include Common::Style
+    include Common::Translate
 
     style_with :angle, :art_styles, :curve, :common_styles, :dimensions
-    STYLES = { angle: 0, curve: 0, fill: Shoes::COLORS[:black] }
+    STYLES = { angle: 0, curve: 0, fill: Shoes::COLORS[:black] }.freeze
 
     def create_dimensions(left, top, width, height)
       left   ||= @style[:left] || 0
@@ -20,7 +21,7 @@ class Shoes
     end
 
     def needs_rotate?
-      rotate != 0
+      rotate && rotate.nonzero?
     end
   end
 end

data/lib/shoes/shape.rb

@@ -1,18 +1,19 @@
 class Shoes
   class Shape
     include Common::UIElement
+    include Common::Clickable
     include Common::Fill
     include Common::Stroke
     include Common::Style
-    include Common::Clickable
+    include Common::Translate
 
     attr_reader :blk, :x, :y, :left_bound, :top_bound, :right_bound, :bottom_bound
 
     style_with :art_styles, :center, :common_styles, :dimensions
 
-    STYLES = { fill: Shoes::COLORS[:black] }
+    STYLES = { fill: Shoes::COLORS[:black] }.freeze
 
-    def create_dimensions()
+    def create_dimensions
       @dimensions = AbsoluteDimensions.new @style
     end
 
@@ -62,7 +63,8 @@ class Shoes
     # @return [Shoes::Shape] This shape
     def line_to(x, y)
       update_bounds_rect(@x, @y, x, y)
-      @x, @y = x, y
+      @x = x
+      @y = y
       @gui.line_to(x, y)
       self
     end
@@ -73,7 +75,8 @@ class Shoes
     # @param [Integer] y The new point's y-value
     # @return [Shoes::Shape] self This shape
     def move_to(x, y)
-      @x, @y = x, y
+      @x = x
+      @y = y
       @gui.move_to(x, y)
       self
     end
@@ -89,7 +92,8 @@ class Shoes
     # @return [Shoes::Shape] This shape
     def curve_to(cx1, cy1, cx2, cy2, x, y)
       update_bounds([@x, cx1, cx2, x], [@y, cy1, cy2, y])
-      @x, @y = x, y
+      @x = x
+      @y = y
       @gui.curve_to(cx1, cy1, cx2, cy2, x, y)
       self
     end
@@ -105,7 +109,8 @@ class Shoes
     # @return [Shoes::Shape] This shape
     def arc_to(x, y, width, height, start_angle, arc_angle)
       update_bounds_rect(x - width / 2, y - height / 2, x + width / 2, y + height / 2)
-      @x, @y = x, y
+      @x = x
+      @y = y
       @gui.arc_to(x, y, width, height, start_angle, arc_angle)
       self
     end
@@ -114,8 +119,8 @@ class Shoes
     # many possibilities of what a shape could contain, this just checks the
     # outer bounding box of the shape, nothing more sophisticated.
     def in_bounds?(x, y)
-      (@left_bound..@right_bound).include?(x) &&
-        (@top_bound..@bottom_bound).include?(y)
+      (@left_bound..@right_bound).cover?(x) &&
+        (@top_bound..@bottom_bound).cover?(y)
     end
 
     private

data/lib/shoes/slot.rb

@@ -13,12 +13,12 @@ class Shoes
     attr_reader :parent, :dimensions, :gui, :contents, :blk
 
     style_with :art_styles, :attach, :common_styles, :dimensions, :scroll
-    STYLES = { scroll: false, fill: Shoes::COLORS[:black] }
+    STYLES = { scroll: false, fill: Shoes::COLORS[:black] }.freeze
 
     def create_dimensions(*args)
       super(*args)
 
-      @fixed_height = height || false
+      @fixed_height = !height.nil?
       @scroll_top   = 0
       set_default_dimension_values
       @pass_coordinates = true
@@ -29,9 +29,9 @@ class Shoes
     end
 
     def handle_block(blk)
-      @current_position = CurrentPosition.new element_left,
-                                              element_top,
-                                              element_top
+      @current_position = Position.new element_left,
+                                       element_top,
+                                       element_top
       @blk = blk
       eval_block blk
     end
@@ -48,6 +48,11 @@ class Shoes
       eval_block blk
     end
 
+    def remove
+      clear
+      super
+    end
+
     def eval_block(blk, *args)
       old_current_slot = @app.current_slot
       @app.current_slot = self
@@ -153,7 +158,7 @@ class Shoes
     end
 
     def fixed_height?
-      !!@fixed_height
+      @fixed_height
     end
 
     def variable_height?
@@ -162,12 +167,12 @@ class Shoes
 
     protected
 
-    CurrentPosition = Struct.new(:x, :y, :next_line_start)
+    Position = Struct.new(:x, :y, :next_line_start)
 
     def position_contents
-      @current_position = CurrentPosition.new element_left,
-                                              element_top,
-                                              element_top
+      @current_position = Position.new element_left,
+                                       element_top,
+                                       element_top
 
       contents.each do |element|
         next if element.hidden?
@@ -178,15 +183,16 @@ class Shoes
 
     def positioning(element, current_position)
       if element.needs_positioning?
-        position_element element, current_position
-        element.contents_alignment(current_position) if element.respond_to? :contents_alignment
-      end
+        align_position = if element.attached_to
+                           position_attached_element(element)
+                         else
+                           position_slotted_element(element, current_position)
+                         end
 
-      if element.takes_up_space?
-        update_current_position(current_position, element)
-      else
-        current_position
+        element.contents_alignment(align_position) if element.respond_to?(:contents_alignment)
       end
+
+      update_current_position(current_position, element)
     rescue => e
       puts "SWALLOWED POSITIONING EXCEPTION ON #{element} - go take care of it: " + e.to_s
       puts e.backtrace.join("\n\t")
@@ -197,7 +203,21 @@ class Shoes
     end
 
     def position_element(_element, _current_position)
-      fail 'position_element is a subclass responsibility'
+      raise 'position_element is a subclass responsibility'
+    end
+
+    def position_attached_element(element)
+      attached_left = element.attached_to.absolute_left + element.style[:left].to_i
+      attached_top  = element.attached_to.absolute_top + element.style[:top].to_i
+
+      position_element_at element, attached_left, attached_top
+
+      Position.new attached_left, attached_top, attached_top
+    end
+
+    def position_slotted_element(element, current_position)
+      position_element element, current_position
+      current_position
     end
 
     def position_in_current_line(element, current_position)
@@ -221,14 +241,23 @@ class Shoes
       element.absolute_left == x && element.absolute_top == y
     end
 
+    def should_update_current_position?(element)
+      !element.attached_to &&
+        !element.absolutely_positioned? &&
+        element.takes_up_space?
+    end
+
     def update_current_position(current_position, element)
-      return current_position if element.absolutely_positioned?
+      return current_position unless should_update_current_position?(element)
+
       current_position.x = element.absolute_right + NEXT_ELEMENT_OFFSET
       current_position.y = element.absolute_top
       next_element_line_start = next_line_start_from element
+
       if current_position.next_line_start < next_element_line_start
         current_position.next_line_start = next_element_line_start
       end
+
       element.adjust_current_position current_position
       current_position
     end
@@ -284,14 +313,14 @@ class Shoes
     end
 
     def compute_content_height
-      max_bottom = contents.
-                   select(&:takes_up_space?).
-                   reject(&:hidden?).
-                   map(&:absolute_bottom).
-                   max
+      max_bottom = contents
+                   .select(&:takes_up_space?)
+                   .reject(&:hidden?)
+                   .map(&:absolute_bottom)
+                   .max
 
       if max_bottom
-        max_bottom - self.element_top + NEXT_ELEMENT_OFFSET
+        max_bottom - element_top + NEXT_ELEMENT_OFFSET
       else
         0
       end

data/lib/shoes/slot_contents.rb

@@ -31,9 +31,7 @@ class Shoes
     def clear
       # reverse_each is important as otherwise we always miss to delete one
       # element
-      @contents.reverse_each do |element|
-        element.is_a?(Shoes::Slot) ? element.clear : element.remove
-      end
+      @contents.reverse_each(&:remove)
       @contents.clear
     end
 

data/lib/shoes/star.rb

@@ -1,14 +1,15 @@
 class Shoes
   class Star
     include Common::UIElement
+    include Common::Clickable
     include Common::Fill
+    include Common::Hover
     include Common::Stroke
     include Common::Style
-    include Common::Clickable
-    include Common::Hover
+    include Common::Translate
 
     style_with :angle, :art_styles, :common_styles, :dimensions, :inner, :outer, :points
-    STYLES = { angle: 0, fill: Shoes::COLORS[:black] }
+    STYLES = { angle: 0, fill: Shoes::COLORS[:black] }.freeze
 
     def create_dimensions(left, top, points, outer, inner)
       # Don't use param defaults as DSL explicit passes nil for missing params

data/lib/shoes/text.rb

@@ -1,6 +1,7 @@
 class Shoes
   class Text
     include Common::Inspect
+    include Common::LinkFinder
 
     attr_reader :to_s, :texts, :color
     attr_accessor :parent, :text_block
@@ -17,6 +18,10 @@ class Shoes
       parent && parent.app
     end
 
+    def links
+      find_links(@texts)
+    end
+
     private
 
     def inspect_details

data/lib/shoes/text_block.rb

@@ -1,19 +1,21 @@
 class Shoes
   CENTER = "center".freeze
-  DEFAULT_TEXTBLOCK_FONT = "Arial"
+  DEFAULT_TEXTBLOCK_FONT = "Arial".freeze
 
   class TextBlock
     include Common::UIElement
-    include Common::Style
     include Common::Clickable
     include Common::Hover
+    include Common::LinkFinder
+    include Common::Style
+    include Common::Translate
     include TextBlockDimensionsDelegations
 
     attr_reader :text, :contents, :text_styles
     attr_accessor :cursor, :textcursor
 
-    style_with :common_styles, :dimensions, :text_block_styles
-    STYLES = { font: DEFAULT_TEXTBLOCK_FONT } # used in TextBlock specs only
+    style_with :common_styles, :dimensions, :text_block_styles, :translate
+    STYLES = { font: DEFAULT_TEXTBLOCK_FONT }.freeze # used in TextBlock specs only
 
     def create_dimensions(*_)
       @dimensions = TextBlockDimensions.new @parent, @style
@@ -89,9 +91,7 @@ class Shoes
     end
 
     def links
-      contents.to_a.select do |element|
-        element.is_a?(Shoes::Link)
-      end
+      find_links(contents)
     end
 
     private
@@ -111,7 +111,7 @@ class Shoes
                     start_point..end_point
                   end
 
-          styles[range]    ||= []
+          styles[range] ||= []
           styles[range] << text
           gather_text_styles(text, text.texts, styles, start_point)
         end
@@ -132,7 +132,7 @@ class Shoes
                         .split(',').map { |x| x.strip.gsub(/["]/, '') }
 
       @style[:font] = font_family.first unless (font_family.size == 1 &&
-        font_family[0] == "") || font_family.size == 0
+        font_family[0] == "") || font_family.empty?
 
       fsize = size_regex.match(type)
       @style[:size] = fsize[1].to_i unless fsize.nil?

data/lib/shoes/ui/picker.rb

@@ -20,7 +20,7 @@ class Shoes
         return unless File.exist?("Gemfile")
 
         # Only need bundler/setup to get our paths right--we don't need to
-        # actually require the gems, since we find the generate-backend.rb's
+        # actually require the gems, since we find the generate_backend.rb's
         # and just require them directly.
         require 'bundler/setup'
       end
@@ -29,7 +29,7 @@ class Shoes
         candidates = find_candidates(desired_backend)
 
         if candidates.empty?
-          raise ArgumentError.new("No gems found matching '#{desired_backend}'")
+          raise ArgumentError, "No gems found matching '#{desired_backend}'"
         elsif candidates.one?
           candidate = candidates.first
           @output.puts "Selecting #{name_for_candidate(candidate)} backend to use. This is a one-time operation."
@@ -42,7 +42,7 @@ class Shoes
       end
 
       def find_candidates(desired_backend)
-        search_string = "shoes/**/#{desired_backend}/generate-backend.rb"
+        search_string = "shoes/**/#{desired_backend}/generate_backend.rb"
         search_string.gsub!("//", "/")
         Gem.find_files(search_string)
       end
@@ -74,8 +74,8 @@ class Shoes
       end
 
       def name_for_candidate(candidate)
-        /.*lib\/shoes\/(.*)\/generate-backend.rb/ =~ candidate
-        return "shoes-#{$1.tr('/', '-')}"
+        match = %r{.*lib\/shoes\/(.*)\/generate_backend.rb}.match(candidate)[1]
+        "shoes-#{match.tr('/', '-')}"
       end
 
       def write_backend(generator_file, bin_dir)

data/lib/shoes/version.rb

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