shoes-core 4.0.0.pre3 → 4.0.0.pre4

data/lib/shoes/core/version.rb

@@ -1,5 +1,5 @@
 class Shoes
   module Core
-    VERSION = "4.0.0.pre3"
+    VERSION = "4.0.0.pre4"
   end
 end

data/lib/shoes/dialog.rb

@@ -12,8 +12,8 @@ class Shoes
       @gui.confirm msg
     end
 
-    def dialog_chooser(title, folder = false)
-      @gui.dialog_chooser title, folder
+    def dialog_chooser(title, folder = false, style = :open)
+      @gui.dialog_chooser title, folder, style
     end
 
     def ask(msg, args)

data/lib/shoes/dimension.rb

@@ -16,6 +16,7 @@ class Shoes
     def initialize(parent = nil, start_as_center = false)
       @parent          = parent
       @start_as_center = start_as_center
+      @combined_margins = 0
     end
 
     def start
@@ -31,15 +32,19 @@ class Shoes
     def extent
       result = @extent
       if @parent
-        result = calculate_relative(result) if is_relative?(result)
-        result = calculate_negative(result) if is_negative?(result)
+        result = calculate_relative(result) if @extent_relative
+        result = calculate_negative(result) if @extent_negative
       end
       result
     end
 
     def extent=(value)
       @extent = value
-      @extent = parse_from_string @extent if is_string? @extent
+      @extent = parse_from_string @extent if string? @extent
+
+      @extent_relative = relative?(@extent)
+      @extent_negative = negative?(@extent)
+
       @extent
     end
 
@@ -53,7 +58,7 @@ class Shoes
       if my_extent.nil?
         nil
       else
-        extent - (margin_start + margin_end)
+        my_extent - @combined_margins
       end
     end
 
@@ -100,35 +105,64 @@ class Shoes
     # getter... reason being that for ParentDimensions we need to be able to
     # figure out if a value has been modified or if we should consult the
     # parent value - see ParentDimension implementation
-    [:margin_start, :margin_end, :displace_start].each do |method|
-      define_method method do
-        instance_variable_name = '@' + method.to_s
-        value = instance_variable_get(instance_variable_name) || 0
-        value = calculate_relative value if is_relative? value
-        value
-      end
+    def margin_start
+      value_factoring_in_relative(@margin_start, @margin_start_relative)
     end
 
-    def self.define_int_parsing_writer(name)
-      define_method "#{name}=" do |value|
-        instance_variable_set("@#{name}", parse_int_value(value))
-      end
+    def margin_end
+      value_factoring_in_relative(@margin_end, @margin_end_relative)
+    end
+
+    def displace_start
+      value_factoring_in_relative(@displace_start, @displace_start_relative)
     end
 
-    %w(start end margin_start margin_end displace_start).each do |method|
-      define_int_parsing_writer method
+    def value_factoring_in_relative(value, relative)
+      value ||= 0
+      value = calculate_relative value if relative
+      value
+    end
+
+    def start=(value)
+      @start_relative = relative?(value)
+      @start = parse_int_value(value)
+    end
+
+    def end=(value)
+      @end = parse_int_value(value)
+    end
+
+    def margin_start=(value)
+      @margin_start_relative = relative?(value)
+      @margin_start = parse_int_value(value)
+
+      @combined_margins = margin_start + margin_end
+      @margin_start
+    end
+
+    def margin_end=(value)
+      @margin_end_relative = relative?(value)
+      @margin_end = parse_int_value(value)
+
+      @combined_margins = margin_start + margin_end
+      @margin_end
+    end
+
+    def displace_start=(value)
+      @displace_start_relative = relative?(value)
+      @displace_start = parse_int_value(value)
     end
 
     private
 
     def basic_start_value
       value = @start
-      value = calculate_relative value if is_relative?(value)
+      value = calculate_relative value if @start_relative
       value = report_relative_to_parent_start if value.nil?
       value
     end
 
-    def is_relative?(result)
+    def relative?(result)
       # as the value is relative to the parent values bigger than one don't
       # make much sense and are problematic. E.g. through calculations users
       # might end up with values like 5.14 meaning 5 pixel which would get
