lacci 0.3.0 → 0.4.0

data/lib/shoes/drawables/edit_box.rb

@@ -2,13 +2,14 @@
 
 class Shoes
   class EditBox < Shoes::Drawable
-    shoes_styles :text, :height, :width
+    shoes_styles :text, :height, :width ,:tooltip, :font
     shoes_events :change
 
-    def initialize(text = "", height: nil, width: nil, &block)
-      super
-      @text = text
+    init_args
+    opt_init_args :text
+    def initialize(*args, **kwargs, &block)
       @callback = block
+      super
 
       bind_self_event("change") do |new_text|
         self.text = new_text
@@ -23,7 +24,7 @@ class Shoes
     end
 
     def append(new_text)
-      self.text = self.text + new_text
+      self.text = (self.text || "") + new_text
     end
   end
 end

data/lib/shoes/drawables/edit_line.rb

@@ -2,13 +2,14 @@
 
 class Shoes
   class EditLine < Shoes::Drawable
-    shoes_styles :text, :width
+    shoes_styles :text, :width, :font, :tooltip, :stroke
     shoes_events :change
 
-    def initialize(text = "", width: nil, &block)
-      super
+    init_args
+    opt_init_args :text
+    def initialize(*args, **kwargs, &block)
       @block = block
-      @text = text
+      super
 
       bind_self_event("change") do |new_text|
         self.text = new_text

data/lib/shoes/drawables/flow.rb

@@ -3,15 +3,13 @@
 class Shoes
   class Flow < Shoes::Slot
     include Shoes::Background
-    include Shoes::Border
-    include Shoes::Spacing
 
-    shoes_styles :width, :height, :margin, :padding
+    Shoes::Drawable.drawable_default_styles[Shoes::Flow][:width] = "100%"
+
     shoes_events
 
-    def initialize(width: "100%", height: nil, margin: nil, padding: nil, **options, &block)
+    def initialize(*args, **kwargs, &block)
       super
-      @options = options
 
       # Create the display-side drawable *before* instance_eval, which will add child drawables with their display drawables
       create_display_drawable

data/lib/shoes/drawables/font_helper.rb

