shoes-core 4.0.0.pre7 → 4.0.0.pre8

data/lib/shoes/font.rb

@@ -26,10 +26,6 @@ class Shoes
         name
       end
 
-      def initial_fonts
-        Shoes.backend::Font.initial_fonts
-      end
-
       private
 
       def font_name(path)

data/lib/shoes/http_request.rb

@@ -0,0 +1,91 @@
+# frozen_string_literal: true
+
+require 'uri'
+require 'net/http'
+
+# Wrapper for Net::HTTP to provide us to the functionality that we need which
+# isn't easily available from any particular gem out there :(
+#
+# Specific things this class does that we need include:
+#
+#   1) Reading in chunks to trigger progress
+#   2) Allow for graceful redirection
+#
+# Most of the gems out there do 2) but not 1), or do both but are untested on
+# JRuby.
+#
+class Shoes
+  class HttpRequest
+    def initialize(started_proc = nil, redirects_left = 5)
+      @started_proc = started_proc
+      @redirects_left = redirects_left
+    end
+
+    def read_chunks(url, meth, body, headers = {}, &blk)
+      uri = URI(url)
+      Net::HTTP.start(uri.host, uri.port, use_ssl: needs_ssl?(uri)) do |http|
+        request = build_request(uri, meth, body, headers)
+
+        http.request(request) do |response|
+          case response
+          when Net::HTTPSuccess
+            handle_success(response, &blk)
+          when Net::HTTPRedirection
+            handle_redirect(response, headers, &blk)
+          else
+            handle_error(response)
+          end
+        end
+      end
+    end
+
+    private
+
+    def build_request(uri, meth, body, headers)
+      klass = Net::HTTP.const_get(meth.downcase.capitalize)
+      klass.new(uri).tap do |request|
+        request.body = body
+        headers.each do |(key, value)|
+          request[key] = value
+        end
+      end
+    end
+
+    def handle_redirect(response, headers, &blk)
+      raise "Exhausted trying to redirect... See ya'" if @redirects_left <= 0
+
+      next_uri = URI(response["Location"])
+
+      if schemes_mismatch?(response.uri, next_uri) &&
+         !allowed_scheme_change?(response.uri, next_uri)
+        raise "Disallowed redirection from '#{response.uri.scheme}' to '#{next_uri.scheme}'"
+      end
+
+      @redirects_left -= 1
+      read_chunks(next_uri, "GET", nil, headers, &blk)
+    end
+
+    def handle_success(response)
+      @started_proc&.call(response)
+      response.read_body do |chunk|
+        yield chunk
+      end
+    end
+
+    def handle_error(response)
+      raise "#{response.code} #{response.message}"
+    end
+
+    def schemes_mismatch?(original_uri, new_uri)
+      original_uri.scheme != new_uri.scheme
+    end
+
+    def allowed_scheme_change?(original_uri, new_uri)
+      original_uri.scheme == "http" && new_uri.scheme == "https"
+    end
+
+    def needs_ssl?(uri)
+      uri.scheme == "https"
+    end
+  end
+end

data/lib/shoes/image.rb

@@ -1,7 +1,6 @@
 class Shoes
   class Image
     include Common::UIElement
-    include Common::Style
     include Common::Clickable
     include Common::Hover
 

data/lib/shoes/input_box.rb

@@ -1,7 +1,6 @@
 class Shoes
   class InputBox
     include Common::UIElement
-    include Common::Style
     include Common::Changeable
     include Common::State
 

data/lib/shoes/internal_app.rb

@@ -7,8 +7,8 @@ class Shoes
   # and providing the bulk of the functionality, leaving the App a relatively
   # blank slate for users to bend to their will.
   class InternalApp
-    include Common::Style
     include Common::Clickable
+    include Common::Style
     include DimensionsDelegations
 
     extend Forwardable

data/lib/shoes/line.rb

@@ -2,26 +2,40 @@ require 'matrix'
 
 class Shoes
   class Line
-    include Common::UIElement
-    include Common::Clickable
-    include Common::Hover
-    include Common::Stroke
-    include Common::Style
-    include Common::Translate
+    include Common::ArtElement
 
     attr_reader :point_a, :point_b
 
     style_with :angle, :art_styles, :dimensions, :x2, :y2
     STYLES = { angle: 0, fill: Shoes::COLORS[:black] }.freeze
 
-    def create_dimensions(point_a, point_b)
-      @point_a = point_a
-      @point_b = point_b
+    def create_dimensions(x1, y1, x2, y2)
+      x1, y1, x2, y2 = default_coordinates(x1, y1, x2, y2)
+
+      @point_a = Shoes::Point.new(x1, y1)
+      @point_b = Shoes::Point.new(x2, y2)
 
       enclosing_box_of_line
 
