easol-canvas 4.17.0 → 4.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2396c564e638650f1f50b0f81e6b79bc9cc3020304f559f1b050034721056d58
-  data.tar.gz: ebfb662861d72d0e7c9777343ee8aee6330f348dc132575d4ca4081c0f7249d4
+  metadata.gz: fa515bf37be7d80d67de3a67e92d6097e17d7298fc436a916acf0ca04687d78c
+  data.tar.gz: bbc64745d8df45188a081795995e0c92fc86b99f53beef20a69b72741657dd91
 SHA512:
-  metadata.gz: a64ab47a1802570ed45ff6a524cd1648a9025b7082a290814049aaec927c363a952299d4e15a311b826735301d95c79cfcb036ff5a1c1cf635f5a989d99e878e
-  data.tar.gz: 365bb2ee7c14ff920f6a15558a01c25cc492814616299ab8159f88a9effd36f645a92566e4a5ad0f10ddf0ff3a4880c56c198e251906f47775bced5a13614b9f
+  metadata.gz: c91c9b333de32d036428dd9bd0c88840e57ea37c3509bb266440ffa6df89fd50d7161edf155ea40f4e22898a0ff1e0a55e0c9900f03fc67a33e0eebf3dbaed19
+  data.tar.gz: 2a8d559a57048b770104a5a3faf5536539c081571f37f44717b2850bd4f9ab7e2975f897f87da1b34014e42d5de7ed11712a9ba90b062a8cb6b3cd6676dafd98

data/lib/canvas/checks/valid_custom_types_check.rb

@@ -6,9 +6,11 @@ module Canvas
   # custom types that are defined in the /types directory.
   class ValidCustomTypesCheck < Check
     def run
+      custom_types = Canvas::FetchCustomTypes.call
+
       custom_type_files.each do |filename|
         schema = extract_json(filename)
-        validator = Validator::CustomType.new(schema: schema)
+        validator = Validator::CustomType.new(schema: schema, custom_types: custom_types)
 
         next if validator.validate
 

data/lib/canvas/checks/valid_liquid_check.rb

@@ -30,27 +30,30 @@ module Canvas
       ::Liquid::Template.register_tag(name, klass)
     end
 
-    # These are the tags that we define in the Rails app. If we add a new custom tag
-    # in the Rails app, we'll need to register it here.
+    # These are the tags that we define in the Rails app. If we add a
+    # new custom tag in the Rails app, we'll need to register it here.
     def register_tags!
-      register_tag("form", ::Liquid::Block)
-      register_tag("product_search", ::Liquid::Block)
-      register_tag("easol_badge", ::Liquid::Tag)
-      register_tag("accommodation_availability", ::Liquid::Block)
-      register_tag("cache", ::Liquid::Block)
-      register_tag("currency_switcher", ::Liquid::Tag)
-      register_tag("json", ::Liquid::Block)
-      register_tag("variant_pricing", ::Liquid::Tag)
-      register_tag("dynamic_package_booking_price", ::Liquid::Tag)
+      # Single statement non-block tags, no closing tag required.
       register_tag("cart_timer", ::Liquid::Tag)
       register_tag("cart_timer_add_time", ::Liquid::Tag)
-      register_tag("experience_slot_search", ::Liquid::Block)
-      register_tag("experience_slot_calendar", ::Liquid::Block)
-      register_tag("package_availability", Liquid::Block)
-      register_tag("package_price", Liquid::Block)
+      register_tag("currency_switcher", ::Liquid::Tag)
+      register_tag("dynamic_package_booking_price", ::Liquid::Tag)
+      register_tag("easol_badge", ::Liquid::Tag)
       register_tag("input", ::Liquid::Tag)
       register_tag("label", ::Liquid::Tag)
