scarpe 0.4.0 → 0.5.0

data/lacci/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/lacci/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/lacci/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/lacci/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/lacci/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

data/lacci/test/test_margin_helper.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-load "lacci/lib/shoes/margin_helper.rb"
+require_relative "../lib/shoes/margin_helper"
 
 
 class TestMarginHelper < Minitest::Test

data/lacci/test/test_niente_test_infra.rb

@@ -23,4 +23,18 @@ class TestNienteTestInfra < NienteTest
       raise "ERROR!"
     SHOES_SPEC
   end
+
+  def test_multi_app_find
+    run_test_niente_code(<<~SHOES_APP, app_test_code: <<~SHOES_SPEC)
+      Shoes.app do
+        @b = button "OK"
+      end
+      Shoes.app do
+        @b2 = button "Nope"
+      end
+    SHOES_APP
+      assert_equal "OK", button("@b").text
+      assert_equal "Nope", button("@b2").text
+    SHOES_SPEC
+  end
 end

data/lacci/test/test_shoes_errors.rb

@@ -17,19 +17,21 @@ class TestShoesErrors < NienteTest
     SHOES_SPEC
   end
 
-  def test_too_many_instances_error
-    run_test_niente_code(<<~SHOES_APP, app_test_code: <<~SHOES_SPEC)
-    $ruby_main = self
-    Shoes.app do
-    end
-    SHOES_APP
-    assert_raises Shoes::Errors::TooManyInstancesError do
-      $ruby_main.instance_eval do
-        Shoes.app {}
-      end
-    end
-    SHOES_SPEC
-  end
+  # Niente can no longer test the TooManyInstancesError because it now
+  # supports multiple Shoes apps.
+  #def test_too_many_instances_error
+  #  run_test_niente_code(<<~SHOES_APP, app_test_code: <<~SHOES_SPEC)
+  #  $ruby_main = self
+  #  Shoes.app do
+  #  end
+  #  SHOES_APP
+  #  assert_raises Shoes::Errors::TooManyInstancesError do
+  #    $ruby_main.instance_eval do
+  #      Shoes.app {}
+  #    end
+  #  end
+  #  SHOES_SPEC
+  #end
 
   def test_drawables_found_errors
     run_test_niente_code(<<~SHOES_APP, app_test_code: <<~SHOES_SPEC)

data/lib/scarpe/assets.rb

@@ -6,7 +6,8 @@ module Scarpe::Webview
   def self.asset_server
     return @asset_server if @asset_server
 
-    @asset_server = Scarpe::Components::AssetServer.new app_dir: Shoes::App.instance.dir
+    # A Scarpe Webview application can have only a single Shoes::App instance.
+    @asset_server = Scarpe::Components::AssetServer.new app_dir: Shoes.APPS[0].dir
 
     # at_exit doesn't work reliably under webview. Give this a try.
     ::Scarpe::Webview::DisplayService.instance.control_interface.on_event(:shutdown) do

data/lib/scarpe/shoes_spec.rb

@@ -107,7 +107,8 @@ module Scarpe::ShoesSpecTest
     finder_name = drawable_class.dsl_name
 
     define_method(finder_name) do |*args|
-      app = Shoes::App.instance
+      # Scarpe-Webview only supports a single Shoes::App instance
+      app = Shoes.APPS[0]
 
       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

data/lib/scarpe/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Scarpe
-  VERSION = "0.4.0"
+  VERSION = "0.5.0"
 end

data/lib/scarpe/wv/edit_line.rb

@@ -2,7 +2,7 @@
 
 module Scarpe::Webview
   class EditLine < Drawable
-    attr_reader :text, :width, :stroke, :font, :tooltip
+    attr_reader :text, :width, :stroke, :font, :tooltip, :secret
 
     def initialize(properties)
       super
@@ -15,7 +15,7 @@ module Scarpe::Webview
         send_self_event(new_text, event_name: "hover")
       end
     end
-    
+
     def properties_changed(changes)
       t = changes.delete("text")
       if t

data/lib/scarpe/wv.rb

@@ -7,7 +7,14 @@
 require "securerandom"
 require "json"
 
-require "bloops"
+# Bloops is optional - only required if you want sound support
+# Install with: gem install bloops (requires portaudio)
+begin
+  require "bloops"
+rescue LoadError
+  # Bloops not installed - sound features will not be available
+end
+
 require "scarpe/components/html" # HTML renderer
 require "scarpe/components/modular_logger"
 require "scarpe/components/promises"

data/scarpe-components/Gemfile

@@ -20,6 +20,4 @@ end
 
 group :development do
   gem "debug"
-  gem "rubocop", "~> 1.21"
-  gem "rubocop-shopify"
 end

data/scarpe-components/Gemfile.lock

@@ -1,20 +1,18 @@
 PATH
   remote: ../lacci
   specs:
-    lacci (0.3.0)
-      scarpe-components
+    lacci (0.4.0)
+      scarpe-components (~> 0.4.0)
 
 PATH
   remote: .
   specs:
