shoes-core 4.0.0.pre7 → 4.0.0.pre8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 24b91fee87f3e41db5ff2dfea086583143fa478f
-  data.tar.gz: 90f1c1286744dec7e681972691c6f14abb838573
+  metadata.gz: f1b7205ad873a89bbd6ed14d91f485200cf83f15
+  data.tar.gz: eec9c9656150201d5c0fcce0b9425c6f2c842fef
 SHA512:
-  metadata.gz: e34d82bc1902bd05f440d69cc8b56cac7f30be8367edbca11e8870996691307bd402084a09e0c9dbfc33b87abcf9b8d8d24e6c230c8c5392a043e7b882ac537b
-  data.tar.gz: 699dd3055e4bfdbcf0498af1be251f88835d870591e6019e04e9a82bdd9f40c87c2189000fcce042f85f1e873833c57cde925cab0ff49be7df04799bb95baf3c
+  metadata.gz: f10912fc2b305ce9296d58358b0b1de4553f291ab1e9471a5cecff13a9838b595ef650ebd36bdb266f0a5f699cf2e361f30e8c3196ccdbb68ee73e4b8b747e3b
+  data.tar.gz: e7de5b6d95f8b7ff98ade674141b42ccdf02e311b6afaa724459e9e0c69e7ca741f169757bee91f6e2155fb0e4fa312760b76e75364d9afd81b2234b3798246e

data/lib/shoes/arc.rb

@@ -1,22 +1,19 @@
 class Shoes
   class Arc
-    include Common::UIElement
-    include Common::Clickable
-    include Common::Hover
-    include Common::Fill
-    include Common::Stroke
-    include Common::Style
-    include Common::Translate
+    include Common::ArtElement
 
     style_with :angle1, :angle2, :art_styles, :center, :common_styles, :dimensions, :radius, :wedge
-    STYLES = { wedge: false }.freeze
+    STYLES = { wedge: false, fill: Shoes::COLORS[:black] }.freeze
 
-    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)
+      @style[:angle1] = angle1 || @style[:angle1] || 0
+      @style[:angle2] = angle2 || @style[:angle2] || 0
+
+      left   ||= @style[:left] || 0
+      top    ||= @style[:top] || 0
+      width  ||= @style[:width] || 0
+      height ||= @style[:height] || 0
 
-    def create_dimensions(left, top, width, height, _angle1, _angle2)
       @dimensions = Dimensions.new parent, left, top, width, height, @style
     end
 

data/lib/shoes/arrow.rb

@@ -1,12 +1,6 @@
 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
+    include Common::ArtElement
 
     style_with :angle, :art_styles, :curve, :common_styles, :dimensions
     STYLES = { angle: 0, fill: Shoes::COLORS[:black] }.freeze
@@ -19,10 +13,6 @@ class Shoes
       @dimensions = AbsoluteDimensions.new left, top, width, width, @style
     end
 
-    def needs_rotate?
-      rotate && rotate.nonzero?
-    end
-
     def width=(*_)
       super
       gui.update_position

data/lib/shoes/background.rb

@@ -1,10 +1,7 @@
 class Shoes
   class Background
-    include Common::UIElement
     include Common::BackgroundElement
     include Common::Fill
-    include Common::Stroke
-    include Common::Style
 
     style_with :angle, :common_styles, :curve, :dimensions, :fill
     STYLES = { angle: 0, curve: 0 }.freeze

data/lib/shoes/border.rb

@@ -1,10 +1,7 @@
 class Shoes
   class Border
-    include Common::UIElement
     include Common::BackgroundElement
-    include Common::Fill
     include Common::Stroke
-    include Common::Style
 
     style_with :angle, :common_styles, :curve, :dimensions, :stroke, :strokewidth
     STYLES = { angle: 0, curve: 0 }.freeze

data/lib/shoes/button.rb

@@ -1,10 +1,13 @@
 class Shoes
   class Button
     include Common::UIElement
-    include Common::Style
     include Common::Clickable
     include Common::State
 
+    # We don't actually support release from buttons, but want to use the
+    # shared infrastructure for clicking. So just get rid of release post def.
+    undef release
+
     style_with :click, :common_styles, :dimensions, :state, :text
 
     def before_initialize(styles, text)

data/lib/shoes/check_button.rb

@@ -1,7 +1,6 @@
 class Shoes
   class CheckButton
     include Common::UIElement
