easol-canvas 4.21.0 → 4.23.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c37703170f2a9f0870de51fa994e8929d1ed3a53ebe7f510c27ab943bddf9b6c
-  data.tar.gz: 1ccfe78c1b4aaaf9cb4bcbbd1d0afc062b63e94d93b41e162174aedff5fe9832
+  metadata.gz: 94f4dc27cf361fbf85c47c331913ce6b671126adac19148c17a5ae4c32d6bf51
+  data.tar.gz: 6c955f86cdeef741fc861780d0bfb5eb77789ea9a423d0c4cae7b273a29dafbf
 SHA512:
-  metadata.gz: 9f2ca1fc7300356060311c3e1622b05df28e9d9e48985a8d50a40319c83d15a882a4ac7174c9f39bdc501f47e2988e8a9e9980187dbf513d03b6c8193f927f62
-  data.tar.gz: 883efd325fda12742d09a6ae3b30c102c51406fec1caf10f112d1ee8ce6ea9f145de80e9c1a4d6dd2f8562c7b5909aee99895a72207108c610d735a89a318db6
+  metadata.gz: 2cddea94e53ac37253e2c7b54fda0628d80c29bb2659fe80901049b332865d8128f527c6e1ee45e55d9c570ad9c03ed7267ed123a39c6cbb75e06dbad2e267c9
+  data.tar.gz: 53a7fab10d4801a7695a9d759534b776be54d4f2394815f13de4a6a5beba7dce354f8dc0823bb29fd68cf0a61fa59ad9dde3d041d6c6ec7ce56e9cee83dfb210

data/lib/canvas/checks/valid_liquid_check.rb

@@ -46,6 +46,7 @@ module Canvas
       register_tag("accommodation_availability", ::Liquid::Block)
       register_tag("cache", ::Liquid::Block)
       register_tag("experience_slot_calendar", ::Liquid::Block)
+      register_tag("experience_slot_lookup", ::Liquid::Block)
       register_tag("experience_slot_search", ::Liquid::Block)
       register_tag("form", ::Liquid::Block)
       register_tag("json", ::Liquid::Block)

data/lib/canvas/dartsass.rb

@@ -1,13 +1,18 @@
 # frozen_string_literal: true
 
-require "open3"
+require "sass-embedded"
 
 module Canvas
-  # This is a thin wrapper around the dartsass binary as provided by
-  # dartsass-rails.
+  # Compiles SCSS with dart-sass via the sass-embedded Ruby API.
   #
   # It is compatible with SassC::Engine as much as we were using it, but 100%
   # compatability is not a goal.
+  #
+  # We use the in-process API rather than shelling out to the `dartsass`
+  # executable: the CLI resolves `Gem.bin_path("sass-embedded", "sass")`, which
+  # is ambiguous (and noisy on stderr) whenever another bundled gem — e.g. the
+  # legacy `sass` gem — also ships a `sass` executable. The API has no such
+  # dependency on executable resolution and avoids a subprocess per render.
   class DartSass
     Error = Class.new(StandardError)
 
@@ -17,31 +22,15 @@ module Canvas
     end
 
     def render
-      stdout, stderr, status = Open3.capture3(*command, stdin_data: @css)
-
-      if status == 0
-        stdout
-      else
-        raise Error.new(stderr)
-      end
-    end
-
-    private
-
-    def command
-      [dartsass, "--stdin", style, *load_paths].compact
-    end
-
-    def dartsass
-      Gem.bin_path("dartsass-rails", "dartsass").shellescape
-    end
-
-    def style
-      (s = @config[:style]) && "--style=#{s.to_s.shellescape}"
-    end
-
-    def load_paths
-      Array(@config[:load_paths]).map { "--load-path=#{_1.shellescape}" }
+      Sass.compile_string(
+        @css,
+        load_paths: Array(@config[:load_paths]),
+        style: @config[:style] || :expanded
+      ).css
+    rescue Sass::CompileError => e
+      # detailed_message keeps the formatted dart-sass error (source snippet and
+      # line:column) the CLI used to print to stderr; highlight: false strips ANSI.
+      raise Error.new(e.detailed_message(highlight: false))
     end
   end
 end

data/lib/canvas/validators/menu_schema.rb

@@ -33,7 +33,7 @@ module Canvas
     #   ]
     # }
     class MenuSchema
-      PERMITTED_KEYS = %w[max_item_levels supports_open_new_tab attributes layout].freeze
+      PERMITTED_KEYS = %w[cache max_item_levels supports_open_new_tab attributes layout].freeze
       ADDITIONAL_RESERVED_NAMES = %w[items type].freeze
 
       attr_reader :schema, :errors
@@ -49,6 +49,7 @@ module Canvas
       def validate
         if ensure_valid_format
           ensure_no_unrecognized_keys
+          ensure_cache_is_valid
           ensure_max_item_levels_is_valid
           ensure_layout_is_valid
           ensure_attributes_are_valid
@@ -75,6 +76,17 @@ module Canvas
         false
       end
 
+      def ensure_cache_is_valid
+        return true unless schema.key?("cache")
+
+        value = schema["cache"]
+        return true if value == true || value == false
+        return true if value.to_s == "true" || value.to_s == "false"
+
+        @errors << "\"cache\" must be true or false"
+        false
+      end
+
       def ensure_max_item_levels_is_valid
         return true unless schema.key?("max_item_levels")
         return true if [1, 2, 3].include?(schema["max_item_levels"].to_i)

data/lib/canvas/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Canvas
-  VERSION = "4.21.0"
+  VERSION = "4.23.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: easol-canvas
 version: !ruby/object:Gem::Version
-  version: 4.21.0
+  version: 4.23.1
 platform: ruby
 authors:
 - Kyle Byrne
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-01-27 00:00:00.000000000 Z
+date: 2026-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -81,6 +81,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.4'
+- !ruby/object:Gem::Dependency
+  name: sass-embedded
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: json-schema
   requirement: !ruby/object:Gem::Requirement