scarpe 0.3.0 → 0.5.0

data/examples/url_routing_example.rb

@@ -0,0 +1,67 @@
+Shoes.app(title: 'Advanced URL Routing Example', width: 300, height: 200) do
+  style(Shoes::Para, size: 10)
+  style(Shoes::Button, width: 80)
+
+  url '/', :index
+  url '/about', :about
+  url '/contact', :contact
+  url '/user/(\d+)', :user
+  url '/product/(\w+)', :product
+
+  def index
+    background '#f0f0f0'
+    title 'Home Page'
+    para 'Welcome to the advanced URL routing example!'
+    button 'About' do
+      visit '/about'
+    end
+    button 'Contact' do
+      visit '/contact'
+    end
+    button 'User 42' do
+      visit '/user/42'
+    end
+    @user_id = edit_line(1, width: "40%", secret: true)
+    button 'Pick a user' do
+      visit "/user/#{@user_id.text}"
+    end
+    button 'Product XYZ' do
+      visit '/product/XYZ'
+    end
+  end
+
+  def about
+    background '#DFA5A5'
+    title 'About Page'
+    para 'This is the About page.'
+    home_button
+  end
+
+  def contact
+    background '#A5DFA5'
+    title 'Contact Page'
+    para 'This is the Contact page.'
+    home_button
+  end
+
+  def user(id)
+    background '#A5A5DF'
+    title 'User Page'
+    para "EDIT LINE: #{@user_id&.text}"
+    para "This is the page for User #{id}"
+    home_button
+  end
+
+  def product(name)
+    background '#DFDF A5'
+    title 'Product Page'
+    para "This is the page for Product #{name}"
+    home_button
+  end
+
+  def home_button
+    button 'Home' do
+      visit '/'
+    end
+  end
+end

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

@@ -16,21 +16,21 @@ 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.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
   spec.files = Dir.chdir(File.expand_path(__dir__)) do
     `git ls-files -z`.split("\x0").reject do |f|
-      (f == __FILE__) || f.match(%r{\A(?:(?:test|spec|features)/|\.(?:git|travis|circleci)|appveyor)})
+      (f == __FILE__) || f.match(%r{\A(?:(?:test|spec|features|tasks)/|\.(?:git|travis|circleci)|appveyor)})
     end
   end
   spec.bindir = "exe"
   spec.executables = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "scarpe-components" # Scarpe-Components has no dependencies, and includes useful infrastructure
+  spec.add_dependency "scarpe-components", "~>0.4.0"
 
   # For more information and examples about making a new gem, check out our
   # guide at: https://bundler.io/guides/creating_gem.html

data/lacci/lib/lacci/scarpe_cli.rb

@@ -28,7 +28,6 @@ module Scarpe
         "Lacci" => [
           env_or_default("SCARPE_DISPLAY_SERVICE", "(none)"),
           env_or_default("SCARPE_LOG_CONFIG", "(default)#{Shoes::Log::DEFAULT_LOG_CONFIG.inspect}"),
-          env_or_default("SCARPE_APP_TEST", "(none)"),
         ],
         "Ruby and Shell" => [
           ["RUBY_DESCRIPTION", RUBY_DESCRIPTION],

data/lacci/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.3.0"
+  VERSION = "0.5.0"
 end

data/lacci/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/lacci/lib/scarpe/niente/display_service.rb

@@ -29,7 +29,7 @@ module Niente
     # @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}.")
@@ -47,6 +47,10 @@ module Niente
       display_drawable.shoes_type = drawable_class_name
       set_drawable_pairing(drawable_id, display_drawable)
 
+      # Nil parent is okay for DocumentRoot and TextDrawables, so we have to specify it.
+      parent = DisplayService.instance.query_display_drawable_for(parent_id, nil_ok: true)
+      display_drawable.set_parent(parent)
+
       return display_drawable
     end
 

data/lacci/lib/scarpe/niente/drawable.rb

@@ -12,6 +12,7 @@ module Niente
 
       super(linkable_id: @shoes_linkable_id)
 
+      # This should only be used for reparenting after a drawable was initially created.
       bind_shoes_event(event_name: "parent", target: shoes_linkable_id) do |new_parent_id|
         display_parent = DisplayService.instance.query_display_drawable_for(new_parent_id)
         if @parent != display_parent
@@ -28,6 +29,7 @@ module Niente
       end
 
       bind_shoes_event(event_name: "destroy", target: shoes_linkable_id) do
+        set_parent(nil)
       end
     end
 

data/lacci/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
@@ -30,7 +30,6 @@ class Niente::Test
     Object.const_set(Scarpe::Components::StringHelpers.camelize(class_name), test_class)
     test_name = "test_" + test_name unless test_name.start_with?("test_")
     test_class.define_method(test_name) do
-      STDERR.puts "Started running #{class_name.inspect}::#{test_name.inspect}"
       eval(code)
     end
   end
@@ -41,15 +40,21 @@ 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?
 
       Niente::ShoesSpecProxy.new(drawables[0])
     end
   end
+
+  def drawable(*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])
+  end
 end
 
 class Niente::ShoesSpecProxy

data/lacci/lib/scarpe/niente.rb

@@ -6,8 +6,16 @@
 # how a real display service should act.
 module Niente; end
 
-require_relative "niente/logger"
-Shoes::Log.instance = Niente::LogImpl.new
+require "scarpe/components/print_logger"
+Shoes::Log.instance = Scarpe::Components::PrintLogImpl.new
+if ENV["NIENTE_LOG_LEVEL"]
+  pl = Scarpe::Components::PrintLogImpl::PrintLogger
+  level = ENV["NIENTE_LOG_LEVEL"].strip.downcase.to_sym
+  unless pl::LEVELS.key?(level)
+    raise "Unrecognized Niente log level: #{level.inspect}!"
+  end
+  pl.min_level = pl::LEVELS[level]
+end
 
 require_relative "niente/drawable"
 require_relative "niente/app"
@@ -16,5 +24,10 @@ require_relative "niente/display_service"
 require_relative "niente/shoes_spec"
 Shoes::Spec.instance = Niente::Test
 
+require "scarpe/components/segmented_file_loader"
+loader = Scarpe::Components::SegmentedFileLoader.new
+Shoes.add_file_loader loader
+
 Shoes::DisplayService.set_display_service_class(Niente::DisplayService)
 
+Shoes::FEATURES.push(:multi_app)