shoes-core 4.0.0.pre6 → 4.0.0.pre7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3a1616fc9ee94998821bae34f5e523b6bb435e8c
-  data.tar.gz: 80be512d070e25a15b46fc9744dd005922bfc1fe
+  metadata.gz: 24b91fee87f3e41db5ff2dfea086583143fa478f
+  data.tar.gz: 90f1c1286744dec7e681972691c6f14abb838573
 SHA512:
-  metadata.gz: 40702d6e8e3ec2dbb2e7e34c98bdcfd37a741010f34d5a5b0c939c0da3c9ec251b7fe38971094cdbc5288cbde912e30fb04273030b752e0c1ceb149f1ee3dff7
-  data.tar.gz: 0dbc92f9dd5a7bd178d998a12456cdca348f8a7b28df320ee6adec3d9fb1d803d157b93302a6c528bbec4a4b14f80c0e4a010300ea2d7e86a6972f3beb1c2092
+  metadata.gz: e34d82bc1902bd05f440d69cc8b56cac7f30be8367edbca11e8870996691307bd402084a09e0c9dbfc33b87abcf9b8d8d24e6c230c8c5392a043e7b882ac537b
+  data.tar.gz: 699dd3055e4bfdbcf0498af1be251f88835d870591e6019e04e9a82bdd9f40c87c2189000fcce042f85f1e873833c57cde925cab0ff49be7df04799bb95baf3c

data/bin/shoes-picker

@@ -5,6 +5,6 @@ $LOAD_PATH << lib_directory
 require 'shoes/ui/picker'
 
 # On Windows getting odd paths with trailing double-quote
-bin_dir = ARGV[0].gsub('"', '')
+bin_dir = ARGV[0].delete('"')
 
 Shoes::UI::Picker.new.run(bin_dir)

data/lib/shoes/app.rb

@@ -66,7 +66,7 @@ class Shoes
       @__app__.quit
     end
 
-    alias_method :close, :quit
+    alias close quit
 
     def parent
       @__app__.current_slot.parent
@@ -80,7 +80,7 @@ class Shoes
 
     def_delegators :@__app__, *delegated_to_internal_app
 
-    alias_method :fullscreen?, :fullscreen
+    alias fullscreen? fullscreen
 
     def eval_with_additional_context(context, &blk)
       @__additional_context__ = context
@@ -107,7 +107,7 @@ class Shoes
       inspect_details
     end
 
-    DELEGATE_BLACKLIST = [:parent, :app]
+    DELEGATE_BLACKLIST = [:parent, :app].freeze
 
     # class definitions are evaluated top to bottom, want to have all of them
     # so define at bottom

data/lib/shoes/arc.rb

@@ -1,21 +1,22 @@
 class Shoes
   class Arc
     include Common::UIElement
+    include Common::Clickable
+    include Common::Hover
     include Common::Fill
     include Common::Stroke
     include Common::Style
-    include Common::Clickable
-    include Common::Hover
+    include Common::Translate
 
     style_with :angle1, :angle2, :art_styles, :center, :common_styles, :dimensions, :radius, :wedge
-    STYLES = { wedge: false }
+    STYLES = { wedge: false }.freeze
 
-    def before_initialize(styles, left, top, width, height, angle1, angle2)
+    def before_initialize(styles, _left, _top, _width, _height, angle1, angle2)
       styles[:angle1] = angle1
       styles[:angle2] = angle2
     end
 
-    def create_dimensions(left, top, width, height, angle1, angle2)
+    def create_dimensions(left, top, width, height, _angle1, _angle2)
       @dimensions = Dimensions.new parent, left, top, width, height, @style
     end
 

data/lib/shoes/arrow.rb

@@ -0,0 +1,31 @@
+class Shoes
+  class Arrow
+    include Common::UIElement
+    include Common::Clickable
+    include Common::Fill
+    include Common::Hover
+    include Common::Stroke
+    include Common::Style
+    include Common::Translate
+
+    style_with :angle, :art_styles, :curve, :common_styles, :dimensions
+    STYLES = { angle: 0, fill: Shoes::COLORS[:black] }.freeze
+
+    def create_dimensions(left, top, width)
+      left   ||= @style[:left] || 0
+      top    ||= @style[:top] || 0
+      width  ||= @style[:width] || 0
+
+      @dimensions = AbsoluteDimensions.new left, top, width, width, @style
+    end
+
+    def needs_rotate?
+      rotate && rotate.nonzero?
+    end
+
+    def width=(*_)
+      super
+      gui.update_position
+    end
+  end
+end

data/lib/shoes/background.rb

@@ -7,7 +7,7 @@ class Shoes
     include Common::Style
 
     style_with :angle, :common_styles, :curve, :dimensions, :fill
-    STYLES = { angle: 0, curve: 0 }
+    STYLES = { angle: 0, curve: 0 }.freeze
 
     def before_initialize(styles, color)
       styles[:fill] = color

data/lib/shoes/border.rb

@@ -7,7 +7,7 @@ class Shoes
     include Common::Style
 
     style_with :angle, :common_styles, :curve, :dimensions, :stroke, :strokewidth