@@ -142,11 +176,11 @@ class Shoes
       (result * @parent.element_extent).to_i
     end
 
-    def is_string?(result)
+    def string?(result)
       result.is_a?(String)
     end
 
-    def is_negative?(result)
+    def negative?(result)
       result && result < 0
     end
 
@@ -158,23 +192,13 @@ class Shoes
 
     def parse_from_string(result)
       match = result.gsub(/\s+/, "").match(PERCENT_REGEX)
-      if match
-        match[1].to_f / 100.0
-      elsif valid_integer_string?(result)
-        int_from_string(result)
-      else
-        nil
-      end
+      return match[1].to_f / 100.0 if match
+      int_from_string(result) if valid_integer_string?(result)
     end
 
     def parse_int_value(input)
-      if input.is_a?(Integer) || input.is_a?(Float)
-        input
-      elsif valid_integer_string?(input)
-        int_from_string(input)
-      else
-        nil
-      end
+      return input if input.is_a?(Integer) || input.is_a?(Float)
+      int_from_string(input) if valid_integer_string?(input)
     end
 
     def int_from_string(result)
@@ -188,19 +212,19 @@ class Shoes
     end
 
     def report_relative_to_parent_start
-      if element_start && parent && parent.element_start
-        element_start - parent.element_start
-      else
-        nil
-      end
+      element_start - parent.element_start if start_exists?
     end
 
     def report_relative_to_parent_end
-      if element_end && parent && parent.element_end
-        parent.element_end - element_end
-      else
-        nil
-      end
+      parent.element_end - element_end if end_exists?
+    end
+
+    def end_exists?
+      element_end && parent && parent.element_end
+    end
+
+    def start_exists?
+      element_start && parent && parent.element_start
     end
 
     def start_as_center?
@@ -208,26 +232,17 @@ class Shoes
     end
 
     def adjust_start_for_center(value)
-      my_extent = extent
-      if my_extent && my_extent > 0
-        value - my_extent / 2
-      else
-        nil
-      end
+      value - extent / 2 if extent && extent > 0
     end
   end
 
   class ParentDimension < Dimension
-    SIMPLE_DELEGATE_METHODS = [:absolute_start, :start]
-
-    SIMPLE_DELEGATE_METHODS.each do |method|
-      define_method method do
-        if value_modified? method
-          super
-        else
-          parent.public_send(method)
-        end
-      end
+    def absolute_start
+      @absolute_start ? super : parent.absolute_start
+    end
+
+    def start
+      @start ? super : parent.start
     end
 
     def extent
@@ -248,11 +263,11 @@ class Shoes
         #
         # To get our extent respecting the parent's margins, it's our absolute
         # start, minus parent's element end (so we don't blow past the margin)
-        extent_in_parent = parent.element_end - self.absolute_start - PIXEL_COUNTING_ADJUSTMENT
+        parent.element_end - absolute_start - PIXEL_COUNTING_ADJUSTMENT
       else
         # If we hit this, then the extent in parent isn't available and will be
         # ignored by the min call below
-        extent_in_parent = Float::INFINITY
+        Float::INFINITY
       end
     end
 
@@ -260,10 +275,5 @@ class Shoes
     def raw_extent(original_value)
       original_value || parent.extent
     end
-
-    def value_modified?(method)
-      instance_variable = ('@' + method.to_s).to_sym
-      instance_variable_get(instance_variable)
-    end
   end
 end

data/lib/shoes/dimensions.rb

@@ -95,14 +95,6 @@ class Shoes
       true
     end
 
-    def inspect
-      nothing = '_'
-      super.insert(-2,
-                   " relative:#{Point.new left, top}->#{Point.new right, bottom}" \
-                   " absolute:#{Point.new absolute_left, absolute_top}->#{Point.new absolute_right, absolute_bottom}" \
-                   " #{width || nothing}x#{height || nothing}")
-    end
-
     def self.setup_delegations
       methods_to_rename = Dimension.public_instance_methods false
       renamed_delegate_to :x_dimension, methods_to_rename, 'start'  => 'left',
@@ -117,6 +109,13 @@ class Shoes
 
     private
 
