lacci 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3bf9fa7d8c25eece259eb65e02ac680c3004762fa86951597ae1721010a8af52
-  data.tar.gz: b997f33fc1f63480f38144f89c54af16a3f99c7eafaf960b53770ea4894b51e6
+  metadata.gz: e4b8a6a22600196c15c5ed8abbb7710bcc2d24fd2842aaa9190af738ef1e1802
+  data.tar.gz: 9bc49da62c2eea40133ca5d0cb01a3af7bec21d0d605478da5c235ce4a34c7a4
 SHA512:
-  metadata.gz: 7eb784a865dfd9add9ade9861a62cfa2192e407d1371e49cdd23eb6205c55c36f67d6a31347775ee6b3d43c6e025ea1788e6c51dedf4251a562dcb62f2cda1e5
-  data.tar.gz: ea5b4aef895ee41ea78699bac827f8404ebbef97f0d7e8ed93b41382076c3188538e70aa32016b5ff90bd81b05feca8effc977f5452efe30744f25a7d3fe845f
+  metadata.gz: 77de9f93d6495c6d0092eaf39bc36d46492a4f32725c3d5b2eb2dc07992cb31c21a10489eea8e77d29144dbbdd1daad8b12b8ccfb42bee1124579a8c0c34dbbb
+  data.tar.gz: fa322933a6da6fd7f831ac8490ec5b519f4e93f740fb35dcddf973562abfd81efa7f5cc9c89c4dd4d23f33dbdc35b59b90f9c217708d0c3e168d0658419ac85e

data/Gemfile

@@ -17,8 +17,6 @@ group :development do
   gem "yard"
   gem "redcarpet"
   gem "debug"
-  gem "rubocop", "~> 1.21"
-  gem "rubocop-shopify"
   #gem "commonmarker"
   #gem "github-markup"
 end

data/Gemfile.lock

@@ -1,19 +1,18 @@
 PATH
   remote: ../scarpe-components
   specs:
-    scarpe-components (0.3.0)
+    scarpe-components (0.4.0)
 
 PATH
   remote: .
   specs:
-    lacci (0.3.0)
-      scarpe-components
+    lacci (0.4.0)
+      scarpe-components (~> 0.4.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
     ansi (1.5.0)
-    ast (2.4.2)
     builder (3.2.4)
     debug (1.8.0)
       irb (>= 1.5.0)
@@ -21,46 +20,21 @@ GEM
     io-console (0.6.0)
     irb (1.7.2)
       reline (>= 0.3.6)
-    json (2.6.3)
-    language_server-protocol (3.17.0.3)
     minitest (5.18.1)
     minitest-reporters (1.6.0)
       ansi
       builder
       minitest (>= 5.0)
       ruby-progressbar
-    parallel (1.23.0)
-    parser (3.2.2.3)
-      ast (~> 2.4.1)
-      racc
-    racc (1.7.1)
-    rainbow (3.1.1)
     rake (13.0.6)
     redcarpet (3.6.0)
-    regexp_parser (2.8.1)
     reline (0.3.6)
       io-console (~> 0.5)
-    rexml (3.2.5)
-    rubocop (1.54.1)
-      json (~> 2.3)
-      language_server-protocol (>= 3.17.0)
-      parallel (~> 1.10)
-      parser (>= 3.2.2.3)
-      rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8, < 3.0)
-      rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.28.0, < 2.0)
-      ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.29.0)
-      parser (>= 3.2.1.0)
-    rubocop-shopify (2.14.0)
-      rubocop (~> 1.51)
     ruby-progressbar (1.13.0)
-    unicode-display_width (2.4.2)
     yard (0.9.34)
 
 PLATFORMS
+  arm64-darwin-21
   x86_64-darwin-22
 
 DEPENDENCIES
@@ -70,8 +44,6 @@ DEPENDENCIES
   minitest-reporters
   rake (~> 13.0)
   redcarpet
-  rubocop (~> 1.21)
-  rubocop-shopify
   scarpe-components!
   yard
 

data/lib/lacci/version.rb

@@ -9,5 +9,5 @@
 # mostly invisible. Instead, look at the {Shoes} module
 # to see what's in Lacci.
 module Lacci
-  VERSION = "0.4.0"
+  VERSION = "0.5.0"
 end

data/lib/scarpe/niente/app.rb

@@ -14,7 +14,18 @@ module Niente
     end
 
     def run
-      send_shoes_event("wait", event_name: "custom_event_loop")
+      send_shoes_event("return", event_name: "custom_event_loop")
+
+      @do_shutdown = false
+      bind_shoes_event(event_name: "destroy") do
+        @do_shutdown = true
+      end
+
+      at_exit do
+        until @do_shutdown
+          Shoes::DisplayService.dispatch_event("heartbeat", nil)
+        end
+      end
     end
 
     def destroy

data/lib/scarpe/niente/shoes_spec.rb

