scarpe 0.3.0 → 0.5.0

data/lib/scarpe/wv/webview_local_display.rb

@@ -52,10 +52,10 @@ module Scarpe
     # @param properties [Hash] a JSON-serialisable Hash with the drawable's Shoes styles
     # @param is_widget [Boolean] whether the class is a user-defined Shoes::Widget subclass
     # @return [Webview::Drawable] the newly-created Webview drawable
-    def create_display_drawable_for(drawable_class_name, drawable_id, properties, is_widget:)
+    def create_display_drawable_for(drawable_class_name, drawable_id, properties, parent_id:, is_widget:)
       existing = query_display_drawable_for(drawable_id, nil_ok: true)
       if existing
-        @log.warn("There is already a display drawable for #{drawable_id.inspect}! Returning #{existing.class.name}.")
+        @log.warn("There is already a Scarpe drawable for #{drawable_id.inspect}! Returning #{existing.class.name} rather than creating a #{drawable_class_name}.")
         return existing
       end
 
@@ -95,6 +95,10 @@ module Scarpe
         @doc_root = display_drawable
       end
 
+      # Nil parent is fine for DocumentRoot and any TextDrawable, so we have to specify it.
+      display_parent = Scarpe::Webview::DisplayService.instance.query_display_drawable_for(parent_id, nil_ok: true)
+      display_drawable.set_parent(display_parent)
+
       display_drawable
     end
 

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"
@@ -63,6 +70,9 @@ Shoes::FONTS.push(
   "Monaco",
 )
 
+Shoes::FEATURES.push(:html)
+Shoes::EXTENSIONS.push(:scarpe)
+
 require_relative "shoes_spec"
 Shoes::Spec.instance = Scarpe::Test
 
@@ -72,6 +82,7 @@ require_relative "wv/control_interface"
 require_relative "wv/drawable"
 
 require_relative "wv/star"
+require_relative "wv/oval"
 require_relative "wv/radio"
 
 require_relative "wv/arc"
@@ -91,7 +102,6 @@ require_relative "wv/list_box"
 require_relative "wv/shape"
 
 require_relative "wv/text_drawable"
-require_relative "wv/span"
 require_relative "wv/link"
 require_relative "wv/line"
 require_relative "wv/rect"
@@ -99,3 +109,7 @@ require_relative "wv/video"
 require_relative "wv/check"
 require_relative "wv/progress"
 require_relative "wv/arrow"
+
+require_relative "wv/scarpe_extensions"
+require_relative "assets"
+require_relative "wv/border"

data/scarpe-components/Gemfile

@@ -8,15 +8,16 @@ gem "lacci", path: "../lacci"
 
 gem "rake", "~> 13.0"
 
-gem "nokogiri"
+#gem "nokogiri"
 
 group :test do
   gem "minitest", "~> 5.0"
   gem "minitest-reporters"
+
+  # Dependencies for specific components being tested
+  gem "webrick"
 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,52 +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
-    nokogiri (1.15.4-x86_64-darwin)
-      racc (~> 1.4)
-    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,11 +47,9 @@ DEPENDENCIES
   lacci!
   minitest (~> 5.0)
   minitest-reporters
-  nokogiri
   rake (~> 13.0)
-  rubocop (~> 1.21)
-  rubocop-shopify
   scarpe-components!
+  webrick
 
 BUNDLED WITH
    2.4.14

data/scarpe-components/README.md

@@ -2,9 +2,9 @@
 
 Scarpe is several things. We package up the Shoes API with as few implementation details as possible (called Lacci.) We have a Webview-based display library, in both local and over-a-socket (relay) versions. We have a Wasm display library (Scarpe-Wasm) in a separate gem.
 
-And we have various default implementations of different reusable components. Scarpe's hierarchical logger isn't particularly specific to your display library or underlying GUI library, but we'd like it to be usable by multiple display libs. CatsCradle is only useful if you're trying to fix up an impedance mismatch between Ruby and an evented under-layer, but it's not really specific to Webview. Scarpe's default downloader, using Ruby's built-in HTTP libraries, is good in many cases but you might want to replace it (e.g. with Typhoeus for better parallel downloads or Hystrix for robustness to bad network connections) in some cases.
+And we have various default implementations of different reusable components. Calzini is a Shoes-to-HTML renderer shared between Scarpe-Webview and Scarpe-Wasm. Scarpe's hierarchical logger isn't particularly specific to your display library or underlying GUI library and we'd like it to be usable by multiple display libs. Scarpe's default downloader, using Ruby's built-in HTTP libraries, is good in many cases but you might want to replace it (e.g. with Typhoeus for better parallel downloads or Hystrix for robustness to bad network connections) in some cases.
 
-Part of our solution is the Scarpe-Components gem, which lives in the same repository as Scarpe (for now?). These components can live there. Any specific display library can pick and choose what it wants or needs and handle its dependencies as it sees fit.
+Part of our solution is the Scarpe-Components gem, which lives in the same repository as Scarpe and Lacci for now. These components can live there. Any specific display library can pick and choose what it wants or needs and handle its dependencies as it sees fit.
 
 ## Dependency Hell