lacci 0.2.1 → 0.2.2

data/lib/shoes/widget.rb

@@ -11,8 +11,8 @@ module Shoes
   # defined here.
   #
   class Widget < Shoes::Linkable
-    include Scarpe::Log
-    include Scarpe::Colors
+    include Shoes::Log
+    include Shoes::Colors
 
     class << self
       attr_accessor :widget_classes
@@ -72,6 +72,9 @@ module Shoes
       end
     end
 
+    # Shoes uses a "hidden" style property for hide/show
+    display_property :hidden
+
     def initialize(*args, **kwargs)
       log_init("Widget")
 
@@ -90,6 +93,8 @@ module Shoes
         "@children=#{@children.inspect} properties=#{display_property_values.inspect}>"
     end
 
+    private
+
     def bind_self_event(event_name, &block)
       raise("Widget has no linkable_id! #{inspect}") unless linkable_id
 
@@ -100,6 +105,8 @@ module Shoes
       bind_shoes_event(event_name:, &block)
     end
 
+    public
+
     def display_property_values
       all_property_names = self.class.display_property_names
 
@@ -111,6 +118,8 @@ module Shoes
       properties
     end
 
+    private
+
     def create_display_widget
       klass_name = self.class.name.delete_prefix("Scarpe::").delete_prefix("Shoes::")
 
@@ -118,8 +127,9 @@ module Shoes
       ::Shoes::DisplayService.display_service.create_display_widget_for(klass_name, self.linkable_id, display_property_values)
     end
 
+    public
+
     attr_reader :parent
-    attr_reader :children
 
     def set_parent(new_parent)
       @parent&.remove_child(self)
@@ -128,28 +138,27 @@ module Shoes
       send_shoes_event(new_parent.linkable_id, event_name: "parent", target: linkable_id)
     end
 
-    # Do not call directly, use set_parent
-    def remove_child(child)
-      @children ||= []
-      unless @children.include?(child)
-        @log.warn("remove_child: no such child(#{child.inspect}) for parent(#{parent.inspect})!")
-      end
-      @children.delete(child)
-    end
-
-    # Do not call directly, use set_parent
-    def add_child(child)
-      @children ||= []
-      @children << child
-    end
-
     # Removes the element from the Shoes::Widget tree
     def destroy
       @parent&.remove_child(self)
       send_shoes_event(event_name: "destroy", target: linkable_id)
     end
+    alias_method :remove, :destroy
+
+    # Hide the widget.
+    def hide
+      self.hidden = true
+    end
 
-    alias_method :destroy_self, :destroy
+    # Show the widget.
+    def show
+      self.hidden = false
+    end
+
+    # Hide the widget if it is currently shown. Show it if it is currently hidden.
+    def toggle
+      self.hidden = !self.hidden
+    end
 
     # We use method_missing for widget-creating methods like "button",
     # and also to auto-create display-property getters and setters.

data/lib/{scarpe → shoes/widgets}/alert.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class Scarpe
+module Shoes
   class Alert < Shoes::Widget
     display_property :text
 
@@ -10,7 +10,7 @@ class Scarpe
       super
 
       bind_self_event("click") do
-        destroy_self
+        remove
       end
 
       create_display_widget

data/lib/{scarpe → shoes/widgets}/arc.rb

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
-class Scarpe
-  class InvalidAttributeValueError < Scarpe::Error; end
+module Shoes
+  class InvalidAttributeValueError < Shoes::Error; end
 
   class Arc < Shoes::Widget
-    display_properties :left, :top, :width, :height, :angle1, :angle2
+    display_properties :left, :top, :width, :height, :angle1, :angle2, :draw_context
 
     def initialize(*args)
       @left, @top, @width, @height, @angle1, @angle2 = args
@@ -16,7 +16,9 @@ class Scarpe
       @angle1 = convert_to_float(@angle1, "angle1")
       @angle2 = convert_to_float(@angle2, "angle2")
 
-      super()
+      @draw_context = Shoes::App.instance.current_draw_context
+
+      super
       create_display_widget
     end
 

data/lib/{scarpe → shoes/widgets}/button.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-class Scarpe
+module Shoes
   class Button < Shoes::Widget