@@ -8,7 +8,7 @@ module Niente; end
 class Niente::Test
   def self.run_shoes_spec_test_code(code, class_name: nil, test_name: nil)
     if @shoes_spec_init
-      raise Shoes::Errors::MultipleShoesSpecRunsError, "Scarpe-Webview can only run a single Shoes spec per process!"
+      raise Shoes::Errors::MultipleShoesSpecRunsError, "Niente can only run a single Shoes spec per process!"
     end
     @shoes_spec_init = true
 
@@ -21,7 +21,7 @@ class Niente::Test
     Shoes::DisplayService.subscribe_to_event("heartbeat", nil) do
       unless @hb_init
         Minitest.run []
-        Shoes::App.instance.destroy
+        Shoes.APPS.each(&:destroy)
       end
       @hb_init = true
     end
@@ -40,9 +40,8 @@ class Niente::ShoesSpecTest < Minitest::Test
     finder_name = drawable_class.dsl_name
 
     define_method(finder_name) do |*args|
-      app = Shoes::App.instance
+      drawables = Shoes::App.find_drawables_by(drawable_class, *args)
 
-      drawables = app.find_drawables_by(drawable_class, *args)
       raise Shoes::Errors::MultipleDrawablesFoundError, "Found more than one #{finder_name} matching #{args.inspect}!" if drawables.size > 1
       raise Shoes::Errors::NoDrawablesFoundError, "Found no #{finder_name} matching #{args.inspect}!" if drawables.empty?
 
@@ -51,7 +50,7 @@ class Niente::ShoesSpecTest < Minitest::Test
   end
 
   def drawable(*specs)
-    drawables = Shoes::App.instance.find_drawables_by(*specs)
+    drawables = Shoes::App.find_drawables_by(*specs)
     raise Shoes::Errors::MultipleDrawablesFoundError, "Found more than one #{finder_name} matching #{args.inspect}!" if drawables.size > 1
     raise Shoes::Errors::NoDrawablesFoundError, "Found no #{finder_name} matching #{args.inspect}!" if drawables.empty?
     Niente::ShoesSpecProxy.new(drawables[0])

data/lib/scarpe/niente.rb

@@ -30,3 +30,4 @@ Shoes.add_file_loader loader
 
 Shoes::DisplayService.set_display_service_class(Niente::DisplayService)
 
+Shoes::FEATURES.push(:multi_app)

data/lib/shoes/app.rb

@@ -4,10 +4,6 @@ class Shoes
   class App < Shoes::Drawable
     include Shoes::Log
 
-    class << self
-      attr_accessor :instance
-    end
-
     # The Shoes root of the drawable tree
     attr_reader :document_root
 
@@ -18,35 +14,48 @@ class Shoes
     shoes_styles :title, :width, :height, :resizable, :features
 
     # This is defined to avoid the linkable-id check in the Shoes-style method_missing def'n
-    def features
-      @features
-    end
+    attr_reader :features
 
-    CUSTOM_EVENT_LOOP_TYPES = ["displaylib", "return", "wait"]
+    # These are the allowed values for custom_event_loop events.
+    #
+    # * displaylib means the display library is not going to return from running the app
+    # * return means the display library will return and the loop will be handled outside Lacci's control
+    # * wait means Lacci should busy-wait and send eternal heartbeats from the "run" event
+    #
+    # If the display service grabs control and keeps it, Webview-style, that means "displaylib"
+    # should be the value. A Scarpe-Wasm-style "return" is appropriate if the code can finish
+    # without Ruby ending the process at the end of the source file. A "wait" can prevent Ruby
+    # from finishing early, but also prevents multiple applications. Only "return" will normally
+    # allow multiple Shoes applications.
+    CUSTOM_EVENT_LOOP_TYPES = %w[displaylib return wait]
+
+    class << self
+      attr_accessor :set_test_code
+    end
 
     init_args
     def initialize(
-      title: "Shoes!",
+      title: 'Shoes!',
       width: 480,
       height: 420,
       resizable: true,
       features: [],
       &app_code_body
     )
-      log_init("Shoes::App")
+      log_init('Shoes::App')
 
-      if Shoes::App.instance
-        @log.error("Trying to create a second Shoes::App in the same process! Fail!")
-        raise Shoes::Errors::TooManyInstancesError, "Cannot create multiple Shoes::App objects!"
+      if Shoes::FEATURES.include?(:multi_app) || Shoes.APPS.empty?
+        Shoes.APPS.push self
       else
-        Shoes::App.instance = self
+        @log.error('Trying to create a second Shoes::App in the same process! Fail!')
+        raise Shoes::Errors::TooManyInstancesError, 'Cannot create multiple Shoes::App objects!'
       end
 
       # We cd to the app's containing dir when running the app
       @dir = Dir.pwd
 
       @do_shutdown = false
-      @event_loop_type = "displaylib" # the default
+      @event_loop_type = 'displaylib' # the default
 
       @features = features
 
