scarpe 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b07033a939f5503cea0f357a5ac67f0df01833038c433933c4dd2984bcd15b76
-  data.tar.gz: cc633f8adfe627f260e06371feae6d1b152f28c279db62576c82f5c16a44e1be
+  metadata.gz: c83fb76fc149cffa58c679978dc3647689acb5b418d7e65a931bddfb1687b250
+  data.tar.gz: 2b73dae2f9f5be78d6b5637d605b089c3031b14aff91acc1eced51f021283f5a
 SHA512:
-  metadata.gz: 105ea36e4f41d00d1e67ce3ff68cefac8195cc692225133e90382c770c2bfe393ee50c827b5feff0873f9d34cb54b35a11cf7e75994ec10b62d35f72ee0adb37
-  data.tar.gz: ff5b648210d7d24e9114e3850529c10999091215aa5f7576e4ee26544797cb98e1f6a51642f39c4b638b7f4a55525bc463188a678265d4ff13f01a5af8d0f931
+  metadata.gz: 6da8066857ec4241252fcca4bbe01a60c369260b618a65f44384666a4ed67311ee3bd065ab68bed79f7084e3f8c5ba7c8db3244c3cbcf9e166d1ad5130ccb43d
+  data.tar.gz: b8ba6762940cc53078e1461024f26b762acd302a99cb6fccd965b4c4018ac1452ad85821c78c8ab59b28db572ac899781d1e84bacd77bce602a9edeb0fe84a85

data/.yardopts

@@ -8,6 +8,7 @@
 --exclude lib/scarpe/glibui
 lib/**/*.rb
 lacci/lib/**/*.rb