-    include Scarpe::Log
+    include Shoes::Log
     display_properties :text, :width, :height, :top, :left, :color, :padding_top, :padding_bottom, :text_color, :size, :font_size
 
     def initialize(text, width: nil, height: nil, top: nil, left: nil, color: nil, padding_top: nil, padding_bottom: nil, size: 12, text_color: nil,

data/lib/shoes/widgets/check.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+module Shoes
+  class Check < Shoes::Widget
+    display_properties :checked
+
+    def initialize(checked = nil, &block)
+      @block = block
+      super
+
+      bind_self_event("click") { click }
+      create_display_widget
+    end
+
+    def click(&block)
+      @block = block
+      self.checked = !checked?
+    end
+
+    def checked?
+      @checked ? true : false
+    end
+
+    def checked(value)
+      self.checked = value
+    end
+  end
+end

data/lib/{scarpe → shoes/widgets}/document_root.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-class Scarpe
-  class DocumentRoot < Scarpe::Flow
+module Shoes
+  class DocumentRoot < Shoes::Flow
     def initialize
       @height = "100%"
       @width = @margin = @padding = nil
@@ -14,7 +14,7 @@ class Scarpe
 
     # The default inspect string can be absolutely huge in console output, and it's frequently printed.
     def inspect
-      "<Scarpe::DocumentRoot>"
+      "<Shoes::DocumentRoot>"
     end
   end
 end

data/lib/{scarpe → shoes/widgets}/edit_box.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class Scarpe
+module Shoes
   class EditBox < Shoes::Widget
     display_properties :text, :height, :width
 

data/lib/{scarpe → shoes/widgets}/edit_line.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class Scarpe
+module Shoes
   class EditLine < Shoes::Widget
     display_properties :text, :width
 

data/lib/{scarpe → shoes/widgets}/flow.rb

@@ -1,10 +1,14 @@
 # frozen_string_literal: true
 
-class Scarpe
+module Shoes
   class Flow < Shoes::Slot
+    include Shoes::Background
+    include Shoes::Border
+    include Shoes::Spacing
+
     display_properties :width, :height, :margin, :padding
 
-    def initialize(width: nil, height: nil, margin: nil, padding: nil, **options, &block)
+    def initialize(width: "100%", height: nil, margin: nil, padding: nil, **options, &block)
       @options = options
 
       super

data/lib/{scarpe → shoes/widgets}/font.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class Scarpe
+module Shoes
   class Font < Shoes::Widget
     display_properties :font
 

data/lib/{scarpe → shoes/widgets}/image.rb

@@ -1,9 +1,6 @@
 # frozen_string_literal: true
 
-require "fastimage"
-require "open-uri"
-
-class Scarpe
+module Shoes
   class Image < Shoes::Widget
     display_properties :url, :width, :height, :top, :left, :click
 
@@ -21,12 +18,9 @@ class Scarpe
     def replace(url)
       self.url = url
     end
-  end
-end
 
-module Shoes
-  class Widget
     def size
+      require "fastimage"
       width, height = FastImage.size(@url)
 
       [width, height]

data/lib/shoes/widgets/line.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Shoes
+  class Line < Shoes::Widget
+    display_properties :left, :top, :x2, :y2, :draw_context
+
+    def initialize(left, top, x2, y2)
+      @left = left
+      @top = top
+      @x2 = x2
+      @y2 = y2
+      @draw_context = Shoes::App.instance.current_draw_context
+
+      super
+      create_display_widget
+    end
+  end
+end

data/lib/{scarpe → shoes/widgets}/link.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class Scarpe
+module Shoes
   class Link < Shoes::TextWidget
     display_properties :text, :click, :has_block
 

data/lib/{scarpe → shoes/widgets}/list_box.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class Scarpe
+module Shoes
   class ListBox < Shoes::Widget
     display_properties :selected_item, :items, :height, :width
 

data/lib/{scarpe → shoes/widgets}/para.rb

@@ -1,15 +1,7 @@
 # frozen_string_literal: true
 
-class Scarpe
+module Shoes
   class Para < Shoes::Widget
-    class << self
-      def inherited(subclass)
-        Scarpe::Widget.widget_classes ||= []
-        Scarpe::Widget.widget_classes << subclass
-        super
-      end
-    end
-
     display_properties :text_items, :stroke, :size, :font, :html_attributes, :hidden
 
     def initialize(*args, stroke: nil, size: :para, font: nil, hidden: false, **html_attributes)
@@ -42,22 +34,6 @@ class Scarpe
       # This should signal the display widget to change
       self.text_items = text_children_to_items(@text_children)
     end
-
-    def hide
-      # idempotent
-      return unless @hidden_text_items.empty?
-
-      @hidden_text_items = self.text_items
-      self.text_items = []
-    end
-
-    def show
-      # idempotent
-      return unless self.text_items.empty?
-
-      self.text_items = @hidden_text_items
-      @hidden_text_items = []
-    end
   end
 end
 

data/lib/shoes/widgets/radio.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+module Shoes
+  class Radio < Shoes::Widget
+    display_properties :group, :checked
+
+    def initialize(group = nil, checked = nil, &block)
+      @group = group
+      @block = block
+      super
+
+      bind_self_event("click") { click }
+      create_display_widget
+    end
+
+    def click(&block)
+      @block = block
+      self.checked = !checked?
+    end
+
+    def checked?
+      @checked ? true : false
+    end
+
+    def checked(value)
+      self.checked = value
+    end
+
+    private
+
+    def group_name
+      @group || @parent
+    end
+  end
+end

data/lib/shoes/widgets/shape.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+module Shoes
+  # A Shape acts as a sort of union type for drawn shapes. In Shoes you can use it to merge multiple
+  # ovals, arcs, stars, etc. into a single drawn shape.
+  #
+  # In Shoes3, a Shape isn't really a Slot. It's a kind of DSL with drawing commands that happen
+  # to have the same name as the Art widgets like star, arc, etc. Here we're treating it as
+  # a slot containing those widgets, which is wrong but not *too* wrong.
+  #
+  # @incompatibility A Shoes3 Shape is *not* a slot; Scarpe does *not* do union shapes
+  class Shape < Shoes::Slot
+    display_properties :left, :top, :shape_commands, :draw_context
+
+    def initialize(left: nil, top: nil, &block)
+      @left = left
+      @top = top
+      @shape_commands = []
+      @draw_context = Shoes::App.instance.current_draw_context
+
+      super
+      create_display_widget
+
+      Shoes::App.instance.with_slot(self, &block) if block_given?
+    end
+
+    # The cmd should be an array of the form:
+    #
+    #     [cmd_name, *args]
+    #
+    # such as ["move_to", 50, 50]. Note that these must
+    # be JSON-serializable.
+    def add_shape_command(cmd)
+      @shape_commands << cmd
+    end
+  end
+end

data/lib/shoes/widgets/slot.rb

@@ -0,0 +1,75 @@
+# frozen_string_literal: true
+
+class Shoes::Slot < Shoes::Widget
+  # @incompatibility Shoes uses #content, not #children, for this
+  attr_reader :children
+
+  # Do not call directly, use set_parent
+  def remove_child(child)
+    @children ||= []
+    unless @children.include?(child)
+      @log.warn("remove_child: no such child(#{child.inspect}) for parent(#{parent.inspect})!")
+    end
+    @children.delete(child)
+  end
+
+  # Do not call directly, use set_parent
+  def add_child(child)
+    @children ||= []
+    @children << child
+  end
+
+  # Get a list of child widgets
+  def contents
+    @children ||= []
+    @children.dup
+  end
+
+  # Calling stack.app or flow.app will execute the block
+  # with the Shoes::App as self, and with that stack or
+  # flow as the current slot.
+  #
+  # @incompatibility Shoes Classic will only change self
+  #   via this method, while Scarpe will also change self
+  #   with the other Slot Manipulation methods: #clear,
+  #   #append, #prepend, #before and #after.
+  #
+  # @return [Shoes::App] the Shoes app
+  # @yield the block to call with the Shoes App as self
+  def app(&block)
+    Shoes::App.instance.with_slot(self, &block) if block_given?
+    Shoes::App.instance
+  end
+
+  # Remove all children from this widget. If a block
+  # is given, call the block to replace the children with
+  # new contents from that block.
+  #
+  # Should only be called on Slots, which can
+  # have children.
+  #
+  # @incompatibility Shoes Classic calls the clear block with current self, while Scarpe uses the Shoes::App as self
+  #
+  # @yield The block to call to replace the contents of the widget (optional)
+  # @return [void]
+  def clear(&block)
+    @children.dup.each(&:destroy)
+    append(&block) if block_given?
+    nil
+  end
+
+  # Call the block to append new children to a Slot.
+  #
+  # Should only be called on a Slot, since only Slots can have children.
+  #
+  # @incompatibility Shoes Classic calls the append block with current self, while Scarpe uses the Shoes::App as self
+  #
+  # @yield the block to call to replace children; will be called on the Shoes::App, appending to the called Slot as the current slot
+  # @return [void]
+  def append(&block)
+    raise("append requires a block!") unless block_given?
+    raise("Don't append to something that isn't a slot!") unless self.is_a?(Shoes::Slot)
+
+    Shoes::App.instance.with_slot(self, &block)
+  end
+end

data/lib/{scarpe → shoes/widgets}/span.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class Scarpe
+module Shoes
   class Span < Shoes::Widget
     display_properties :text, :stroke, :size, :font, :html_attributes
 

data/lib/{scarpe → shoes/widgets}/stack.rb

@@ -1,7 +1,11 @@
 # frozen_string_literal: true
 
-class Scarpe
+module Shoes
   class Stack < Shoes::Slot
+    include Shoes::Background
+    include Shoes::Border
+    include Shoes::Spacing
+
     # TODO: sort out various margin and padding properties, including putting stuff into spacing
     display_properties :width, :height, :scroll
 

data/lib/{scarpe → shoes/widgets}/star.rb

@@ -1,20 +1,17 @@
 # frozen_string_literal: true
 
-require_relative "wv/shape_helper"
-class Scarpe
-  class InvalidAttributeValueError < Scarpe::Error; end
-
+module Shoes
   class Star < Shoes::Widget
-    include ShapeHelper
-    display_properties :left, :top, :points, :outer, :inner, :color
+    display_properties :left, :top, :points, :outer, :inner, :draw_context
 
     def initialize(left, top, points = 10, outer = 100, inner = 50)
       @points = convert_to_integer(points, "points", 10)
       @outer = convert_to_float(outer, "outer", 100.0)
       @inner = convert_to_float(inner, "inner", 50.0)
-      @color = color_for_fill
 
-      super()
+      @draw_context = Shoes::App.instance.current_draw_context
+
+      super
       create_display_widget
     end
 

data/lib/{scarpe → shoes/widgets}/subscription_item.rb

@@ -9,7 +9,7 @@
 #
 # Inheriting from Widget gives these a parent slot and a
 # linkable_id automatically.
-class SubscriptionItem < Shoes::Widget
+class Shoes::SubscriptionItem < Shoes::Widget
   display_property :shoes_api_name
 
   def initialize(shoes_api_name:, &block)

data/lib/shoes/{text_widget.rb → widgets/text_widget.rb}

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Scarpe::TextWidget
+# Shoes::TextWidget
 
 module Shoes
   class TextWidget < Shoes::Widget
@@ -38,8 +38,7 @@ module Shoes
           self.content = new_text
         end
       end
-      # TODO: move this to Shoes module
-      Scarpe.const_set class_name, widget_class
+      Shoes.const_set class_name, widget_class
       widget_class.class_eval do
         display_property :content
       end

data/lib/{scarpe → shoes/widgets}/video.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class Scarpe
+module Shoes
   class Video < Shoes::Widget
     display_properties :url
 

data/lib/shoes/widgets.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+require "shoes/widgets/slot"
+require "shoes/widgets/stack"
+require "shoes/widgets/flow"
+require "shoes/widgets/document_root"
+
+require "shoes/widgets/text_widget"
+
+require "shoes/widgets/font"
+require "shoes/widgets/subscription_item"
+
+require "shoes/widgets/arc"
+require "shoes/widgets/line"
+require "shoes/widgets/shape"
+require "shoes/widgets/star"
+
+require "shoes/widgets/alert"
+require "shoes/widgets/button"
+require "shoes/widgets/check"
+require "shoes/widgets/edit_box"
+require "shoes/widgets/edit_line"
+require "shoes/widgets/image"
+require "shoes/widgets/link"
+require "shoes/widgets/list_box"
+require "shoes/widgets/para"
+require "shoes/widgets/radio"
+require "shoes/widgets/span"
+require "shoes/widgets/video"