@@ -62,19 +71,26 @@ class Shoes
 
       @slots = []
 
+      @content_container = nil
+
+      @routes = {}
+
       super
 
       # This creates the DocumentRoot, including its corresponding display drawable
-      @document_root = Shoes::DocumentRoot.new
+      Drawable.with_current_app(self) do
+        @document_root = Shoes::DocumentRoot.new
+      end
 
       # Now create the App display drawable
       create_display_drawable
 
       # Set up testing *after* Display Service basic objects exist
 
-      if ENV["SHOES_SPEC_TEST"]
-        test_code = File.read ENV["SHOES_SPEC_TEST"]
+      if ENV['SHOES_SPEC_TEST'] && !Shoes::App.set_test_code
+        test_code = File.read ENV['SHOES_SPEC_TEST']
         unless test_code.empty?
+          Shoes::App.set_test_code = true
           Shoes::Spec.instance.run_shoes_spec_test_code test_code
         end
       end
@@ -83,30 +99,34 @@ class Shoes
 
       # Try to de-dup as much as possible and not send repeat or multiple
       # destroy events
-      @watch_for_destroy = bind_shoes_event(event_name: "destroy") do
+      @watch_for_destroy = bind_shoes_event(event_name: 'destroy') do
         Shoes::DisplayService.unsub_from_events(@watch_for_destroy) if @watch_for_destroy
         @watch_for_destroy = nil
-        self.destroy(send_event: false)
+        destroy(send_event: false)
       end
 
-      @watch_for_event_loop = bind_shoes_event(event_name: "custom_event_loop") do |loop_type|
-        raise(Shoes::Errors::InvalidAttributeValueError, "Unknown event loop type: #{loop_type.inspect}!") unless CUSTOM_EVENT_LOOP_TYPES.include?(loop_type)
+      @watch_for_event_loop = bind_shoes_event(event_name: 'custom_event_loop') do |loop_type|
+        unless CUSTOM_EVENT_LOOP_TYPES.include?(loop_type)
+          raise(Shoes::Errors::InvalidAttributeValueError,
+                "Unknown event loop type: #{loop_type.inspect}!")
+        end
 
         @event_loop_type = loop_type
       end
 
-      Signal.trap("INT") do
-        @log.warn("App interrupted by signal, stopping...")
+      Signal.trap('INT') do
+        @log.warn('App interrupted by signal, stopping...')
         puts "\nStopping Shoes app..."
         destroy
       end
     end
 
     def init
-      send_shoes_event(event_name: "init")
+      send_shoes_event(event_name: 'init')
       return if @do_shutdown
 
-      ::Shoes::App.instance.with_slot(@document_root, &@app_code_body)
+      with_slot(@document_root, &@app_code_body)
+      render_index_if_defined_on_first_boot
     end
 
     # "Container" drawables like flows, stacks, masks and the document root
@@ -130,7 +150,7 @@ class Shoes
       return unless block_given?
 
       push_slot(slot_item)
-      Shoes::App.instance.instance_eval(&block)
+      instance_eval(&block)
     ensure
       pop_slot
     end
@@ -144,7 +164,9 @@ class Shoes
       return super unless klass
 
       ::Shoes::App.define_method(name) do |*args, **kwargs, &block|
-        klass.new(*args, **kwargs, &block)
+        Drawable.with_current_app(self) do
+          klass.new(*args, **kwargs, &block)
+        end
       end
 
       send(name, *args, **kwargs, &block)
@@ -163,34 +185,33 @@ class Shoes
     # want to (and/or can't) take control of the event loop.
     def run
       if @do_shutdown
-        $stderr.puts "Destroy has already been signaled, but we just called Shoes::App.run!"
+        warn 'Destroy has already been signaled, but we just called Shoes::App.run!'
         return
       end
 
       # The display lib can send us an event to customise the event loop handling.
       # But it must do so before the "run" event returns.
-      send_shoes_event(event_name: "run")
+      send_shoes_event(event_name: 'run')
 
       case @event_loop_type
-      when "wait"
+      when 'wait'
         # Display lib wants us to busy-wait instead of it.
-        until @do_shutdown
-          Shoes::DisplayService.dispatch_event("heartbeat", nil)
-        end
-      when "displaylib"
+        Shoes::DisplayService.dispatch_event('heartbeat', nil) until @do_shutdown
+      when 'displaylib'
         # If run event returned, that means we're done.
         destroy
-      when "return"
+      when 'return'
         # We can just return to the main event loop. But we shouldn't call destroy.
         # Presumably some event loop *outside* our event loop is handling things.
       else
-        raise Shoes::Errors::InvalidAttributeValueError, "Internal error! Incorrect event loop type: #{@event_loop_type.inspect}!"
+        raise Shoes::Errors::InvalidAttributeValueError,
+              "Internal error! Incorrect event loop type: #{@event_loop_type.inspect}!"
       end
     end
 
     def destroy(send_event: true)
       @do_shutdown = true
