lacci 0.2.2 → 0.3.0

data/lib/shoes.rb

@@ -12,38 +12,53 @@ if RUBY_VERSION[0..2] < "3.2"
   exit(-1)
 end
 
-module Shoes; end
+class Shoes; end
 class Shoes::Error < StandardError; end
+require_relative "shoes/errors"
 
 require_relative "shoes/constants"
+require_relative "shoes/ruby_extensions"
 
 # Shoes adds some top-level methods and constants that can be used everywhere. Kernel is where they go.
 module Kernel
   include Shoes::Constants
 end
 
-require_relative "shoes/log"
 require_relative "shoes/display_service"
+
+# Pre-declare classes that get referenced outside their own require file
+class Shoes::Drawable < Shoes::Linkable; end
+class Shoes::Slot < Shoes::Drawable; end
+class Shoes::Widget < Shoes::Slot; end
+
+require_relative "shoes/log"
 require_relative "shoes/colors"
 
+require_relative "shoes/builtins"
+
 require_relative "shoes/background"
 require_relative "shoes/border"
 require_relative "shoes/spacing"
 
-require_relative "shoes/widget"
+require_relative "shoes/drawable"
 require_relative "shoes/app"
-require_relative "shoes/widgets"
+require_relative "shoes/drawables"
 
 require_relative "shoes/download"
 
+# No easy way to tell at this point whether
+# we will later load Shoes-Spec code, e.g.
+# by running a segmented app with test code.
+require_relative "shoes-spec"
+
 # The module containing Shoes in all its glory.
 # Shoes is a platform-independent GUI library, designed to create
 # small visual applications in Ruby.
 #
-module Shoes
+class Shoes
   class << self
     # Creates a Shoes app with a new window. The block parameter is used to create
-    # widgets and set up handlers. Arguments are passed to Shoes::App.new internally.
+    # drawables and set up handlers. Arguments are passed to Shoes::App.new internally.
     #
     # @incompatibility In Shoes3, this method will return normally.
     #   In Scarpe, after the block is executed, the method will not return and Scarpe
@@ -81,11 +96,16 @@ module Shoes
     # more loaders, a Lacci-based display library can accept new file formats as
     # well, not just raw Shoes .rb files.
     #
-    # @param path [String] The current-dir-relative path to the file
+    # @param relative_path [String] The current-dir-relative path to the file
     # @return [void]
     # @see Shoes.add_file_loader
     def run_app(relative_path)
       path = File.expand_path relative_path
+      dir = File.dirname(path)
+
+      # Shoes assumes we're starting from the app code's path
+      Dir.chdir(dir)
+
       loaded = false
       file_loaders.each do |loader|
         if loader.call(path)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lacci
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Marco Concetto Rudilosso
@@ -9,8 +9,22 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-08-29 00:00:00.000000000 Z
-dependencies: []
+date: 2023-11-24 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: scarpe-components
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description:
 email:
 - marcoc.r@outlook.com
@@ -25,41 +39,54 @@ files:
 - lib/lacci/scarpe_cli.rb
 - lib/lacci/scarpe_core.rb
 - lib/lacci/version.rb
+- lib/scarpe/niente.rb
+- lib/scarpe/niente/app.rb
+- lib/scarpe/niente/display_service.rb
+- lib/scarpe/niente/drawable.rb
+- lib/scarpe/niente/logger.rb
+- lib/scarpe/niente/shoes_spec.rb
+- lib/shoes-spec.rb
 - lib/shoes.rb
 - lib/shoes/app.rb
 - lib/shoes/background.rb
 - lib/shoes/border.rb
+- lib/shoes/builtins.rb
+- lib/shoes/changelog.rb
 - lib/shoes/colors.rb
 - lib/shoes/constants.rb
 - lib/shoes/display_service.rb
 - lib/shoes/download.rb
+- lib/shoes/drawable.rb
+- lib/shoes/drawables.rb
+- lib/shoes/drawables/arc.rb
+- lib/shoes/drawables/arrow.rb
+- lib/shoes/drawables/button.rb
+- lib/shoes/drawables/check.rb
+- lib/shoes/drawables/document_root.rb
+- lib/shoes/drawables/edit_box.rb
+- lib/shoes/drawables/edit_line.rb
+- lib/shoes/drawables/flow.rb
+- lib/shoes/drawables/image.rb
+- lib/shoes/drawables/line.rb
+- lib/shoes/drawables/link.rb
+- lib/shoes/drawables/list_box.rb
+- lib/shoes/drawables/para.rb
+- lib/shoes/drawables/progress.rb
+- lib/shoes/drawables/radio.rb
+- lib/shoes/drawables/rect.rb
+- lib/shoes/drawables/shape.rb
+- lib/shoes/drawables/slot.rb
+- lib/shoes/drawables/span.rb
+- lib/shoes/drawables/stack.rb
+- lib/shoes/drawables/star.rb
+- lib/shoes/drawables/subscription_item.rb
+- lib/shoes/drawables/text_drawable.rb
+- lib/shoes/drawables/video.rb
+- lib/shoes/drawables/widget.rb
+- lib/shoes/errors.rb
 - lib/shoes/log.rb
