scarpe 0.3.0 → 0.4.0

data/lacci/test/test_helper.rb

@@ -4,6 +4,7 @@ $LOAD_PATH.unshift File.expand_path("../lib", __dir__)
 require "shoes"
 
 require "scarpe/components/unit_test_helpers"
+require "scarpe/components/minitest_result"
 
 require "minitest/autorun"
 
@@ -35,29 +36,55 @@ class NienteTest < Minitest::Test
     timeout: 5.0,
     class_name: self.class,
     method_name: self.name,
-    display_service: "niente"
+    expect_process_fail: false,
+    expect_minitest_exception: false,
+    display_service: "niente",
+    log_level: "warn"
   )
+    sspec_file = File.expand_path(File.join __dir__, "niente_test.json")
+    File.unlink sspec_file rescue nil
+
     with_tempfiles([
       #["scarpe_log_config.json", JSON.dump(log_config_for_test)],
       [["shoes_spec_code", ".rb"], app_test_code],
     ]) do |shoes_spec_path,_|
       system(
         "LOCALAPPDATA=\"#{Dir.tmpdir}\" " +
+        "NIENTE_LOG_LEVEL=#{log_level} " +
         "SHOES_SPEC_TEST=\"#{shoes_spec_path}\" " +
         "SCARPE_DISPLAY_SERVICE=\"#{display_service}\" " +
-        "SHOES_MINITEST_EXPORT_FILE=niente_test.json " +
+        "SHOES_MINITEST_EXPORT_FILE=#{sspec_file} " +
         "SHOES_MINITEST_CLASS_NAME=\"#{class_name}\" " +
         "SHOES_MINITEST_METHOD_NAME=\"#{method_name}\" " +
         "ruby #{SCARPE_EXE} --dev #{test_app_location}"
       )
     end
 
+    if expect_process_fail
+      assert(false, "Expected app to fail but it succeeded!") if $?.success?
+      return
+    end
+
     # Check if the process exited normally or crashed (segfault, failure, timeout)
     unless $?.success?
-      assert(false, "Niente app failed with exit code: #{$?.exitstatus}")
+      assert(false, "App failed with exit code: #{$?.exitstatus}")
       return
     end
 
-
+    result = Scarpe::Components::MinitestResult.new(sspec_file)
+    if result.error?
+      if expect_minitest_exception
+        assert_equal true, true
+      else
+        raise result.error_message
+      end
+    elsif result.fail?
+      assert false, result.fail_message
+    elsif result.skip?
+      skip
+    else
+      # Count out the correct number of assertions
+      result.assertions.times { assert true }
+    end
   end
 end

data/lacci/test/test_lacci.rb

@@ -5,14 +5,101 @@ require_relative "test_helper"
 class TestLacci < NienteTest
   def test_simple_button_click
     run_test_niente_code(<<~SHOES_APP, app_test_code: <<~SHOES_SPEC)
-    Shoes.app do
-      @b = button "OK" do
-        @b.text = "Yup"
+      Shoes.app do
+        @b = button "OK" do
+          @b.text = "Yup"
+        end
       end
-    end
     SHOES_APP
-    button().trigger_click
-    assert_equal "Yup", button().text
+      button().trigger_click
+      assert_equal "Yup", button().text
+    SHOES_SPEC
+  end
+
+  def test_positional_default_values
+    run_test_niente_code(<<~SHOES_APP, app_test_code: <<~SHOES_SPEC)
+      Shoes.app do
+        star 15, 35
+      end
+    SHOES_APP
+      s = star()
+      assert_equal 10, s.points
+      assert_equal 50, s.inner
+    SHOES_SPEC
+  end
+
+  def test_positional_args
+    run_test_niente_code(<<~SHOES_APP, app_test_code: <<~SHOES_SPEC)
+      Shoes.app do
+        star 10, 25, 8 # Leave outer and inner as default
+      end
+    SHOES_APP
+      s = star()
+      assert_equal 10, s.left
+      assert_equal 25, s.top
+      assert_equal 8, s.points
+      assert_equal 50, s.inner
+    SHOES_SPEC
+  end
+
+  def test_keyword_args
+    run_test_niente_code(<<~SHOES_APP, app_test_code: <<~SHOES_SPEC)
+      Shoes.app do
+        star 5, 6, points: 8, inner: 30
+      end
+    SHOES_APP
+      s = star()
+      assert_equal 5, s.left
+      assert_equal 6, s.top
+      assert_equal 8, s.points
+      assert_equal 100, s.outer
+      assert_equal 30, s.inner
+    SHOES_SPEC
+  end
+
+  def test_too_many_positional_args
+    run_test_niente_code(<<~SHOES_APP, app_test_code: <<~SHOES_SPEC)
+      Shoes.app do
+        @s = stack {}
+      end
+    SHOES_APP
+      s = stack("@s")
+      assert_raises Shoes::Errors::BadArgumentListError do
+        s.star 5, 6, 7, 8, 9, 10, 11
+      end
+    SHOES_SPEC
+  end
+
+  def test_too_few_positional_args
+    run_test_niente_code(<<~SHOES_APP, app_test_code: <<~SHOES_SPEC)
+      Shoes.app do
+        @s = stack {}
+      end
+    SHOES_APP
+      s = stack("@s")
+      assert_raises Shoes::Errors::BadArgumentListError do
+        s.star 5
+      end
+    SHOES_SPEC
+  end
+
+  def test_unsupported_feature
+    run_test_niente_code(<<~SHOES_APP, app_test_code: <<~SHOES_SPEC, expect_process_fail: true)
+      Shoes.app(features: :html) do
+        para "Not supported by Niente, though."
+      end
+    SHOES_APP
+      assert true
+    SHOES_SPEC
+  end
+
+  def test_unknown_feature
+    run_test_niente_code(<<~SHOES_APP, app_test_code: <<~SHOES_SPEC)
+      Shoes.app(features: :squid) do
+        para "No such feature, though."
+      end
+    SHOES_APP
+      assert true
     SHOES_SPEC
   end
 end

