easol-canvas 3.1.1 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 02a735325d86666992a3673a94898fd3ad6800e11c4efbe74b34eb7126b349cf
-  data.tar.gz: e86117c8bcc022a091448f90f4107aa9b07bc51c8d895e15937643ce0fe9502f
+  metadata.gz: dba3808e67ba544e61935e149356057b6a757454f3b1dbe2b4da9f85035a8edf
+  data.tar.gz: f89ba9a8687bf7ef413a19892892ca2c80482482bb8774e5c3e73030c133b220
 SHA512:
-  metadata.gz: c2ed2183d3766d3aa7daccfb40f35685739940e9e48cb419efd511d81e232e01f4865f58a06a0b07edd33786ab841ac6a6586331d874381a2722cfaf7e4dc4cb
-  data.tar.gz: 2deb9d2f391b9e47f76c5ceac8691e1786769992f684ed6ff11d4f9f6ce9a5a51ad98d40c6c968f87407d9775f1cdf01147e853aad5632fd57ff90b784728403
+  metadata.gz: aca6441038d4dd7ddfed0f8d94e7641131cb4972607f7e313ac1c448218553e003850604df4635c07a0afa6cc796e576fea4250c847eb74aad711ff6e6ff7cc5
+  data.tar.gz: 1fa803e9cd5d217c6309ec7b20b0719ac7e27cb9bee9cc8713bc88d3961abd47a25e071242dfb151aa630f2b1d882f63a3dded9641b971ec054f9f476a15aed3

data/lib/canvas/constants.rb

@@ -12,20 +12,34 @@ module Canvas
     ].freeze
 
     PRIMITIVE_TYPES = %w[
+      boolean
+      color
       image
-      product
-      post
-      page
       link
-      text
-      string
-      boolean
       number
-      color
-      select
-      range
+      page
+      post
+      product
       radio
+      range
+      select
+      string
+      text
       variant
     ].freeze
+
+    # These are types where the value is stored as a primitive type, e.g. string, integer.
+    # As opposed to values such as product IDs, color hashes, etc.
+    # This constant is currently used to determine whether it is safe to preserve
+    # a value when a variable changes type.
+    TYPES_WITH_PRIMITIVE_VALUE = %w[
+      boolean
+      number
+      radio
+      range
+      select
+      string
+      text
+    ]
   end
 end

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

@@ -7,10 +7,12 @@ module Canvas
       # Attribute validations specific to product-type variables.
       class Product < Base
         ALLOWED_DEFAULT_VALUES = %w[random].freeze
+        ALLOWED_RESTRICTIONS = %w[experiences accommodations extras].freeze
 
         def validate
           super &&
-            ensure_default_values_are_valid
+            ensure_default_values_are_valid &&
+            ensure_only_values_are_valid
         end
 
         private
@@ -23,6 +25,10 @@ module Canvas
           end
         end
 
+        def optional_keys
+          super.merge("only" => Array)
+        end
+
         def ensure_default_values_are_valid
           return true unless attribute.key?("default")
 
@@ -33,11 +39,27 @@ module Canvas
           end
         end
 
+        def ensure_only_values_are_valid
+          return true unless attribute.key?("only")
+
+          if attribute["only"].empty?
+            @errors << %["only" cannot be empty]
+            return false
+          end
+
+          unsupported_entries = attribute["only"] - ALLOWED_RESTRICTIONS
+          if unsupported_entries.any?
+            @errors << %["only" for product-type variables must be one of: #{ALLOWED_RESTRICTIONS.join(', ')}]
+            return false
+          end
+
+          true
+        end
+
         def default_value_is_valid?(value)
           value = value.downcase
           if !ALLOWED_DEFAULT_VALUES.include?(value)
-            @errors << "\"default\" for product-type variables must be "\
-                       "one of: #{ALLOWED_DEFAULT_VALUES.join(', ')}"
+            @errors << %["default" for product-type variables must be one of: #{ALLOWED_DEFAULT_VALUES.join(', ')}]
             false
           else
             true

data/lib/canvas/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: easol-canvas
 version: !ruby/object:Gem::Version
-  version: 3.1.1
+  version: 3.3.0
 platform: ruby
 authors:
 - Kyle Byrne
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-12-14 00:00:00.000000000 Z
+date: 2023-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -171,7 +171,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.3.26
 signing_key:
 specification_version: 4
 summary: CLI to help with building themes for Easol