+- lib/shoes/ruby_extensions.rb
 - lib/shoes/spacing.rb
-- lib/shoes/widget.rb
-- lib/shoes/widgets.rb
-- lib/shoes/widgets/alert.rb
-- lib/shoes/widgets/arc.rb
-- lib/shoes/widgets/button.rb
-- lib/shoes/widgets/check.rb
-- lib/shoes/widgets/document_root.rb
-- lib/shoes/widgets/edit_box.rb
-- lib/shoes/widgets/edit_line.rb
-- lib/shoes/widgets/flow.rb
-- lib/shoes/widgets/font.rb
-- lib/shoes/widgets/image.rb
-- lib/shoes/widgets/line.rb
-- lib/shoes/widgets/link.rb
-- lib/shoes/widgets/list_box.rb
-- lib/shoes/widgets/para.rb
-- lib/shoes/widgets/radio.rb
-- lib/shoes/widgets/shape.rb
-- lib/shoes/widgets/slot.rb
-- lib/shoes/widgets/span.rb
-- lib/shoes/widgets/stack.rb
-- lib/shoes/widgets/star.rb
-- lib/shoes/widgets/subscription_item.rb
-- lib/shoes/widgets/text_widget.rb
-- lib/shoes/widgets/video.rb
 homepage: https://github.com/scarpe-team/scarpe
 licenses:
 - MIT

data/lib/shoes/widget.rb

@@ -1,218 +0,0 @@
-# frozen_string_literal: true
-
-module Shoes
-  # Shoes::Widget
-  #
-  # This is the display-service portable Shoes Widget interface. Visible Shoes
-  # widgets like buttons inherit from this. Compound widgets made of multiple
-  # different smaller Widgets inherit from it in their various apps or libraries.
-  # The Shoes Widget helps build a Shoes-side widget tree, with parents and
-  # children. Any API that applies to all widgets (e.g. remove) should be
-  # defined here.
-  #
-  class Widget < Shoes::Linkable
-    include Shoes::Log
-    include Shoes::Colors
-
-    class << self
-      attr_accessor :widget_classes
-
-      def inherited(subclass)
-        Shoes::Widget.widget_classes ||= []
-        Shoes::Widget.widget_classes << subclass
-        super
-      end
-
-      def dsl_name
-        n = name.split("::").last.chomp("Widget")
-        n.gsub(/(.)([A-Z])/, '\1_\2').downcase
-      end
-
-      def widget_class_by_name(name)
-        widget_classes.detect { |k| k.dsl_name == name.to_s }
-      end
-
-      private
-
-      def linkable_properties
-        @linkable_properties ||= []
-      end
-
-      def linkable_properties_hash
-        @linkable_properties_hash ||= {}
-      end
-
-      public
-
-      # Display properties in Shoes Linkables are automatically sync'd with the display side objects.
-      # TODO: do we want types or other modifiers on specific properties?
-      def display_property(name)
-        name = name.to_s
-
-        return if linkable_properties_hash[name]
-
-        linkable_properties << { name: name }
-        linkable_properties_hash[name] = true
-      end
-
-      # Add these names as display properties
-      def display_properties(*names)
-        names.each { |n| display_property(n) }
-      end
-
-      def display_property_names
-        parent_prop_names = self != Shoes::Widget ? self.superclass.display_property_names : []
-
-        parent_prop_names | linkable_properties.map { |prop| prop[:name] }
-      end
-
-      def display_property_name?(name)
-        linkable_properties_hash[name.to_s] ||
-          (self != Shoes::Widget && superclass.display_property_name?(name))
-      end
-    end
-
-    # Shoes uses a "hidden" style property for hide/show
-    display_property :hidden
-
-    def initialize(*args, **kwargs)
-      log_init("Widget")
-
-      self.class.display_property_names.each do |prop|
-        if kwargs[prop.to_sym]
-          instance_variable_set("@" + prop, kwargs[prop.to_sym])
-        end
-      end
-
-      super() # linkable_id defaults to object_id
-    end
-
-    def inspect
-      "#<#{self.class}:#{self.object_id} " +
-        "@linkable_id=#{@linkable_id.inspect} @parent=#{@parent.inspect} " +
-        "@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
-
-      bind_shoes_event(event_name: event_name, target: linkable_id, &block)
-    end
-
-    def bind_no_target_event(event_name, &block)
-      bind_shoes_event(event_name:, &block)
-    end
-
-    public
-
-    def display_property_values
-      all_property_names = self.class.display_property_names
-
-      properties = {}
-      all_property_names.each do |prop|
-        properties[prop] = instance_variable_get("@" + prop)
-      end
-      properties["shoes_linkable_id"] = self.linkable_id
-      properties
-    end
-
-    private
-
-    def create_display_widget
-      klass_name = self.class.name.delete_prefix("Scarpe::").delete_prefix("Shoes::")
-
-      # Should we save a reference to widget for later reference?
-      ::Shoes::DisplayService.display_service.create_display_widget_for(klass_name, self.linkable_id, display_property_values)
-    end
-
-    public
-
-    attr_reader :parent
-
-    def set_parent(new_parent)
-      @parent&.remove_child(self)
-      new_parent&.add_child(self)
-      @parent = new_parent
-      send_shoes_event(new_parent.linkable_id, event_name: "parent", target: linkable_id)
-    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
-
-    # 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.
-    def method_missing(name, *args, **kwargs, &block)
-      name_s = name.to_s
-
-      if name_s[-1] == "="
-        prop_name = name_s[0..-2]
-        if self.class.display_property_name?(prop_name)
-          self.class.define_method(name) do |new_value|
-            raise "Trying to set display properties in an object with no linkable ID!" unless linkable_id
-
-            instance_variable_set("@" + prop_name, new_value)
-            send_shoes_event({ prop_name => new_value }, event_name: "prop_change", target: linkable_id)
-          end
-
-          return self.send(name, *args, **kwargs, &block)
-        end
-      end
-
-      if self.class.display_property_name?(name_s)
-        self.class.define_method(name) do
-          raise "Trying to get display properties in an object with no linkable ID!" unless linkable_id
-
-          instance_variable_get("@" + name_s)
-        end
-
-        return self.send(name, *args, **kwargs, &block)
-      end
-
-      klass = Widget.widget_class_by_name(name)
-      return super unless klass
-
-      ::Shoes::Widget.define_method(name) do |*args, **kwargs, &block|
-        # Look up the Shoes widget and create it...
-        widget_instance = klass.new(*args, **kwargs, &block)
-
-        unless klass.ancestors.include?(Shoes::TextWidget)
-          widget_instance.set_parent Shoes::App.instance.current_slot
-        end
-
-        widget_instance
-      end
-
-      send(name, *args, **kwargs, &block)
-    end
-
-    def respond_to_missing?(name, include_private = false)
-      name_s = name.to_s
-      return true if self.class.display_property_name?(name_s)
-      return true if self.class.display_property_name?(name_s[0..-2]) && name_s[-1] == "="
-      return true if Widget.widget_class_by_name(name_s)
-
-      super
-    end
-  end
-end