+    def inspect_details
+      nothing = '_'
+      " relative:#{Point.new left, top}->#{Point.new right, bottom}" \
+        " absolute:#{Point.new absolute_left, absolute_top}->#{Point.new absolute_right, absolute_bottom}" \
+        " #{width || nothing}x#{height || nothing}"
+    end
+
     def hash_as_argument?(left)
       left.respond_to? :fetch
     end
@@ -185,10 +184,23 @@ class Shoes
     extend Forwardable
 
     UNDELEGATED_METHODS = [:to_s]
-    DELEGATED_METHODS = Dimensions.public_instance_methods(false) - UNDELEGATED_METHODS
+    CANDIDATE_METHODS = Dimensions.public_instance_methods(false) - UNDELEGATED_METHODS
+
+    WRITER_METHODS    = CANDIDATE_METHODS.select { |meth| meth.to_s.end_with?("=") }
+    DELEGATED_METHODS = CANDIDATE_METHODS - WRITER_METHODS
 
     def_delegators :dimensions, *DELEGATED_METHODS
 
+    # For performance reasons, it's critical to write out dimension values to
+    # the styles hash directly when they change, so do that here.
+    WRITER_METHODS.each do |meth|
+      key = meth.to_s.sub("=", "").to_sym
+      define_method(meth) do |value|
+        @style[key] = value if @style
+        self.dimensions.send(meth, value)
+      end
+    end
+
     def adjust_current_position(*_)
       # no-op by default for almost all elements
     end
@@ -198,6 +210,6 @@ class Shoes
   module BackendDimensionsDelegations
     extend Forwardable
 
-    def_delegators :dsl, *DimensionsDelegations::DELEGATED_METHODS
+    def_delegators :dsl, *DimensionsDelegations::CANDIDATE_METHODS
   end
 end

data/lib/shoes/download.rb

@@ -31,6 +31,7 @@ class Shoes
       @blk = slot.create_bound_block(blk)
       @progress_blk = slot.create_bound_block(@opts[:progress])
       @finish_blk = slot.create_bound_block(@opts[:finish])
+      @error_blk = slot.create_bound_block(@opts[:error] || default_error_proc)
     end
 
     def start
@@ -51,6 +52,7 @@ class Shoes
     end
 
     def percent
+      return 0 if @transferred.nil? || @content_length.nil?
       @transferred * 100 / @content_length
     end
 
@@ -68,20 +70,34 @@ class Shoes
     def start_download
       require 'open-uri'
       @thread = Thread.new do
-        uri_opts = {}
-        uri_opts[:content_length_proc] = content_length_proc
-        uri_opts[:progress_proc] = progress_proc if @progress_blk
-
-        open @url, uri_opts do |download_data|
-          @response.body = download_data.read
-          @response.status = download_data.status
-          @response.headers = download_data.meta
-          save_to_file(@opts[:save]) if @opts[:save]
-          finish_download download_data
+        begin
+          uri_opts = {}
+          uri_opts[:content_length_proc] = content_length_proc
+          uri_opts[:progress_proc] = progress_proc if @progress_blk
+
+          open @url, uri_opts do |download_data|
+            @response.body = download_data.read
+            @response.status = download_data.status
+            @response.headers = download_data.meta
+            save_to_file(@opts[:save]) if @opts[:save]
+            finish_download download_data
+          end
+        rescue SocketError => e
+          Shoes.logger.error e
+        rescue => e
+          eval_block(@error_blk, e)
         end
       end
     end
 
+    def default_error_proc
+      lambda do |exception|
+        Shoes.logger.error "Failure downloading #{@url}. To handle this yourself, pass `:error` option to the download call."
+        Shoes.logger.error exception.message
+        Shoes.logger.error exception.backtrace.join("\n\t")
+      end
+    end
+
     def content_length_proc
       lambda do |content_length|
         download_started(content_length)

data/lib/shoes/dsl.rb

@@ -77,9 +77,13 @@ require 'shoes/color'
 require 'shoes/common/background_element'
 require 'shoes/common/changeable'
 require 'shoes/common/clickable'
+require 'shoes/common/fill'
+require 'shoes/common/initialization'
 require 'shoes/common/positioning'
 require 'shoes/common/remove'