-    scarpe-components (0.3.0)
+    scarpe-components (0.4.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
     ansi (1.5.0)
-    ast (2.4.2)
-    base64 (0.1.1)
     builder (3.2.4)
     debug (1.8.0)
       irb (>= 1.5.0)
@@ -23,51 +21,25 @@ GEM
     irb (1.8.0)
       rdoc (~> 6.5)
       reline (>= 0.3.6)
-    json (2.6.3)
-    language_server-protocol (3.17.0.3)
     minitest (5.19.0)
     minitest-reporters (1.6.1)
       ansi
       builder
       minitest (>= 5.0)
       ruby-progressbar
-    parallel (1.23.0)
-    parser (3.2.2.3)
-      ast (~> 2.4.1)
-      racc
     psych (5.1.0)
       stringio
-    racc (1.7.1)
-    rainbow (3.1.1)
     rake (13.0.6)
     rdoc (6.5.0)
       psych (>= 4.0.0)
-    regexp_parser (2.8.1)
     reline (0.3.8)
       io-console (~> 0.5)
-    rexml (3.2.6)
-    rubocop (1.56.2)
-      base64 (~> 0.1.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.1, < 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)
     stringio (3.0.8)
-    unicode-display_width (2.4.2)
     webrick (1.8.1)
 
 PLATFORMS
+  arm64-darwin-21
   x86_64-darwin-22
 
 DEPENDENCIES
@@ -76,8 +48,6 @@ DEPENDENCIES
   minitest (~> 5.0)
   minitest-reporters
   rake (~> 13.0)
-  rubocop (~> 1.21)
-  rubocop-shopify
   scarpe-components!
   webrick
 

data/scarpe-components/lib/scarpe/components/calzini/misc.rb

@@ -22,9 +22,17 @@ module Scarpe::Components::Calzini
 
   def edit_line_element(props)
     oninput = handler_js_code("change", "this.value")
-    
+
     HTML.render do |h|
-      h.input(id: html_id, oninput: oninput, onmouseover: handler_js_code("hover"), value: props["text"], style: edit_line_style(props),title: props["tooltip"])
+      h.input(
+        id: html_id,
+        type: props["secret"] ? :password : :text,
+        oninput: oninput,
+        onmouseover: handler_js_code("hover"),
+        value: props["text"],
+        style: edit_line_style(props),
+        title: props["tooltip"]
+      )
     end
   end
 

data/scarpe-components/lib/scarpe/components/calzini/para.rb

@@ -220,9 +220,14 @@ module Scarpe::Components::Calzini
   private
 
   def text_drawable_attrs(props)
+    click_value = props["click"]
+    # Internal routes (starting with /) should use onclick, not href
+    # External URLs use href for normal browser navigation
+    is_internal_route = click_value.is_a?(String) && click_value.start_with?("/")
+
     {
       # These properties will normally only be set by link()
-      href: props["click"],
+      href: is_internal_route ? nil : click_value,
       onclick: props["has_block"] ? handler_js_code("click") : nil,
     }.compact
   end

data/scarpe-components/lib/scarpe/components/calzini/slots.rb

@@ -100,6 +100,8 @@ module Scarpe::Components::Calzini
       "linear-gradient(45deg, #{bc.first}, #{bc.last})"
     when ->(value) { File.exist?(value) }
       "url(data:image/png;base64,#{encode_file_to_base64(bc)})"
+    when ->(value) { valid_url?(value) }
+      "url(#{bc})"
     else
       bc
     end

data/scarpe-components/lib/scarpe/components/port_helpers.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+require "socket"
+
+module Scarpe::Components
+  module PortHelpers
+    MAX_SERVER_STARTUP_WAIT = 5.0
+
+    def port_working?(ip, port_num)
+      begin
+        TCPSocket.new(ip, port_num)
+      rescue Errno::ECONNREFUSED
+        return false
+      end
+      return true
+    end
+
+    def wait_until_port_working(ip, port_num, max_wait: MAX_SERVER_STARTUP_WAIT)
+      t_start = Time.now
+      loop do
+        if Time.now - t_start > max_wait
+          raise "Server on port #{port_num} didn't start up in time!"
+        end
+
+        sleep 0.1
+        return if port_working?(ip, port_num)
+      end
+    end
+  end
+end

data/scarpe-components/lib/scarpe/components/version.rb

@@ -2,6 +2,6 @@
 
 module Scarpe
   module Components
-    VERSION = "0.4.0"
+    VERSION = "0.5.0"
   end
 end

data/scarpe-components/scarpe-components.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |spec|
   # spec.metadata["allowed_push_host"] = "TODO: Set to your gem server 'https://example.com'"
 
   spec.metadata["homepage_uri"] = spec.homepage
-  spec.metadata["source_code_uri"] = "https://github.com/scarpe-team/scarpe"
+  #spec.metadata["source_code_uri"] = "https://github.com/scarpe-team/scarpe"
   spec.metadata["changelog_uri"] = "https://github.com/scarpe-team/scarpe/blob/main/CHANGELOG.md"
 
   # Specify which files should be added to the gem when it is released.

data/scarpe-components/test/test_port_helpers.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+require_relative "test_helper"
+
+require "scarpe/components/port_helpers"
+class TestPortHelpers < Minitest::Test
+  include Scarpe::Components::PortHelpers
+
+  def test_port_finder
+    assert_equal false, port_working?("127.0.0.1", 9832), "Port 9832 should be unused!"
+  end
+end