data/lib/shoes/widgets/alert.rb

@@ -1,19 +0,0 @@
-# frozen_string_literal: true
-
-module Shoes
-  class Alert < Shoes::Widget
-    display_property :text
-
-    def initialize(text)
-      @text = text
-
-      super
-
-      bind_self_event("click") do
-        remove
-      end
-
-      create_display_widget
-    end
-  end
-end

data/lib/shoes/widgets/arc.rb

@@ -1,51 +0,0 @@
-# frozen_string_literal: true
-
-module Shoes
-  class InvalidAttributeValueError < Shoes::Error; end
-
-  class Arc < Shoes::Widget
-    display_properties :left, :top, :width, :height, :angle1, :angle2, :draw_context
-
-    def initialize(*args)
-      @left, @top, @width, @height, @angle1, @angle2 = args
-
-      @left = convert_to_integer(@left, "left")
-      @top = convert_to_integer(@top, "top")
-      @width = convert_to_integer(@width, "width")
-      @height = convert_to_integer(@height, "height")
-      @angle1 = convert_to_float(@angle1, "angle1")
-      @angle2 = convert_to_float(@angle2, "angle2")
-
-      @draw_context = Shoes::App.instance.current_draw_context
-
-      super
-      create_display_widget
-    end
-
-    private
-
-    def convert_to_integer(value, attribute_name)
-      begin
-        value = Integer(value)
-        raise InvalidAttributeValueError, "Negative number '#{value}' not allowed for attribute '#{attribute_name}'" if value < 0
-
-        value
-      rescue ArgumentError
-        error_message = "Invalid value '#{value}' provided for attribute '#{attribute_name}'. The value should be a number."
-        raise InvalidAttributeValueError, error_message
-      end
-    end
-
-    def convert_to_float(value, attribute_name)
-      begin
-        value = Float(value)
-        raise InvalidAttributeValueError, "Negative number '#{value}' not allowed for attribute '#{attribute_name}'" if value < 0
-
-        value
-      rescue ArgumentError
-        error_message = "Invalid value '#{value}' provided for attribute '#{attribute_name}'. The value should be a number."
-        raise InvalidAttributeValueError, error_message
-      end
-    end
-  end
-end

