Shoes widget not scarpe

.yardopts

@@ -3,6 +3,8 @@
 --protected
 --no-private
 --template-path docs/yard/template
+--tag incompatibility:"Incompatibilities with Shoes"
+--exclude lib/scarpe/libui
 -
 lib/**/*.rb
 docs/yard/*.md

examples/button_go_away.rb

@@ -1,4 +1,4 @@
-Shoes.app(debug: true) do
+Shoes.app do
   @b = button "Go away, button"
   @b.click {
     @b.destroy

examples/ruby_racer.rb

@@ -1,7 +1,7 @@
 require "benchmark"
 require "stringio"
 
-Shoes.app(title: "Ruby Racer", debug: true) do
+Shoes.app(title: "Ruby Racer") do
   racer1 = nil
   racer2 = nil
 

lib/scarpe.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "shoes"
+
 require_relative "scarpe/logger"
 
 # This will never be triggered -- we use the (...) feature below, which means this
@@ -15,7 +17,6 @@
 # Is there a Shoes::Error class? Should this be two different error classes?
 class Scarpe::Error < StandardError; end
 
-require_relative "scarpe/constants"
 require_relative "scarpe/version"
 require_relative "scarpe/promises"
 require_relative "scarpe/display_service"
@@ -26,16 +27,3 @@ class Scarpe::Error < StandardError; end
 d_s = ENV["SCARPE_DISPLAY_SERVICE"] || "wv_local"
 # This is require, not require_relative, to allow gems to supply a new display service
 require "scarpe/#{d_s}"
-
-include Constants
-
-module Shoes
-  class << self
-    def app(...)
-      app = Scarpe::App.new(...)
-      app.init
-      app.run
-      app.destroy
-    end
-  end
-end

lib/scarpe/alert.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class Scarpe
-  class Alert < Scarpe::Widget
+  class Alert < Shoes::Widget
     display_property :text
 
     def initialize(text)

lib/scarpe/arc.rb

@@ -3,7 +3,7 @@
 class Scarpe
   class InvalidAttributeValueError < Scarpe::Error; end
 
-  class Arc < Scarpe::Widget
+  class Arc < Shoes::Widget
     display_properties :left, :top, :width, :height, :angle1, :angle2
 
     def initialize(*args)

lib/scarpe/button.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class Scarpe
-  class Button < Scarpe::Widget
+  class Button < Shoes::Widget
     include Scarpe::Log
     display_properties :text, :width, :height, :top, :left, :color, :padding_top, :padding_bottom, :text_color, :size, :font_size
 

lib/scarpe/cats_cradle.rb

@@ -164,11 +164,13 @@ def on_event(event, &block)
     }
     # What to do about TextWidgets? Link, code, em, strong?
     # Also, wait, what's up with span? What *is* that?
-    WIDGET_FINDERS.each do |finder_name, scarpe_class|
+    Shoes::Widget.widget_classes.each do |widget_class|
+      finder_name = widget_class.dsl_name
+
       define_method(finder_name) do |*args|
-        app = Scarpe::App.instance
+        app = Shoes::App.instance
 
-        widgets = app.find_widgets_by(scarpe_class, *args)
+        widgets = app.find_widgets_by(widget_class, *args)
         raise "Found more than one #{finder_name} matching #{args.inspect}!" if widgets.size > 1
         raise "Found no #{finder_name} matching #{args.inspect}!" if widgets.empty?
 
@@ -239,7 +241,7 @@ def test_finished
     end
   end
 
-  # This module is mixed into Scarpe::App if we're running CC-based tests
+  # This module is mixed into Shoes::App if we're running CC-based tests
   module CatsCradle
     def event_init
       @cc_instance = CCInstance.instance

lib/scarpe/display_service.rb

@@ -26,18 +26,6 @@
 # And when a display-side event occurs (e.g. user pushes a button,) it will be
 # dispatched as a :shoes event, to be sent to the Shoes tree of widgets.
 #
-# It is normally assumed that there will only be a single 'real' consumer for each
-# queue. You wouldn't usually want multiple display services sending back click
-# events, for example. But that's not a technical limitation of the system.
-# You could have no display service and not get any events back, or a debug
-# display service that just records what happened. But in real situations,
-# exactly one display service is a reasonable and appropriate assumption.
-#
-# The event types are "queues" in the sense that they're separate from each
-# other. You need to subscribe separately to :shoes and :display events if
-# you want both. But internally they're immediately dispatched as events
-# rather than keeping a literal array of items.
-#
 module Shoes
   class DisplayService
     class << self
@@ -167,6 +155,10 @@ def destroy
   # This is for objects that can be referred to via events, using their
   # IDs. There are also convenience functions for binding and sending
   # events.
+  #
+  # Linkable objects may be event targets. Technically anything, linkable
+  # or not, can be an event subscriber, but linkables get easy convenience
+  # functions for subscription.
   class Linkable
     attr_reader :linkable_id
 

lib/scarpe/download.rb

@@ -4,7 +4,7 @@
 require "openssl"
 require "nokogiri"
 
-class Scarpe
+module Shoes
   class Widget
     class ResponseWrapper
       attr_reader :response
@@ -26,7 +26,7 @@ def download(url, method: "GET", save: nil, styles: {}, &block)
       @block = block
 
       Thread.new do
-        logger = Scarpe::Logger.logger("Scarpe::App#download")
+        logger = Scarpe::Logger.logger("Shoes::App#download")
         begin
           uri = URI(url)
           response = perform_request(uri, method, styles)

lib/scarpe/edit_box.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class Scarpe
-  class EditBox < Scarpe::Widget
+  class EditBox < Shoes::Widget
     display_properties :text, :height, :width
 
     def initialize(text = "", height: nil, width: nil, &block)

lib/scarpe/edit_line.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class Scarpe
-  class EditLine < Scarpe::Widget
+  class EditLine < Shoes::Widget
     display_properties :text, :width
 
     def initialize(text = "", width: nil, &block)

lib/scarpe/fill.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class Scarpe
-  class Fill < Scarpe::Widget
+  class Fill < Shoes::Widget
     display_properties :color
 
     def initialize(color)

lib/scarpe/flow.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class Scarpe
-  class Flow < Scarpe::Slot
+  class Flow < Shoes::Slot
     display_properties :width, :height, :margin, :padding
 
     def initialize(width: nil, height: nil, margin: nil, padding: nil, **options, &block)
@@ -12,7 +12,7 @@ def initialize(width: nil, height: nil, margin: nil, padding: nil, **options, &b
       # Create the display-side widget *before* instance_eval, which will add child widgets with their display widgets
       create_display_widget
 
-      Scarpe::App.instance.with_slot(self, &block) if block_given?
+      Shoes::App.instance.with_slot(self, &block) if block_given?
     end
   end
 end

lib/scarpe/font.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class Scarpe
-  class Font < Scarpe::Widget
+  class Font < Shoes::Widget
     display_properties :font
 
     def initialize(font)

lib/scarpe/image.rb

@@ -4,7 +4,7 @@
 require "open-uri"
 
 class Scarpe
-  class Image < Scarpe::Widget
+  class Image < Shoes::Widget
     display_properties :url, :width, :height, :top, :left, :click
 
     def initialize(url, width: nil, height: nil, top: nil, left: nil, click: nil)
@@ -22,7 +22,9 @@ def replace(url)
       self.url = url
     end
   end
+end
 
+module Shoes
   class Widget
     def size
       width, height = FastImage.size(@url)

lib/scarpe/line.rb

@@ -3,7 +3,7 @@
 require_relative "wv/shape_helper"
 
 class Scarpe
-  class Line < Scarpe::Widget
+  class Line < Shoes::Widget
     include ShapeHelper
 
     display_properties :left, :top, :x2, :y2, :color

lib/scarpe/link.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class Scarpe
-  class Link < Scarpe::TextWidget
+  class Link < Shoes::TextWidget
     display_properties :text, :click, :has_block
 
     def initialize(text, click: nil, &block)

lib/scarpe/list_box.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class Scarpe
-  class ListBox < Scarpe::Widget
+  class ListBox < Shoes::Widget
     display_properties :selected_item, :items, :height, :width
 
     def initialize(args = {}, &block)

lib/scarpe/para.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class Scarpe
-  class Para < Scarpe::Widget
+  class Para < Shoes::Widget
     class << self
       def inherited(subclass)
         Scarpe::Widget.widget_classes ||= []
@@ -59,7 +59,9 @@ def show
       @hidden_text_items = []
     end
   end
+end
 
+module Shoes
   class Widget
     def banner(*args, **kwargs)
       para(*args, **{ size: :banner }.merge(kwargs))

lib/scarpe/shape.rb

@@ -3,7 +3,7 @@
 require_relative "wv/shape_helper"
 
 class Scarpe
-  class Shape < Scarpe::Widget
+  class Shape < Shoes::Widget
     include ShapeHelper
     display_properties :left, :top
 

lib/scarpe/slot.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class Scarpe::Slot < Scarpe::Widget
+class Shoes::Slot < Shoes::Widget
   include Scarpe::Background
   include Scarpe::Border
   include Scarpe::Spacing

lib/scarpe/span.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class Scarpe
-  class Span < Scarpe::Widget
+  class Span < Shoes::Widget
     display_properties :text, :stroke, :size, :font, :html_attributes
 
     def initialize(text, stroke: nil, size: :span, font: nil, **html_attributes)

lib/scarpe/stack.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class Scarpe
-  class Stack < Scarpe::Slot
+  class Stack < Shoes::Slot
     # TODO: sort out various margin and padding properties, including putting stuff into spacing
     display_properties :width, :height, :scroll
 
@@ -14,7 +14,7 @@ def initialize(width: nil, height: nil, margin: nil, padding: nil, scroll: false
 
       create_display_widget
       # Create the display-side widget *before* running the block, which will add child widgets with their display widgets
-      Scarpe::App.instance.with_slot(self, &block) if block_given?
+      Shoes::App.instance.with_slot(self, &block) if block_given?
     end
   end
 end

lib/scarpe/star.rb

@@ -4,7 +4,7 @@
 class Scarpe
   class InvalidAttributeValueError < Scarpe::Error; end
 
-  class Star < Scarpe::Widget
+  class Star < Shoes::Widget
     include ShapeHelper
     display_properties :left, :top, :points, :outer, :inner, :color
 

lib/scarpe/subscription_item.rb

@@ -9,7 +9,7 @@
 #
 # Inheriting from Widget gives these a parent slot and a
 # linkable_id automatically.
-class SubscriptionItem < Scarpe::Widget
+class SubscriptionItem < Shoes::Widget
   display_property :shoes_api_name
 
   def initialize(shoes_api_name:, &block)

lib/scarpe/video.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class Scarpe
-  class Video < Scarpe::Widget
+  class Video < Shoes::Widget
     display_properties :url
 
     def initialize(url)

lib/scarpe/widgets.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 require_relative "colors"
-require_relative "widget"
-require_relative "app"
+require "shoes/widget"
+require "shoes/app"
 
 require_relative "spacing"
 require_relative "background"
@@ -29,7 +29,7 @@
 require_relative "shape"
 require_relative "arc"
 
-require_relative "text_widget"
+require "shoes/text_widget"
 require_relative "link"
 require_relative "line"
 require_relative "video"