-      send_shoes_event(event_name: "destroy") if send_event
+      send_shoes_event(event_name: 'destroy') if send_event
     end
 
     def all_drawables
@@ -205,40 +226,52 @@ class Shoes
       out
     end
 
+    # We can add various ways to find drawables here.
+    # These are sort of like Shoes selectors, used for testing.
+    # This method finds a drawable across all active Shoes apps.
+    def self.find_drawables_by(*specs)
+      Shoes.APPS.flat_map do |app|
+        app.find_drawables_by(*specs)
+      end
+    end
+
     # We can add various ways to find drawables here.
     # These are sort of like Shoes selectors, used for testing.
     def find_drawables_by(*specs)
       drawables = all_drawables
       specs.each do |spec|
         if spec == Shoes::App
-          drawables = [Shoes::App.instance]
+          drawables = [@app]
         elsif spec.is_a?(Class)
           drawables.select! { |w| spec === w }
         elsif spec.is_a?(Symbol) || spec.is_a?(String)
           s = spec.to_s
           case s[0]
-          when "$"
+          when '$'
             begin
               # I'm not finding a global_variable_get or similar...
               global_value = eval s
               drawables &= [global_value]
             rescue
-              raise Shoes::Errors::InvalidAttributeValueError, "Error getting global variable: #{spec.inspect}"
+              # raise Shoes::Errors::InvalidAttributeValueError, "Error getting global variable: #{spec.inspect}"
+              drawables = []
             end
-          when "@"
-            if Shoes::App.instance.instance_variables.include?(spec.to_sym)
-              drawables &= [self.instance_variable_get(spec)]
+          when '@'
+            if @app.instance_variables.include?(spec.to_sym)
+              drawables &= [@app.instance_variable_get(spec)]
             else
-              raise Shoes::Errors::InvalidAttributeValueError, "Can't find top-level instance variable: #{spec.inspect}!"
+              # raise Shoes::Errors::InvalidAttributeValueError, "Can't find top-level instance variable: #{spec.inspect}!"
+              drawables = []
             end
           else
-            if s.start_with?("id:")
-              find_id = Integer(s[3..-1])
-              drawable = Shoes::Drawable.drawable_by_id(find_id)
-              drawables &= [drawable]
-            else
+            unless s.start_with?('id:')
               raise Shoes::Errors::InvalidAttributeValueError, "Don't know how to find drawables by #{spec.inspect}!"
             end
+
+            find_id = Integer(s[3..-1])
+            drawable = Shoes::Drawable.drawable_by_id(find_id)
+            drawables &= [drawable]
+
           end
         else
           raise(Shoes::Errors::InvalidAttributeValueError, "Don't know how to find drawables by #{spec.inspect}!")
@@ -246,11 +279,67 @@ class Shoes
       end
       drawables
     end
+
+    def page(name, &block)
+      @pages ||= {}
+      @pages[name] = proc do
+        stack(width: 1.0, height: 1.0) do
+          instance_eval(&block)
+        end
+      end
+    end
+
+    def visit(name_or_path)
+      # First, check for exact page match (symbol)
+      if @pages && @pages[name_or_path]
+        @document_root.clear do
+          instance_eval(&@pages[name_or_path])
+        end
+        return
+      end
+
+      # Second, check URL routes
+      route, method_name = @routes.find { |r, _| r === name_or_path }
+      if route
+        @document_root.clear do
+          if route.is_a?(Regexp)
+            match_data = route.match(name_or_path)
+            send(method_name, *match_data.captures)
+          else
+            send(method_name)
+          end
+        end
+        return
+      end
+
+      # Third, if it's a string path like "/page2", try matching page :page2
+      if name_or_path.is_a?(String) && name_or_path.start_with?("/")
+        page_name = name_or_path[1..-1].to_sym  # "/page2" -> :page2
+        if @pages && @pages[page_name]
+          @document_root.clear do
+            instance_eval(&@pages[page_name])
+          end
+          return
+        end
+      end
+
+      puts "Error: URL '#{name_or_path}' not found"
+    end
+
+    def url(path, method_name)
+      if path.is_a?(String) && path.include?('(')
+        # Convert string patterns to regex
+        regex = Regexp.new("^#{path.gsub(/\(.*?\)/, '(.*?)')}$")
+        @routes[regex] = method_name
+      else
+        @routes[path] = method_name
+      end
+    end
   end
 end
 
 # Event handler DSLs get defined in both App and Slot - same code, slightly different results
-events = [:motion, :hover, :leave, :click, :release, :keypress, :animate, :every, :timer]
+events = %i[motion hover leave click release keypress animate every timer]
 events.each do |event|
   Shoes::App.define_method(event) do |*args, &block|
     subscription_item(args:, shoes_api_name: event.to_s, &block)