-      style[:x2] = point_b.x
-      style[:y2] = point_b.y
+      style[:x2] = @point_b.x
+      style[:y2] = @point_b.y
+    end
+
+    def default_coordinates(x1, y1, x2, y2)
+      x1 ||= @style[:left] || 0
+      y1 ||= @style[:top]  || 0
+
+      x2 ||= @style[:right]
+      if x2
+        # With 3 arguments, draws horizontal line, so fallback to y1
+        y2 ||= @style[:bottom] || y1
+      else
+        # If didn't get needed arguments, set start to end which draws nothing
+        x2 = x1
+        y2 = y1
+      end
+
+      [x1, y1, x2, y2]
     end
 
     # Check out http://math.stackexchange.com/questions/60070/checking-whether-a-point-lies-on-a-wide-line-segment

data/lib/shoes/link.rb

@@ -1,9 +1,9 @@
 class Shoes
   class Link < Span
-    include Common::Style
     include Common::Fill
-    include Common::Stroke
     include Common::Hover
+    include Common::Stroke
+    include Common::Style
 
     attr_reader :app, :gui, :blk
     style_with :common_styles, :text_block_styles
@@ -14,12 +14,12 @@ class Shoes
       style_init styles
       @gui = Shoes.backend_for self
 
-      setup_click blk
+      register_click blk
       super texts, @style
     end
 
     # Doesn't use Common::Clickable because of URL flavor option clicks
-    def setup_click(blk)
+    def register_click(blk)
       if blk.nil?
         blk = if @style[:click].respond_to? :call
                 @style[:click]
@@ -35,6 +35,12 @@ class Shoes
     def click(&blk)
       @gui.click blk if blk
       @blk = blk
+      self
+    end
+
+    def release(&blk)
+      @gui.release blk if blk
+      self
     end
 
     def pass_coordinates?

data/lib/shoes/list_box.rb

@@ -26,7 +26,6 @@ class Shoes
 
   class ListBox
     include Common::UIElement
-    include Common::Style
     include Common::Changeable
     include Common::State
 

data/lib/shoes/mock/app.rb

@@ -44,6 +44,12 @@ class Shoes
 
       def wait_until_closed
       end
+
+      def click(_blk)
+      end
+
+      def release(_blk)
+      end
     end
   end
 end

data/lib/shoes/mock/clickable.rb

@@ -3,6 +3,9 @@ class Shoes
     module Clickable
       def click(_blk)
       end
+
+      def release(_blk)
+      end
     end
   end
 end

data/lib/shoes/mock/font.rb

@@ -5,10 +5,6 @@ class Shoes
         def add_font(path)
           Shoes::Font.add_font_to_fonts path
         end
-
-        def initial_fonts
-          []
-        end
       end
     end
   end

data/lib/shoes/oval.rb

@@ -1,27 +1,17 @@
 class Shoes
   class Oval
-    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 :art_styles, :center, :common_styles, :dimensions, :radius
     STYLES = { fill: Shoes::COLORS[:black] }.freeze
 
     def create_dimensions(left, top, width, height)
-      left   ||= @style[:left]
-      top    ||= @style[:top]
+      left   ||= @style[:left] || 0
+      top    ||= @style[:top] || 0
       width  ||= @style[:diameter] || @style[:width] || (@style[:radius] || 0) * 2
       height ||= @style[:height] || width
 
       @dimensions = AbsoluteDimensions.new left, top, width, height, @style
     end
-
-    def needs_rotate?
-      rotate && rotate.nonzero?
-    end
   end
 end

data/lib/shoes/progress.rb

@@ -1,7 +1,6 @@
 class Shoes
   class Progress
     include Common::UIElement
-    include Common::Style
 
     style_with :common_styles, :dimensions, :fraction
     STYLES = { fraction: 0.0 }.freeze

data/lib/shoes/rect.rb

@@ -1,12 +1,6 @@
 class Shoes
   class Rect
-    include Common::UIElement
-    include Common::Fill
-    include Common::Stroke
-    include Common::Clickable
-    include Common::Hover
-    include Common::Style
-    include Common::Translate
+    include Common::ArtElement
 
     style_with :angle, :art_styles, :curve, :common_styles, :dimensions
     STYLES = { angle: 0, curve: 0, fill: Shoes::COLORS[:black] }.freeze
@@ -19,9 +13,5 @@ class Shoes
 
       @dimensions = AbsoluteDimensions.new left, top, width, height, @style
     end
-
-    def needs_rotate?
-      rotate && rotate.nonzero?
-    end
   end
 end

data/lib/shoes/shape.rb

@@ -1,11 +1,6 @@
 class Shoes
   class Shape
-    include Common::UIElement
-    include Common::Clickable
-    include Common::Fill
-    include Common::Stroke
-    include Common::Style
-    include Common::Translate
+    include Common::ArtElement
 
     attr_reader :blk, :x, :y, :left_bound, :top_bound, :right_bound, :bottom_bound
 