+      register_tag("variant_pricing", ::Liquid::Tag)
+      # Tags wrapping nested content with a closing tag.
+      register_tag("accommodation_availability", ::Liquid::Block)
+      register_tag("cache", ::Liquid::Block)
+      register_tag("experience_slot_calendar", ::Liquid::Block)
+      register_tag("experience_slot_search", ::Liquid::Block)
+      register_tag("form", ::Liquid::Block)
+      register_tag("json", ::Liquid::Block)
+      register_tag("package_availability", ::Liquid::Block)
+      register_tag("package_price", ::Liquid::Block)
       register_tag("package_step_product_search", ::Liquid::Block)
+      register_tag("packages_search_and_calendar", ::Liquid::Block)
+      register_tag("product_search", ::Liquid::Block)
     end
   end
 end

data/lib/canvas/constants.rb

@@ -16,6 +16,7 @@ module Canvas
       color
       image
       link
+      modifier
       number
       page
       post

data/lib/canvas/validators/custom_type.rb

@@ -26,10 +26,11 @@ module Canvas
     class CustomType
       REQUIRED_KEYS = %w[key name attributes].freeze
 
-      attr_reader :schema, :errors
+      attr_reader :schema, :errors, :custom_types
 
-      def initialize(schema:)
+      def initialize(schema:, custom_types: [])
         @schema = schema
+        @custom_types = custom_types
         @errors = []
       end
 
@@ -127,7 +128,7 @@ module Canvas
         schema["attributes"].each do |attribute_schema|
           attr_validator = Validator::SchemaAttribute.new(
             attribute: attribute_schema,
-            custom_types: []
+            custom_types: custom_types
           )
           next if attr_validator.validate
 

data/lib/canvas/validators/schema_attribute.rb

@@ -20,6 +20,7 @@ module Canvas
     class SchemaAttribute
       VALIDATORS = {
         "image" => SchemaAttribute::Image,
+        "modifier" => SchemaAttribute::Modifier,
         "product" => SchemaAttribute::Product,
         "post" => SchemaAttribute::Post,
         "page" => SchemaAttribute::Page,

data/lib/canvas/validators/schema_attributes/modifier.rb

@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+module Canvas
+  module Validator
+    class SchemaAttribute
+      # :documented:
+      # Attribute validations specific to modifier-type variables.
+      # Modifier drops expose name and id properties for use in site builder schemas.
+      class Modifier < Base
+        ALLOWED_DEFAULT_VALUES = %w[random].freeze
+
+        def validate
+          super &&
+            ensure_default_values_are_valid
+        end
+
+        private
+
+        def permitted_values_for_default_key
+          if attribute["array"]
+            Array
+          else
+            String
+          end
+        end
+
+        def ensure_default_values_are_valid
+          return true unless attribute.key?("default")
+
+          if attribute["array"]
+            attribute["default"].all? { |value| default_value_is_valid?(value) }
+          else
+            default_value_is_valid?(attribute["default"])
+          end
+        end
+
+        def default_value_is_valid?(value)
+          value = value.downcase
+          if !ALLOWED_DEFAULT_VALUES.include?(value)
+            @errors << %["default" for modifier-type variables must be one of: #{ALLOWED_DEFAULT_VALUES.join(', ')}]
+            false
+          else
+            true
+          end
+        end
+      end
+    end
+  end
+end

data/lib/canvas/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: easol-canvas
 version: !ruby/object:Gem::Version
-  version: 4.17.0
+  version: 4.20.0
 platform: ruby
 authors:
 - Kyle Byrne
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-04-25 00:00:00.000000000 Z
+date: 2026-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -145,6 +145,7 @@ files:
 - lib/canvas/validators/schema_attributes/experience_slot.rb
 - lib/canvas/validators/schema_attributes/image.rb
 - lib/canvas/validators/schema_attributes/link.rb
+- lib/canvas/validators/schema_attributes/modifier.rb
 - lib/canvas/validators/schema_attributes/number.rb
 - lib/canvas/validators/schema_attributes/package.rb
 - lib/canvas/validators/schema_attributes/page.rb