scarpe 0.4.0 → 0.5.0

data/examples/bloopsaphone/working/type_rebellion.rb

@@ -0,0 +1,157 @@
+require_relative 'feepogram'
+
+bloops = Bloops.new
+bloops.tempo = 360  # Fast and furious!
+
+song = Feepogram.new(bloops) do
+  # The mighty kick of rebellion
+  sound :boss_kick, Bloops::SQUARE do |s|
+    s.volume = 0.8
+    s.punch = 0.8
+    s.sustain = 0.2
+    s.decay = 0.1
+    s.phase = 0.2
+  end
+
+  # The snare of defiance
+  sound :battle_snare, Bloops::NOISE do |s|
+    s.volume = 0.7
+    s.punch = 0.6
+    s.sustain = 0.1
+    s.decay = 0.2
+    s.freq = 0.5
+  end
+
+  # The relentless type checker
+  sound :type_checker, Bloops::SAWTOOTH do |s|
+    s.volume = 0.6
+    s.punch = 0.4
+    s.sustain = 0.2
+    s.decay = 0.1
+    s.slide = -0.3  # Menacing downward slide
+  end
+
+  # The sword of dynamic typing
+  sound :ruby_sword, Bloops::SQUARE do |s|
+    s.volume = 0.6
+    s.punch = 0.5
+    s.sustain = 0.15
+    s.decay = 0.2
+    s.phase = 0.3
+    s.freq = 0.8
+  end
+
+  # Duck typing power-up
+  sound :duck_power, Bloops::SAWTOOTH do |s|
+    s.volume = 0.5
+    s.punch = 0.3
+    s.sustain = 0.4
+    s.decay = 0.2
+    s.slide = 0.2
+  end
+
+  # The battle cry
+  sound :battle_cry, Bloops::SQUARE do |s|
+    s.volume = 0.7
+    s.punch = 0.5
+    s.sustain = 0.3
+    s.decay = 0.2
+    s.phase = 0.4
+  end
+
+  def intense_beat
+    boss_kick " c 4 c 4 c c 4 c " * 4
+    battle_snare " 4 c 4 c 4 c c c " * 4
+  end
+
+  def type_checker_attack
+    type_checker %{
+      c4 c4 g3 g3 c4 c4 g3 g3
+      a3 a3 e3 e3 a3 a3 e3 e3
+      f3 f3 c3 c3 f3 f3 c3 c3
+      g3 g3 d3 d3 g3 g3 d3 d3
+    }
+  end
+
+  def ruby_counter_attack
+    ruby_sword %{
+      c5 g5 c6 g5 c5 g5 c6 g5
+      a5 e6 a6 e6 a5 e6 a6 e6
+      f5 c6 f6 c6 f5 c6 f6 c6
+      g5 d6 g6 d6 g5 d6 g6 d6
+    }
+  end
+
+  def duck_typing_combo
+    duck_power %{
+      8:c6 8:d6 8:e6 8:f6 8:g6 8:a6 8:b6 c7
+      8:c7 8:b6 8:a6 8:g6 8:f6 8:e6 8:d6 c6
+      8:a5 8:b5 8:c6 8:d6 8:e6 8:f6 8:g6 a6
+      8:a6 8:g6 8:f6 8:e6 8:d6 8:c6 8:b5 a5
+    }
+  end
+
+  def battle_cry_melody
+    battle_cry %{
+      c5 4 g5 4 c6 4 g5 c5
+      a5 4 e5 4 a5 4 e5 a4
+      f5 4 c6 4 f6 4 c6 f5
+      g5 4 d6 4 g6 4 d6 g5
+    }
+  end
+
+  def intro_phase
+    2.times do
+      phrase do
+        intense_beat
+        type_checker_attack
+      end
+    end
+  end
+
+  def battle_phase
+    2.times do
+      phrase do
+        intense_beat
+        type_checker_attack
+        ruby_counter_attack
+      end
+    end
+  end
+
+  def power_up_phase
+    phrase do
+      intense_beat
+      duck_typing_combo
+      battle_cry_melody
+    end
+  end
+
+  def final_stand
+    phrase do
+      intense_beat
+      type_checker_attack
+      ruby_counter_attack
+      duck_typing_combo
+      battle_cry_melody
+    end
+  end
+
+  def victory_outro
+    phrase do
+      boss_kick " c 4 4 4 "
+      ruby_sword " c6 e6 g6 c7 "
+      battle_cry " 1:c6 "
+    end
+  end
+
+  # The epic battle unfolds!
+  intro_phase
+  battle_phase
+  power_up_phase
+  battle_phase
+  final_stand
+  victory_outro
+end
+
+song.play