@@ -13,8 +8,11 @@ class Shoes
 
     STYLES = { fill: Shoes::COLORS[:black] }.freeze
 
-    def create_dimensions
-      @dimensions = AbsoluteDimensions.new @style
+    def create_dimensions(left, top)
+      left ||= @style[:left] || 0
+      top  ||= @style[:top] || 0
+
+      @dimensions = AbsoluteDimensions.new left, top
     end
 
     def handle_block(blk)
@@ -40,6 +38,16 @@ class Shoes
       @app.height
     end
 
+    def element_width
+      return super unless @right_bound && @left_bound
+      @right_bound - @left_bound
+    end
+
+    def element_height
+      return super unless @bottom_bound && @top_bound
+      @bottom_bound - @top_bound
+    end
+
     def fixed_height?
       false
     end

data/lib/shoes/slot.rb

@@ -3,7 +3,6 @@ class Shoes
     include Common::UIElement
     include Common::Clickable
     include Common::Hover
-    include Common::Style
 
     # We need that offset because otherwise element overlap e.g. occupy
     # the same pixel - this way they start right next to each other
@@ -194,6 +193,8 @@ class Shoes
 
       update_current_position(current_position, element)
     rescue => e
+      raise e if ENV['SHOES_ENV'] == 'test'
+
       puts "SWALLOWED POSITIONING EXCEPTION ON #{element} - go take care of it: " + e.to_s
       puts e.backtrace.join("\n\t")
       puts 'Unfortunately we have to swallow it or risk SWT hanging.'

data/lib/shoes/star.rb

@@ -1,21 +1,18 @@
 class Shoes
   class Star
-    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, :common_styles, :dimensions, :inner, :outer, :points
     STYLES = { angle: 0, fill: Shoes::COLORS[:black] }.freeze
 
+    # Don't use param defaults as DSL explicit passes nil for missing params
     def create_dimensions(left, top, points, outer, inner)
-      # Don't use param defaults as DSL explicit passes nil for missing params
-      points ||= 10
-      outer  ||= 100.0
-      inner  ||= 50.0
+      left ||= @style[:left] || 0
+      top  ||= @style[:top] || 0
+
+      points ||= @style[:points] || 10
+      outer  ||= @style[:outer] || 100.0
+      inner  ||= @style[:inner] || 50.0
 
       # Careful not to turn Fixnum to Float, lest Dimensions make you relative!
       width = outer * 2

data/lib/shoes/text_block.rb

@@ -7,7 +7,6 @@ class Shoes
     include Common::Clickable
     include Common::Hover
     include Common::LinkFinder
-    include Common::Style
     include Common::Translate
     include TextBlockDimensionsDelegations
 

data/lib/shoes/ui/picker.rb

@@ -1,7 +1,19 @@
+#
+# This class is used for interactively (if necessary) picking the Shoes
+# backend that the user will run their Shoes app with.
+#
+# This interacts with backend gems via the following contract:
+#
+#   * Backend provides file "shoes/#{backend_name}/generate_backend.rb"
+#   * Requiring that file defines a module Shoes::SelectedBackend
+#   * Shoes::SelectedBackend should implement the following class methods:
+#     * generate(path) - passed bin path, generates shell command to start
+#                        Shoes on given backend
+#     * validate() - checks whether this backend is valid to run (i.e. right
+#                    ruby platform) and exits if not.
+#
 class Shoes
   module UI
-    # This class is used for interactively (if necessary) picking the Shoes
-    # backend that the user will run their Shoes app with.
     class Picker
       def initialize(input = STDIN, output = STDOUT)
         @input  = input
@@ -10,8 +22,11 @@ class Shoes
 
       def run(bin_dir, desired_backend = nil)
         bundle
-        generator_file = select_generator(desired_backend)
-        write_backend(generator_file, bin_dir)
+
+        require_generator(desired_backend)
+        validate_generator
+
+        write_backend(bin_dir)
       end
 
       # Only bundle if we find a local Gemfile.  This allows us to work properly
@@ -78,13 +93,19 @@ class Shoes
         "shoes-#{match.tr('/', '-')}"
       end
 
-      def write_backend(generator_file, bin_dir)
+      def require_generator(desired_backend)
+        generator_file = select_generator(desired_backend)
         require generator_file
+      end
+
+      def validate_generator
+        Shoes::SelectedBackend.validate
+      end
 
+      def write_backend(bin_dir)
         File.open(File.expand_path(File.join(bin_dir, "shoes-backend")), "w") do |file|
-          # Contract with backends is to define generate_backend method that we
-          # can call. Bit ugly, open to better options for that interchange.
-          file.write(generate_backend(ENV["SHOES_PICKER_BIN_DIR"] || bin_dir))
+          dest_dir = ENV["SHOES_PICKER_BIN_DIR"] || bin_dir
+          file.write(Shoes::SelectedBackend.generate(dest_dir))
         end
       end
     end