@@ -273,7 +362,7 @@ class Shoes::App < Shoes::Drawable
   end
 
   # Draw Context methods -- forward to the current slot
-  [:fill, :nofill, :stroke, :strokewidth, :nostroke, :rotate].each do |dc_method|
+  %i[fill nofill stroke strokewidth nostroke rotate].each do |dc_method|
     define_method(dc_method) do |*args|
       current_slot.send(dc_method, *args)
     end
@@ -282,22 +371,38 @@ class Shoes::App < Shoes::Drawable
   # Shape DSL methods
 
   def move_to(x, y)
-    raise(Shoes::Errors::InvalidAttributeValueError, "Pass only Numeric arguments to move_to!") unless x.is_a?(Numeric) && y.is_a?(Numeric)
-
-    if current_slot.is_a?(::Shoes::Shape)
-      current_slot.add_shape_command(["move_to", x, y])
+    unless x.is_a?(Numeric) && y.is_a?(Numeric)
+      raise(Shoes::Errors::InvalidAttributeValueError,
+            'Pass only Numeric arguments to move_to!')
     end
+
+    return unless current_slot.is_a?(::Shoes::Shape)
+
+    current_slot.add_shape_command(['move_to', x, y])
   end
 
   def line_to(x, y)
-    raise(Shoes::Errors::InvalidAttributeValueError, "Pass only Numeric arguments to line_to!") unless x.is_a?(Numeric) && y.is_a?(Numeric)
-
-    if current_slot.is_a?(::Shoes::Shape)
-      current_slot.add_shape_command(["line_to", x, y])
+    unless x.is_a?(Numeric) && y.is_a?(Numeric)
+      raise(Shoes::Errors::InvalidAttributeValueError,
+            'Pass only Numeric arguments to line_to!')
     end
+
+    return unless current_slot.is_a?(::Shoes::Shape)
+
+    current_slot.add_shape_command(['line_to', x, y])
   end
 
   # Not implemented yet: curve_to, arc_to
 
-  alias_method :info, :puts
+  alias info puts
+
+  private
+
+  def render_index_if_defined_on_first_boot
+    return if @first_boot_finished
+
+    visit('/') if @routes['/'] == :index
+
+    @first_boot_finished = true
+  end
 end

data/lib/shoes/constants.rb

@@ -54,6 +54,7 @@ class Shoes
     # goes in EXTENSIONS and is nonstandard.
     KNOWN_FEATURES = [
       :html, # Supports .to_html on display objects, HTML classes on drawables, etc.
+      :multi_app, # Supports multiple applications at once
     ].freeze
   end
 

data/lib/shoes/drawable.rb

@@ -54,12 +54,12 @@ class Shoes
       def validate_as(prop_name, value)
         prop_name = prop_name.to_s
         hashes = shoes_style_hashes
-      
+
         h = hashes.detect { |hash| hash[:name] == prop_name }
         raise(Shoes::Errors::NoSuchStyleError, "Can't find property #{prop_name.inspect} in #{self} property list: #{hashes.inspect}!") unless h
-      
+
         return value if h[:validator].nil?
-      
+
         # Pass both the property name and value to the validator block
         h[:validator].call(value,prop_name)
       end
@@ -215,7 +215,7 @@ class Shoes
       # styles available with no features requested, pass nil to with_features.
       def shoes_style_names(with_features: nil)
         # No with_features given? Use the ones requested by this Shoes::App
-        with_features ||= Shoes::App.instance.features
+        with_features ||= @app.features
         parent_prop_names = self != Shoes::Drawable ? self.superclass.shoes_style_names(with_features:) : []
 
         if with_features == :all
@@ -236,6 +236,24 @@ class Shoes
         linkable_properties_hash[name.to_s] ||
           (self != Shoes::Drawable && superclass.shoes_style_name?(name))
       end
+
+      # Current_app is set every time a drawable is created - we don't want to keep a default
+      # long because it's possible for apps to alternate who is creating. So make sure it's
+      # not kept long, and used up when used once.
+
+      def with_current_app(app)
+        old_cur_app = @current_app
+        @current_app = app
+        ret = yield
+        @current_app = old_cur_app
+        ret
+      end
+
+      def use_current_app
+        cur_app = @current_app
+        @current_app = nil
+        cur_app
+      end
     end
 
     # Every Shoes drawable has positioning properties
@@ -256,17 +274,20 @@ class Shoes
     # Their value is set at drawable-create time.
     DRAW_CONTEXT_STYLES = [:fill, :stroke, :strokewidth, :rotate, :transform, :translate]
 
-  include MarginHelper
+    include MarginHelper
 
     def initialize(*args, **kwargs)
       kwargs = margin_parse(kwargs)
       log_init("Shoes::#{self.class.name}") unless @log
 
+      # Grab the current app, mark it as used
+      @app = self.is_a?(Shoes::App) ? self : Drawable.use_current_app
+
       # First, get the list of allowed and disallowed styles for the given features
       # and make sure no disallowed styles were given.
 