+require 'shoes/common/rotate'
 require 'shoes/common/state'
+require 'shoes/common/stroke'
 require 'shoes/common/style'
 require 'shoes/common/style_normalizer'
 require 'shoes/common/visibility'
@@ -245,7 +249,7 @@ class Shoes
       create Shoes::Stack, opts, blk
     end
 
-    def button(text = 'Button', opts = {}, &blk)
+    def button(text = nil, opts = {}, &blk)
       create Shoes::Button, text, opts, blk
     end
 
@@ -347,30 +351,20 @@ 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]
     def oval(*opts, &blk)
       oval_style = pop_style(opts)
       oval_style = style_normalizer.normalize(oval_style)
-      case opts.length
-        when 3
-          left, top, width = opts
-          height = width
-        when 4
-          left, top, width, height = opts
-        when 0
-          left = oval_style[:left] || 0
-          top = oval_style[:top] || 0
-          width = oval_style[:diameter] || oval_style[:width] ||
-                  (oval_style[:radius] || 0) * 2
-          height = oval_style[:height] || width
-        else
-          message = <<EOS
+
+      left, top, width, height = opts
+
+      message = <<EOS
 Wrong number of arguments. Must be one of:
   - oval(left, top, diameter, [opts])
   - oval(left, top, width, height, [opts])
   - oval(styles)
 EOS
-          fail ArgumentError, message
-      end
+      fail ArgumentError, message unless OVAL_ALLOWED_ARG_SIZES.include? opts.size
       create Shoes::Oval, left, top, width, height, oval_style, blk
     end
 
@@ -396,58 +390,45 @@ 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]
     def rect(*args, &blk)
       opts = style_normalizer.normalize pop_style(args)
-      case args.length
-      when 3
-        left, top, width = args
-        height = width
-        opts[:curve] ||= 0
-      when 4
-        left, top, width, height = args
-        opts[:curve] ||= 0
-      when 5
-        left, top, width, height, opts[:curve] = args
-      when 0
-        left = opts[:left] || 0
-        top = opts[:top] || 0
-        width = opts[:width] || 0
-        height = opts[:height] || width
-        opts[:curve] ||= 0
-      else
-        message = <<EOS
+
+      left, top, width, height, curve = args
+      opts[:curve] = curve if curve
+
+      message = <<EOS
 Wrong number of arguments. Must be one of:
   - rect(left, top, side, [opts])
   - rect(left, top, width, height, [opts])
   - rect(left, top, width, height, curve, [opts])
   - rect(styles)
 EOS
-        fail ArgumentError, message
-      end
+      fail ArgumentError, message unless RECT_ALLOWED_ARG_SIZES.include? args.size
       create Shoes::Rect, left, top, width, height, style.merge(opts), blk
     end
 
     # Creates a new Shoes::Star object
     #
-    # @overload shape(left, top, styles, &block)
+    # @overload star(left, top, styles, &block)
     #   Creates a star at (left, top) with the given style
     #   @param [Integer] left the x-coordinate of the top-left corner
     #   @param [Integer] top the y-coordinate of the top-left corner
     #   @param [Hash] styles optional, additional styling for the element
-    # @overload shape(left, top, points, styles, &block)
+    # @overload star(left, top, points, styles, &block)
     #   Creates a star at (left, top) with the given style
     #   @param [Integer] left the x-coordinate of the top-left corner
     #   @param [Integer] top the y-coordinate of the top-left corner
     #   @param [Integer] points count of points on the star
     #   @param [Hash] styles optional, additional styling for the element
-    # @overload shape(left, top, points, outer, styles, &block)
+    # @overload star(left, top, points, outer, styles, &block)
     #   Creates a star at (left, top) with the given style
     #   @param [Integer] left the x-coordinate of the top-left corner
     #   @param [Integer] top the y-coordinate of the top-left corner
     #   @param [Integer] points count of points on the star
     #   @param [Integer] outer outer radius of star
     #   @param [Hash] styles optional, additional styling for the element
-    # @overload shape(left, top, points, outer, inner, styles, &block)
+    # @overload star(left, top, points, outer, inner, styles, &block)
     #   Creates a star at (left, top) with the given style
     #   @param [Integer] left the x-coordinate of the top-left corner
     #   @param [Integer] top the y-coordinate of the top-left corner