data/lacci/test/test_margin_helper.rb

@@ -0,0 +1,82 @@
+# frozen_string_literal: true
+
+load "lacci/lib/shoes/margin_helper.rb"
+
+
+class TestMarginHelper < Minitest::Test
+include MarginHelper
+
+    def test_one_Number_margin
+
+        kwargs = {:margin => 20}
+
+        assert_equal({:margin => nil, :margin_left => 20, :margin_top => 20, :margin_right => 20, :margin_bottom => 20},margin_parse(kwargs))
+
+    end
+
+    def test_Array_four_margin
+
+        kwargs = {:margin => [20,20,30,40]}
+
+        assert_equal({:margin => nil, :margin_left => 20, :margin_top => 20, :margin_right => 30, :margin_bottom => 40},margin_parse(kwargs))
+
+    end
+
+    def test_Array_one_margin
+
+        kwargs = {:margin => [20]}
+
+        assert_equal({:margin => nil, :margin_left => 20, :margin_top => 20, :margin_right => 20, :margin_bottom => 20},margin_parse(kwargs))
+
+    end
+
+
+    def test_String_four_margin
+
+        kwargs = {:margin => "20 30 40 50"}
+
+        assert_equal({:margin => nil, :margin_left => "20", :margin_top => "30", :margin_right => "40", :margin_bottom => "50"},margin_parse(kwargs))
+
+    end
+
+    def test_String_one_margin
+
+        kwargs = {:margin => "20"}
+
+        assert_equal({:margin => nil, :margin_left => "20", :margin_top => "20", :margin_right => "20", :margin_bottom => "20"},margin_parse(kwargs))
+
+    end
+
+    def test_Hash_four_margin
+
+        kwargs = {:margin => {left:20,top:20,right:30,bottom:30}}
+
+        assert_equal({:margin => nil, :margin_left => 20, :margin_top => 20, :margin_right => 30, :margin_bottom => 30},margin_parse(kwargs))
+
+    end
+
+    def test_Hash_three_margin
+
+        kwargs = {:margin => {top:20,right:30,bottom:30}}
+
+        assert_equal({:margin => nil, :margin_top => 20, :margin_right => 30, :margin_bottom => 30},margin_parse(kwargs))
+
+    end
+
+    def test_Hash_two_margin
+
+        kwargs = {:margin => {left:20,top:20}}
+
+        assert_equal({:margin => nil, :margin_left => 20, :margin_top => 20},margin_parse(kwargs))
+
+    end
+
+    def test_Hash_one_margin
+
+        kwargs = {:margin => {bottom:30}}
+
+        assert_equal({:margin => nil, :margin_bottom => 30},margin_parse(kwargs))
+
+    end
+
+end

data/lacci/test/test_niente_test_infra.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+require_relative "test_helper"
+
+class TestNienteTestInfra < NienteTest
+  def test_app_fail_in_test
+    run_test_niente_code(<<~SHOES_APP, app_test_code: <<~SHOES_SPEC, expect_process_fail: true)
+      Shoes.app do
+        @b = button "OK"
+        raise "ERROR!"
+      end
+    SHOES_APP
+      assert_equal true, true
+    SHOES_SPEC
+  end
+
+  def test_app_fail_in_spec
+    run_test_niente_code(<<~SHOES_APP, app_test_code: <<~SHOES_SPEC, expect_minitest_exception: true)
+      Shoes.app do
+        @b = button "OK"
+      end
+    SHOES_APP
+      raise "ERROR!"
+    SHOES_SPEC
+  end
+end