-      app_features = Shoes::App.instance.features
-      this_app_styles = self.class.shoes_style_names.map(&:to_sym)
+      app_features = @app.features
+      this_app_styles = self.class.shoes_style_names(with_features: @app.features).map(&:to_sym)
       not_this_app_styles = self.class.shoes_style_names(with_features: :all).map(&:to_sym) - this_app_styles
 
       bad_styles = kwargs.keys & not_this_app_styles
@@ -309,8 +330,8 @@ class Shoes
         end
       end
 
-      this_drawable_styles = self.class.shoes_style_names.map(&:to_sym)
-      dc = Shoes::App.instance.current_draw_context || {}
+      this_drawable_styles = self.class.shoes_style_names(with_features: @app.features).map(&:to_sym)
+      dc = @app.current_draw_context || {}
 
       # Styles not passed as arguments can come from the draw context
 
@@ -318,11 +339,6 @@ class Shoes
       # given as positional or keyword arguments?
       draw_context_styles = (DRAW_CONTEXT_STYLES & this_drawable_styles) - supplied_args
       unless draw_context_styles.empty?
-        # When we first call this, there is no parent. We don't want to set the parent
-        # yet because that will send a notification, and *that* should wait until after
-        # we've told the display service that this drawable was created. So instead
-        # we'll query the parent object's draw context directly.
-
         draw_context_styles.each do |style|
           dc_val = dc[style.to_s]
           next if dc_val.nil?
@@ -363,7 +379,7 @@ class Shoes
 
       generate_debug_id
 
-      parent = ::Shoes::App.instance.current_slot
+      parent = @app.current_slot
       if self.class.expects_parent?
         set_parent(parent, notify: false)
       end
@@ -416,8 +432,8 @@ class Shoes
     # @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
+      @app.with_slot(self, &block) if block_given?
+      @app
     end
 
     private
@@ -471,8 +487,8 @@ class Shoes
       send_shoes_event(*args, **kwargs, event_name:, target: linkable_id)
     end
 
-    def shoes_style_values
-      all_property_names = self.class.shoes_style_names
+    def shoes_style_values(with_features: @app.features)
+      all_property_names = self.class.shoes_style_names(with_features:)
 
       properties = {}
       all_property_names.each do |prop|

data/lib/shoes/drawables/arc.rb

@@ -15,10 +15,10 @@ class Shoes
 
     init_args :left, :top, :width, :height, :angle1, :angle2
     def initialize(*args, **kwargs)
-      @draw_context = Shoes::App.instance.current_draw_context
-
       super
 
+      @draw_context = @app.current_draw_context
+
       create_display_drawable
     end
 

data/lib/shoes/drawables/arrow.rb

@@ -11,10 +11,10 @@ class Shoes
 
     init_args :left, :top, :width
     def initialize(*args, **kwargs)
-      @draw_context = Shoes::App.instance.current_draw_context
-
       super
 
+      @draw_context = @app.current_draw_context
+
       create_display_drawable
     end
   end

data/lib/shoes/drawables/border.rb

@@ -17,7 +17,7 @@ class Shoes
     opt_init_args :stroke, :strokewidth, :curve
     def initialize(*args, **kwargs)
       super
-      @draw_context = Shoes::App.instance.current_draw_context
+      @draw_context = @app.current_draw_context
 
       create_display_drawable
     end

data/lib/shoes/drawables/button.rb

@@ -41,7 +41,7 @@ class Shoes
       # Bind block to a handler named "click"
       bind_self_event("click") do
         @log.debug("Button clicked, calling handler") if @block
-        @block&.call
+        @block&.call if @block
       end
 
       create_display_drawable

data/lib/shoes/drawables/edit_line.rb

@@ -2,7 +2,7 @@
 
 class Shoes
   class EditLine < Shoes::Drawable
-    shoes_styles :text, :width, :font, :tooltip, :stroke
+    shoes_styles :text, :width, :font, :tooltip, :stroke, :secret
     shoes_events :change
 
     init_args

data/lib/shoes/drawables/flow.rb

@@ -14,7 +14,7 @@ class Shoes
       # Create the display-side drawable *before* instance_eval, which will add child drawables with their display drawables
       create_display_drawable
 
-      Shoes::App.instance.with_slot(self, &block) if block_given?
+      @app.with_slot(self, &block) if block_given?
     end
   end
 end

data/lib/shoes/drawables/line.rb

@@ -7,10 +7,10 @@ class Shoes
 
     init_args :left, :top, :x2, :y2
     def initialize(*args, **kwargs)
-      @draw_context = Shoes::App.instance.current_draw_context
-
       super
 
+      @draw_context = @app.current_draw_context
+
       create_display_drawable
     end
   end

data/lib/shoes/drawables/link.rb