@@ -0,0 +1,62 @@
+module FontHelper
+
+    def parse_font(font)
+        
+        input = font
+        regex = /\s+(?=(?:[^']*'[^']*')*[^']*$)(?![^']*,[^']*')/
+        result = input.split(regex)
+       
+        fs = nil
+        fv = nil
+        fw = nil
+        fss = nil
+        ff = ""
+        
+        fos = ["italic", "oblique"]
+        fov = ["small-caps", "initial", "inherit"]
+        fow = ["bold", "bolder", "lighter", "100", "200", "300", "400", "500", "600", "700", "800", "900"]
+        foss = ["xx-small", "x-small", "small","large", "x-large", "xx-large", "smaller", "larger"]
+        
+        result.each do |i|
+          if fos.include?(i)
+            fs = i
+            next
+          elsif fov.include?(i)
+            fv = i
+            next
+          elsif fow.include?(i)
+            fw = i
+            next
+          elsif foss.include?(i)
+            fss = i
+            next
+          else
+            if contains_number?(i)
+              
+              fss=i;
+    
+            elsif i != "normal" && i != "medium" && i.strip != ""
+    
+              if ff == "Arial"
+    
+                ff = i
+    
+              else
+                
+                ff = ff+" "+i
+    
+              end
+            end
+          end
+          
+        end
+        
+          [fs, fv , fw , fss , ff.strip]
+    end
+
+    def contains_number?(str)
+    
+      !!(str =~ /\d/)
+
+    end
+end

data/lib/shoes/drawables/image.rb

@@ -5,9 +5,9 @@ class Shoes
     shoes_styles :url, :width, :height, :top, :left, :click
     shoes_events # No Image-specific events yet
 
-    def initialize(url, width: nil, height: nil, top: nil, left: nil, click: nil)
+    init_args :url
+    def initialize(*args, **kwargs)
       super
-      @url = url
 
       # Get the image dimensions
       # @width, @height = size

data/lib/shoes/drawables/line.rb

@@ -5,15 +5,12 @@ class Shoes
     shoes_styles :left, :top, :x2, :y2, :draw_context
     shoes_events # No Line-specific events yet
 
-    def initialize(left, top, x2, y2)
-      super
-
-      @left = left
-      @top = top
-      @x2 = x2
-      @y2 = y2
+    init_args :left, :top, :x2, :y2
+    def initialize(*args, **kwargs)
       @draw_context = Shoes::App.instance.current_draw_context
 
+      super
+
       create_display_drawable
     end
   end

data/lib/shoes/drawables/link.rb

@@ -5,22 +5,19 @@ class Shoes
     shoes_styles :text, :click, :has_block
     shoes_events :click
 
-    def initialize(text, click: nil, &block)
-      super
+    #Shoes::Drawable.drawable_default_styles[Shoes::Link][:click] = "#"
 
-      @text = text
+    init_args # Empty by the time it reaches Drawable#initialize
+    def initialize(*args, **kwargs, &block)
       @block = block
       # We can't send a block to the display drawable, but we can send a boolean
       @has_block = !block.nil?
 
-      # The click property should be changed before it gets sent to the display drawable
-      @click ||= "#"
+      super
 
       bind_self_event("click") do
         @block&.call
       end
-
-      create_display_drawable
     end
   end
 
@@ -28,7 +25,7 @@ class Shoes
   # hovered over. The functionality isn't present in Lacci yet.
   class LinkHover < Link
     def initialize
-      raise "This class should never be instantiated! Use link, not link_hover!"
+      raise "This class should never be instantiated directly! Use link, not link_hover!"
     end
   end
 end

data/lib/shoes/drawables/list_box.rb

@@ -11,11 +11,14 @@ class Shoes
 
     shoes_events :change
 
-    def initialize(**args, &block)
-      super
-
-      @items = args[:items] || []
-      @chosen = args[:choose] || args[:items]&.first
+    init_args # No positional args
+    def initialize(**kwargs, &block)
+      # These aren't being set as styles -- remove them from kwargs before calling super
+      # TODO: set [] as default value for items?
+      @items = kwargs.delete(:items) || []
+      @chosen = kwargs.delete(:choose) || @items&.first
+
+      super(**kwargs, &block)
 
       bind_self_event("change") do |new_item|
         self.chosen = new_item

data/lib/shoes/drawables/oval.rb

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+class Shoes
+  # Docs: https://github.com/scarpe-team/scarpe/blob/main/docs/static/manual.md#ovalleft-top-radius--shoesshape
+  class Oval < Shoes::Drawable
+    shoes_styles :center, :draw_context, :stroke, :fill
+
+    shoes_style(:left) { |val| convert_to_integer(val, "left") }
+    shoes_style(:top) { |val| convert_to_integer(val, "top") }
+    shoes_style(:radius) { |val| convert_to_integer(val, "radius") }
+    shoes_style(:height) { |val| convert_to_integer(val, "height") }
+    shoes_style(:width) { |val| convert_to_integer(val, "width") }
+    shoes_style(:strokewidth) { |val| convert_to_integer(val, "strokewidth") }
+
+    Shoes::Drawable.drawable_default_styles[Shoes::Oval][:fill] = "black"
+    Shoes::Drawable.drawable_default_styles[Shoes::Oval][:stroke] = "black"
+
+    init_args :left, :top
+    opt_init_args :radius, :height
+    def initialize(*args, **options)
+      @draw_context = Shoes::App.instance.current_draw_context
+
+      super # Parse any positional or keyword args
+
+      unless @left && @top && (@width || @height || @radius)
+        raise Shoes::Errors::InvalidAttributeValueError, "Oval requires left, top and one of (width, height, radius) to be specified!"
+      end
+
+      # Calzini expects "radius" to mean the x-axis-aligned radius, not y-axis-aligned.
+      # For an axis-aligned oval the two may be different.
+
+      # If we have no width, but a radius, default the width to be the radius * 2
+      @width ||= @radius * 2 if @radius
+
+      # We now know we have width or height, but maybe not both.
+
+      # Default to a circle - set height from width or vice-versa
+      @width ||= @height
+      @height ||= @width
+
+      # If we don't have radius yet, set it from width
+      @radius ||= @width / 2
+
+      create_display_drawable
+    end
+
+  end
+end

data/lib/shoes/drawables/para.rb

@@ -1,24 +1,34 @@
 # frozen_string_literal: true
-
+require_relative 'font_helper.rb'
 class Shoes
-  class Para < Shoes::Drawable
-    shoes_styles :text_items, :size, :font, :html_attributes, :hidden
-    shoes_style(:stroke) { |val| Shoes::Colors.to_rgb(val) }
+  class Para < Shoes::Drawable 
+  include FontHelper
+    shoes_styles :text_items, :size, :family, :font_weight, :font, :font_variant, :emphasis, :kerning
+    shoes_style(:stroke) { |val, _name| Shoes::Colors.to_rgb(val) }
+    shoes_style(:fill) { |val, _name| Shoes::Colors.to_rgb(val) }
+
+    shoes_style(:align) do |val|
+      unless ["left", "center", "right"].include?(val)
+        raise(Shoes::Errors::InvalidAttributeValueError, "Align must be one of left, center or right!")
+      end
+      val
+    end
+
+    Shoes::Drawable.drawable_default_styles[Shoes::Para][:size] = :para
 
     shoes_events # No Para-specific events yet
 
-    # Initializes a new instance of the `Para` widget.
+    # Initializes a new instance of the `Para` drawable. There are different
+    # methods to instantiate slightly different styles of Para, such as
+    # `tagline`, `caption` and `subtitle`. These will always be different
+    # sizes, but may be generally styled differently for some display services.
     #
     # @param args The text content of the paragraph.
-    # @param stroke [String, nil] The color of the text stroke.
-    # @param size [Symbol] The size of the paragraph text.
-    # @param font [String, nil] The font of the paragraph text.
-    # @param hidden [Boolean] Determines if the paragraph is initially hidden.
-    # @param html_attributes [Hash] Additional HTML attributes for the paragraph.
+    # @param kwargs [Hash] the various Shoes styles for this paragraph.
     #
     # @example
     #    Shoes.app do
-    #      p = para "Hello, This is at the top!", stroke: "red", size: :title, font: "Arial"
+    #      p = para "Hello, This is at the top!", stroke: red, size: :title, font: "Arial"
     #
     #      banner("Welcome to Shoes!")
     #      title("Shoes Examples")
@@ -29,22 +39,60 @@ class Shoes
     #
     #      p.replace "On top we'll switch to ", strong("bold"), "!"
     #    end
-    def initialize(*args, stroke: nil, size: :para, font: nil, **html_attributes)
-      super
+    
+    def initialize(*args, **kwargs)
+
+      if kwargs[:font]
+        arr= parse_font(kwargs[:font])
+        
+        if arr[0] != nil
+
+          kwargs[:emphasis] = arr[0]
+
+        end
+
+        if arr[1] != nil
+
+          kwargs[:font_variant] = arr[1]
+
+        end
+
+        if arr[2] != nil
+
+          kwargs[:font_weight] = arr[2]
+
+        end
+
+        if arr[3] != nil
+
+          kwargs[:size] = arr[3]
+
+        end
 
+        if arr[4] != ""
+
+          kwargs[:family] = arr[4]
+
+        end
+
+      end
+ 
+      # Don't pass text_children args to Drawable#initialize
+      super(*[], **kwargs)
+        
       # Text_children alternates strings and TextDrawables, so we can't just pass
       # it as a Shoes style. It won't serialize.
       update_text_children(args)
 
-      @html_attributes = html_attributes || {}
-
       create_display_drawable
     end
 
+    
+
     private
 
     def text_children_to_items(text_children)
-      text_children.map { |arg| arg.is_a?(String) ? arg : arg.linkable_id }
+      text_children.map { |arg| arg.is_a?(TextDrawable) ? arg.linkable_id : arg.to_s }
     end
 
     public
@@ -67,10 +115,20 @@ class Shoes
       update_text_children(children)
     end
 
+    # Return the text, but not the styling, of the para's
+    # contents. For example, if the contents had strong
+    # and emphasized text, the bold and emphasized would
+    # be removed but the text would be returned.
+    #
+    # @return [String] the text from this para
     def text
       @text_children.map(&:to_s).join
     end
 
+    # Return the text but not styling from the para. This
+    # is the same as #text.
+    #
+    # @return [String] the text from this para
     def to_s
       self.text
     end
@@ -84,35 +142,65 @@ class Shoes
       # This should signal the display drawable to change
       self.text_items = text_children_to_items(@text_children)
     end
+
+    
   end
 end
 
 class Shoes
   class Drawable
+    # Return a banner-sized para. This can use all the normal
+    # Para styles and arguments. See {Para#initialize} for
+    # details.
+    #
+    # @return [Shoes::Para] the new para drawable
     def banner(*args, **kwargs)
       para(*args, **{ size: :banner }.merge(kwargs))
     end
 
+    # Return a title-sized para. This can use all the normal
+    # Para styles and arguments. See {Para#initialize} for
+    # details.
+    #
+    # @return [Shoes::Para] the new para drawable
     def title(*args, **kwargs)
       para(*args, **{ size: :title }.merge(kwargs))
     end
 
+    # Return a subtitle-sized para. This can use all the normal
+    # Para styles and arguments. See {Para#initialize} for
+    # details.
+    #
+    # @return [Shoes::Para] the new para drawable
     def subtitle(*args, **kwargs)
       para(*args, **{ size: :subtitle }.merge(kwargs))
     end
 
+    # Return a tagline-sized para. This can use all the normal
+    # Para styles and arguments. See {Para#initialize} for
+    # details.
+    #
+    # @return [Shoes::Para] the new para drawable
     def tagline(*args, **kwargs)
       para(*args, **{ size: :tagline }.merge(kwargs))
     end
 
+    # Return a caption-sized para. This can use all the normal
+    # Para styles and arguments. See {Para#initialize} for
+    # details.
+    #
+    # @return [Shoes::Para] the new para drawable
     def caption(*args, **kwargs)
       para(*args, **{ size: :caption }.merge(kwargs))
     end
 
+    # Return an inscription-sized para. This can use all the normal
+    # Para styles and arguments. See {Para#initialize} for
+    # details.
+    #
+    # @return [Shoes::Para] the new para drawable
     def inscription(*args, **kwargs)
       para(*args, **{ size: :inscription }.merge(kwargs))
     end
-
-    alias_method :ins, :inscription
   end
 end

data/lib/shoes/drawables/progress.rb

@@ -5,7 +5,8 @@ class Shoes
     shoes_styles :fraction
     shoes_events # No Progress-specific events yet
 
-    def initialize(fraction: nil)
+    init_args # No positional args
+    def initialize(**kwargs)
       super
 
       create_display_drawable

data/lib/shoes/drawables/radio.rb

@@ -8,11 +8,13 @@ class Shoes
     shoes_styles :group, :checked
     shoes_events :click
 
-    def initialize(group = nil, checked: nil, &block)
-      super
-      @group = group
+    init_args
+    opt_init_args :group
+    def initialize(*args, **kwargs, &block)
       @block = block
 
+      super
+
       bind_self_event("click") { click }
       create_display_drawable
     end

data/lib/shoes/drawables/rect.rb

@@ -2,14 +2,15 @@
 
 class Shoes
   class Rect < Shoes::Drawable
-    shoes_styles :left, :top, :width, :height, :draw_context, :curve
-    shoes_events # No Rect-specific events yet
+    shoes_styles :draw_context, :curve, :stroke, :fill
+    shoes_events # No Rect-specific events
 
-    def initialize(*args)
+    init_args :left, :top, :width, :height
+    opt_init_args :curve
+    def initialize(*args, **kwargs)
       @draw_context = Shoes::App.instance.current_draw_context
 
       super
-      self.left, self.top, self.width, self.height, self.curve = args
 
       create_display_drawable
     end

data/lib/shoes/drawables/shape.rb

@@ -13,7 +13,8 @@ class Shoes
     shoes_styles :left, :top, :shape_commands, :draw_context
     shoes_events # No Shape-specific events yet
 
-    def initialize(left: nil, top: nil, &block)
+    init_args # No positional args
+    def initialize(**kwargs, &block)
       @shape_commands = []
       @draw_context = Shoes::App.instance.current_draw_context
 

data/lib/shoes/drawables/slot.rb

@@ -1,10 +1,31 @@
 # frozen_string_literal: true
 
 class Shoes::Slot < Shoes::Drawable
-  # @incompatibility Shoes uses #content, not #children, for this
+  # @incompatibility Shoes uses #content, not #children, for this. Scarpe does both.
   attr_reader :children
 
-  shoes_events # No Slot-specific events yet
+  shoes_events # No Slot-specific events
+
+  # This only shows this specific slot's settings, not its parent's.
+  # Use current_draw_context to allow inheritance.
+  attr_reader :draw_context
+
+
+  def initialize(...)
+    # The draw context tracks current settings like fill and stroke,
+    # plus potentially other current state that changes from drawable
+    # to drawable and slot to slot.
+    @draw_context = {
+      "fill" => nil,
+      "stroke" => nil,
+      "strokewidth" => nil,
+      "rotate" => nil,
+      # "transform" => nil, # "corner",
+      # "translate" => nil, # [0, 0],
+    }
+
+    super
+  end
 
   # Do not call directly, use set_parent
   def remove_child(child)
@@ -29,30 +50,99 @@ class Shoes::Slot < Shoes::Drawable
 
   # We use method_missing for drawable-creating methods like "button".
   # The parent's method_missing will auto-create Shoes style getters and setters.
+  # This is similar to the method_missing in Shoes::App, but differs in where
+  # the new drawable will appear.
   def method_missing(name, *args, **kwargs, &block)
     klass = ::Shoes::Drawable.drawable_class_by_name(name)
     return super unless klass
 
     ::Shoes::Slot.define_method(name) do |*args, **kwargs, &block|
-      # Look up the Shoes drawable and create it...
-      drawable_instance = klass.new(*args, **kwargs, &block)
+      instance = nil
 
-      unless klass.ancestors.include?(::Shoes::TextDrawable)
-        drawable_instance.set_parent self # Create drawable in THIS SLOT, not current app slot
+      # Look up the Shoes drawable and create it. But first set
+      # this slot as the current one so that draw context
+      # is handled properly.
+      Shoes::App.instance.with_slot(self) do
+        instance = klass.new(*args, **kwargs, &block)
       end
 
-      drawable_instance
+      instance
     end
 
     send(name, *args, **kwargs, &block)
   end
 
   def respond_to_missing?(name, include_private = false)
-    return true if Drawable.drawable_class_by_name(name.to_s)
+    return true if ::Shoes::Drawable.drawable_class_by_name(name.to_s)
 
     false
   end
 
+  # Draw context methods
+
+  # Set the default fill color in this slot and child slots.
+  # Pass nil for "no setting", so that it can inherit defaults.
+  #
+  # @param color [Nil,Color] a Shoes color for the fill color or nil to use parent setting
+  # @return [void]
+  def fill(color)
+    @draw_context["fill"] = color
+  end
+
+  # Set the default fill in this slot and child slots to transparent.
+  #
+  # @return [void]
+  def nofill
+    @draw_context["fill"] = rgb(0, 0, 0, 0)
+  end
+
+  # Set the default stroke color in this slot and child slots.
+  # Pass nil for "no setting" so it can inherit defaults.
+  #
+  # @param color [Nil,Color] a Shoes color for the stroke color or nil to use parent setting
+  # @return [void]
+  def stroke(color)
+    @draw_context["stroke"] = color
+  end
+
+  # Set the default strokewidth in this slot and child slots.
+  # Pass nil for "no setting".
+  #
+  # @param width [Numeric,Nil] the new width, or nil to use parent setting
+  # @return [void]
+  def strokewidth(width)
+    @draw_context["strokewidth"] = width
+  end
+
+  # Set the default stroke in this slot and child slots
+  # to transparent.
+  #
+  # @return [void]
+  def nostroke
+    @draw_context["stroke"] = rgb(0, 0, 0, 0)
+  end
+
+  # Set the current rotation in this slot and any child slots.
+  # Pass nil to reset the angle to default.
+  #
+  # @param angle [Numeric,Nil] the new default rotation for shapes or nil to use parent setting
+  # @return [void]
+  def rotate(angle)
+    @draw_context["rotate"] = angle
+  end
+
+  # Get the current draw context styles, based on this slot and its parent slots.
+  #
+  # @return [Hash] a hash of Shoes styles for the context
+  def current_draw_context
+    s = @parent ? @parent.current_draw_context : {}
+    @draw_context.each { |k, v| s[k] = v unless v.nil? }
+
+    s
+  end
+
+  # Methods to add or remove children
+
   # Remove all children from this drawable. If a block
   # is given, call the block to replace the children with
   # new contents from that block.
@@ -65,6 +155,7 @@ class Shoes::Slot < Shoes::Drawable
   # @yield The block to call to replace the contents of the drawable (optional)
   # @return [void]
   def clear(&block)
+    @children ||= []
     @children.dup.each(&:destroy)
     append(&block) if block_given?
     nil