data/lacci/test/test_oval.rb

@@ -0,0 +1,82 @@
+# frozen_string_literal: true
+
+require_relative "test_helper"
+
+class TestLacciOval < NienteTest
+  # For an oval, the args go left, top, radius, height
+  def test_simple_oval_values
+    run_test_niente_code(<<~SHOES_APP, app_test_code: <<~SHOES_SPEC)
+      Shoes.app do
+        oval 5, 10, 25 # circle with radius 25 with its upper-left point at 5, 10
+      end
+    SHOES_APP
+      ov = oval()
+      assert_equal 5, ov.left
+      assert_equal 10, ov.top
+      assert_equal 25, ov.radius
+      assert_equal 50, ov.width
+      assert_equal 50, ov.height
+    SHOES_SPEC
+  end
+
+  def test_oval_with_height
+    run_test_niente_code(<<~SHOES_APP, app_test_code: <<~SHOES_SPEC)
+      Shoes.app do
+        oval 5, 10, 25, 35 # oval with radius 25, 50 wide, 35 tall
+      end
+    SHOES_APP
+      ov = oval()
+      assert_equal 5, ov.left
+      assert_equal 10, ov.top
+      assert_equal 25, ov.radius
+      assert_equal 50, ov.width
+      assert_equal 35, ov.height
+    SHOES_SPEC
+  end
+
+  def test_simple_oval_keyword_values
+    run_test_niente_code(<<~SHOES_APP, app_test_code: <<~SHOES_SPEC)
+      Shoes.app do
+        oval left: 5, top: 10, radius: 25
+      end
+    SHOES_APP
+      ov = oval()
+      assert_equal 5, ov.left
+      assert_equal 10, ov.top
+      assert_equal 25, ov.radius
+      assert_equal 50, ov.height
+      assert_equal 50, ov.width
+    SHOES_SPEC
+  end
+
+  def test_oval_keywords_with_height_but_no_radius
+    run_test_niente_code(<<~SHOES_APP, app_test_code: <<~SHOES_SPEC)
+      Shoes.app do
+        oval left: 5, top: 10, height: 25
+      end
+    SHOES_APP
+      ov = oval()
+      assert_equal 5, ov.left
+      assert_equal 10, ov.top
+      assert_equal 12, ov.radius
+      assert_equal 25, ov.height
+      assert_equal 25, ov.width
+    SHOES_SPEC
+  end
+
+  def test_oval_strokewidth
+    run_test_niente_code(<<~SHOES_APP, app_test_code: <<~SHOES_SPEC)
+      Shoes.app do
+        strokewidth 3
+        oval 5, 10, 25
+      end
+    SHOES_APP
+      ov = oval()
+      assert_equal 5, ov.left
+      assert_equal 10, ov.top
+      assert_equal 25, ov.radius
+      assert_equal 3, ov.draw_context["strokewidth"]
+      # assert_equal 3, ov.strokewidth # This should work but doesn't yet, see issue #476
+    SHOES_SPEC
+  end
+end

data/lacci/test/test_parenting.rb

