scarpe 0.3.0 → 0.5.0

data/scarpe-components/lib/scarpe/components/print_logger.rb

@@ -11,26 +11,41 @@ class Scarpe::Components::PrintLogImpl
   class PrintLogger
     class << self
       attr_accessor :silence
+      attr_accessor :min_level
     end
 
+    LEVELS = {
+      :never => 1000,
+      :error => 4,
+      :warn => 3,
+      :info => 2,
+      :debug => 1,
+      :always => -1,
+    }
+    PrintLogger.min_level = LEVELS[:always]
+
     def initialize(component_name)
       @comp_name = component_name
     end
 
     def error(msg)
-      puts "#{@comp_name} error: #{msg}" unless PrintLogger.silence
+      return if PrintLogger.silence || PrintLogger.min_level > LEVELS[:error]
+      puts "#{@comp_name} error: #{msg}"
     end
 
     def warn(msg)
+      return if PrintLogger.silence || PrintLogger.min_level > LEVELS[:warn]
       puts "#{@comp_name} warn: #{msg}" unless PrintLogger.silence
     end
 
     def debug(msg)
+      return if PrintLogger.silence || PrintLogger.min_level > LEVELS[:debug]
       puts "#{@comp_name} debug: #{msg}" unless PrintLogger.silence
     end
 
     def info(msg)
-      puts "#{@comp_name} info: #{msg}" unless PrintLogger.silence
+      return if PrintLogger.silence || PrintLogger.min_level > LEVELS[:info]
+      puts "#{@comp_name} info: #{msg}"
     end
   end
 

data/scarpe-components/lib/scarpe/components/process_helpers.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+# These can be used for unit tests, but also more generally.
+
+require_relative "file_helpers"
+
+module Scarpe::Components::ProcessHelpers
+  include Scarpe::Components::FileHelpers
+
+  # Run the command and capture its stdout and stderr output, and whether
+  # it succeeded or failed. Return after the command has completed.
+  # The awkward name is because this is normally a component of another
+  # library. Ordinarily you'd want to raise a library-specific exception
+  # on failure, print a library-specific message or delimiter, or otherwise
+  # handle success and failure. This is too general as-is.
+  #
+  # @param cmd [String,Array<String>] the command to run in Kernel#spawn format
+  # @return [Array(String,String,bool)] the stdout output, stderr output and success/failure of the command in a 3-element Array
+  def run_out_err_result(cmd)
+    out_str = ""
+    err_str = ""
+    success = nil
+
+    with_tempfiles([
+      ["scarpe_cmd_stdout", ""],
+      ["scarpe_cmd_stderr", ""],
+    ]) do |stdout_file, stderr_file|
+      pid = Kernel.spawn(cmd, out: stdout_file, err: stderr_file)
+      Process.wait(pid)
+      success = $?.success?
+      out_str = File.read stdout_file
+      err_str = File.read stderr_file
+    end
+
+    [out_str, err_str, success]
+  end
+end

data/scarpe-components/lib/scarpe/components/segmented_file_loader.rb

@@ -176,7 +176,7 @@ module Scarpe::Components
         "shoes" => proc { |seg_file| after_load { load seg_file } },
         "app_test" => proc do |seg_file|
           ENV["SHOES_SPEC_TEST"] = seg_file
-          ENV["SHOES_MINITEST_EXPORT_FILE"] = "sspec.json"
+          ENV["SHOES_MINITEST_EXPORT_FILE"] ||= "sspec.json"
         end,
       }
     end

data/scarpe-components/lib/scarpe/components/tiranti.rb

@@ -2,8 +2,8 @@
 
 # In Italian, tiranti are bootstraps -- the literal pull-on-a-boot kind, not a step to something better.
 # Tiranti.rb builds on calzini.rb, but renders a Bootstrap-decorated version of the HTML output.
-# You would ordinarily set either Calzini or Tiranti as the top-level HTML renderer, not both.
-# You'll include both if you use Tiranti, because it falls back to Calzini for a lot of its rendering.
+# You can set Tiranti as your HTML renderer and you'll get Bootstrap versions of all the drawables.
+# Tiranti requires Calzini's files because it falls back to Calzini for a lot of its rendering.
 
 require "scarpe/components/calzini"
 
@@ -17,45 +17,22 @@ module Scarpe::Components::Tiranti
   include Scarpe::Components::Calzini
   extend self
 