-    include Common::Style
     include Common::Clickable
     include Common::State
 

data/lib/shoes/common/art_element.rb

@@ -0,0 +1,21 @@
+class Shoes
+  module Common
+    module ArtElement
+      include Common::UIElement
+      include Common::Clickable
+      include Common::Fill
+      include Common::Rotate
+      include Common::Stroke
+      include Common::Translate
+
+      # Modules that muck with class methods need to be included like this
+      #
+      # We also can't rely on Common::UIElement providing these, as it gets
+      # ArtElement, not the destination class to add things to!
+      def self.included(base)
+        base.include Common::Hover
+        base.include Common::Style
+      end
+    end
+  end
+end

data/lib/shoes/common/background_element.rb

@@ -1,6 +1,16 @@
 class Shoes
   module Common
     module BackgroundElement
+      include Common::UIElement
+
+      # Modules that muck with class methods need to be included like this
+      #
+      # We also can't rely on Common::UIElement providing these, as it gets
+      # BackgroundElement, not the destination class to add things to!
+      def self.included(base)
+        base.include Common::Style
+      end
+
       def create_dimensions(*_)
         @dimensions = ParentDimensions.new @parent, @style
       end

data/lib/shoes/common/clickable.rb

@@ -5,10 +5,12 @@ class Shoes
 
       def click(&blk)
         @gui.click blk
+        self
       end
 
       def release(&blk)
         @gui.release blk
+        self
       end
 
       def register_click(blk = nil)

data/lib/shoes/common/rotate.rb

@@ -1,9 +1,8 @@
 class Shoes
   module Common
     module Rotate
-      # By default no one can rotate. Have to enable in particular classes.
       def needs_rotate?
-        false
+        rotate && rotate.nonzero?
       end
     end
   end

data/lib/shoes/common/ui_element.rb

@@ -7,9 +7,18 @@ class Shoes
       include Common::Visibility
       include Common::Positioning
       include Common::Remove
-      include Common::Rotate
       include DimensionsDelegations
 
+      # Modules that muck with class methods need to be included like this
+      def self.included(base)
+        base.include Common::Style
+      end
+
+      # Nobody rotates by default, but we need to let you check
+      def needs_rotate?
+        false
+      end
+
       # Expected to be overridden by pulling in Common::Fill or Common::Stroke
       # if element needs to actually notify GUI classes of colors changes.
       def update_fill

data/lib/shoes/core/version.rb

@@ -2,6 +2,6 @@
 
 class Shoes
   module Core
-    VERSION = "4.0.0.pre7"
+    VERSION = "4.0.0.pre8"
   end
 end

data/lib/shoes/download.rb

@@ -17,7 +17,12 @@ class Shoes
     def initialize(app, _parent, url, opts = {}, &blk)
       @app = app
       @url = url
+
       @opts = opts
+      @body    = opts[:body]
+      @headers = opts[:headers] || {}
+      @method  = opts[:method] || "GET"
+
       initialize_blocks(app, blk)
 
       @gui = Shoes.backend_for(self)
@@ -70,20 +75,16 @@ class Shoes
     private
 
     def start_download
-      require 'open-uri'
       @thread = Thread.new do
         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
+          request = Shoes::HttpRequest.new(download_started_proc)
+          request.read_chunks(@url, @method, @body, @headers) do |chunk|
+            @response.body += chunk
+            try_progress(@response.body.length)
           end
+
+          save_to_file(@opts[:save]) if @opts[:save]
+          finish_download
         rescue SocketError => e
           Shoes.logger.error e
         rescue => e
@@ -100,26 +101,25 @@ class Shoes
       end
     end
 
-    def content_length_proc
-      lambda do |content_length|
-        download_started(content_length)
-        eval_block(@progress_blk, self)
+    def try_progress(size)
+      if should_mark_progress?(size)
+        @transferred = size
+        mark_progress
       end
     end
 
-    def progress_proc
-      lambda do |size|
-        if !content_length.nil? &&
-           (size - transferred) > (content_length / UPDATE_STEPS) &&
-           !@gui.busy?
-          @gui.busy = true
-          eval_block(@progress_blk, self)
-          @transferred = size
-        end
-      end
+    def mark_progress
+      @gui.busy = true
+      eval_block(@progress_blk, self)
+    end
+
+    def should_mark_progress?(size)
+      !content_length.nil? &&
+        (size - transferred) > (content_length / UPDATE_STEPS) &&
+        !@gui.busy?
     end
 