-    STYLES = { angle: 0, curve: 0 }
+    STYLES = { angle: 0, curve: 0 }.freeze
 
     def before_initialize(styles, color)
       styles[:stroke] = color

data/lib/shoes/builtin_methods.rb

@@ -24,7 +24,7 @@ class Shoes
       end
     end
 
-    alias_method :confirm?, :confirm
+    alias confirm? confirm
 
     def ask_open_file
       Shoes::Dialog.new.dialog_chooser 'Open File...'

data/lib/shoes/color.rb

@@ -24,7 +24,7 @@ Must be one of:
   - #{self.class}.new(red, green, blue)
   - #{self.class}.new(red, green, blue, alpha)
 EOS
-        fail ArgumentError, message
+        raise ArgumentError, message
       end
       alpha ||= OPAQUE
       @red = normalize_rgb(red)
@@ -56,7 +56,7 @@ EOS
     end
 
     def black?
-      @red == 0 && @green == 0 && @blue == 0
+      @red.zero? && @green.zero? && @blue.zero?
     end
 
     def <=>(other)
@@ -86,7 +86,7 @@ EOS
     end
 
     def normalize_rgb(value)
-      rgb = value.is_a?(Fixnum) ? value : (255 * value).round
+      rgb = value.is_a?(Integer) ? value : (255 * value).round
       return 255 if rgb > 255
       return 0 if rgb < 0
       rgb

data/lib/shoes/color/dsl_helpers.rb

@@ -14,7 +14,7 @@ class Shoes
           when Shoes::ImagePattern
             arg
           else
-            fail ArgumentError, "Bad pattern: #{arg.inspect}"
+            raise ArgumentError, "Bad pattern: #{arg.inspect}"
           end
         else
           gradient(*args)
@@ -50,16 +50,19 @@ class Shoes
           arg = args[0]
           case arg
           when Gradient
-            min, max = arg.color1, arg.color2
+            min = arg.color1
+            max = arg.color2
           when Range
-            min, max = arg.first, arg.last
+            min = arg.first
+            max = arg.last
           else
-            fail ArgumentError, "Can't make gradient out of #{arg.inspect}"
+            raise ArgumentError, "Can't make gradient out of #{arg.inspect}"
           end
         when 2
-          min, max = args[0], args[1]
+          min = args[0]
+          max = args[1]
         else
-          fail ArgumentError, "Wrong number of arguments (#{args.length} for 1 or 2)"
+          raise ArgumentError, "Wrong number of arguments (#{args.length} for 1 or 2)"
         end
         Shoes::Gradient.new(color(min), color(max))
       end
@@ -68,7 +71,7 @@ class Shoes
         Shoes::Color.new(level, level, level, alpha)
       end
 
-      alias_method :grey, :gray
+      alias grey gray
 
       private
 

data/lib/shoes/color/hex_converter.rb

@@ -2,7 +2,7 @@ class Shoes
   class Color
     class HexConverter
       def initialize(hex)
-        @hex = validate(hex) || fail(ArgumentError, "Bad hex color: #{hex}")
+        @hex = validate(hex) || raise(ArgumentError, "Bad hex color: #{hex}")
         @red, @green, @blue = hex_to_rgb(pad_if_necessary(@hex))
       end
 

data/lib/shoes/common/attachable.rb

@@ -0,0 +1,11 @@
+class Shoes
+  module Common
+    module Attachable
+      def attached_to
+        target = style[:attach]
+        target = @app.top_slot if target == Shoes::Window
+        target
+      end
+    end
+  end
+end

data/lib/shoes/common/background_element.rb

@@ -13,6 +13,14 @@ class Shoes
       def takes_up_space?
         false
       end
+
+      def translate_left
+        0
+      end
+
+      def translate_top
+        0
+      end
     end
   end
 end

data/lib/shoes/common/hover.rb

@@ -23,10 +23,6 @@ class Shoes
         @hovered
       end
 
-      def eval_in_parent?
-        false
-      end
-
       def hover_class
         return @hover_class if @hover_class
 
@@ -40,7 +36,7 @@ class Shoes
         @hovered = true
 
         apply_style_from_hover_class
-        target.eval_hover_block(@hover_blk)
+        eval_hover_block(@hover_blk)
       end
 
       def mouse_left
@@ -49,37 +45,31 @@ class Shoes
         @hovered = false
 
         apply_style_from_pre_hover
-        target.eval_hover_block(@leave_blk)
+        eval_hover_block(@leave_blk)
       end
 
       def add_mouse_hover_control
         app.add_mouse_hover_control(self)
       end
 
-      def target
-        target = self
-        target = parent if eval_in_parent?
-        target
-      end
-
       def eval_hover_block(blk)
         blk.call(self) if blk
       end
 
       def apply_style_from_hover_class
-        hover_style = @app.element_styles[self.hover_class]
+        hover_style = @app.element_styles[hover_class]
         return unless hover_style
 