@@ -10,12 +10,22 @@ class Shoes
     init_args # Empty by the time it reaches Drawable#initialize
     def initialize(*args, **kwargs, &block)
       @block = block
+
+      # Check if click is an internal route (starts with /)
+      click_value = kwargs[:click]
+      @internal_route = click_value.is_a?(String) && click_value.start_with?("/")
+
       # We can't send a block to the display drawable, but we can send a boolean
-      @has_block = !block.nil?
+      # Also set has_block if we have an internal route (so display uses onclick, not href)
+      @has_block = !block.nil? || @internal_route
 
       super
 
       bind_self_event("click") do
+        if @internal_route
+          # Navigate to the internal route
+          app.visit(@click)
+        end
         @block&.call
       end
     end

data/lib/shoes/drawables/oval.rb

@@ -18,10 +18,10 @@ class Shoes
     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
 
+      @draw_context = @app.current_draw_context
+
       unless @left && @top && (@width || @height || @radius)
         raise Shoes::Errors::InvalidAttributeValueError, "Oval requires left, top and one of (width, height, radius) to be specified!"
       end

data/lib/shoes/drawables/rect.rb

@@ -8,10 +8,10 @@ class Shoes
     init_args :left, :top, :width, :height
     opt_init_args :curve
     def initialize(*args, **kwargs)
-      @draw_context = Shoes::App.instance.current_draw_context
-
       super
 
+      @draw_context = @app.current_draw_context
+
       create_display_drawable
     end
   end

data/lib/shoes/drawables/shape.rb

@@ -16,12 +16,12 @@ class Shoes
     init_args # No positional args
     def initialize(**kwargs, &block)
       @shape_commands = []
-      @draw_context = Shoes::App.instance.current_draw_context
 
       super
+      @draw_context = @app.current_draw_context
       create_display_drawable
 
-      Shoes::App.instance.with_slot(self, &block) if block_given?
+      @app.with_slot(self, &block) if block_given?
     end
 
     # The cmd should be an array of the form:

data/lib/shoes/drawables/slot.rb

@@ -62,8 +62,10 @@ class Shoes::Slot < Shoes::Drawable
       # 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)
+      @app.with_slot(self) do
+        Shoes::Drawable.with_current_app(self.app) do
+          instance = klass.new(*args, **kwargs, &block)
+        end
       end
 
       instance
@@ -173,6 +175,6 @@ class Shoes::Slot < Shoes::Drawable
     raise(Shoes::Errors::InvalidAttributeValueError, "append requires a block!") unless block_given?
     raise(Shoes::Errors::InvalidAttributeValueError, "Don't append to something that isn't a slot!") unless self.is_a?(Shoes::Slot)
 
-    Shoes::App.instance.with_slot(self, &block)
+    @app.with_slot(self, &block)
   end
 end

data/lib/shoes/drawables/stack.rb

@@ -15,7 +15,7 @@ class Shoes
 
       # Create the display-side drawable *before* running the block.
       # Then child drawables have a parent to add themselves to.
-      Shoes::App.instance.with_slot(self, &block) if block_given?
+      @app.with_slot(self, &block) if block_given?
     end
   end
 end

data/lib/shoes/drawables/star.rb

@@ -19,7 +19,7 @@ class Shoes
     def initialize(*args, **kwargs)
       super
 
-      @draw_context = Shoes::App.instance.current_draw_context
+      @draw_context = @app.current_draw_context
 
       create_display_drawable
     end

data/lib/shoes/drawables/widget.rb

@@ -67,7 +67,7 @@ class Shoes::Widget < Shoes::Slot
       __widget_initialize(*args, **kwargs, &block)
 
       # Do Widgets do this?
-      Shoes::App.instance.with_slot(self, &block) if block
+      @app.with_slot(self, &block) if block
     end
     @midway_through_adding_initialize = false
   end

data/lib/shoes.rb

@@ -7,47 +7,47 @@
 # to handle the DSL and command-line parts of Shoes without knowing anything about how the
 # display side works at all.
 
-if RUBY_VERSION[0..2] < "3.2"
-  Shoes::Log.logger("Shoes").error("Lacci (Scarpe, Shoes) requires Ruby 3.2 or higher!")
+if RUBY_VERSION[0..2] < '3.2'
+  Shoes::Log.logger('Shoes').error('Lacci (Scarpe, Shoes) requires Ruby 3.2 or higher!')
   exit(-1)
 end
 
 class Shoes; end
 class Shoes::Error < StandardError; end
-require_relative "shoes/errors"
+require_relative 'shoes/errors'
 
-require_relative "shoes/constants"
-require_relative "shoes/ruby_extensions"
+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/display_service"
+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/log'
+require_relative 'shoes/colors'
 
-require_relative "shoes/builtins"
+require_relative 'shoes/builtins'
 
-require_relative "shoes/background"
+require_relative 'shoes/background'
 
