lacci 0.3.0 → 0.5.0

data/lib/shoes.rb

@@ -7,49 +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/border"
-require_relative "shoes/spacing"
+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
@@ -57,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.
     #
@@ -76,16 +108,60 @@ class Shoes
     # @param width [Integer] The new app window width
     # @param height [Integer] The new app window height
     # @param resizable [Boolean] Whether the app window should be resizeable
+    # @param features [Symbol,Array<Symbol>] Additional Shoes extensions requested by the app
     # @return [void]
     # @see Shoes::App#new
     def app(
-      title: "Shoes!",
+      title: 'Shoes!',
       width: 480,
       height: 420,
       resizable: true,
+      features: [],
       &app_code_body
     )
-      app = Shoes::App.new(title:, width:, height:, resizable:, &app_code_body)
+      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
@@ -124,7 +200,7 @@ class Shoes
         proc do |path|
           load path
           true
-        end,
+        end
       ]
     end
 
@@ -144,4 +220,6 @@ class Shoes
       @file_loaders = loaders
     end
   end
+
+  Shoes.APPS ||= []
 end

metadata

@@ -1,31 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: lacci
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Marco Concetto Rudilosso
 - Noah Gibbs
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-11-24 00:00:00.000000000 Z
+date: 1980-01-02 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'
+        version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-description:
+        version: 0.4.0
 email:
 - marcoc.r@outlook.com
 - the.codefolio.guy@gmail.com
@@ -43,7 +41,6 @@ files:
 - 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
@@ -60,23 +57,25 @@ files:
 - lib/shoes/drawables.rb
 - lib/shoes/drawables/arc.rb
 - lib/shoes/drawables/arrow.rb
+- lib/shoes/drawables/border.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/font_helper.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/oval.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
@@ -85,16 +84,14 @@ files:
 - lib/shoes/drawables/widget.rb
 - lib/shoes/errors.rb
 - lib/shoes/log.rb
+- lib/shoes/margin_helper.rb
 - lib/shoes/ruby_extensions.rb
-- lib/shoes/spacing.rb
 homepage: https://github.com/scarpe-team/scarpe
 licenses:
 - MIT
 metadata:
   homepage_uri: https://github.com/scarpe-team/scarpe
-  source_code_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.4.10
-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: []

data/lib/scarpe/niente/logger.rb

@@ -1,29 +0,0 @@
-# frozen_string_literal: true
-
-require "shoes/log"
-require "json"
-
-module Niente; end
-class Niente::LogImpl
-  include Shoes::Log # for constants
-
-  class PrintLogger
-    def initialize(_)
-    end
-
-    [:error, :warn, :debug, :info].each do |level|
-      define_method(level) do |msg|
-        puts "#{level}: #{msg}"
-      end
-    end
-  end
-
-  def logger_for_component(component)
-    PrintLogger.new(component.to_s)
-  end
-
-  def configure_logger(log_config)
-  end
-end
-
-#Shoes::Log.instance = Niente::LogImpl.new

data/lib/shoes/drawables/span.rb

@@ -1,27 +0,0 @@
-# frozen_string_literal: true
-
-class Shoes
-  class Span < Shoes::Drawable
-    shoes_styles :text, :stroke, :size, :font, :html_attributes
-    shoes_events # No Span-specific events yet
-
-    def initialize(text, stroke: nil, size: :span, font: nil, **html_attributes)
-      super
-
-      @text = text
-      @stroke = stroke
-      @size = size
-      @font = font
-      @html_attributes = html_attributes
-
-      create_display_drawable
-    end
-
-    def replace(text)
-      @text = text
-
-      # This should signal the display drawable to change
-      self.text = @text
-    end
-  end
-end

data/lib/shoes/spacing.rb

@@ -1,9 +0,0 @@
-# frozen_string_literal: true
-
-class Shoes
-  module Spacing
-    def self.included(includer)
-      includer.shoes_styles :margin, :padding, :margin_top, :margin_left, :margin_right, :margin_bottom, :options
-    end
-  end
-end