data/examples/border.rb

@@ -8,4 +8,4 @@ Shoes.app(width: 300, height: 50) do
     para "This border is also on top of text"
     border blue, strokewidth: 4
   end
-end
+end

data/examples/internal_link_navigation.rb

@@ -0,0 +1,19 @@
+# Test for internal link navigation (issue #569)
+# link(click: "/path") should trigger visit() internally
+
+Shoes.app width: 400, height: 300, title: "Internal Link Test" do
+  page(:index) do
+    title "Page 1"
+    para "This is the first page."
+    para link("Go to Page 2", click: "/page2")
+  end
+
+  page(:page2) do
+    title "Page 2"
+    para "You navigated here internally!"
+    para link("Back to Page 1", click: "/index")
+  end
+
+  # Start on the index page
+  visit(:index)
+end

data/examples/page_navigation_single_app.rb

@@ -0,0 +1,42 @@
+Shoes.app(title: "Page Navigation Example", width: 300, height: 200) do
+  style(Shoes::Para, size: 10)
+  style(Shoes::Button, width: 80)
+
+  page(:home) do
+    title "Home Page"
+    background "#f0f0f0"
+    para "Welcome to the page navigation example!"
+    button "Go to Razzmatazz" do
+      visit(:razzmatazz)
+    end
+    button "Go to FlooperLand" do
+      visit(:flooperland)
+    end
+  end
+
+  page(:razzmatazz) do
+    title "Razzmatazz"
+    background "#DFA5A5"
+    para "This is Razzmatazz"
+    button "Go Home" do
+      visit(:home)
+    end
+    button "Go to FlooperLand" do
+      visit(:flooperland)
+    end
+  end
+
+  page(:flooperland) do
+    title "FlooperLand"
+    background "#A5DFA5"
+    para "This is FlooperLand"
+    button "Go Home" do
+      visit(:home)
+    end
+    button "Go to Razzmatazz" do
+      visit(:razzmatazz)
+    end
+  end
+
+  visit(:home)  # Start at the home page
+end

data/examples/shoes_subclass_app.rb

@@ -0,0 +1,25 @@
+# Test for class MyApp < Shoes inheritance pattern
+# This is the classic Shoes pattern that _why designed
+
+class MyBook < Shoes
+  url '/', :index
+  url '/about', :about
+
+  def index
+    stack margin: 20 do
+      title "Welcome to My Book"
+      para "This is the index page using the classic Shoes inheritance pattern!"
+      para link("Go to About", click: "/about")
+    end
+  end
+
+  def about
+    stack margin: 20 do
+      title "About"
+      para "This page shows that URL routing works with class inheritance!"
+      para link("Back to Index", click: "/")
+    end
+  end
+end
+
+Shoes.app width: 400, height: 300, title: "Shoes Subclass Test"

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,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/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.4.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/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
@@ -40,9 +40,8 @@ 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?
 
@@ -51,7 +50,7 @@ class Niente::ShoesSpecTest < Minitest::Test
   end
 
   def drawable(*specs)
-    drawables = Shoes::App.instance.find_drawables_by(*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])

data/lacci/lib/scarpe/niente.rb

@@ -30,3 +30,4 @@ Shoes.add_file_loader loader
 
 Shoes::DisplayService.set_display_service_class(Niente::DisplayService)
 
+Shoes::FEATURES.push(:multi_app)