@@ -488,6 +469,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]
     def shape(*args, &blk)
       opts = style_normalizer.normalize pop_style(args)
       opts[:left], opts[:top] = args if args.length == 2
@@ -498,7 +480,7 @@ Wrong number of arguments. Must be one of:
   - shape(left, top, [opts])
   - shape(styles)
 EOS
-      fail ArgumentError, message unless [0, 2].include? args.length
+      fail ArgumentError, message unless SHAPE_ALLOWED_ARG_SIZES.include? args.length
       create Shoes::Shape, style.merge(opts), blk
     end
 
@@ -507,13 +489,13 @@ EOS
     OTHER_APP_STYLES = [:cap, :rotate, :strokewidth, :transform, :translate]
 
     PATTERN_APP_STYLES.each do |style|
-      define_method style.to_s do |val|
+      define_method style do |val|
         @__app__.style[style] = pattern(val)
       end
     end
 
     OTHER_APP_STYLES.each do |style|
-      define_method style.to_s do |val|
+      define_method style do |val|
         @__app__.style[style] = val
       end
     end
@@ -607,13 +589,12 @@ EOS
     def visit(url)
       match_data = nil
       url_data = Shoes::URL.urls.find { |page, _| match_data = page.match url }
-      if url_data
-        action_proc = url_data[1]
-        url_argument = match_data[1]
-        clear do
-          @__app__.location = url
-          action_proc.call self, url_argument
-        end
+      return unless url_data
+      action_proc = url_data[1]
+      url_argument = match_data[1]
+      clear do
+        @__app__.location = url
+        action_proc.call self, url_argument
       end
     end
 

data/lib/shoes/gradient.rb

@@ -10,22 +10,15 @@ class Shoes
 
     attr_reader :alpha, :color1, :color2
 
-    def inspect
-      super.insert(-2, " #{color1}->#{color2}")
-    end
-
     def <=>(other) # arbitrarily compare 1st non-equal color
-      raise_class_mismatch_error(other) unless other.is_a?(self.class)
-      if @color1 == other.color1
-        @color2 <=> other.color2
-      else
-        @color1 <=> other.color1
-      end
+      return unless other.is_a?(self.class)
+      [color1, color2] <=> [other.color1, other.color2]
     end
 
-    def raise_class_mismatch_error(other)
-      fail ArgumentError,
-           "can't compare #{self.class.name} with #{other.class.name}"
+    private
+
+    def inspect_details
+      " #{color1}->#{color2}"
     end
   end
 end

data/lib/shoes/image.rb

@@ -6,17 +6,12 @@ class Shoes
 
     BINARY_ENCODING = Encoding.find('binary')
 
-    attr_reader :app, :parent, :dimensions, :gui
     style_with :art_styles, :common_styles, :dimensions, :file_path
 
-    def initialize(app, parent, file_path_or_data, styles = {}, blk = nil)
-      @app = app
-      @parent = parent
-      style_init styles, file_path: normalized_source(file_path_or_data)
-      @dimensions = Dimensions.new parent, @style
-      @parent.add_child self
-      @gui = Shoes.configuration.backend_for self, @parent.gui
-      register_click blk
+    STYLES = { fill: Shoes::COLORS[:black] }
+
+    def before_initialize(styles, file_path_or_data)
+      styles[:file_path] = normalized_source(file_path_or_data)
     end
 
     def path

data/lib/shoes/input_box.rb

@@ -4,16 +4,13 @@ class Shoes
     include Common::Style
     include Common::Changeable
 
-    attr_reader :app, :parent, :dimensions, :gui
-
-    def initialize(app, parent, text, styles = {}, blk = nil)
-      @app = app
-      @parent = parent
-      style_init styles, text: text.to_s
-      @dimensions = Dimensions.new parent, @style
-      @parent.add_child self
-      @gui = Shoes.configuration.backend_for self, @parent.gui
+    def before_initialize(styles, text)
+      styles[:text] = text.to_s
+    end
+
+    def handle_block(blk)
       change(&blk) if blk
+      update_visibility
     end
 
     def state=(value)