RubyGems - scarpe-components - Versions diffs - 0.3.0 → 0.4.0 - Mend

scarpe-components 0.3.0 → 0.4.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (52) hide show

checksums.yaml +4 -4
data/Gemfile +4 -1
data/Gemfile.lock +2 -3
data/README.md +2 -2
data/assets/bootstrap-themes/bootstrap-cerulean.css +12229 -0
data/assets/bootstrap-themes/bootstrap-cosmo.css +11810 -0
data/assets/bootstrap-themes/bootstrap-cyborg.css +12210 -0
data/assets/bootstrap-themes/bootstrap-darkly.css +12153 -0
data/assets/bootstrap-themes/bootstrap-flatly.css +12126 -0
data/assets/bootstrap-themes/bootstrap-icons.min.css +5 -0
data/assets/bootstrap-themes/bootstrap-journal.css +12099 -0
data/assets/bootstrap-themes/bootstrap-litera.css +12211 -0
data/assets/bootstrap-themes/bootstrap-lumen.css +12369 -0
data/assets/bootstrap-themes/bootstrap-lux.css +11928 -0
data/assets/bootstrap-themes/bootstrap-materia.css +13184 -0
data/assets/bootstrap-themes/bootstrap-minty.css +12177 -0
data/assets/bootstrap-themes/bootstrap-morph.css +12750 -0
data/assets/bootstrap-themes/bootstrap-pulse.css +11890 -0
data/assets/bootstrap-themes/bootstrap-quartz.css +12622 -0
data/assets/bootstrap-themes/bootstrap-sandstone.css +12201 -0
data/assets/bootstrap-themes/bootstrap-simplex.css +12186 -0
data/assets/bootstrap-themes/bootstrap-sketchy.css +12451 -0
data/assets/bootstrap-themes/bootstrap-slate.css +12492 -0
data/assets/bootstrap-themes/bootstrap-solar.css +12149 -0
data/assets/bootstrap-themes/bootstrap-spacelab.css +12266 -0
data/assets/bootstrap-themes/bootstrap-superhero.css +12216 -0
data/assets/bootstrap-themes/bootstrap-united.css +12077 -0
data/assets/bootstrap-themes/bootstrap-vapor.css +12549 -0
data/assets/bootstrap-themes/bootstrap-yeti.css +12325 -0
data/assets/bootstrap-themes/bootstrap-zephyr.css +12283 -0
data/assets/bootstrap-themes/bootstrap.bundle.min.js +7 -0
data/lib/scarpe/components/asset_server.rb +219 -0
data/lib/scarpe/components/base64.rb +22 -0
data/lib/scarpe/components/calzini/{art_widgets.rb → art_drawables.rb} +42 -18
data/lib/scarpe/components/calzini/border.rb +38 -0
data/lib/scarpe/components/calzini/button.rb +6 -8
data/lib/scarpe/components/calzini/misc.rb +7 -17
data/lib/scarpe/components/calzini/para.rb +213 -11
data/lib/scarpe/components/calzini/slots.rb +14 -60
data/lib/scarpe/components/calzini.rb +88 -1
data/lib/scarpe/components/errors.rb +4 -0
data/lib/scarpe/components/html.rb +4 -1
data/lib/scarpe/components/minitest_export_reporter.rb +11 -3
data/lib/scarpe/components/minitest_result.rb +41 -0
data/lib/scarpe/components/print_logger.rb +17 -2
data/lib/scarpe/components/process_helpers.rb +37 -0
data/lib/scarpe/components/segmented_file_loader.rb +1 -1
data/lib/scarpe/components/tiranti.rb +42 -100
data/lib/scarpe/components/unit_test_helpers.rb +3 -1
data/lib/scarpe/components/version.rb +1 -1
metadata +34 -6
data/lib/scarpe/components/calzini/text_widgets.rb +0 -65

data/lib/scarpe/components/process_helpers.rb ADDED Viewed

@@ -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/lib/scarpe/components/segmented_file_loader.rb CHANGED Viewed

@@ -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/lib/scarpe/components/tiranti.rb CHANGED Viewed

@@ -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/lib/scarpe/components/unit_test_helpers.rb CHANGED Viewed

@@ -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/lib/scarpe/components/version.rb CHANGED Viewed

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

metadata CHANGED Viewed

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scarpe-components
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Marco Concetto Rudilosso
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-11-24 00:00:00.000000000 Z
+date: 2024-05-06 00:00:00.000000000 Z
 dependencies: []
 description:
 email:
@@ -23,15 +23,43 @@ files:
 - Gemfile.lock
 - README.md
 - Rakefile