-require_relative "shoes/drawable"
-require_relative "shoes/app"
-require_relative "shoes/drawables"
+require_relative 'shoes/drawable'
+require_relative 'shoes/app'
+require_relative 'shoes/drawables'
 
-require_relative "shoes/download"
+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"
+require_relative 'shoes-spec'
 
 # The module containing Shoes in all its glory.
 # Shoes is a platform-independent GUI library, designed to create
@@ -55,6 +55,40 @@ require_relative "shoes-spec"
 #
 class Shoes
   class << self
+    attr_accessor :APPS
+
+    # Track the most recently defined Shoes subclass for the inheritance pattern
+    # e.g., class Book < Shoes; end; Shoes.app
+    attr_accessor :pending_app_class
+
+    # When someone does `class MyApp < Shoes`, track it
+    def inherited(subclass)
+      # Only track direct subclasses of Shoes, not Shoes::App, Shoes::Drawable, etc.
+      # Those have their own inheritance tracking
+      if self == ::Shoes
+        Shoes.pending_app_class = subclass
+      end
+      super
+    end
+
+    # Class-level url method for defining routes in Shoes subclasses
+    # e.g., class Book < Shoes; url '/', :index; end
+    def url(path, method_name)
+      @class_routes ||= {}
+      if path.is_a?(String) && path.include?('(')
+        # Convert string patterns like '/page/(\d+)' to regex
+        regex = Regexp.new("^#{path.gsub(/\(.*?\)/, '(.*?)')}$")
+        @class_routes[regex] = method_name
+      else
+        @class_routes[path] = method_name
+      end
+    end
+
+    # Get the routes defined on this class
+    def class_routes
+      @class_routes ||= {}
+    end
+
     # Creates a Shoes app with a new window. The block parameter is used to create
     # drawables and set up handlers. Arguments are passed to Shoes::App.new internally.
     #
@@ -78,7 +112,7 @@ class Shoes
     # @return [void]
     # @see Shoes::App#new
     def app(
-      title: "Shoes!",
+      title: 'Shoes!',
       width: 480,
       height: 420,
       resizable: true,
@@ -87,6 +121,47 @@ class Shoes
     )
       f = [features].flatten # Make sure this is a list, not a single symbol
       app = Shoes::App.new(title:, width:, height:, resizable:, features: f, &app_code_body)
+
+      # If there's a pending Shoes subclass (e.g., class Book < Shoes), use it
+      if Shoes.pending_app_class
+        subclass = Shoes.pending_app_class
+        Shoes.pending_app_class = nil  # Clear it so it doesn't affect future apps
+
+        # Include the subclass as a module to get its instance methods
+        # This works because we're extending the singleton class
+        methods_to_copy = subclass.instance_methods(false)
+
+        methods_to_copy.each do |method_name|
+          # Get source location and use eval to redefine - but that's fragile
+          # Instead, let's use a delegation pattern with the app as context
+
+          # Read the method's arity and create a proper wrapper
+          um = subclass.instance_method(method_name)
+
+          # Define a wrapper that will eval the original method body in app's context
+          # This is a bit hacky but works: we store the subclass and call via instance_eval
+          app.define_singleton_method(method_name) do |*args, &block|
+            # Create a temporary subclass instance that delegates to app for Shoes methods
+            temp = subclass.allocate
+            temp.instance_variable_set(:@__shoes_app__, self)
+
+            # Define method_missing on the temp to delegate Shoes DSL calls to the app
+            temp.define_singleton_method(:method_missing) do |name, *a, **kw, &b|
+              @__shoes_app__.send(name, *a, **kw, &b)
+            end
+            temp.define_singleton_method(:respond_to_missing?) { |*| true }
+
+            # Call the original method on temp (which delegates DSL calls to app)
+            temp.send(method_name, *args, &block)
+          end
+        end
+
+        # Copy routes from the subclass to the app
+        subclass.class_routes.each do |path, method_name|
+          app.url(path, method_name)
+        end
+      end
+
       app.init
       app.run
       nil
@@ -125,7 +200,7 @@ class Shoes
         proc do |path|
           load path
           true
-        end,
+        end
       ]
     end
 
@@ -145,4 +220,6 @@ class Shoes
       @file_loaders = loaders
     end
   end
+
+  Shoes.APPS ||= []
 end

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lacci
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Marco Concetto Rudilosso
 - Noah Gibbs
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-05-06 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: scarpe-components
@@ -25,7 +24,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.4.0
-description:
 email:
 - marcoc.r@outlook.com
 - the.codefolio.guy@gmail.com
@@ -94,7 +92,6 @@ licenses:
 metadata:
   homepage_uri: https://github.com/scarpe-team/scarpe
   changelog_uri: https://github.com/scarpe-team/scarpe/blob/main/CHANGELOG.md
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -109,8 +106,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.3
-signing_key:
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Lacci - a portable Shoes DSL with switchable display backends, part of Scarpe
 test_files: []