-  # Currently we're using Bootswatch 5
-  BOOTSWATCH_THEMES = [
-    "cerulean",
-    "cosmo",
-    "cyborg",
-    "darkly",
-    "flatly",
-    "journal",
-    "litera",
-    "lumen",
-    "lux",
-    "materia",
-    "minty",
-    "morph",
-    "pulse",
-    "quartz",
-    "sandstone",
-    "simplex",
-    "sketchy",
-    "slate",
-    "solar",
-    "spacelab",
-    "superhero",
-    "united",
-    "vapor",
-    "yeti",
-    "zephyr",
-  ]
-
-  BOOTSWATCH_THEME = ENV["SCARPE_BOOTSTRAP_THEME"] || "sketchy"
-
-  def empty_page_element
+  # Currently we're using Bootswatch 5.
+  # Bootswatch themes downloaded from https://bootswatch.com/5/THEME_NAME/bootstrap.css
+
+  def empty_page_element(theme: ENV["SCARPE_BOOTSTRAP_THEME"] || "sketchy")
+    comp_dir = File.expand_path("#{__dir__}/../../..")
+    bootstrap_js_url = Scarpe::Webview.asset_server.asset_url("#{comp_dir}/assets/bootstrap-themes/bootstrap.bundle.min.js", url_type: :asset)
+    theme_url = Scarpe::Webview.asset_server.asset_url("#{comp_dir}/assets/bootstrap-themes/bootstrap-#{theme}.css", url_type: :asset)
+    icons_url = Scarpe::Webview.asset_server.asset_url("#{comp_dir}/assets/bootstrap-themes/bootstrap-icons.min.css", url_type: :asset)
+
     <<~HTML
       <html>
         <head id='head-wvroot'>
           <meta charset="utf-8">
           <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-          <link rel="stylesheet" href="https://bootswatch.com/5/#{BOOTSWATCH_THEME}/bootstrap.css">