+scarpe-components/lib/**/*.rb
 -
 docs/yard/*.md
 docs/static/manual.md

data/CHANGELOG.md

@@ -10,10 +10,24 @@ straightforward as possible.
 
 ### Fixed
 
-## [0.2.0] - 2022-07-02
+## [0.3.0] - 2023-11-24 - You
+
+- Progress bars
+- Various new APIs and many bug fixes
+- Added Tiranti, a Bootstrap-based Calzini HTML renderer replacement
+- Added Calzini, a Drawable-to-HTML renderer
+- Rename of Widget to Drawable
+- Extremely early Shoes-Spec testing support
+- Niente, a "no-op" testing display service
+
+## [0.2.1] - 2023-07-02 - Give
+
+- Bugfix release
+
+## [0.2.0] - 2023-07-02 - Gonna
 
 - First batch of functionality. Will aggressively track to changelog from here on out.
 
-## [0.1.0] - 2022-02-09
+## [0.1.0] - 2023-02-09 - Never
 
 - Initial release

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    scarpe (0.2.1)
+    scarpe (0.3.0)
       bloops (~> 0.5)
       fastimage
       lacci
@@ -14,12 +14,13 @@ PATH
 PATH
   remote: lacci
   specs:
-    lacci (0.2.1)
+    lacci (0.3.0)
+      scarpe-components
 
 PATH
   remote: scarpe-components
   specs:
-    scarpe-components (0.2.1)
+    scarpe-components (0.3.0)
 
 GEM
   remote: https://rubygems.org/
@@ -53,6 +54,8 @@ GEM
     multi_json (1.15.0)
     nokogiri (1.15.2-x86_64-darwin)
       racc (~> 1.4)
+    nokogiri (1.15.2-x86_64-linux)
+      racc (~> 1.4)
     parallel (1.22.1)
     parser (3.2.1.0)
       ast (~> 2.4.1)
@@ -80,6 +83,7 @@ GEM
       rubocop (~> 1.44)
     ruby-progressbar (1.11.0)
     sqlite3 (1.6.3-x86_64-darwin)
+    sqlite3 (1.6.3-x86_64-linux)
     unicode-display_width (2.4.2)
     webrick (1.7.0)
     webview_ruby (0.1.2)

data/README.md

@@ -29,17 +29,31 @@ Shoes.app do
 end
 ```
 
-More examples can be found in the [`examples` folder](https://github.com/scarpe-team/scarpe/tree/main/examples)!
+<img width="480" alt="hello_world" src="https://user-images.githubusercontent.com/9624267/158565981-57240f72-fbaf-4b72-b66e-8c0d517a90d7.png">
+
+A bit more...
+
+```ruby
+Shoes.app do
+  @push = button "Push me"
+  @note = para "Nothing pushed so far"
+  @push.click {
+    @note.replace(
+      "Aha! Click! ",
+      link("Go back") { @note.replace "Nothing pushed so far" }
+    )
+  }
+end
+```
 
-## Screenshots
+<img width="480" alt="hello_world" src="https://user-images.githubusercontent.com/9624267/158566011-0372d0c7-fbeb-4ed6-a082-73908f04a0b6.gif">
 
-From the hello world example:
+More examples can be found in the [`examples` folder](https://github.com/scarpe-team/scarpe/tree/main/examples)!
 
-<img width="480" alt="hello_world" src="https://user-images.githubusercontent.com/9624267/158565981-57240f72-fbaf-4b72-b66e-8c0d517a90d7.png">
+## Wiki
 
-From the button example:
+Explore more in the [Scarpe Wiki](https://github.com/scarpe-team/scarpe/wiki) for in-depth documentation, tutorials, and additional resources. Whether you're a new contributor or an experienced user, the Wiki provides valuable information to enhance your Scarpe experience.
 
-<img width="480" alt="hello_world" src="https://user-images.githubusercontent.com/9624267/158566011-0372d0c7-fbeb-4ed6-a082-73908f04a0b6.gif">
 
 ## Scarpe in Development
 
@@ -52,8 +66,10 @@ This repo is where most of the action is happening right now, and to have the fu
 ```
 # dependencies - Mac version
 brew install portaudio pkg-config # for sound!
+# dependencies - Mac M1 version
+brew install portaudio && bundle config build.bloops --with-portaudio-dir=$(brew --prefix portaudio)
 # dependencies - Ubuntu Linux version
-sudo apt install libgtk-3-dev libwebkit2gtk-4.0-dev libportaudio2
+sudo apt install libgtk-3-dev libwebkit2gtk-4.0-dev portaudio19-dev
 
 for any other linux or windows. please see the webview docs for your [platform](https://github.com/webview/webview#prerequisites)
 
@@ -147,7 +163,7 @@ You can set SCARPE_LOG_CONFIG to an appropriate YAML file to set log levels per-
 ```
 {
     "default": "warn",
-    "WV::WebWrangler": ["logger/web_wrangler.log", "debug"]
+    "Webview::WebWrangler": ["logger/web_wrangler.log", "debug"]
 }
 ```
 

data/Rakefile

@@ -24,4 +24,4 @@ end
 
 RuboCop::RakeTask.new
 
-task default: [:test, :lacci_test, :component_test, :rubocop]
+task default: [:test, :lacci_test, :component_test]

data/examples/animate.rb

@@ -0,0 +1,20 @@
+Shoes.app do
+  stack do
+    para "10 fps"
+    p = para "-"
+    animate do |frame|
+      p.replace(frame.to_s)
+    end
+    para "20 fps"
+    p2 = para "-"
+    animate(20) do |frame|
+      p2.replace(frame.to_s)
+    end
+    para "3spf"
+    p3 = para "-"
+    every(3) do |count|
+      p3.replace(count.to_s)
+    end
+  end
+end
+

data/examples/arrow.rb

@@ -0,0 +1,10 @@
+Shoes.app do
+  arrow 100, 100, 30
+
+  arrow 150, 120,40
+
+  arrow 30 ,60 ,40
+
+  arrow :left => 50, :top => 80,
+    :width => 40
+end

data/examples/btn_tooltip.rb

@@ -0,0 +1,7 @@
+Shoes.app do
+  @btn = button "who am i?", :tooltip => "i have no idea either"
+  @para = para "i am a button"
+  @btn.hover do
+    @para.replace "i am a button and i am being hovered"
+  end
+end

data/examples/button_style_changed.rb

@@ -0,0 +1,7 @@
+Shoes.app do
+  @p = para "This text will start red\n", stroke: :red
+  button "OK" do
+    @p.replace("... but turn green when you click it.")
+    @p.stroke = :green
+  end
+end

data/examples/button_styles_default.rb

@@ -0,0 +1,6 @@
+Shoes.app do
+  style Shoes::Para, stroke: :red
+  para "This text should be red\n"
+  para "But this text should be green\n", stroke: :green
+  button "OK"
+end

data/examples/gen.rb

@@ -2,9 +2,9 @@
 require 'erb'
 
 class ScarpeGenerator
-  def initialize(filename, display_properties)
+  def initialize(filename, shoes_styles)
     @filename = filename
-    @display_properties = display_properties
+    @shoes_styles = shoes_styles
   end
 
   def generate_files(choice, class_template_choice)
@@ -96,7 +96,7 @@ class ScarpeGenerator
     capitalized_argument = @filename.capitalize
     binding.dup.tap do |b|
       b.local_variable_set(:argument, capitalized_argument)
-      b.local_variable_set(:display_properties, @display_properties)
+      b.local_variable_set(:shoes_styles, @shoes_styles)
     end
   end
 end
@@ -109,7 +109,7 @@ Shoes.app(title: 'Templates') do
     end
 
     stack width: 400 do
-      para 'Enter display properties (like :height,:text) '
+      para 'Enter Shoes styles (like :height,:text) '
       $properties_input = edit_line
     end
 
@@ -125,13 +125,13 @@ Shoes.app(title: 'Templates') do
 
     button 'Generate Files!',color:"#FF7116",padding_bottom:"8",padding_top:"8",text_color:"white",font_size:"16" do
       filename = $filename_input.text
-      display_properties = $properties_input.text
-      choice = $choice_input.selected_item
+      shoes_styles = $properties_input.text
+      choice = $choice_input.text
 
-      generator = ScarpeGenerator.new(filename, display_properties)
+      generator = ScarpeGenerator.new(filename, shoes_styles)
 
       if choice == 'Class'
-        generator.generate_files(choice, $class_template_choice_input.selected_item)
+        generator.generate_files(choice, $class_template_choice_input.text)
       else
         generator.generate_files(choice, nil)
       end

data/examples/highlander.rb

@@ -35,7 +35,7 @@ def update_dup_list
 end
 
 def highlander_the_selected_item
-  selected = $dup_list.selected_item
+  selected = $dup_list.text
   if !selected || selected == "" || !selected.include?(DIVIDER)
     $bottom_display.replace("Select an item first!")
     return
@@ -58,7 +58,7 @@ def highlander_the_selected_item
     end
   end
 
-  $dup_list.selected_item = nil
+  $dup_list.choose nil
   $bottom_display.replace BOTTOM_DISPLAY_INSTRUCTIONS
   update_dup_list
 end
@@ -67,7 +67,7 @@ Shoes.app(title: "Highlander") do
   stack :margin => 40 do
     $top_text = para "Loading..."
     $dup_list = list_box(:items => []).change do
-      $bottom_display.replace "Selected duplicates: #{$dup_list.selected_item.inspect}"
+      $bottom_display.replace "Selected duplicates: #{$dup_list.text.inspect}"
     end
 
     update_dup_list

data/examples/legacy/README.md

@@ -0,0 +1,6 @@
+# Legacy Projects
+
+These are Shoes examples, taken from a wide variety of sources. In general, we try not to modify them.
+
+It's possible that some of them run but we haven't realised it yet, which is why the "not_checked" directory is nameed that, rather than something like "won't work". Also, they aren't checked by CI, while the ones marked working have to at least boot up.
+

data/examples/legacy/not_checked/shoes-contrib/basic/shoes-notes.rb

@@ -12,5 +12,5 @@ Shoes.app do
       @add.text = ""
     end
   end
-  @notes = stack :margin => 20, :widht => -250
+  @notes = stack :margin => 20, :width => -250
 end

data/examples/legacy/not_checked/simple/anim-shapes.rb

@@ -14,4 +14,4 @@ Shoes.app do
   button "OK", :top => 0.5, :left => 0.5 do
     Shoes.quit unless confirm "You ARE sure you're OK??"
   end
-end
+end

data/examples/legacy/not_checked/speedometer_app.rb

@@ -0,0 +1,55 @@
+# Source: https://www.hanselman.com/blog/the-weekly-source-code-29-ruby-and-shoes-and-the-first-ruby-virus
+
+class Speedometer < Shoes::Widget
+  attr_accessor :range, :tick, :position
+  def initialize opts = {}
+    @range = opts[:range] || 200
+    @tick = opts[:tick] || 10
+    @position = opts[:position] || 0
+    @cx, @cy = self.left + 110, self.top + 100
+ 
+    nostroke
+    rect :top => self.top, :left => self.left,
+      :width => 220, :height => 200
+    nofill
+    stroke white
+    oval :left => @cx - 50, :top => @cy - 50, :radius => 100
+    (ticks + 1).times do |i|
+      radial_line 225 + ((270.0 / ticks) * i), 70..80
+      radial_line 225 + ((270.0 / ticks) * i), 45..49
+    end
+    strokewidth 2
+    oval :left => @cx - 70, :top => @cy - 70, :radius => 140
+    stroke lightgreen
+    oval :left => @cx - 5, :top => @cy - 5, :radius => 10
+    @needle = radial_line 225 + ((270.0 / @range) * @position), 0..90
+  end
+  def ticks; @range / @tick end
+  def radial_line deg, r
+    pos = ((deg / 360.0) * (2.0 * Math::PI)) - (Math::PI / 2.0)
+    line (Math.cos(pos) * r.begin) + @cx, (Math.sin(pos) * r.begin) + @cy,
+      (Math.cos(pos) * r.end) + @cx, (Math.sin(pos) * r.end) + @cy
+  end
+  def position= pos
+    @position = pos
+    @needle.remove
+    append do
+      @needle = radial_line 225 + ((270.0 / @range) * @position), 0..90
+    end
+  end
+end
+ 
+Shoes.app do
+  stack do
+    para "Enter a number between 0 and 100"
+    flow do
+      @p = edit_line
+      button "OK" do
+        @s.position = @p.text.to_i
+      end
+    end
+ 
+    @s = speedometer :range => 100, :ticks => 10
+  end
+end
+

data/examples/legacy/working/simple/image-icon.rb

@@ -0,0 +1,3 @@
+Shoes.app do
+  image "https://user-images.githubusercontent.com/7865030/217309905-7f25e3cf-1850-481d-811b-dfddea2df54a.png"
+end

data/examples/legacy/{not_checked → working}/simple/image.rb

@@ -1,7 +1,7 @@
 Shoes.app do
   background "#eee"
   @list = stack do
-    @img = image '../static/man-builds.png'
+    @img = image "#{DIR}/docs/static/man-builds.png"
     para "Enter a image URL to download:", :margin => [10, 8, 10, 0]
     flow :margin => 10 do
       @url = edit_line :width => -120

data/examples/list_box_choose.rb

@@ -0,0 +1,17 @@
+Shoes.app(title: "Guessing secret word", width: 500, height: 450) do
+  secret_word = "apple"
+  guess_label = para "Guess the secret word:"
+  guess_input = list_box items: ["apple", "banana", "orange"], choose: "orange"
+
+  button "Guess" do
+    guess = guess_input.text
+
+    if guess == secret_word
+      alert("Yayyy! that's right.")
+    else
+      alert("No, better luck next time😕")
+    end
+
+    guess_input.choose "orange"
+  end
+end

data/examples/local_assets/local_file_server.rb

@@ -0,0 +1,82 @@
+# Require the WEBrick library
+require 'webrick'
+
+# Configuration for the server
+configuration = {
+  Port: 4567,
+  DocumentRoot: File.join(File.dirname(__FILE__), '..', '..', 'examples', 'local_assets')
+}
+
+# Create a new instance of WEBrick::HTTPServer with the configuration
+server = WEBrick::HTTPServer.new(configuration)
+
+# Define a custom servlet to handle file requests
+class FileServlet < WEBrick::HTTPServlet::AbstractServlet
+  def do_GET(request, response)
+    relative_path = request.path
+    path = File.join(@config[:DocumentRoot], relative_path)
+
+    if File.exist?(path) && !File.directory?(path)
+      begin
+        file_content = File.read(path)
+
+        response.status = 200
+        response['Content-Type'] = WEBrick::HTTPUtils.mime_type(path, WEBrick::HTTPUtils::DefaultMimeTypes)
+        response['Content-Disposition'] = "inline; filename=#{File.basename(path)}"
+        response.body = file_content
+      rescue StandardError => e
+        response.status = 500
+        response.body = 'Internal Server Error'
+      end
+    else
+      response.status = 404
+      response.body = 'File not found'
+    end
+  end
+end
+
+# Mount the custom servlet at the root URL
+server.mount('/', FileServlet)
+
+# Set up a signal trap to gracefully shut down the server on interrupt (e.g., Ctrl+C)
+trap('INT') do
+  server.shutdown
+end
+
+# Start the server in a separate thread
+server_thread = Thread.new { server.start }
+
+# Shoes application to display the file from the local server
+Shoes.app do
+  stack do
+    flow do
+      para "Enter the file path: (e.g., sample.gif, sample.mp4)"
+      @file_path = edit_line
+    end
+
+    button "Display File" do
+      file_path = @file_path.text
+
+      begin
+        file_extension = File.extname(file_path).downcase
+
+        case file_extension
+        when '.png', '.jpg', '.jpeg', '.gif'
+          image "http://localhost:4567/#{file_path}"
+        when '.mp4', '.mov'
+          video "http://localhost:4567/#{file_path}"
+        else
+          para "Unsupported file type"
+        end
+      rescue StandardError => e
+        para "Error: #{e.message}"
+      end
+    end
+  end
+
+  # Ensure the Shoes application is closed before stopping the server
+  at_exit do
+    server_thread.join if server_thread.alive?
+    server.shutdown
+  end
+end

data/examples/local_fonts.rb

@@ -1,4 +1,4 @@
 Shoes.app do
-  font "fonts/Pacifico.ttf"
-  para "Hello yayyy"
+  font "#{DIR}/fonts/Pacifico.ttf"
+  para "Hello yayyy", font: "Pacifico"
 end

data/examples/local_images.rb

@@ -1,4 +1,3 @@
 Shoes.app do
-    image "docs/static/man-builds.png"
-  end
-  
+  image "#{DIR}/docs/static/man-builds.png"
+end

data/examples/para/para_text.rb

@@ -0,0 +1,14 @@
+Shoes.app do
+  stack do
+    @note = para " your note will appear here"
+
+    @edit_box = edit_box ""
+    @save_button = button "Save"
+
+    @save_button.click do
+      new_text = @edit_box.text
+      @note.text = new_text
+      alert("Note saved successfully!")
+    end
+  end
+end

data/examples/progress.rb

@@ -0,0 +1,31 @@
+Shoes.app(width: 400, height: 300) do
+    flow do
+      stack(width: 0.5) do
+        para "this is initally at 30%"
+        @progress1 = progress fraction: 0.3
+
+        para "this is initally at 60%"
+        @progress2 = progress fraction: 0.6
+
+        para "this is initally at 80%"
+        @progress3 = progress fraction: 0.8
+
+        para "this is a normal progress bar with no initial value"
+        @progress4 = progress
+      end
+
+      stack(width: 0.5) do
+        @start = button "Start"
+        @start.click { start_progress }
+      end
+    end
+
+    def start_progress
+      animate do
+        @progress1.fraction += 0.01
+        @progress2.fraction += 0.015
+        @progress3.fraction += 0.02
+      end
+    end
+
+  end

data/examples/radio/radio_groups.rb

@@ -1,4 +1,4 @@
- Shoes.app do
+Shoes.app do
   stack do
     para "Among these films, which do you prefer?"
     flow do
@@ -13,6 +13,6 @@
       radio :films
       para "Children of Heaven by Majid Majidi"
     end
-    puts radio(:films).checked?
+    para "Is radio button checked? #{radio(:films).checked?}"
   end
 end

data/examples/rect.rb

@@ -0,0 +1,4 @@
+Shoes.app do
+  para "Behold, the mighty rectangle!"
+  rect 10, 10, 75, 50, 5
+end

data/examples/rotate_shapes.rb

@@ -0,0 +1,17 @@
+Shoes.app(height:600) do
+  rotate 90
+  rect 10, 10, 75, 50, 5
+  rotate 180
+  arrow 100, 100, 30
+  rotate 60
+  arrow 150, 120,40
+  rotate 120
+  arrow 30 ,60 ,40
+  rotate 75
+  arc 50, 50, 120, 100, 60, 225
+  rotate 45
+  arrow :left => 50, :top => 80,
+    :width => 40
+  rotate 180
+  line 100, 100, 200, 200
+end

data/examples/simpler-menu.rb

@@ -0,0 +1,21 @@
+# Cut down from a more complicated example widget
+
+class MenuPanel < Shoes::Widget
+  @@boxes = []
+  def initialize(color, args)
+    @@boxes << self
+    background color
+    para "Box #{@@boxes.length}",
+        :margin => 18, :align => "center", :size => 20
+  end
+end
+
+Shoes.app :width => 400, :height => 130 do
+  #style(Link, :underline => nil)
+  #style(LinkHover, :fill => nil, :underline => nil)
+  menu_panel green,  :width => 175, :height => 120, :margin => 4
+  menu_panel blue,   :width => 140, :height => 120, :margin => 4
+  menu_panel red,    :width => 135, :height => 120, :margin => 4
+  menu_panel purple, :width => 125, :height => 120, :margin => 4
+end
+

data/exe/scarpe

@@ -38,6 +38,7 @@ add_env_categories("Scarpe::WV" => [
   env_or_default("SCARPE_TEST_CONTROL", "(none)"),
   env_or_default("SCARPE_TEST_RESULTS", "(none)"),
   env_or_default("SCARPE_TEST_DEBUG", "(none)"),
+  env_or_default("SCARPE_HTML_RENDERER", "calzini"),
 ])
 
 verb = "run"
@@ -76,7 +77,7 @@ when "-v"
   puts "Lacci #{Lacci::VERSION}"
 when "run"
   # Run the Scarpe app file
-  Shoes.run_app ARGV[0]
+  Shoes.run_app verb_target
 when "env"
   print_env
 else

data/lacci/Gemfile

@@ -4,6 +4,8 @@ source "https://rubygems.org"
 
 gemspec
 
+gem "scarpe-components", path: "../scarpe-components"
+
 gem "rake", "~> 13.0"
 
 group :test do

data/lacci/Gemfile.lock

@@ -1,7 +1,13 @@
+PATH
+  remote: ../scarpe-components
+  specs:
+    scarpe-components (0.3.0)
+
 PATH
   remote: .
   specs:
-    lacci (0.2.1)
+    lacci (0.3.0)
+      scarpe-components
 
 GEM
   remote: https://rubygems.org/
@@ -66,6 +72,7 @@ DEPENDENCIES
   redcarpet
   rubocop (~> 1.21)
   rubocop-shopify
+  scarpe-components!
   yard
 
 BUNDLED WITH