+- assets/bootstrap-themes/bootstrap-cerulean.css
+- assets/bootstrap-themes/bootstrap-cosmo.css
+- assets/bootstrap-themes/bootstrap-cyborg.css
+- assets/bootstrap-themes/bootstrap-darkly.css
+- assets/bootstrap-themes/bootstrap-flatly.css
+- assets/bootstrap-themes/bootstrap-icons.min.css
+- assets/bootstrap-themes/bootstrap-journal.css
+- assets/bootstrap-themes/bootstrap-litera.css
+- assets/bootstrap-themes/bootstrap-lumen.css
+- assets/bootstrap-themes/bootstrap-lux.css
+- assets/bootstrap-themes/bootstrap-materia.css
+- assets/bootstrap-themes/bootstrap-minty.css
+- assets/bootstrap-themes/bootstrap-morph.css
+- assets/bootstrap-themes/bootstrap-pulse.css
+- assets/bootstrap-themes/bootstrap-quartz.css
+- assets/bootstrap-themes/bootstrap-sandstone.css
+- assets/bootstrap-themes/bootstrap-simplex.css
+- assets/bootstrap-themes/bootstrap-sketchy.css
+- assets/bootstrap-themes/bootstrap-slate.css
+- assets/bootstrap-themes/bootstrap-solar.css
+- assets/bootstrap-themes/bootstrap-spacelab.css
+- assets/bootstrap-themes/bootstrap-superhero.css
+- assets/bootstrap-themes/bootstrap-united.css
+- assets/bootstrap-themes/bootstrap-vapor.css
+- assets/bootstrap-themes/bootstrap-yeti.css
+- assets/bootstrap-themes/bootstrap-zephyr.css
+- assets/bootstrap-themes/bootstrap.bundle.min.js
+- lib/scarpe/components/asset_server.rb
 - lib/scarpe/components/base64.rb
 - lib/scarpe/components/calzini.rb
 - lib/scarpe/components/calzini/alert.rb
-- lib/scarpe/components/calzini/art_widgets.rb
+- lib/scarpe/components/calzini/art_drawables.rb
+- lib/scarpe/components/calzini/border.rb
 - lib/scarpe/components/calzini/button.rb
 - lib/scarpe/components/calzini/misc.rb
 - lib/scarpe/components/calzini/para.rb
 - lib/scarpe/components/calzini/slots.rb
-- lib/scarpe/components/calzini/text_widgets.rb
 - lib/scarpe/components/errors.rb
 - lib/scarpe/components/file_helpers.rb
 - lib/scarpe/components/html.rb
@@ -40,6 +68,7 @@ files:
 - lib/scarpe/components/minitest_result.rb
 - lib/scarpe/components/modular_logger.rb
 - lib/scarpe/components/print_logger.rb
+- lib/scarpe/components/process_helpers.rb
 - lib/scarpe/components/promises.rb
 - lib/scarpe/components/segmented_file_loader.rb
 - lib/scarpe/components/string_helpers.rb
@@ -51,7 +80,6 @@ licenses:
 - MIT
 metadata:
   homepage_uri: https://github.com/scarpe-team/scarpe
-  source_code_uri: https://github.com/scarpe-team/scarpe
   changelog_uri: https://github.com/scarpe-team/scarpe/blob/main/CHANGELOG.md
 post_install_message:
 rdoc_options: []
@@ -68,7 +96,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.5.3
 signing_key:
 specification_version: 4
 summary: Reusable components for Scarpe display libraries

data/lib/scarpe/components/calzini/text_widgets.rb DELETED Viewed

@@ -1,65 +0,0 @@
-# frozen_string_literal: true
-module Scarpe::Components::Calzini
-  def link_element(props)
-    HTML.render do |h|
-      h.a(**link_attributes(props)) do
-        props["text"]
-      end
-    end
-  end
-  def span_element(props, &block)
-    HTML.render do |h|
-      h.span(**span_options(props), &block)
-    end
-  end
-  def code_element(props, &block)
-    HTML.render do |h|
-      h.code(&block)
-    end
-  end
-  def em_element(props, &block)
-    HTML.render do |h|
-      h.em(&block)
-    end
-  end
-  def strong_element(props, &block)
-    HTML.render do |h|
-      h.strong(&block)
-    end
-  end
-  private
-  def link_attributes(props)
-    {
-      id: html_id,
-      href: props["click"],
-      onclick: (handler_js_code("click") if props["has_block"]),
-      style: drawable_style(props),
-    }.compact
-  end
-  def span_style(props)
-    {
-      color: props["stroke"],
-      "font-size": span_font_size(props),
-      "font-family": props["font"],
-    }.compact
-  end
-  def span_options(props)
-    (props["html_attributes"] || {}).merge(id: html_id, style: span_style(props))
-  end
-  def span_font_size(props)
-    sz = props["size"]
-    font_size = SIZES.key?(sz.to_s.to_sym) ? SIZES[sz.to_s.to_sym] : sz
-    dimensions_length(font_size)
-  end
-end