-        @pre_hover_style = hover_style.inject({}) do |memo, (key, _)|
-          memo[key] = self.style[key]
+        @pre_hover_style = hover_style.each_with_object({}) do |(key, _), memo|
+          memo[key] = style[key]
           memo
         end
 
-        self.style(hover_style)
+        style(hover_style)
       end
 
       def apply_style_from_pre_hover
-        self.style(@pre_hover_style) if @pre_hover_style
+        style(@pre_hover_style) if @pre_hover_style
         @pre_hover_style = nil
       end
     end

data/lib/shoes/common/link_finder.rb

@@ -0,0 +1,12 @@
+class Shoes
+  module Common
+    module LinkFinder
+      def find_links(texts)
+        texts.to_a
+             .select { |text| text.respond_to?(:links) }
+             .map(&:links)
+             .flatten
+      end
+    end
+  end
+end

data/lib/shoes/common/positioning.rb

@@ -17,7 +17,7 @@ class Shoes
         gui.update_position if gui && gui.respond_to?(:update_position)
       end
 
-      # displace(left: a number, top: a number) » self
+      # displace(left: a number, top: a number) >> self
       # Displacing an element moves it.  But without changing the layout around it.
       def displace(left, top)
         self.displace_left = left

data/lib/shoes/common/state.rb

@@ -1,7 +1,7 @@
 class Shoes
   module Common
     module State
-      DISABLED_STATE = "disabled"
+      DISABLED_STATE = "disabled".freeze
 
       def after_initialize(*_)
         super

data/lib/shoes/common/style.rb

@@ -23,7 +23,7 @@ class Shoes
                                :justify, :kerning, :leading, :rise, :size, :stretch,
                                :strikecolor, :strikethrough, :stroke, :undercolor,
                                :underline, :weight, :wrap],
-      }
+      }.freeze
 
       # Adds styles, or just returns current style if no argument
       def style(new_styles = nil)
@@ -85,7 +85,7 @@ class Shoes
 
         def define_reader_methods
           needs_readers = @supported_styles.reject do |style|
-            self.method_defined?(style)
+            method_defined?(style)
           end
 
           needs_readers.map(&:to_sym).each do |style|
@@ -97,7 +97,7 @@ class Shoes
 
         def define_writer_methods
           needs_writers = @supported_styles.reject do |style|
-            self.method_defined?("#{style}=")
+            method_defined?("#{style}=")
           end
 
           needs_writers.map(&:to_sym).each do |style_key|
@@ -126,6 +126,7 @@ class Shoes
         set_visibility(new_styles)
         set_coloring(new_styles)
         set_hovers(new_styles)
+        set_translate(new_styles)
         click(&new_styles[:click]) if new_styles.key?(:click)
         @style.merge! normalized_style
       end
@@ -153,9 +154,13 @@ class Shoes
         leave(&new_styles[:leave]) if new_styles.include?(:leave)
       end
 
+      def set_translate(new_styles)
+        clear_translate if new_styles.include?(:translate)
+      end
+
       def update_dimensions # so that @style hash matches actual values
         STYLE_GROUPS[:dimensions].each do |style|
-          if self.respond_to?(style)
+          if respond_to?(style)
             value = send(style)
             @style[style] = value if value
           end

data/lib/shoes/common/translate.rb

@@ -0,0 +1,24 @@
+class Shoes
+  module Common
+    module Translate
+      def translate_left
+        @translate_left ||= begin
+                              left, _ = translate
+                              left || 0
+                            end
+      end
+
+      def translate_top
+        @translate_top ||= begin
+                             _, top = translate
+                             top || 0
+                           end
+      end
+
+      def clear_translate
+        @translate_left = nil
+        @translate_top = nil
+      end
+    end
+  end
+end

data/lib/shoes/common/ui_element.rb

@@ -1,6 +1,7 @@
 class Shoes
   module Common
     module UIElement
+      include Common::Attachable
       include Common::Initialization
       include Common::Inspect
       include Common::Visibility

data/lib/shoes/common/visibility.rb

@@ -11,7 +11,7 @@ class Shoes
         style[:hidden]
       end
 
-      alias_method :hidden, :hidden?
+      alias hidden hidden?
 
       def visible?
         !hidden?

data/lib/shoes/configuration.rb

@@ -32,7 +32,7 @@ class Shoes
         return if @backend_name == name
 
         unless @backend.nil?
-          fail "Can't switch backend to Shoes::#{name.capitalize}, Shoes::#{backend_name.capitalize} backend already loaded."
+          raise "Can't switch backend to Shoes::#{name.capitalize}, Shoes::#{backend_name.capitalize} backend already loaded."
         end
         @backend_name ||= name
       end
@@ -48,7 +48,7 @@ class Shoes
         class_name = klazz.name.split("::").last
         # Lookup with false to not consult modules higher in the chain Object
         # because Shoes::Swt.const_defined? 'Range' => true
-        fail ArgumentError, "#{object} does not have a backend class defined for #{backend}" unless backend.const_defined?(class_name, false)
+        raise ArgumentError, "#{object} does not have a backend class defined for #{backend}" unless backend.const_defined?(class_name, false)
         backend.const_get(class_name, false)
       end