-    def finish_download(_download_data)
+    def finish_download
       @finished = true
 
       # In case backend didn't catch the 100%
@@ -140,9 +140,27 @@ class Shoes
       open(file_path, 'wb') { |fw| fw.print @response.body }
     end
 
-    def download_started(content_length)
-      @content_length = content_length
-      @started        = true
+    def download_started_proc
+      lambda do |response|
+        download_started(response)
+      end
+    end
+
+    def download_started(response)
+      @started = true
+      @content_length = read_content_length(response)
+
+      @response.status = [response.code, response.message]
+      response.each_header do |key|
+        @response.headers[key] = response[key]
+      end
+
+      mark_progress
+    end
+
+    def read_content_length(response)
+      len = response["Content-Length"]
+      len.nil? ? nil : len.to_i
     end
   end
 end

data/lib/shoes/dsl.rb

@@ -68,14 +68,14 @@ require 'shoes/renamed_delegate'
 require 'shoes/common/inspect'
 require 'shoes/dimension'
 require 'shoes/dimensions'
-require 'shoes/not_implemented_error'
 require 'shoes/file_not_found_error'
+require 'shoes/http_request'
+require 'shoes/not_implemented_error'
 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'
@@ -93,6 +93,8 @@ require 'shoes/common/translate'
 require 'shoes/common/visibility'
 
 require 'shoes/common/ui_element'
+require 'shoes/common/art_element'
+require 'shoes/common/background_element'
 
 require 'shoes/builtin_methods'
 require 'shoes/check_button'
@@ -148,7 +150,6 @@ class Shoes
   #     #element_styles: a hash of {Class => styles}, where styles is
   #                      a hash of default styles for elements of Class,
   module DSL
-    include Common::Style
     include Color::DSLHelpers
 
     # Set default style for elements of a particular class, or for all
@@ -308,15 +309,37 @@ class Shoes
       Shoes::Sound.new @__app__, soundfile, opts, &blk
     end
 
-    # Creates an arrow centered at (left, top)
+    # Creates an arrow
     #
-    # @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
+    # @overload arrow(left, top, width, opts)
+    #   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 the width of the arrow
+    #   @param [Hash] opts Arrow style options
+    #   @option opts [Integer] rotate (false)
+    # @overload arrow(opts)
+    #   Creates an arrow using values from the opts Hash.
+    #   @param [Hash] opts
+    #   @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
+    #   @option styles [Integer] width (0) the width
+    #   @option styles [Integer] rotate (false)
+    def arrow(*args, &blk)
+      opts = style_normalizer.normalize pop_style(args)
+
+      left, top, width, *leftovers = args
+
+      message = <<EOS
+Too many arguments. Must be one of:
+  - arrow(left, top, width, [opts])
+  - arrow(left, top, [opts])
+  - arrow(left, [opts])
+  - arrow([opts])
+EOS
+      raise ArgumentError, message if leftovers.any?
+
+      create Shoes::Arrow, left, top, width, opts, blk
     end
 
     # Creates an arc at (left, top)
@@ -330,8 +353,24 @@ class Shoes
     # @param [Hash] opts Arc style options
     # @option opts [Boolean] wedge (false)
     # @option opts [Boolean] center (false) is (left, top) the center of the rectangle?
-    def arc(left, top, width, height, angle1, angle2, styles = {}, &blk)
-      create Shoes::Arc, left, top, width, height, angle1, angle2, styles, blk
+    def arc(*args, &blk)
+      opts = style_normalizer.normalize pop_style(args)
+
+      left, top, width, height, angle1, angle2, *leftovers = args
+
+      message = <<EOS
+Too many arguments. Must be one of:
+  - arc(left, top, width, height, angle1, angle2, [opts])
+  - arc(left, top, width, height, angle1, [opts])
+  - arc(left, top, width, height, [opts])
+  - arc(left, top, width, [opts])
+  - arc(left, top, [opts])
+  - arc(left, [opts])
+  - arc([opts])
+EOS
+      raise ArgumentError, message if leftovers.any?
+
+      create Shoes::Arc, left, top, width, height, angle1, angle2, opts, blk
     end
 
     # Draws a line from point A (x1,y1) to point B (x2,y2)