@@ -0,0 +1,140 @@
+# frozen_string_literal: true
+
+require_relative "test_helper"
+
+class TestParenting < NienteTest
+  def test_simple_button
+    run_test_niente_code(<<~SHOES_APP, app_test_code: <<~SHOES_SPEC)
+      Shoes.app do
+        button "OK"
+      end
+    SHOES_APP
+      # Test that Lacci has set parents properly
+      doc_root = button().parent
+      assert_equal Shoes::DocumentRoot, doc_root.class
+      assert_equal [button().obj], doc_root.contents
+
+      # Test that Niente has set parents properly
+      assert_equal "DocumentRoot", button().display.parent.shoes_type
+    SHOES_SPEC
+  end
+
+  def test_button_in_stack
+    run_test_niente_code(<<~SHOES_APP, app_test_code: <<~SHOES_SPEC)
+      Shoes.app do
+        stack do
+          button "OK"
+        end
+      end
+    SHOES_APP
+      # Test that Lacci has set parents properly
+      assert_equal Shoes::DocumentRoot, stack().parent.class
+      assert_equal Shoes::Stack, button().parent.class
+      assert_equal [button().obj], stack().contents
+
+      # Test that Niente has set parents properly
+      assert_equal "DocumentRoot", stack().display.parent.shoes_type
+      assert_equal "Stack", button().display.parent.shoes_type
+      assert_equal [button().display], stack().display.children
+    SHOES_SPEC
+  end
+
+  # We had a bug with this. It wasn't setting @children properly.
+  def test_clear_with_no_contents
+    run_test_niente_code(<<~SHOES_APP, app_test_code: <<~SHOES_SPEC)
+      Shoes.app do
+        @s = stack do
+        end
+        button "Clear" do
+          @s.clear do
+            para "cleared"
+          end
+        end
+      end
+    SHOES_APP
+      button().trigger_click
+      assert_equal "cleared", para.text
+    SHOES_SPEC
+  end
+
+  def test_stack_clear
+    run_test_niente_code(<<~SHOES_APP, app_test_code: <<~SHOES_SPEC)
+      Shoes.app do
+        @s = stack do
+          @p = para "Here"
+        end
+        button "Clear" do
+          @s.clear
+        end
+      end
+    SHOES_APP
+      button.trigger_click
+      assert_equal [], stack.contents
+    SHOES_SPEC
+  end
+
+  def test_drawable_remove
+    run_test_niente_code(<<~SHOES_APP, app_test_code: <<~SHOES_SPEC)
+      Shoes.app do
+        @s = stack do
+          @p = para "Here"
+        end
+        button "Clear" do
+          @p.remove
+        end
+      end
+    SHOES_APP
+      p = para # grab it while it's still there
+      button.trigger_click
+      assert_equal [], stack.contents
+      assert_nil p.parent
+    SHOES_SPEC
+  end
+
+  # I don't think Shoes does this. We have to use Lacci-specific methods.
+  # It's still good to have a test for it.
+  def test_drawable_reparent
+    run_test_niente_code(<<~SHOES_APP, app_test_code: <<~SHOES_SPEC)
+      Shoes.app do
+        @s1 = stack do
+          @p = para "Move me"
+        end
+
+        @s2 = stack do
+        end
+
+        button "Move It!" do
+          @p.set_parent(@s2)
+        end
+      end
+    SHOES_APP
+      button.trigger_click
+
+      # Check parents in Lacci
+      assert_equal [], stack("@s1").contents
+      assert_equal stack("@s2").obj, para.parent
+      assert_equal [para.obj], stack("@s2").contents
+
+      # Check parents in Niente
+      assert_equal [], stack("@s1").display.children
+      assert_equal stack("@s2").display, para.display.parent
+      assert_equal [para.display], stack("@s2").display.children
+    SHOES_SPEC
+  end
+
+  def test_add_to_non_current_slot
+    run_test_niente_code(<<~SHOES_APP, app_test_code: <<~SHOES_SPEC)
+      Shoes.app do
+        @s = stack do
+        end
+        button "Add a Button" do
+          @ok_button = @s.button "OK"
+        end
+      end
+    SHOES_APP
+      button.trigger_click
+      assert_equal [button("@ok_button").obj], stack.contents
+      assert_equal stack.obj, button("@ok_button").parent
+    SHOES_SPEC
+  end
+end

data/lacci/test/test_text_drawables.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require_relative "test_helper"
+
+class TestTextDrawables < NienteTest
+  def test_simple_button
+    run_test_niente_code(<<~'SHOES_APP', app_test_code: <<~'SHOES_SPEC')
+      Shoes.app do
+        para "These are ", em("emphatically"), " ", strong("strongly"), " text drawables!"
+      end
+    SHOES_APP
+      assert_equal "These are emphatically strongly text drawables!", para.text
+
+      # Test that Lacci has set parents properly
+      assert_equal Shoes::DocumentRoot, para.parent.class
+      assert_equal [Shoes::Para], para.parent.contents.map(&:class)
+
+      # Test that Niente has set parents properly
+      assert_equal "DocumentRoot", para().display.parent.shoes_type
+      assert_equal ["Para"], document_root.display.children.map(&:shoes_type), "Doc root should have only para as a child!"
+    SHOES_SPEC
+  end
+end

data/lib/scarpe/assets.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+require "scarpe/components/asset_server"
+
+module Scarpe::Webview
+  def self.asset_server
+    return @asset_server if @asset_server
+
+    @asset_server = Scarpe::Components::AssetServer.new app_dir: Shoes::App.instance.dir
+
+    # at_exit doesn't work reliably under webview. Give this a try.
+    ::Scarpe::Webview::DisplayService.instance.control_interface.on_event(:shutdown) do
+      @asset_server&.kill_server
+    end
+
+    @asset_server
+  end
+end