data/lib/shoes/widgets/button.rb

@@ -1,35 +0,0 @@
-# frozen_string_literal: true
-
-module Shoes
-  class Button < Shoes::Widget
-    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,
-      font_size: nil, & block)
-
-      log_init("Button")
-
-      # Properties passed as positional args, not keywords, don't get auto-set
-      @text = text
-      @color = color
-
-      @block = block
-
-      super
-
-      # Bind to a handler named "click"
-      bind_self_event("click") do
-        @log.debug("Button clicked, calling handler") if @block
-        @block&.call
-      end
-
-      create_display_widget
-    end
-
-    # Set the click handler
-    def click(&block)
-      @block = block
-    end
-  end
-end

data/lib/shoes/widgets/font.rb

@@ -1,14 +0,0 @@
-# frozen_string_literal: true
-
-module Shoes
-  class Font < Shoes::Widget
-    display_properties :font
-
-    def initialize(font)
-      @font = font
-      super
-
-      create_display_widget
-    end
-  end
-end

data/lib/shoes/widgets/link.rb

@@ -1,25 +0,0 @@
-# frozen_string_literal: true
-
-module Shoes
-  class Link < Shoes::TextWidget
-    display_properties :text, :click, :has_block
-
-    def initialize(text, click: nil, &block)
-      @text = text
-      @block = block
-      # We can't send a block to the display widget, but we can send a boolean
-      @has_block = !block.nil?
-
-      super
-
-      # The click property should be changed before it gets sent to the display widget
-      @click ||= "#"
-
-      bind_self_event("click") do
-        @block&.call
-      end
-
-      create_display_widget
-    end
-  end
-end

data/lib/shoes/widgets/list_box.rb

@@ -1,25 +0,0 @@
-# frozen_string_literal: true
-
-module Shoes
-  class ListBox < Shoes::Widget
-    display_properties :selected_item, :items, :height, :width
-
-    def initialize(args = {}, &block)
-      @items = args[:items] || []
-      @selected_item = args[:selected_item]
-      super()
-
-      bind_self_event("change") do |new_item|
-        self.selected_item = new_item
-        @callback&.call(new_item)
-      end
-
-      create_display_widget
-    end
-
-    def change(&block)
-      @callback = block
-      self # Allow chaining calls
-    end
-  end
-end

data/lib/shoes/widgets/para.rb

@@ -1,68 +0,0 @@
-# frozen_string_literal: true
-
-module Shoes
-  class Para < Shoes::Widget
-    display_properties :text_items, :stroke, :size, :font, :html_attributes, :hidden
-
-    def initialize(*args, stroke: nil, size: :para, font: nil, hidden: false, **html_attributes)
-      @text_children = args || []
-      if hidden
-        @hidden_text_items = text_children_to_items(@text_children)
-        @text_items = []
-      else
-        # Text_children alternates strings and TextWidgets, so we can't just pass
-        # it as a display property. It won't serialize.
-        @text_items = text_children_to_items(@text_children)
-        @hidden_text_items = []
-      end
-      stroke = to_rgb(stroke)
-
-      @html_attributes = html_attributes || {}
-
-      super
-
-      create_display_widget
-    end
-
-    def text_children_to_items(text_children)
-      text_children.map { |arg| arg.is_a?(String) ? arg : arg.linkable_id }
-    end
-
-    def replace(*children)
-      @text_children = children
-
-      # This should signal the display widget to change
-      self.text_items = text_children_to_items(@text_children)
-    end
-  end
-end
-
-module Shoes
-  class Widget
-    def banner(*args, **kwargs)
-      para(*args, **{ size: :banner }.merge(kwargs))
-    end
-
-    def title(*args, **kwargs)
-      para(*args, **{ size: :title }.merge(kwargs))
-    end
-
-    def subtitle(*args, **kwargs)
-      para(*args, **{ size: :subtitle }.merge(kwargs))
-    end
-
-    def tagline(*args, **kwargs)
-      para(*args, **{ size: :tagline }.merge(kwargs))
-    end
-
-    def caption(*args, **kwargs)
-      para(*args, **{ size: :caption }.merge(kwargs))
-    end
-
-    def inscription(*args, **kwargs)
-      para(*args, **{ size: :inscription }.merge(kwargs))
-    end
-
-    alias_method :ins, :inscription
-  end
-end

data/lib/shoes/widgets/radio.rb

@@ -1,35 +0,0 @@
-# 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