@@ -341,8 +380,22 @@ class Shoes
     # @param [Integer] x2 The x-value of point B
     # @param [Integer] y2 The y-value of point B
     # @param [Hash] opts Style options
-    def line(x1, y1, x2, y2, styles = {}, &blk)
-      create Shoes::Line, Shoes::Point.new(x1, y1), Shoes::Point.new(x2, y2), styles, blk
+    def line(*args, &blk)
+      opts = style_normalizer.normalize pop_style(args)
+
+      x1, y1, x2, y2, *leftovers = args
+
+      message = <<EOS
+Too many arguments. Must be one of:
+  - line(x1, y1, x2, y2, [opts])
+  - line(x1, y1, x2, [opts])
+  - line(x1, y1, [opts])
+  - line(x1, [opts])
+  - line([opts])
+EOS
+      raise ArgumentError, message if leftovers.any?
+
+      create Shoes::Line, x1, y1, x2, y2, opts, blk
     end
 
     # Creates an oval at (left, top)
@@ -367,21 +420,22 @@ 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].freeze
-    def oval(*opts, &blk)
-      oval_style = pop_style(opts)
-      oval_style = style_normalizer.normalize(oval_style)
+    def oval(*args, &blk)
+      opts = style_normalizer.normalize pop_style(args)
 
-      left, top, width, height = opts
+      left, top, width, height, *leftovers = args
 
       message = <<EOS
 Wrong number of arguments. Must be one of:
-  - oval(left, top, diameter, [opts])
   - oval(left, top, width, height, [opts])
+  - oval(left, top, diameter, [opts])
+  - oval(left, top, [opts])
+  - oval(left, [opts])
   - oval(styles)
 EOS
-      raise ArgumentError, message unless OVAL_ALLOWED_ARG_SIZES.include? opts.size
-      create Shoes::Oval, left, top, width, height, oval_style, blk
+      raise ArgumentError, message if leftovers.any?
+
+      create Shoes::Oval, left, top, width, height, opts, blk
     end
 
     # Creates a rectangle
@@ -406,21 +460,24 @@ 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].freeze
     def rect(*args, &blk)
       opts = style_normalizer.normalize pop_style(args)
 
-      left, top, width, height, curve = args
+      left, top, width, height, curve, *leftovers = 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(left, top, width, height, [opts])
+  - rect(left, top, side, [opts])
+  - rect(left, top, [opts])
+  - rect(left, [opts])
   - rect(styles)
 EOS
-      raise ArgumentError, message unless RECT_ALLOWED_ARG_SIZES.include? args.size
+
+      raise ArgumentError, message if leftovers.any?
+
       create Shoes::Rect, left, top, width, height, style.merge(opts), blk
     end
 
@@ -452,21 +509,21 @@ EOS
     #   @param [Integer] outer outer radius of star
     #   @param [Integer] inner inner radius of star
     #   @param [Hash] styles optional, additional styling for the element
-    def star(left, top, *args, &blk)
+    def star(*args, &blk)
       styles = style_normalizer.normalize pop_style(args)
 
-      points, outer, inner, extras = args
+      left, top, points, outer, inner, *leftovers = args
 
-      if extras
-        message = <<EOS
+      message = <<EOS
 Wrong number of arguments. Must be one of:
+  - star([styles])
+  - star(left, [styles])
   - star(left, top, [styles])
   - star(left, top, points, [styles])
   - star(left, top, points, outer, [styles])
   - star(left, top, points, outer, inner, [styles])
 EOS
-        raise ArgumentError, message
-      end
+      raise ArgumentError, message if leftovers.any?
 
       create Shoes::Star, left, top, points, outer, inner, styles, blk
     end
@@ -485,19 +542,21 @@ 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].freeze
     def shape(*args, &blk)
       opts = style_normalizer.normalize pop_style(args)
-      opts[:left], opts[:top] = args if args.length == 2
+
+      left, top, *leftovers = args
 
       message = <<EOS
 Wrong number of arguments. Must be one of:
-  - shape()
   - shape(left, top, [opts])
-  - shape(styles)
+  - shape(left, [opts])
+  - shape([opts])
 EOS
-      raise ArgumentError, message unless SHAPE_ALLOWED_ARG_SIZES.include? args.length
-      create Shoes::Shape, style.merge(opts), blk
+
+      raise ArgumentError, message if leftovers.any?
+
+      create Shoes::Shape, left, top, opts, blk
     end
 
     # Define app-level setter methods