-          <link rel="stylesheet" href="https://bootswatch.com/_vendor/bootstrap-icons/font/bootstrap-icons.min.css">
+          <link rel="stylesheet" href=#{theme_url.inspect}>
+          <link rel="stylesheet" href=#{icons_url.inspect}>
           <style id='style-wvroot'>
             /** Style resets **/
             body {
@@ -67,22 +44,22 @@ module Scarpe::Components::Tiranti
         <body id='body-wvroot'>
           <div id='wrapper-wvroot'></div>
 
-          <script src="https://bootswatch.com/_vendor/bootstrap/dist/js/bootstrap.bundle.min.js"></script>
+          <script src=#{bootstrap_js_url}></script>
         </body>
       </html>
     HTML
   end
 
-  # def render_stack
-  # end
-  # def render_flow
-  # end
-
   # How do we want to handle theme-specific colours and primary/secondary buttons in Bootstrap?
   # "Disabled" could be checked in properties. Is there any way we can/should use "outline" buttons?
   def button_element(props)
     HTML.render do |h|
-      h.button(id: html_id, type: "button", class: "btn btn-primary", onclick: handler_js_code("click"), style: button_style(props)) do
+      h.button(
+        id: html_id,
+        type: "button",
+        class: props["html_class"] ? "btn #{props["html_class"]}" : "btn btn-primary",
+          onclick: handler_js_code("click"), style: button_style(props)
+      ) do
         props["text"]
       end
     end
@@ -97,14 +74,11 @@ module Scarpe::Components::Tiranti
     styles[:"padding-top"] = props["padding_top"] if props["padding_top"]
     styles[:"padding-bottom"] = props["padding_bottom"] if props["padding_bottom"]
     styles[:color] = props["text_color"] if props["text_color"]
-    styles[:width] = dimensions_length(props["width"]) if props["width"]
-    styles[:height] = dimensions_length(props["height"]) if props["height"]
-    styles[:"font-size"] = props["font_size"] if props["font_size"]
 
-    styles[:top] = dimensions_length(props["top"]) if props["top"]
-    styles[:left] = dimensions_length(props["left"]) if props["left"]
-    styles[:position] = "absolute" if props["top"] || props["left"]
+    # How do we want to handle font size?
+    styles[:"font-size"] = props["font_size"] if props["font_size"]
     styles[:"font-size"] = dimensions_length(text_size(props["size"])) if props["size"]
+
     styles[:"font-family"] = props["font"] if props["font"]
 
     styles
@@ -153,8 +127,11 @@ module Scarpe::Components::Tiranti
   end
 
   def progress_element(props)
+    progress_style = drawable_style(props).merge({
+      width: "90%",
+    })
     HTML.render do |h|
-      h.div(class: "progress", style: "width: 90%") do
+      h.div(id: html_id, class: "progress", style: progress_style) do
         pct = "%.1f" % ((props["fraction"] || 0.0) * 100.0)
         h.div(
           class: "progress-bar progress-bar-striped progress-bar-animated",
@@ -168,58 +145,23 @@ module Scarpe::Components::Tiranti
     end
   end
 
-  # para_element is a bit of a hard one, since it does not-entirely-trivial
-  # mapping between display objects and IDs. But we don't want Calzini
-  # messing with the display service or display objects.
   def para_element(props, &block)
-    tag, opts = para_elt_and_opts(props)
-
-    HTML.render do |h|
-      h.send(tag, **opts, &block)
-    end
-  end
-
-  private
-
-  ELT_AND_SIZE = {
-    inscription: [:p, 10],
-    ins: [:p, 10],
-    para: [:p, 12],
-    caption: [:p, 14],
-    tagline: [:p, 18],
-    subtitle: [:h3, 26],
-    title: [:h2, 34],
-    banner: [:h1, 48],
-  }.freeze
-
-  def para_elt_and_opts(props)
-    elt, size = para_elt_and_size(props)
-    size = dimensions_length(size)
-
-    para_style = drawable_style(props).merge({
-      color: rgb_to_hex(props["stroke"]),
-      "font-size": para_font_size(props),
-      "font-family": props["font"],
-    }.compact)
-
-    opts = (props["html_attributes"] || {}).merge(id: html_id, style: para_style)
-
-    [elt, opts]
-  end
-
-  def para_elt_and_size(props)
-    return [:p, nil] unless props["size"]
-
-    ps = props["size"].to_s.to_sym
-    if ELT_AND_SIZE.key?(ps)
-      ELT_AND_SIZE[ps]
+    ps, _extra = para_style(props)
+    size = ps[:"font-size"] || "12px"
+    size_int = size.to_i # Mostly useful if it's something like "12px"
+    if size.include?("calc") || size.end_with?("%")
+      # Very big text!
+      props["tag"] = "h2"
+    elsif size_int >= 48
+      props["tag"] = "h1"
+    elsif size_int >= 34
+      props["tag"] = "h2"
+    elsif size_int >= 26
+      props["tag"] = "h3"
     else
-      sz = props["size"].to_i
-      if sz > 18
-        [:h2, sz]
-      else
-        [:p, sz]
-      end
+      props["tag"] = "p"
     end
+
+    super
   end
 end

data/scarpe-components/lib/scarpe/components/unit_test_helpers.rb

@@ -5,6 +5,7 @@ require "json"
 require "fileutils"
 
 require "scarpe/components/file_helpers"
+require "scarpe/components/process_helpers"
 
 module Scarpe::Test; end
 
@@ -20,6 +21,7 @@ ALREADY_SET_UP_LOGGED_TEST_FAILURES = { setup: false }
 module Scarpe::Test::Helpers
   # Very useful for tests
   include Scarpe::Components::FileHelpers
+  include Scarpe::Components::ProcessHelpers
 
   # Temporarily set env vars for the block of code inside. The old environment
   # variable values will be restored after the block finishes.
@@ -67,7 +69,7 @@ module Scarpe::Test::LoggedTest
     @normal_log_config = Shoes::Log.current_log_config
     Shoes::Log.configure_logger(log_config_for_test)
 
-    Shoes::Log.logger("LoggedScarpeTest").info("Test: #{self.class.name}##{self.name}")
+    Shoes::Log.logger("LoggedTest").info("Test: #{self.class.name}##{self.name}")
   end
 
   # If you include this module and don't override setup/teardown, everything will

data/scarpe-components/lib/scarpe/components/version.rb

@@ -2,6 +2,6 @@
 
 module Scarpe
   module Components
-    VERSION = "0.3.0"
+    VERSION = "0.5.0"
   end
 end

data/scarpe-components/scarpe-components.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.